Merge from BRANCH_1_0.

1 files changed, 61 insertions, 56 deletions

diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 37db7fb..4e02e16 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -3,15 +3,15 @@
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation type="unfinished"></translation>
+        <translation>Problema na Aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A aplicação %1 não está a responder.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Quer forçar o término da aplicação?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,26 +19,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toque na cruz com firmeza e 
+precisão para calibrar o ecrâ.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Bem-vindo ao Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista em Icones</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista em Lista</translation>
     </message>
 </context>
 <context>
@@ -46,192 +47,196 @@ accurately to calibrate your screen.</source>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
+        <translation>O nível de energia está muito baixo.
+Desligue o dispositivo ou ligue-o à corrente!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
+        <translation>O nível de energia está baixo.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
+        <translation>O nível de energia da bateria extra está baixo.
+Deve carregá-la.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão de Visita</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação</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 type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A data do sistema não parece ser válida.
+(%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation>Execução</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation>- Execução</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhuma aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não há nenhuma aplicação definida para este tipo de documento.&lt;p&gt;O tipo do documento é %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation type="unfinished"></translation>
+        <translation>A procurar documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation type="unfinished"></translation>
+        <translation>A procurar nos documentos</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ficheiros</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os tipos de ficheiros</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Documentos</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão inserido</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Foi inserido um cartão. Quer indexar os ficheiros dele?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <translation>Que tipos de ficheiros</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Àudio</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Imagem</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Vídeo</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicações</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
+        <translation>Limitar a procura à directoria: (por implementar)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
+        <translation>A sua decisão será guardada no cartão.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Não perguntar novamente para este cartão</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Estado da Bateria</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar o Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar Dispositivo</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;
+Estas operações estão disponíveis principalmente para desenvolvimento e testes do sistema Opie. Num ambiente normal, estes conceitos são desnecessários.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
+        <translation>A desligar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação de Sincronização</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;Se estiver a usar uma versão do Ambiente Qtopia mais antigo que a 1.5.1, deverá actualizá-lo.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"></translation>
+        <translation>Rejeitar</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;É normal se for o primeiro acesso para sincronização.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir</translation>
     </message>
 </context>
 <context>