Merge from BRANCH_1_0.

1 files changed, 187 insertions, 58 deletions

diff --git a/i18n/pt/reader.ts b/i18n/pt/reader.ts
index 4d52761..af0a2ac 100644
--- a/i18n/pt/reader.ts
+++ b/i18n/pt/reader.ts
@@ -1,664 +1,793 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CBarPrefs</name>
     <message>
         <source>Toolbar Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações da Barra de Ferramentas</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Marks</source>
         <translation>Marcas</translation>
     </message>
     <message>
         <source>Indicators</source>
         <translation>Indicadores</translation>
     </message>
     <message>
         <source>Policy</source>
         <translation>Política</translation>
     </message>
 </context>
 <context>
     <name>CButtonPrefs</name>
     <message>
         <source>Scroll Speed</source>
         <translation>Velocidade de Deslizamento</translation>
     </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation>&lt;Nenhum&gt;</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Abrir ficheiro</translation>
+    </message>
+    <message>
+        <source>Autoscroll</source>
+        <translation>Deslizamento Automático</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Atalho</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anotar</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Ecrâ Todo</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation>Aproximar</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation>Afastar</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Voltar</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Próximo</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Início</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation>Página Anterior</translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation>Página Seguinte</translation>
+    </message>
+    <message>
+        <source>Line up</source>
+        <translation>Linha Acima</translation>
+    </message>
+    <message>
+        <source>Line down</source>
+        <translation>Linha Abaixo</translation>
+    </message>
+    <message>
+        <source>Beginning</source>
+        <translation>Início</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Fim</translation>
+    </message>
+    <message>
+        <source>Escape Button</source>
+        <translation>Botão de Escape</translation>
+    </message>
+    <message>
+        <source>Space Button</source>
+        <translation>Botão de Espaço</translation>
+    </message>
+    <message>
+        <source>Return Button</source>
+        <translation>Botão de Enter</translation>
+    </message>
+    <message>
+        <source>Left Arrow</source>
+        <translation>Seta Esquerda</translation>
+    </message>
+    <message>
+        <source>Right Arrow</source>
+        <translation>Seta Direita</translation>
+    </message>
+    <message>
+        <source>Down Arrow</source>
+        <translation>Seta Baixo</translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation>Seta Cima</translation>
+    </message>
 </context>
 <context>
     <name>CCloseDialog</name>
     <message>
         <source>Tidy-up</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrumar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Delete Bookmarks</source>
-        <translation type="unfinished">Apagar</translation>
+        <translation>Apagar Atalhos</translation>
     </message>
     <message>
         <source>Delete Configuration</source>
         <translation>Apagar Configuração</translation>
     </message>
 </context>
 <context>
     <name>CFileBarPrefs</name>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>Two/One
 Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Dois/Up
+Toque</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
 </context>
 <context>
     <name>CIndBarPrefs</name>
     <message>
         <source>Annotation</source>
         <translation>Anotação</translation>
     </message>
 </context>
 <context>
     <name>CInterPrefs</name>
     <message>
         <source>International</source>
         <translation>Internacional</translation>
     </message>
     <message>
         <source>Ideograms</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideogramas</translation>
     </message>
     <message>
         <source>Ideogram Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Largura das Ideogramas</translation>
     </message>
     <message>
         <source>Apply font
 to dialogs</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicar fontes
+aos diálogos</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Codificação</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
     <message>
         <source>Two/One
 Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Dois/Um
+Toque</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Dicionário</translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>Mudar Acção
+do Toque</translation>
     </message>
 </context>
 <context>
     <name>CLayoutPrefs</name>
     <message>
         <source>Strip CR</source>
         <translation>Remover CR</translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation>Remover Hífens</translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation>Espaço Simples</translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation>Remover Identação</translation>
     </message>
     <message>
         <source>Reparagraph</source>
-        <translation type="unfinished"></translation>
+        <translation>Re-paragrafar</translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation>Espaço Duplo</translation>
     </message>
     <message>
         <source>Remap</source>
-        <translation type="unfinished"></translation>
+        <translation>Re-mapear</translation>
     </message>
     <message>
         <source>Embolden</source>
-        <translation type="unfinished"></translation>
+        <translation>Mais escuro</translation>
     </message>
     <message>
         <source>Full Justify</source>
         <translation>Justificação Completa</translation>
     </message>
+    <message>
+        <source>Text</source>
+        <translation>Texto</translation>
+    </message>
 </context>
 <context>
     <name>CLayoutPrefs2</name>
     <message>
         <source>Indent</source>
         <translation>Identar</translation>
     </message>
     <message>
         <source>Page
 Overlap</source>
-        <translation type="unfinished"></translation>
+        <translation>Sobrepor
+Páginas</translation>
     </message>
     <message>
         <source>Graphics
 Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Escalar os
+Gráficos</translation>
     </message>
     <message>
         <source>Margin</source>
         <translation>Margem</translation>
     </message>
     <message>
         <source>Paragraph
 Leading</source>
-        <translation type="unfinished"></translation>
+        <translation>Identação
+do Parágrafo</translation>
     </message>
     <message>
         <source>Line
 Leading</source>
-        <translation type="unfinished"></translation>
+        <translation>Identação
+da Linha</translation>
     </message>
     <message>
         <source>Markup</source>
-        <translation type="unfinished"></translation>
+        <translation>Marcas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
 </context>
 <context>
     <name>CMarkBarPrefs</name>
     <message>
         <source>Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalho</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Anotar</translation>
     </message>
     <message>
         <source>Goto</source>
-        <translation type="unfinished">Ir Para</translation>
+        <translation>Ir Para</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Autogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerar Automaticamente</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Tidy</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrumar</translation>
     </message>
     <message>
         <source>Mark Block</source>
         <translation>Marcar Bloco</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Copiar Bloco</translation>
     </message>
 </context>
 <context>
     <name>CMiscBarPrefs</name>
     <message>
         <source>Floating</source>
-        <translation type="unfinished"></translation>
+        <translation>Flutuar</translation>
     </message>
     <message>
         <source>Single bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Uma barra</translation>
     </message>
     <message>
         <source>Menu/tool bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu/barra</translation>
     </message>
     <message>
         <source>Multiple bars</source>
-        <translation type="unfinished"></translation>
+        <translation>Múltiplas barras</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Topo</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Final</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Minimised</source>
         <translation>Minimizar</translation>
     </message>
     <message>
         <source>Movable</source>
-        <translation type="unfinished"></translation>
+        <translation>Amovível</translation>
     </message>
 </context>
 <context>
     <name>CMiscPrefs</name>
     <message>
         <source>Annotation</source>
         <translation>Anotação</translation>
     </message>
     <message>
         <source>Dictionary</source>
         <translation>Dicionário</translation>
     </message>
     <message>
         <source>Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Clipboard</translation>
     </message>
     <message>
         <source>Depluck</source>
-        <translation type="unfinished"></translation>
+        <translation>Des-depenar</translation>
     </message>
     <message>
         <source>Dejpluck</source>
-        <translation type="unfinished"></translation>
+        <translation>Des-depenar</translation>
     </message>
     <message>
         <source>Continuous</source>
         <translation>Contínuo</translation>
     </message>
+    <message>
+        <source>Select Action</source>
+        <translation>Seleccione Acção</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>Depenar</translation>
+    </message>
 </context>
 <context>
     <name>CNavBarPrefs</name>
     <message>
         <source>Scroll</source>
         <translation>Deslizar</translation>
     </message>
     <message>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo</translation>
     </message>
     <message>
         <source>Page Up</source>
         <translation>Página Anterior</translation>
     </message>
     <message>
         <source>Page Down</source>
         <translation>Página Seguinte</translation>
     </message>
     <message>
         <source>Goto Start</source>
         <translation>Ir Para Início</translation>
     </message>
     <message>
         <source>Goto End</source>
         <translation>Ir Para Fim</translation>
     </message>
     <message>
         <source>Jump</source>
         <translation>Ir Para</translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizar por página/linha</translation>
     </message>
 </context>
 <context>
     <name>CPrefs</name>
     <message>
         <source>OpieReader Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações do OpieReader</translation>
     </message>
     <message>
         <source>Layout</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo</translation>
     </message>
     <message>
         <source>Layout(2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo(2)</translation>
     </message>
     <message>
         <source>Locale</source>
-        <translation type="unfinished"></translation>
+        <translation>Localização</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Buttons</source>
         <translation>Botões</translation>
     </message>
 </context>
 <context>
     <name>CURLDialog</name>
     <message>
         <source>Save URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar URL</translation>
     </message>
     <message>
         <source>Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Clipboard</translation>
     </message>
     <message>
         <source>Local file</source>
         <translation>Ficheiro local</translation>
     </message>
     <message>
         <source>Global file</source>
         <translation>Ficheiro global</translation>
     </message>
 </context>
 <context>
     <name>CViewBarPrefs</name>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Set Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Fonte</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Codificação</translation>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideograma</translation>
     </message>
 </context>
 <context>
     <name>QTReaderApp</name>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
         <source>Scroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizar</translation>
     </message>
     <message>
         <source>Jump</source>
         <translation>Ir Para</translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizar por página/linha</translation>
     </message>
     <message>
         <source>Two/One Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Dois/Um Toque</translation>
     </message>
     <message>
         <source>Annotation</source>
         <translation>Anotação</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Set Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Fonte</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Anotar</translation>
     </message>
     <message>
         <source>Goto</source>
         <translation>Ir Para</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Autogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerar Automaticamente</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Tidy</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrumar</translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation>Início do Bloco</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Copiar Bloco</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Marks</source>
         <translation>Marcas</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Procurar Próximo</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Procura</translation>
     </message>
     <message>
         <source>Do Reg</source>
-        <translation type="unfinished"></translation>
+        <translation>Registar</translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation>Fechar Edição</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Save Config</source>
         <translation>Gravar Configuração</translation>
     </message>
     <message>
         <source>Load Config</source>
         <translation>Ler Configuração</translation>
     </message>
     <message>
         <source>Delete Config</source>
         <translation>Apagar Configuração</translation>
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Barras de Ferramentas</translation>
     </message>
     <message>
         <source>Run Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Executar script</translation>
     </message>
     <message>
         <source>Export Links</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar Ligações</translation>
     </message>
     <message>
         <source>Goto Start</source>
         <translation>Ir Para o Início</translation>
     </message>
     <message>
         <source>Goto End</source>
         <translation>Ir Para o Fim</translation>
     </message>
     <message>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo</translation>
     </message>
     <message>
         <source>Scrolling</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizamento</translation>
     </message>
     <message>
         <source>Set Target</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolher Destino</translation>
     </message>
     <message>
         <source>Pause Paras</source>
-        <translation type="unfinished"></translation>
+        <translation>Parar Parágrafos</translation>
     </message>
     <message>
         <source>Set Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Codificação</translation>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideograma</translation>
     </message>
     <message>
         <source>Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalho</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>Leitor</translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar ficheiro</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Escondidos</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
 </context>
 </TS>