Merge from BRANCH_1_0.

1 files changed, 89 insertions, 57 deletions

diff --git a/i18n/it/textedit.ts b/i18n/it/textedit.ts
index 99c92ad..cf79811 100644
--- a/i18n/it/textedit.ts
+++ b/i18n/it/textedit.ts
@@ -1,59 +1,6 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation>Modifica Testo</translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation>Errore in Scrittura</translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation>Senza Nome</translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation>Editor di Testi</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>Tutti</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>Testo</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation>Permessi</translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation>Scegli font</translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>Vuoi veramente&lt;BR&gt; &lt;B&gt;cancellare&lt;/B&gt; il file corrente
-dal disco?&lt;BR&gt;Questo è &lt;B&gt;irreversibile!!&lt;/B&gt;</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation>Text Edit è copyright&lt;BR&gt;2000 Trolltech AS, e&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;ed è sotto licenza GPL</translation>
-    </message>
-</context>
-<context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
@@ -128,10 +75,6 @@ dal disco?&lt;BR&gt;Questo è &lt;B&gt;irreversibile!!&lt;/B&gt;</translation>
         <translation>Permessi File</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>Informazioni</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>File</translation>
     </message>
@@ -175,6 +118,95 @@ dal disco?&lt;BR&gt;Questo è &lt;B&gt;irreversibile!!&lt;/B&gt;</translation>
         <source>Linked Document</source>
         <translation>Documento Linkato</translation>
     </message>
+    <message>
+        <source>Goto Line...</source>
+        <translation>Vai alla Linea...</translation>
+    </message>
+    <message>
+        <source>Search Bar Open</source>
+        <translation>Apri Barra di Ricerca</translation>
+    </message>
+    <message>
+        <source>Auto Save 5 min.</source>
+        <translation>Salvataggio Automatico 5 min.</translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation>Text Editor ha rivelato&lt;BR&gt;che hai selezionato un file &lt;B&gt;.desktop&lt;/B&gt;.&lt;BR&gt;Aprire il file &lt;B&gt;.desktop&lt;/B&gt; o il file &lt;B&gt;linkato&lt;/B&gt;?</translation>
+    </message>
+    <message>
+        <source>Text Edit</source>
+        <translation>Modifica Testo</translation>
+    </message>
+    <message>
+        <source>Write Failed</source>
+        <translation>Errore in Scrittura</translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation>Senza Nome</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Permessi</translation>
+    </message>
+    <message>
+        <source>Choose font</source>
+        <translation>Scegli font</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
+        <translation type="obsolete">Vuoi veramente&lt;BR&gt; &lt;B&gt;cancellare&lt;/B&gt; il file corrente
+dal disco?&lt;BR&gt;Questo è &lt;B&gt;irreversibile!!&lt;/B&gt;</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
+        <translation>Text Edit è copyright&lt;BR&gt;2000 Trolltech AS, e&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;ed è sotto licenza GPL</translation>
+    </message>
+    <message>
+        <source>Textedit</source>
+        <translation>Textedit</translation>
+    </message>
+    <message>
+        <source>Textedit detected
+you have unsaved changes
+Go ahead and save?
+</source>
+        <translation>Sono state rivelate
+modifiche non salvate
+Procedere e salvare?</translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation>Non Salvare</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancella</translation>
+    </message>
+    <message>
+        <source>Not enough lines</source>
+        <translation>Linee insufficienti</translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Text Editor</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>Vuoi veramente&lt;BR&gt;&lt;B&gt;cancellare&lt;/B&gt; il file corrente
+dal disco?&lt;BR&gt;L&apos;operazione è &lt;B&gt;irreversibile!&lt;/B&gt;</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>