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

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

This commit is contained in:
nowrep 2012-03-12 19:48:02 +01:00
commit 873aa12a74

View File

@ -1239,7 +1239,7 @@
</message> </message>
<message> <message>
<source>Image files</source> <source>Image files</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -2277,11 +2277,11 @@
</message> </message>
<message> <message>
<source>Allow Netscape Plugins (Flash plugin)</source> <source>Allow Netscape Plugins (Flash plugin)</source>
<translation type="unfinished"></translation> <translation>Flashプラグインを有効にする</translation>
</message> </message>
<message> <message>
<source>Don&apos;t load tabs until selected</source> <source>Don&apos;t load tabs until selected</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -2606,7 +2606,7 @@
<message> <message>
<source>Configuration Information</source> <source>Configuration Information</source>
<translatorcomment></translatorcomment> <translatorcomment></translatorcomment>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<source>Report &amp;Issue</source> <source>Report &amp;Issue</source>
@ -2980,35 +2980,35 @@
</message> </message>
<message> <message>
<source>Build Configuration</source> <source>Build Configuration</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>Disabled</source> <source>Disabled</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>&lt;b&gt;Enabled&lt;/b&gt;</source> <source>&lt;b&gt;Enabled&lt;/b&gt;</source>
<translation type="unfinished"></translation> <translation>&lt;b&gt;&lt;/b&gt;</translation>
</message> </message>
<message> <message>
<source>Debug build</source> <source>Debug build</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<source>WebGL support</source> <source>WebGL support</source>
<translation type="unfinished"></translation> <translation>WebGLサポート</translation>
</message> </message>
<message> <message>
<source>Windows 7 API</source> <source>Windows 7 API</source>
<translation type="unfinished"></translation> <translation>Windows 7 API</translation>
</message> </message>
<message> <message>
<source>KDE integration</source> <source>KDE integration</source>
<translation type="unfinished"></translation> <translation>KDE integration</translation>
</message> </message>
<message> <message>
<source>Portable build</source> <source>Portable build</source>
<translation type="unfinished"></translation> <translation>Portable build</translation>
</message> </message>
</context> </context>
<context> <context>
@ -3597,7 +3597,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
</message> </message>
<message> <message>
<source>Image files</source> <source>Image files</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -3914,7 +3914,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<message> <message>
<source>Clear All</source> <source>Clear All</source>
<translatorcomment></translatorcomment> <translatorcomment></translatorcomment>
<translation></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>
@ -4108,7 +4108,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
</message> </message>
<message> <message>
<source>Create Search Engine</source> <source>Create Search Engine</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
</context> </context>
<context> <context>