1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00

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

This commit is contained in:
nowrep 2012-04-30 16:27:52 +02:00
commit bb4d981c31
2 changed files with 20 additions and 44 deletions

View File

@ -2424,12 +2424,12 @@
<message>
<location filename="../src/lib/preferences/preferences.ui" line="645"/>
<source>Show tab previews</source>
<translation type="unfinished"></translation>
<translation>Приказуј прегледе језичака</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="766"/>
<source>Make tab previews animated</source>
<translation type="unfinished"></translation>
<translation>Анимирај прегледе језичака</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="791"/>
@ -2723,14 +2723,6 @@
<source>&lt;b&gt;SSL Certificates&lt;/b&gt;</source>
<translation>&lt;b&gt;ССЛ сертификати&lt;/b&gt;</translation>
</message>
<message>
<source>SSL Manager</source>
<translation type="obsolete">ССЛ менаџер</translation>
</message>
<message>
<source>Edit CA certificates in SSL Manager</source>
<translation type="obsolete">Уредите сертификате издавача у ССЛ менаџеру</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1856"/>
<location filename="../src/lib/preferences/preferences.ui" line="2115"/>
@ -2750,7 +2742,7 @@
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1918"/>
<source>Certificate Manager</source>
<translation type="unfinished"></translation>
<translation>Менаџер сертификата</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1969"/>
@ -2805,7 +2797,7 @@
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1863"/>
<source>Manage CA certificates</source>
<translation type="unfinished"></translation>
<translation>Управљај сертификатима</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="2122"/>
@ -3997,14 +3989,10 @@ Please add some with RSS icon in navigation bar on site which offers feeds.</sou
</context>
<context>
<name>SSLManager</name>
<message>
<source>SSL Manager</source>
<translation type="obsolete">ССЛ менаџер</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="14"/>
<source>Certificate Manager</source>
<translation type="unfinished"></translation>
<translation>Менаџер сертификата</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="24"/>
@ -4030,7 +4018,7 @@ Please add some with RSS icon in navigation bar on site which offers feeds.</sou
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="79"/>
<source>Import</source>
<translation type="unfinished"></translation>
<translation>Увези</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="106"/>
@ -4083,7 +4071,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<message>
<location filename="../src/lib/preferences/sslmanager.cpp" line="134"/>
<source>Import certificate...</source>
<translation type="unfinished"></translation>
<translation>Увоз сертификата...</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.cpp" line="165"/>
@ -4837,17 +4825,17 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<message>
<location filename="../src/lib/webview/webpage.cpp" line="300"/>
<source>QupZilla cannot handle &lt;b&gt;%1:&lt;/b&gt; links. The requested link is &lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;Do you want QupZilla to try open this link in system application?</source>
<translation type="unfinished"></translation>
<translation>Капзила не може да рукује &lt;b&gt;%1:&lt;/b&gt; везама. Захтијевана веза је &lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;Желите ли да Капзила покуша да отвори ову везу помоћу системског програма?</translation>
</message>
<message>
<location filename="../src/lib/webview/webpage.cpp" line="305"/>
<source>Remember my choice for this protocol</source>
<translation type="unfinished"></translation>
<translation>Запамти мој избор за за овај протокол</translation>
</message>
<message>
<location filename="../src/lib/webview/webpage.cpp" line="306"/>
<source>External Protocol Request</source>
<translation type="unfinished"></translation>
<translation>Захтјев за спољашњи протокол</translation>
</message>
<message>
<location filename="../src/lib/webview/webpage.cpp" line="408"/>

View File

@ -2423,12 +2423,12 @@
<message>
<location filename="../src/lib/preferences/preferences.ui" line="645"/>
<source>Show tab previews</source>
<translation type="unfinished"></translation>
<translation>Приказуј прегледе језичака</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="766"/>
<source>Make tab previews animated</source>
<translation type="unfinished"></translation>
<translation>Анимирај прегледе језичака</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="791"/>
@ -2722,14 +2722,6 @@
<source>&lt;b&gt;SSL Certificates&lt;/b&gt;</source>
<translation>&lt;b&gt;ССЛ сертификати&lt;/b&gt;</translation>
</message>
<message>
<source>SSL Manager</source>
<translation type="obsolete">ССЛ менаџер</translation>
</message>
<message>
<source>Edit CA certificates in SSL Manager</source>
<translation type="obsolete">Уредите сертификате издавача у ССЛ менаџеру</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1856"/>
<location filename="../src/lib/preferences/preferences.ui" line="2115"/>
@ -2749,7 +2741,7 @@
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1918"/>
<source>Certificate Manager</source>
<translation type="unfinished"></translation>
<translation>Менаџер сертификата</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1969"/>
@ -2804,7 +2796,7 @@
<message>
<location filename="../src/lib/preferences/preferences.ui" line="1863"/>
<source>Manage CA certificates</source>
<translation type="unfinished"></translation>
<translation>Управљај сертификатима</translation>
</message>
<message>
<location filename="../src/lib/preferences/preferences.ui" line="2122"/>
@ -3996,14 +3988,10 @@ Please add some with RSS icon in navigation bar on site which offers feeds.</sou
</context>
<context>
<name>SSLManager</name>
<message>
<source>SSL Manager</source>
<translation type="obsolete">ССЛ менаџер</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="14"/>
<source>Certificate Manager</source>
<translation type="unfinished"></translation>
<translation>Менаџер сертификата</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="24"/>
@ -4029,7 +4017,7 @@ Please add some with RSS icon in navigation bar on site which offers feeds.</sou
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="79"/>
<source>Import</source>
<translation type="unfinished"></translation>
<translation>Увези</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.ui" line="106"/>
@ -4082,7 +4070,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<message>
<location filename="../src/lib/preferences/sslmanager.cpp" line="134"/>
<source>Import certificate...</source>
<translation type="unfinished"></translation>
<translation>Увоз сертификата...</translation>
</message>
<message>
<location filename="../src/lib/preferences/sslmanager.cpp" line="165"/>
@ -4836,17 +4824,17 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<message>
<location filename="../src/lib/webview/webpage.cpp" line="300"/>
<source>QupZilla cannot handle &lt;b&gt;%1:&lt;/b&gt; links. The requested link is &lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;Do you want QupZilla to try open this link in system application?</source>
<translation type="unfinished"></translation>
<translation>Капзила не може да рукује &lt;b&gt;%1:&lt;/b&gt; везама. Захтевана веза је &lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;Желите ли да Капзила покуша да отвори ову везу помоћу системског програма?</translation>
</message>
<message>
<location filename="../src/lib/webview/webpage.cpp" line="305"/>
<source>Remember my choice for this protocol</source>
<translation type="unfinished"></translation>
<translation>Запамти мој избор за за овај протокол</translation>
</message>
<message>
<location filename="../src/lib/webview/webpage.cpp" line="306"/>
<source>External Protocol Request</source>
<translation type="unfinished"></translation>
<translation>Захтев за спољашњи протокол</translation>
</message>
<message>
<location filename="../src/lib/webview/webpage.cpp" line="408"/>