Merge from BRANCH_1_0.

1 files changed, 16 insertions, 19 deletions

diff --git a/i18n/it/mediummount.ts b/i18n/it/mediummount.ts
index 6fb21e1..dc102d0 100644
--- a/i18n/it/mediummount.ts
+++ b/i18n/it/mediummount.ts
@@ -1,20 +1,21 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
-        <translation>Globale</translation>
+        <source>Medium Mount Settings</source>
+        <translation>Gestione Supporti</translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Global</source>
+        <translation>Globale</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="obsolete">Se un supporto viene inserito in questo dispositivo, Opie vi cercherà dei Documenti. Su supporti molto grandi la ricerca impiegherà più tempo. Puoi scegliere se Opie deve cercare i Documenti in modo globale o in base al supporto. Potrai inoltre riconfigurare ogni supporto.</translation>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Se un supporto viene inserito nel dispositivo Opie tenta di ricercare dei Documenti. Su supporti molto grandi questa operazione può impiegare parecchio tempo. Puoi scegliere se Opie deve effettuare la ricerca globalmente o per singolo supporto. Puoi riconfigurare inoltre ogni supporto.</translation>
     </message>
     <message>
         <source>Enable medium checking</source>
@@ -26,7 +27,7 @@
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Quale file multimediale</translation>
+        <translation>Quali file multimediali</translation>
     </message>
     <message>
         <source>Audio</source>
@@ -48,16 +49,16 @@
         <source>Video</source>
         <translation>Video</translation>
     </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation>Configura questo supporto.  Le modifiche avranno effetto solo dopo la chiusura dell&apos;applicazione. Per aggiornare il Tab Documenti devi rimuovere ed reinserire il supporto.</translation>
+    </message>
     <message>
         <source>Which media files</source>
-        <translation>Quake file multimediale</translation>
+        <translation>Quali file multimediali</translation>
     </message>
     <message>
         <source>Audio</source>
@@ -91,9 +92,5 @@
         <source>Always check this medium</source>
         <translation>Controlla sempre questo supporto</translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>