Merge pull request #42 from JHooverman/master

Updated German translation

FAQ

@@ -1,41 +1,41 @@
 FAQ
 
-Q: I have been told to look for a file in my profile directory. So where are
+Q: I have been told to look for a file in my profile directory. So where is
    all my profile data stored?
 ----------------------------------------------------------------------------------
-A: Go to Menu Help -> Informations about application and then scroll to 
+A: Please select the menu entry Help -> Informations about application and then
-   Paths section.
+   scroll to the Paths section.
 
 
 Q: I have bookmarked a page, the star icon is shining, but I cannot see
-   the bookmark in Menu nor Bookmark Panel. Where is it?
+   the bookmark in the Menu or in the bookmark panel. Where do I find it?
 ----------------------------------------------------------------------------------      
 A: When you add a bookmark from the star icon, it is automatically added
-   to unsorted bookmarks folder. You will see it only in Library (Ctrl+Shift+O).
+   to unsorted bookmarks folder. You will find it only in the library (Ctrl+Shift+O).
-   You can move the bookmark to other folder in star icon or in Library.
+   You can move the bookmark to other folder in the star icon or in the library.
    
 
 Q: I am getting a lot of SSL errors when visiting secured (https) pages.
-   Why is that?
+   Why does this happen?
 ----------------------------------------------------------------------------------
-A: Your system CA Certificates list is probably too small or even missing.
+A: Your system CA certificates list is probably too small or even missing.
-   You can check it in SSL Manager (Preferences -> Privacy -> SSL Manager).
+   You can check this in SSL Manager (Tools ->Preferences -> Privacy -> SSL Manager).
-   If this is your case, you have to download ca-bundle.crt file from
+   If this is your case, you have to download the ca-bundle.crt file from
-   https://github.com/nowrep/QupZilla/tree/master/other/ca-bundle.crt .
+   https://github.com/nowrep/QupZilla/tree/master/other/ca-bundle.crt.
    It contains certificates from Debian's ca-certificates package and I am
-   trying to update it as soon as it is updated in Debian repository.
+   trying to update it as soon as it is updated in the Debian repository.
    
    After downloading this file, you may put it into $yourprofile/certificates/
-   directory or in some other place, but then you have to add new certificate
+   directory or in some other place. But then you have to add a new certificate
-   path in SSL Manager (last tab - settings).
+   path in the SSL Manager (last tab - settings).
    
 
-Q: I cannot save any bookmark and my history is empty. What to do?
+Q: I cannot save any bookmark and my history is empty. What should I do?
 ----------------------------------------------------------------------------------
-A: At first, please check that you have installed Qt SQLite plugin.
+A: At first, please check that you have installed the Qt SQLite plugin.
    On Debian, this package is called libqt4-sql-sqlite.
    If you have it installed and you are still experiencing this issue,
-   please run QupZilla from terminal and have a look at the output.
+   please run QupZilla from a terminal window and have a look at the output.
    If it contains something like
    
          QSqlQuery::value: not positioned on a valid record
@@ -53,25 +53,25 @@ A: At first, please check that you have installed Qt SQLite plugin.
 Q: QupZilla is using a lot % of my CPU. What can I do to cool it down?
 ----------------------------------------------------------------------------------
 A: Well, the problem with using excessive amount of processor time is very likely
-   to be some Flash running in browser (most likely bad coded adverts).
+   caused by some flash content running in the browser (most likely bad coded
-   You have 3 options to do:
+   adverts). You have 3 options to solve this:
-    1) Completely disable Flash in Preferences (Browsing -> Web Configuration ->
+    1) Completely disable Flash in preferences (Browsing -> Web Configuration ->
        Enable Plugins (Flash plugin)
-    2) Use Click2Flash plugin (Preferences -> Plugins -> WebKit plugins ->
+    2) Use the Click2Flash plugin (Preferences -> Plugins -> WebKit plugins ->
-       Enable Click2Flash). You will now have to manually start every Flash content
+       Enable Click2Flash). You will now have to manually start every flash content
-       on site.
+       on a specific site.
     3) Use AdBlock to filter adverts. Menu Tools -> AdBlock -> Enable AdBlock.
-       Before using AdBlock, you need to update filters by clicking Update Filters
+       Before using AdBlock, you will have to update filters by clicking the
-       button.  
+       Update Filters button.  
    
    
-Q: When I add or edit my Search Engines and restart browser, the changes won't stay.
+Q: When I add or edit my Search Engines and restart QupZilla, the changes won't stay.
    What's wrong?
 ----------------------------------------------------------------------------------
-A: If you were using own builds from git, you have probably old version of profile
+A: If you are using your own builds from git, you have probably an old version of
-   database file. The easiest way to upgrade your database is to edit version file
+   the profile database file. The easiest way to upgrade your database is to edit
-   in your profile. Open it with some text editor and change 1.0.0-rc1 (or whatever
+   the version file in your profile. Open it with some text editor and change
-   you have in it) to 1.0.0-b4 and then restart browser.
+   1.0.0-rc1 (or whatever you have in it) to 1.0.0 and restart QupZilla.
    Your database should now be updated and changes won't be discarded on every
    restart anymore.
    

translations/de_DE.ts

@@ -236,7 +236,7 @@
     <message>
         <location filename="../src/preferences/autofillmanager.ui" line="45"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Nutzername</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.ui" line="50"/>
@@ -280,7 +280,7 @@
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="97"/>
         <source>Hide Passwords</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzeige der Passwörter verbergen</translation>
     </message>
     <message>
         <location filename="../src/preferences/autofillmanager.cpp" line="115"/>
@@ -308,7 +308,7 @@
     <message>
         <location filename="../src/autofill/autofillnotification.cpp" line="35"/>
         <source>Do you want QupZilla to remember password for &lt;b&gt;%1&lt;/b&gt; on %2?</source>
-        <translation type="unfinished"></translation>
+        <translation>Soll QupZilla das Passwort für &lt;b&gt;%1&lt;/b&gt; auf %2 speichern?</translation>
     </message>
 </context>
 <context>