1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Merge branch 'master' of github.com:QupZilla/qupzilla

This commit is contained in:
nowrep 2013-09-01 12:47:42 +02:00
commit 51a686598d
2 changed files with 2 additions and 2 deletions

View File

@ -460,7 +460,7 @@
<item row="5" column="1" colspan="3"> <item row="5" column="1" colspan="3">
<widget class="QLabel" name="label_19"> <widget class="QLabel" name="label_19">
<property name="text"> <property name="text">
<string>&lt;b&gt;Warning:&lt;/b&gt; Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable this options first!</string> <string>&lt;b&gt;Warning:&lt;/b&gt; Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first!</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

View File

@ -1469,7 +1469,7 @@ Please install latest version of QupZilla.</source>
</message> </message>
<message> <message>
<location filename="../src/lib/cookies/cookiemanager.ui" line="463"/> <location filename="../src/lib/cookies/cookiemanager.ui" line="463"/>
<source>&lt;b&gt;Warning:&lt;/b&gt; Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable this options first!</source> <source>&lt;b&gt;Warning:&lt;/b&gt; Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>