Merge pull request #47 from JHooverman/master

Updated German translation + english corrections
QupZilla · Dec 4, 2011 · 934e6ea · 934e6ea
2 parents 7205c73 + 79ef665
commit 934e6ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/preferences/sslmanager.ui b/src/preferences/sslmanager.ui
@@ -54,7 +54,7 @@
        <item row="0" column="0" colspan="2">
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>This is list of CA Authorities Certificates stored in standard system path and in user specified paths.</string>
+          <string>This is a list of CA Authorities Certificates stored in the standard system path and in user specified paths.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -105,7 +105,7 @@
        <item row="0" column="0" colspan="2">
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>This is list of Local Certificates stored in user profile. This list also contains all certificates, that have received an exception.</string>
+          <string>This is a list of Local Certificates stored in your user profile. It also contains all certificates, that have received an exception.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -156,7 +156,7 @@
        <item row="0" column="0" colspan="4">
         <widget class="QLabel" name="label_3">
          <property name="text">
-          <string>If CA Authorities Certificates were not automatically loaded from system, you can specify manual paths where certificates are stored.</string>
+          <string>If CA Authorities Certificates were not automatically loaded from the system, you can specify paths manually where the certificates are stored.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -168,7 +168,7 @@
          <item row="1" column="1">
           <widget class="QLabel" name="label_4">
            <property name="text">
-            <string>&lt;b&gt;NOTE:&lt;/b&gt; Setting this option is big security risk!</string>
+            <string>&lt;b&gt;NOTE:&lt;/b&gt; Setting this option is a high security risk!</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
@@ -230,7 +230,7 @@
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>All certificates must have .crt suffix.
-After adding or removing certificate paths, it is neccessary to restart browser in order to changes take effect.</string>
+After adding or removing certificate paths, it is neccessary to restart QupZilla in order to take effect the changes.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>

diff --git a/translations/de_DE.ts b/translations/de_DE.ts
@@ -2218,7 +2218,7 @@
     <message>
         <location filename="../src/preferences/preferences.ui" line="284"/>
         <source>Open speed dial</source>
-        <translation type="unfinished"></translation>
+        <translation>Schnellwahl öffnen</translation>
     </message>
     <message>
         <location filename="../src/preferences/preferences.ui" line="438"/>
@@ -3187,43 +3187,43 @@
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="220"/>
         <source>Speed Dial</source>
-        <translation type="unfinished"></translation>
+        <translation>Schnellwahl</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="221"/>
         <source>Add New Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Seite hinzufügen</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="222"/>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="230"/>
         <source>Edit</source>
-        <translation type="unfinished">Bearbeiten</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="223"/>
         <source>Remove</source>
-        <translation type="unfinished">Entfernen</translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="224"/>
         <source>Reload</source>
-        <translation type="unfinished">Neu laden</translation>
+        <translation>Neu laden</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="228"/>
         <source>Url</source>
-        <translation type="unfinished">Url</translation>
+        <translation>Url</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="229"/>
         <source>Title</source>
-        <translation type="unfinished">Titel</translation>
+        <translation>Titel</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="231"/>
         <source>New Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Seite</translation>
     </message>
     <message>
         <location filename="../src/network/qupzillaschemehandler.cpp" line="174"/>