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 2012-08-10 21:17:12 +02:00
commit 0f98af2001

View File

@ -196,11 +196,11 @@
</message> </message>
<message> <message>
<source>Disable on %1</source> <source>Disable on %1</source>
<translation type="unfinished"></translation> <translation>%1 </translation>
</message> </message>
<message> <message>
<source>Disable only on this page</source> <source>Disable only on this page</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -2369,23 +2369,24 @@
</message> </message>
<message> <message>
<source>Suggest when typing into address bar:</source> <source>Suggest when typing into address bar:</source>
<translation type="unfinished"></translation> <translation>:</translation>
</message> </message>
<message> <message>
<source>History and Bookmarks</source> <source>History and Bookmarks</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>History</source> <source>History</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>Bookmarks</source> <source>Bookmarks</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>Nothing</source> <source>Nothing</source>
<translation type="unfinished"></translation> <translatorcomment></translatorcomment>
<translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -4087,7 +4088,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<message> <message>
<source>To show this page, QupZilla must resend request which do it again <source>To show this page, QupZilla must resend request which do it again
(like searching on making an shopping, which has been already done.)</source> (like searching on making an shopping, which has been already done.)</source>
<translation type="unfinished"></translation> <translation>QupZillaがもう一度リクエストを送信する必要があります()</translation>
</message> </message>
</context> </context>
<context> <context>
@ -4111,7 +4112,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
</message> </message>
<message> <message>
<source>Show suggestions</source> <source>Show suggestions</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>