Merge from BRANCH_1_0.

1 files changed, 575 insertions, 98 deletions

diff --git a/i18n/de/reader.ts b/i18n/de/reader.ts
index 7bd97bb..0bf3ce2 100644
--- a/i18n/de/reader.ts
+++ b/i18n/de/reader.ts
@@ -1,309 +1,786 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
+    <message>
+        <source>Toolbar Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Datei</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigation</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Markierung</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Indikatoren</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation>Scroll Geschwindigkeit</translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autoscroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished">Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished">Anmerken</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished">Vollbild</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Zurück</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished">Vorwärts</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Home</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Space Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Return Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
+    <message>
+        <source>Tidy-up</source>
+        <translation>Aufräumen</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Delete Bookmarks</source>
+        <translation>Lösche Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Delete Configuration</source>
+        <translation>Lösche Konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Schliessen</translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <source>On Action...</source>
-        <translation>Bei Aktion...</translation>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Suchen</translation>
     </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
     <message>
-        <source>Open File</source>
-        <translation>Datei öffnen</translation>
+        <source>Annotation</source>
+        <translation>Anmerkung</translation>
     </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
     <message>
-        <source>Autoscroll</source>
-        <translation>Autoscroll</translation>
+        <source>International</source>
+        <translation>International</translation>
     </message>
     <message>
-        <source>Mark</source>
-        <translation>Markieren</translation>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fullscreen</source>
-        <translation>Vollbild</translation>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
-        <translation>Navigation</translation>
+        <source>Apply font
+to dialogs</source>
+        <translation>Schrift auf Dialoge anwenden</translation>
     </message>
     <message>
-        <source>Scroll</source>
-        <translation>Scrollen</translation>
+        <source>Encoding</source>
+        <translation>Encoding</translation>
     </message>
     <message>
-        <source>Jump</source>
-        <translation>Springe</translation>
+        <source>Application</source>
+        <translation>Programm</translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
-        <translation>Seiten/Zeilen Scroll</translation>
+        <source>Message</source>
+        <translation>Mitteilung</translation>
     </message>
     <message>
-        <source>Set Overlap</source>
-        <translation>Überhang setzen</translation>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
-        <translation>Cursor benutzen</translation>
+        <source>Dictionary</source>
+        <translation type="unfinished">Wörterbuch</translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
-        <translation>Wörterbuch setzen</translation>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
     <message>
-        <source>Two/One Touch</source>
-        <translation>Doppel-/Einfachklick</translation>
+        <source>Strip CR</source>
+        <translation type="unfinished">CR entfernen</translation>
+    </message>
+    <message>
+        <source>Dehyphen</source>
+        <translation type="unfinished">ohne Bindestr. </translation>
+    </message>
+    <message>
+        <source>Single Space</source>
+        <translation type="unfinished">Einzelleerzeichen</translation>
+    </message>
+    <message>
+        <source>Unindent</source>
+        <translation type="unfinished">Nicht eingerückt</translation>
+    </message>
+    <message>
+        <source>Reparagraph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Double Space</source>
+        <translation>Doppelleerzeichen</translation>
+    </message>
+    <message>
+        <source>Remap</source>
+        <translation>Umbelegen</translation>
+    </message>
+    <message>
+        <source>Embolden</source>
+        <translation>Fett stellen</translation>
     </message>
     <message>
-        <source>Target</source>
-        <translation>Ziel</translation>
+        <source>Full Justify</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished">Kodierung</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Schrift</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anmerken</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Gehe zu</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Automatisch gen.</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Löschen</translation>
     </message>
     <message>
+        <source>Save</source>
+        <translation>Sichern</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>ordentlich</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Block kopieren</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Oben</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Unten</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Rechts</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Links</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>minimiert</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>bewegbar</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
         <source>Annotation</source>
         <translation>Anmerkung</translation>
     </message>
     <message>
         <source>Dictionary</source>
         <translation>Wörterbuch</translation>
     </message>
     <message>
         <source>Clipboard</source>
         <translation>Zwischenablage</translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation>Hoch</translation>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation>Runter</translation>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
-        <translation>Suchen...</translation>
+        <source>Continuous</source>
+        <translation>Pausenlos</translation>
     </message>
     <message>
-        <source>Continuous</source>
-        <translation>Fortlaufend</translation>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
-        <translation>Kodierung</translation>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
     <message>
-        <source>Auto</source>
-        <translation>Automatisch</translation>
+        <source>Scroll</source>
+        <translation>Scrollen</translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Nichts</translation>
+        <source>Back</source>
+        <translation>Zurück</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>Text</translation>
+        <source>Home</source>
+        <translation>Home</translation>
     </message>
     <message>
-        <source>HTML</source>
-        <translation>HTML</translation>
+        <source>Forward</source>
+        <translation>Vorwärts</translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
-        <translation>Peanut/PML</translation>
+        <source>Page Up</source>
+        <translation>Seite nach oben</translation>
     </message>
     <message>
-        <source>Layout</source>
-        <translation>Layout</translation>
+        <source>Page Down</source>
+        <translation>Seite nach unten</translation>
     </message>
     <message>
-        <source>Strip CR</source>
-        <translation>CR entfernen</translation>
+        <source>Goto Start</source>
+        <translation>Zum Anfang gehen</translation>
     </message>
     <message>
-        <source>Dehyphen</source>
-        <translation>ohne Bindestriche</translation>
+        <source>Goto End</source>
+        <translation>Zum Ende gehen</translation>
     </message>
     <message>
-        <source>Single Space</source>
-        <translation>Einzelne Leerzeichen</translation>
+        <source>Jump</source>
+        <translation>Springe</translation>
     </message>
     <message>
-        <source>Unindent</source>
-        <translation>Nicht eingerückt</translation>
+        <source>Page/Line Scroll</source>
+        <translation>Seiten/Zeilen Scroll</translation>
     </message>
+</context>
+<context>
+    <name>CPrefs</name>
     <message>
-        <source>Re-paragraph</source>
-        <translation>Umformatieren</translation>
+        <source>OpieReader Settings</source>
+        <translation>OpieReader Einstellungen</translation>
     </message>
     <message>
-        <source>Double Space</source>
-        <translation>Doppelte Leerzeichen</translation>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
     </message>
     <message>
-        <source>Indent+</source>
-        <translation>Einrücken</translation>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
-        <translation>Ausrücken</translation>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
-        <translation>Repalm</translation>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remap</source>
-        <translation>Umbelegen</translation>
+        <source>Buttons</source>
+        <translation>Knöpfe</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
-        <translation>Fett stellen</translation>
+        <source>Clipboard</source>
+        <translation>Zwischenablage</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Vollbild</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Vergrößern</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Verkleinern</translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
-        <translation>Ideogramm/Wort</translation>
-    </message>
-    <message>
-        <source>Set width</source>
-        <translation>Breite setzen</translation>
+        <source>Set Font</source>
+        <translation>Schrift setzen</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Encoding</translation>
     </message>
     <message>
-        <source>Ascii</source>
-        <translation>ASCII</translation>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>UTF-8</source>
-        <translation>UTF-8</translation>
+        <source>Open</source>
+        <translation>Öffnen</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Vollbild</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigation</translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Scrollen</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Springe</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Seiten/Zeilen Scroll</translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
-        <translation>UCS-2(BE)</translation>
+        <source>Two/One Touch</source>
+        <translation>Doppel/Singel Touch</translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
-        <translation>USC-2(LE)</translation>
+        <source>Annotation</source>
+        <translation>Anmerkung</translation>
     </message>
     <message>
-        <source>Palm</source>
-        <translation>Palm</translation>
+        <source>Up</source>
+        <translation>Hoch</translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
-        <translation>Windows(1252)</translation>
+        <source>Down</source>
+        <translation>Runter</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Suchen...</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Vergrößern</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Verkleinern</translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation>Font setzen</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Anmerken</translation>
     </message>
     <message>
         <source>Goto</source>
         <translation>Gehe zu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation>Automatisch gen.</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sichern</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation>ordentlich</translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation>Blockanfang</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Block kopieren</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation>Format</translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation>Markierung</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Nächtes suchen</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Suche schließen</translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation>Reg. erstellen</translation>
     </message>
     <message>
         <source>Close Edit</source>
-        <translation>Edit schliessen</translation>
+        <translation>Edit schließen</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Konfiguration</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Speichere die Einstellungen</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>Lade die Einstellungen</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Lösche die Einstellungen</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Führe Script aus</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Exportiere Verweise</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Gehe zum Anfang</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Gehe zum Ende</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Zurück</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Vorwärts</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Setze Ziel</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Setze Encoding</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
-        <translation>Datei suchen</translation>
+        <translation>Dateien suchen</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Versteckt</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
 </context>
 </TS>