Merge from BRANCH_1_0.

1 files changed, 38 insertions, 53 deletions

diff --git a/i18n/it/odict.ts b/i18n/it/odict.ts
index 5b587d8..ffdb0e7 100644
--- a/i18n/it/odict.ts
+++ b/i18n/it/odict.ts
@@ -1,127 +1,112 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opzioni</translation>
     </message>
     <message>
         <source>Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Metodo di ricerca</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <source>New</source>
+        <translation>Nuovo</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <source>Change</source>
+        <translation>Cambia</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>Dizionario Opie</translation>
     </message>
     <message>
         <source>Query:</source>
-        <translation type="unfinished"></translation>
+        <translation>Query:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <translation>Metodi di ricerca</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>
+        <translation>C&amp;ase sensitive</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>
-        <translation type="unfinished"></translation>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>Parameter</source>
+        <translation>Parametro</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>No dictionary defined</source>
+        <translation>Nessun dizionario definito</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definiscine uno</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancella</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Configuration</source>
+        <translation>Configurazione</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation type="unfinished"></translation>
+        <source>Opie-Dictionary</source>
+        <translation>Dizionario Opie</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
-        <translation type="unfinished"></translation>
+        <translation>File dizionario</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca</translation>
     </message>
     <message>
         <source>Language 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Linguaggio 1</translation>
     </message>
     <message>
         <source>Decollator</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Language 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Linguaggio 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo Metodo di ricerca</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambia Metodo di ricerca</translation>
     </message>
 </context>
 </TS>