Merge from BRANCH_1_0.

1 files changed, 65 insertions, 63 deletions

diff --git a/i18n/pt/keypebble.ts b/i18n/pt/keypebble.ts
index 5ddff59..1288571 100644
--- a/i18n/pt/keypebble.ts
+++ b/i18n/pt/keypebble.ts
@@ -19,3 +19,3 @@ data, the remote host has probably dropped the
 connection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao ler os dados.</translation>
     </message>
@@ -23,3 +23,3 @@ connection.</source>
         <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro desconhecido</translation>
     </message>
@@ -30,3 +30,3 @@ connection.</source>
         <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
+        <translation>À espera da inicialização do servidor...</translation>
     </message>
@@ -34,3 +34,3 @@ connection.</source>
         <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
+        <translation>À espera do nome do ambiente de trabalho...</translation>
     </message>
@@ -38,3 +38,3 @@ connection.</source>
         <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligado a %1</translation>
     </message>
@@ -42,3 +42,3 @@ connection.</source>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro de Protocolo: recebida a mensagem %1 em vez de uma actualização.</translation>
     </message>
@@ -46,3 +46,3 @@ connection.</source>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro de Protocolo: o servidor %1 usou uma codificação desconhecida </translation>
     </message>
@@ -53,3 +53,3 @@ connection.</source>
         <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
+        <translation>À espera da versão do servidor...</translation>
     </message>
@@ -57,3 +57,3 @@ connection.</source>
         <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: versão do servidor inválida, %1</translation>
     </message>
@@ -61,3 +61,3 @@ connection.</source>
         <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: versão do servidor não suportada, %1</translation>
     </message>
@@ -65,3 +65,3 @@ connection.</source>
         <source>Logged in</source>
-        <translation type="unfinished"></translation>
+        <translation>Autenticado em</translation>
     </message>
@@ -70,3 +70,4 @@ connection.</source>
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: este servidor necessita de palavra chave, mas não foi especificada nenhuma.
+</translation>
     </message>
@@ -74,3 +75,3 @@ connection.</source>
         <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: a palavra chave especificada é incorrecta.</translation>
     </message>
@@ -79,3 +80,4 @@ connection.</source>
 to this account, please try later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: demasiadas tentativas inválidas de autenticação 
+para esta conta, tente mais tarde.</translation>
     </message>
@@ -83,3 +85,3 @@ to this account, please try later.</source>
         <source>Login Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Autenticação Falhou</translation>
     </message>
@@ -87,3 +89,3 @@ to this account, please try later.</source>
         <source>Too many failures</source>
-        <translation type="unfinished"></translation>
+        <translation>Demasiadas falhas de autenticação</translation>
     </message>
@@ -94,3 +96,3 @@ to this account, please try later.</source>
         <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliente VNC</translation>
     </message>
@@ -98,3 +100,3 @@ to this account, please try later.</source>
         <source>Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
@@ -102,3 +104,3 @@ to this account, please try later.</source>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligar</translation>
     </message>
@@ -106,3 +108,3 @@ to this account, please try later.</source>
         <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Sair de Ecrâ Todo</translation>
     </message>
@@ -110,3 +112,3 @@ to this account, please try later.</source>
         <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligar ao servidor remoto</translation>
     </message>
@@ -114,3 +116,3 @@ to this account, please try later.</source>
         <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligado ao servidor remoto</translation>
     </message>
@@ -118,3 +120,3 @@ to this account, please try later.</source>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação terminada</translation>
     </message>
@@ -122,3 +124,3 @@ to this account, please try later.</source>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova Ligação</translation>
     </message>
@@ -126,3 +128,3 @@ to this account, please try later.</source>
         <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir Atalho</translation>
     </message>
@@ -130,3 +132,3 @@ to this account, please try later.</source>
         <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar Atalho</translation>
     </message>
@@ -134,3 +136,3 @@ to this account, please try later.</source>
         <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar Control-Alt-Del</translation>
     </message>
@@ -138,3 +140,3 @@ to this account, please try later.</source>
         <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo Clique é Duplo Clique</translation>
     </message>
@@ -142,3 +144,3 @@ to this account, please try later.</source>
         <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo Clique é Clique Direito</translation>
     </message>
@@ -149,3 +151,3 @@ to this account, please try later.</source>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalhos</translation>
     </message>
@@ -153,3 +155,3 @@ to this account, please try later.</source>
         <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha o atalho que deseja abrir</translation>
     </message>
@@ -160,3 +162,3 @@ to this account, please try later.</source>
         <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação do Cliente VNC</translation>
     </message>
@@ -164,3 +166,3 @@ to this account, please try later.</source>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor</translation>
     </message>
@@ -168,3 +170,3 @@ to this account, please try later.</source>
         <source>Show Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar palavra Chave</translation>
     </message>
@@ -172,3 +174,3 @@ to this account, please try later.</source>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Palavra Chave:</translation>
     </message>
@@ -176,3 +178,3 @@ to this account, please try later.</source>
         <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do Atalho:</translation>
     </message>
@@ -180,3 +182,3 @@ to this account, please try later.</source>
         <source>Host Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor:</translation>
     </message>
@@ -184,3 +186,3 @@ to this account, please try later.</source>
         <source>Display Number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Número do Ecrâ:</translation>
     </message>
@@ -188,3 +190,3 @@ to this account, please try later.</source>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
@@ -192,3 +194,3 @@ to this account, please try later.</source>
         <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar ecrâ cada:</translation>
     </message>
@@ -196,3 +198,3 @@ to this account, please try later.</source>
         <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Mili-segundos</translation>
     </message>
@@ -200,3 +202,3 @@ to this account, please try later.</source>
         <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
+        <translation>Pedir sessão de 256 cores</translation>
     </message>
@@ -204,3 +206,3 @@ to this account, please try later.</source>
         <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
+        <translation>Primeiro Plano quando tocar</translation>
     </message>
@@ -208,3 +210,3 @@ to this account, please try later.</source>
         <source>Request shared session</source>
-        <translation type="unfinished"></translation>
+        <translation>Pedir sessão partilhada</translation>
     </message>
@@ -212,3 +214,3 @@ to this account, please try later.</source>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
@@ -216,3 +218,3 @@ to this account, please try later.</source>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
@@ -220,3 +222,3 @@ to this account, please try later.</source>
         <source>4</source>
-        <translation type="unfinished"></translation>
+        <translation>4</translation>
     </message>
@@ -224,3 +226,3 @@ to this account, please try later.</source>
         <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Factor de Escala</translation>
     </message>
@@ -228,3 +230,3 @@ to this account, please try later.</source>
         <source>Encodings</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificações</translation>
     </message>
@@ -232,3 +234,3 @@ to this account, please try later.</source>
         <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;Hextile&quot;</translation>
     </message>
@@ -236,3 +238,3 @@ to this account, please try later.</source>
         <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;CoRRE&quot;</translation>
     </message>
@@ -240,3 +242,3 @@ to this account, please try later.</source>
         <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;RRE&quot;</translation>
     </message>
@@ -244,3 +246,3 @@ to this account, please try later.</source>
         <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;Copy Rectangle&quot;</translation>
     </message>
@@ -248,3 +250,3 @@ to this account, please try later.</source>
         <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>A palavra chave do servidor VNC</translation>
     </message>
@@ -252,3 +254,3 @@ to this account, please try later.</source>
         <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
+        <translation>Esconder/mostrar a palavra chave</translation>
     </message>
@@ -256,3 +258,3 @@ to this account, please try later.</source>
         <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome do servidor VNC</translation>
     </message>
@@ -260,3 +262,3 @@ to this account, please try later.</source>
         <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome de rede do servidor VNC </translation>
     </message>
@@ -264,3 +266,3 @@ to this account, please try later.</source>
         <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>O número de ecrâ do servidor VNC</translation>
     </message>
@@ -268,3 +270,3 @@ to this account, please try later.</source>
         <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervalo de actualização </translation>
     </message>
@@ -272,3 +274,3 @@ to this account, please try later.</source>
         <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
+        <translation>Usa apenas 256 cores</translation>
     </message>
@@ -276,3 +278,3 @@ to this account, please try later.</source>
         <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Permite várias ligações simultâneas ao servidor VNC</translation>
     </message>
@@ -280,3 +282,3 @@ to this account, please try later.</source>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
+        <translation>Escalar o ecrâ remoto para caber no ecrâ do dispositivo (lento)</translation>
     </message>
@@ -284,3 +286,3 @@ to this account, please try later.</source>
         <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar a transmissão de rectangulos semelhantes como referência dos dados existentes</translation>
     </message>