Merge from BRANCH_1_0.

1 files changed, 64 insertions, 50 deletions

diff --git a/i18n/it/advancedfm.ts b/i18n/it/advancedfm.ts
index a5aabc6..ea3bb64 100644
--- a/i18n/it/advancedfm.ts
+++ b/i18n/it/advancedfm.ts
@@ -6,26 +6,16 @@
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>La directory non esiste</translation>
     </message>
     <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-copyright 2002 di
-L.J.Potter &lt;llornkcor@handhelds.org&gt;
-sotto licenza GPL</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Mostra File Nascosti</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Esegui</translation>
     </message>
     <message>
@@ -112,98 +102,74 @@ sotto licenza GPL</translation>
         <source>Switch to Local</source>
         <translation>Cambia su Locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Cambia su Remoto</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">Informazioni</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="obsolete">Vuoi veramente cancellare
-</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossibile rinominare</translation>
     </message>
     <message>
-        <source> already exists
-Do you really want to delete it?</source>
-        <translation type="obsolete"> già esiste
-Vuoi veramente cancellarlo?</translation>
-    </message>
-    <message>
         <source>Could not copy
 </source>
         <translation>Impossibile copiare
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>to
 </translation>
     </message>
     <message>
         <source>Copy </source>
-        <translation>Copia</translation>
+        <translation>Copia </translation>
     </message>
     <message>
         <source> As</source>
-        <translation>Come</translation>
+        <translation> Come</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Impossibile spostare
 </translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Output AdvancedFm</translation>
     </message>
     <message>
-        <source>command failed!</source>
-        <translation type="obsolete">commando fallito!</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
         <source>Advancedfm Beam out</source>
         <translation>Trasmissione Advancedfm</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir eseguito.</translation>
     </message>
     <message>
@@ -220,24 +186,16 @@ copyright 2002-2003 di
 L.J.Potter &lt;llornkcor@handhelds.org&gt;
 sotto licenza GPL</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambia Directory</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!!</source>
-        <translation>Impossibile eliminare la directory corrente
-dai bookmarks.
-Non è inserita nei bookmark!!</translation>
-    </message>
-    <message>
         <source>Select All</source>
         <translation>Seleziona Tutto</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Directory Bookmark</translation>
     </message>
     <message>
@@ -250,22 +208,16 @@ Non è inserita nei bookmark!!</translation>
         <translation>Vuoi realmente cancellare
 %1 file?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Cancella Directory?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>Eliminare realmente
-</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>Copiare realmente
 %1 file?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>File Esistente!</translation>
@@ -289,27 +241,69 @@ esiste. Ok per sovrascrivere?</translation>
 Do you really want to delete it?</source>
         <translation> già esiste.
 Vuoi veramente eliminarlo?</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation>Impossibile rimuovere la directory corrente
+dai bookmark.
+Non è inserita nei bookmark!</translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation>Cerca File</translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>Vuoi veramente eliminare %1
+e tutto il suo contenuto ?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>Vuoi veramente eliminare
+%1?</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salva output su file (solo nome)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>Il processo non può essere iniziato</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Errore
+</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Terminato
+</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Imposta Permessi File</translation>
     </message>
     <message>
@@ -343,10 +337,30 @@ Vuoi veramente eliminarlo?</translation>
     <message>
         <source>write</source>
         <translation>scrittura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>esecuzione</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Attenzione</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Errore- nessun utente</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Errore- nessun gruppo</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Errore impostazioni proprietà utente o gruppo</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Errore impostazioni permessi</translation>
+    </message>
 </context>
 </TS>