Merge from BRANCH_1_0.

1 files changed, 13 insertions, 29 deletions

diff --git a/i18n/en/odict.ts b/i18n/en/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/en/odict.ts
+++ b/i18n/en/odict.ts
@@ -1,100 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>