Merge from BRANCH_1_0.

1 files changed, 11 insertions, 10 deletions

diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index af5cb1f..10dedec 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,17 +1,18 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -53,73 +54,66 @@ Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</transla
     <message>
         <source>Battery is running very low.</source>
         <translation>La batteria si sta scaricando.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>biglietto da visita</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Informazione</translation>
+        <translation>Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>Stato Batteria</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca documenti</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca documenti</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Tutti i tipi di file</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Mostra Documento</translation>
     </message>
@@ -167,32 +161,39 @@ Cambiarla subito.</translation>
         <translation>Limita ricerca alla dir: (non ancora usata)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>La tua scelta verrà inserita sul supporto.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Non chiedere nuovamente per questo supporto</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Stato Batteria</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Chiudi Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Riavvia</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Riavvia Opie</translation>