Merge from BRANCH_1_0.

1 files changed, 26 insertions, 43 deletions

diff --git a/i18n/de/odict.ts b/i18n/de/odict.ts
index ade26b7..84e6e04 100644
--- a/i18n/de/odict.ts
+++ b/i18n/de/odict.ts
@@ -1,128 +1,111 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Suchmethode</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation>Allgemeine Einstellungen</translation>
+        <source>New</source>
+        <translation>Neu</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation>Suchmethoden</translation>
+        <source>Change</source>
+        <translation>Ändern</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
-        <source>OPIE-Dictionary</source>
-        <translation>Opie-Wörterbuch</translation>
+        <source>Opie-Dictionary</source>
+        <translation>OPIE-Wörterbuch</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Suche:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation>Suchmethoden</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Groß/Kleinschreibung beachten</translation>
-    </message>
-    <message>
-        <source>Only &amp;complete Words</source>
-        <translation>&amp;Nur ganze Wörter</translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation>&amp;Reguläre Ausdrücke erlauben</translation>
+        <translation>&amp;Groß- und Kleinschreibung beachten</translation>
     </message>
     <message>
-        <source>0 Errors</source>
-        <translation>0 Fehler</translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation>1 Fehler</translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation>2 Fehler</translation>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation>3 Fehler</translation>
+        <source>Parameter</source>
+        <translation>Parameter</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation>4 Fehler</translation>
+        <source>No dictionary defined</source>
+        <translation>Kein Wörterbuch definiert</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation>Bis zum Treffer</translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definieren</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation>&amp;Fehlertoleranz</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Abbruch</translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation>Parameter</translation>
+        <source>OPIE-Dictionary</source>
+        <translation>OPIE-Lexikon</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
-        <translation>Wörterbuchdatei</translation>
+        <translation>Wörterbuch</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Sprache 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Trenner</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Sprache 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Neue Suchmethode</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
-        <translation>Ändere Suchmethode</translation>
+        <translation>Suchmethode ändern</translation>
     </message>
 </context>
 </TS>