# HG changeset patch
# User insilmaril
# Date 1157450609 0
# Node ID 1f6263d403a0bdc2d6db0ffd05b76ffee4cdebb9
# Parent  cd7558fa3ffc271d8cebeb6564d23fb8e33d0d98
Moved qt4-port branch to head

diff -r cd7558fa3ffc -r 1f6263d403a0 icons/newbranch.png
Binary file icons/newbranch.png has changed
diff -r cd7558fa3ffc -r 1f6263d403a0 lang/vym_de.ts
--- a/lang/vym_de.ts	Tue Sep 05 10:03:29 2006 +0000
+++ b/lang/vym_de.ts	Tue Sep 05 10:03:29 2006 +0000
@@ -10,31 +10,31 @@
     <name>EditXLinkDialog</name>
     <message>
         <source>Edit XLink</source>
-        <translation>xLink ändern</translation>
+        <translation type="obsolete">xLink ändern</translation>
     </message>
     <message>
         <source>XLink width:</source>
-        <translation>xLink Dicke:</translation>
+        <translation type="obsolete">xLink Dicke:</translation>
     </message>
     <message>
         <source>Set color of heading</source>
-        <translation>Farbe Heading</translation>
+        <translation type="obsolete">Farbe Heading</translation>
     </message>
     <message>
         <source>XLink color:</source>
-        <translation>Farbe xLink:</translation>
+        <translation type="obsolete">Farbe xLink:</translation>
     </message>
     <message>
         <source>Use as default:</source>
-        <translation>Als Standard verwenden:</translation>
+        <translation type="obsolete">Als Standard verwenden:</translation>
     </message>
     <message>
         <source>Delete XLink</source>
-        <translation>xLink löschen</translation>
+        <translation type="obsolete">xLink löschen</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
 </context>
 <context>
@@ -108,7 +108,7 @@
     <name>ExportXHTMLDialog</name>
     <message>
         <source>Export XHTML</source>
-        <translation>Exportiere XHTML</translation>
+        <translation type="obsolete">Exportiere XHTML</translation>
     </message>
     <message>
         <source>Directory:</source>
@@ -116,15 +116,15 @@
     </message>
     <message>
         <source>Browse</source>
-        <translation>Durchsuchen</translation>
+        <translation type="obsolete">Durchsuchen</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Optionen</translation>
+        <translation type="obsolete">Optionen</translation>
     </message>
     <message>
         <source>Include image</source>
-        <translation>Bild erzeugen</translation>
+        <translation type="obsolete">Bild erzeugen</translation>
     </message>
     <message>
         <source>Include text</source>
@@ -132,23 +132,23 @@
     </message>
     <message>
         <source>show output of external scripts</source>
-        <translation>Zeige Ausgabe der externen Skripte</translation>
+        <translation type="obsolete">Zeige Ausgabe der externen Skripte</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation>Exportieren</translation>
+        <translation type="obsolete">Exportieren</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
         <source>VYM - Export HTML to directory</source>
-        <translation>VYM - Exportiere HTML in Verzeichnis</translation>
+        <translation type="obsolete">VYM - Exportiere HTML in Verzeichnis</translation>
     </message>
     <message>
         <source>Critical Error</source>
-        <translation>Kritischer Fehler</translation>
+        <translation type="obsolete">Kritischer Fehler</translation>
     </message>
     <message>
         <source>Couldn&apos;t start </source>
@@ -160,39 +160,39 @@
     </message>
     <message>
         <source>Export to directory:</source>
-        <translation>Export Verzeichnis:</translation>
+        <translation type="obsolete">Export Verzeichnis:</translation>
     </message>
     <message>
         <source>Colored headings in text</source>
-        <translation>Farbige Headings im Text</translation>
+        <translation type="obsolete">Farbige Headings im Text</translation>
     </message>
     <message>
         <source>showWarnings e.g. if directory is not empty</source>
-        <translation>Warnung, falls Verzeichnis nicht leer ist</translation>
+        <translation type="obsolete">Warnung, falls Verzeichnis nicht leer ist</translation>
     </message>
     <message>
         <source>Stylesheets</source>
-        <translation>Stylesheets</translation>
+        <translation type="obsolete">Stylesheets</translation>
     </message>
     <message>
         <source>CSS:</source>
-        <translation>CSS:</translation>
+        <translation type="obsolete">CSS:</translation>
     </message>
     <message>
         <source>XSL:</source>
-        <translation>XSL:</translation>
+        <translation type="obsolete">XSL:</translation>
     </message>
     <message>
         <source>VYM - Path to CSS file</source>
-        <translation>VYM - Pfad zu CSS Datei</translation>
+        <translation type="obsolete">VYM - Pfad zu CSS Datei</translation>
     </message>
     <message>
         <source>VYM - Path to XSL file</source>
-        <translation>VYM - Pfad zu XSL Datei</translation>
+        <translation type="obsolete">VYM - Pfad zu XSL Datei</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation>Warnung</translation>
+        <translation type="obsolete">Warnung</translation>
     </message>
     <message>
         <source> could not be opened!</source>
@@ -200,19 +200,19 @@
     </message>
     <message>
         <source>Save settings in map</source>
-        <translation>Einstellungen in map speichern</translation>
+        <translation type="obsolete">Einstellungen in map speichern</translation>
     </message>
     <message>
         <source>Scripts</source>
-        <translation>Skripte</translation>
+        <translation type="obsolete">Skripte</translation>
     </message>
     <message>
         <source>Before export:</source>
-        <translation>Vor Export:</translation>
+        <translation type="obsolete">Vor Export:</translation>
     </message>
     <message>
         <source>After Export:</source>
-        <translation>Nach Export:</translation>
+        <translation type="obsolete">Nach Export:</translation>
     </message>
     <message>
         <source>The settings saved in the map would like to run scripts:
@@ -230,11 +230,11 @@
     </message>
     <message>
         <source>VYM - Path to pre export script</source>
-        <translation>VYM - Pfad für Prä-Export Skript</translation>
+        <translation type="obsolete">VYM - Pfad für Prä-Export Skript</translation>
     </message>
     <message>
         <source>VYM - Path to post export script</source>
-        <translation>VYM -Pfad für Post-Export Skript</translation>
+        <translation type="obsolete">VYM -Pfad für Post-Export Skript</translation>
     </message>
     <message>
         <source>Stylesheets:</source>
@@ -251,7 +251,7 @@
 
 Please check, if you really
 want to allow this in your system!</source>
-        <translation>Die in der Map gespeicherten Einstellungen möchten gerne Skripte starten:
+        <translation type="obsolete">Die in der Map gespeicherten Einstellungen möchten gerne Skripte starten:
 
 %1
 
@@ -259,19 +259,19 @@
     </message>
     <message>
         <source>Could not open %1</source>
-        <translation>%1 konnte nicht geöffnet werden</translation>
+        <translation type="obsolete">%1 konnte nicht geöffnet werden</translation>
     </message>
     <message>
         <source>Could not write %1</source>
-        <translation>%1 konnte nicht geschrieben werden</translation>
+        <translation type="obsolete">%1 konnte nicht geschrieben werden</translation>
     </message>
     <message>
         <source>Could not start %1</source>
-        <translation>Konnte %1 nicht starten</translation>
+        <translation type="obsolete">Konnte %1 nicht starten</translation>
     </message>
     <message>
         <source>%1 didn&apos;t exit normally</source>
-        <translation>%1 wurde nicht richtig beendet</translation>
+        <translation type="obsolete">%1 wurde nicht richtig beendet</translation>
     </message>
     <message>
         <source>Couldn&apos;t start %1</source>
@@ -282,31 +282,31 @@
     <name>ExtraInfoDialog</name>
     <message>
         <source>VYM - Info</source>
-        <translation>VYM - Info</translation>
+        <translation type="obsolete">VYM - Info</translation>
     </message>
     <message>
         <source>Map:</source>
-        <translation>Map:</translation>
+        <translation type="obsolete">Map:</translation>
     </message>
     <message>
         <source>Author:</source>
-        <translation>Author:</translation>
+        <translation type="obsolete">Author:</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation>Kommentar:</translation>
+        <translation type="obsolete">Kommentar:</translation>
     </message>
     <message>
         <source>Statistics:</source>
-        <translation>Statistik:</translation>
+        <translation type="obsolete">Statistik:</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Schliessen</translation>
+        <translation type="obsolete">Schliessen</translation>
     </message>
 </context>
 <context>
@@ -895,7 +895,7 @@
     </message>
     <message>
         <source>Export map as image</source>
-        <translation type="obsolete">als Bild</translation>
+        <translation>als Bild</translation>
     </message>
     <message>
         <source>Export as ASCII (still experimental)</source>
@@ -1142,7 +1142,7 @@
     </message>
     <message>
         <source>Modes when using modifiers</source>
-        <translation>Modes beim Benutzen von Modifizierern</translation>
+        <translation type="obsolete">Modes beim Benutzen von Modifizierern</translation>
     </message>
     <message>
         <source>Add a branch by inserting and making selection its child</source>
@@ -1186,7 +1186,7 @@
     </message>
     <message>
         <source>Goto XLink</source>
-        <translation>xLink folgen</translation>
+        <translation type="obsolete">xLink folgen</translation>
     </message>
     <message>
         <source>This map does not exist:
@@ -1300,11 +1300,11 @@
     </message>
     <message>
         <source>Set application to open pdf files  ...</source>
-        <translation>Anwendung zum Öffnen von PDF Dateien...</translation>
+        <translation type="obsolete">Anwendung zum Öffnen von PDF Dateien...</translation>
     </message>
     <message>
         <source>Set application to open external links...</source>
-        <translation>Anwendung zum Öffnen externer Verweise...</translation>
+        <translation type="obsolete">Anwendung zum Öffnen externer Verweise...</translation>
     </message>
     <message>
         <source>Exit</source>
@@ -1461,7 +1461,7 @@
     </message>
     <message>
         <source>Couldn&apos;t save %1</source>
-        <translation>Konnte %1 nicht speichern</translation>
+        <translation type="obsolete">Konnte %1 nicht speichern</translation>
     </message>
     <message>
         <source>Export to Open Office</source>
@@ -1641,14 +1641,45 @@
         <translation>Konnte %1 nicht starten um einen neuen Tab zu öffnen.</translation>
     </message>
     <message>
+        <source>Image</source>
+        <translation>Bild</translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <comment>Toolbars</comment>
+        <translation>Format Actions</translation>
+    </message>
+    <message>
+        <source>View Actions</source>
+        <comment>Toolbars</comment>
+        <translation>Ansicht Aktionen</translation>
+    </message>
+    <message>
+        <source>Modes when using modifiers</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished">Modes beim Benutzen von Modifizierern</translation>
+    </message>
+    <message>
+        <source>Standard Flags</source>
+        <comment>Standard Flag Toolbar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow XLink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Couldn&apos;t find configuration for export to Open Office
 </source>
-        <translation>Die Konfigurationsdateien für den Export ins Open Office
-Format konnten nicht gefunden werden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No matches found for &quot;%1&quot;</source>
-        <translation>Keine Treffer gefunden für &quot;%1&quot;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2220,15 +2251,15 @@
     <name>ShowTextDialog</name>
     <message>
         <source>VYM - Info</source>
-        <translation>VYM - Info</translation>
+        <translation type="obsolete">VYM - Info</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Schliessen</translation>
+        <translation type="obsolete">Schliessen</translation>
     </message>
     <message>
         <source>History of %1</source>
-        <translation>Verlauf von %1</translation>
+        <translation type="obsolete">Verlauf von %1</translation>
     </message>
 </context>
 <context>
@@ -2455,7 +2486,7 @@
     </message>
     <message>
         <source>Convert paragraphs to linebreaks</source>
-        <translation>Absätze in Zeilenbrüche umwandeln</translation>
+        <translation type="obsolete">Absätze in Zeilenbrüche umwandeln</translation>
     </message>
     <message>
         <source>&amp;Convert Paragraphs</source>
@@ -2463,7 +2494,7 @@
     </message>
     <message>
         <source>Join all lines of a paragraph</source>
-        <translation>Alle Zeilenumbrüche eines Absatzes zu vereinen</translation>
+        <translation type="obsolete">Alle Zeilenumbrüche eines Absatzes zu vereinen</translation>
     </message>
     <message>
         <source>&amp;Join lines</source>
@@ -2493,36 +2524,44 @@
         <source>F&amp;ormat</source>
         <translation>F&amp;ormat</translation>
     </message>
+    <message>
+        <source>File Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Print Document</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WarningDialog</name>
     <message>
         <source>VYM - Warning : Foo...</source>
-        <translation>VYM - Warnung: ...</translation>
-    </message>
-    <message>
-        <source>textLabel</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>showAgainBox</source>
-        <translation></translation>
+        <translation type="obsolete">VYM - Warnung: ...</translation>
     </message>
     <message>
         <source>Proceed</source>
-        <translation>Weiter</translation>
+        <translation type="obsolete">Weiter</translation>
     </message>
     <message>
         <source>Show this message again</source>
-        <translation>Diese Meldung das nächste Mal wieder zeigen</translation>
+        <translation type="obsolete">Diese Meldung das nächste Mal wieder zeigen</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
 </context>
 </TS>
diff -r cd7558fa3ffc -r 1f6263d403a0 lang/vym_en.ts
--- a/lang/vym_en.ts	Tue Sep 05 10:03:29 2006 +0000
+++ b/lang/vym_en.ts	Tue Sep 05 10:03:29 2006 +0000
@@ -8,189 +8,12 @@
 </context>
 <context>
     <name>EditXLinkDialog</name>
-    <message>
-        <source>Edit XLink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>XLink width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set color of heading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>XLink color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use as default:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete XLink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ExportXHTMLDialog</name>
-    <message>
-        <source>Export XHTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export to directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Include image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colored headings in text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save settings in map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>showWarnings e.g. if directory is not empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>show output of external scripts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CSS:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>XSL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Before export:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After Export:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VYM - Export HTML to directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VYM - Path to CSS file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VYM - Path to XSL file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VYM - Path to pre export script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VYM - Path to post export script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stylesheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scripts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The settings saved in the map would like to run scripts:
-
-%1
-
-Please check, if you really
-want to allow this in your system!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not write %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 didn&apos;t exit normally</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ExtraInfoDialog</name>
-    <message>
-        <source>VYM - Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Map:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Statistics:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FindWindow</name>
@@ -593,10 +416,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Modes when using modifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use modifier to color branches</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,10 +603,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Goto XLink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use modifier to draw xLinks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -867,14 +682,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set application to open pdf files  ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set application to open external links...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1028,10 +835,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Couldn&apos;t save %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open VYM Documentation (pdf) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1193,6 +996,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export map as image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Actions</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modes when using modifiers</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard Flags</source>
+        <comment>Standard Flag Toolbar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow XLink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Couldn&apos;t find configuration for export to Open Office
 </source>
         <translation type="unfinished"></translation>
@@ -1398,18 +1237,6 @@
 </context>
 <context>
     <name>ShowTextDialog</name>
-    <message>
-        <source>VYM - Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>History of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TextEditor</name>
@@ -1518,18 +1345,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Convert paragraphs to linebreaks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Convert Paragraphs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Join all lines of a paragraph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Join lines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1645,36 +1464,24 @@
         <source>F&amp;ormat</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Print Document</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WarningDialog</name>
-    <message>
-        <source>VYM - Warning : Foo...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>textLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>showAgainBox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proceed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show this message again</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff -r cd7558fa3ffc -r 1f6263d403a0 lang/vym_es.ts
--- a/lang/vym_es.ts	Tue Sep 05 10:03:29 2006 +0000
+++ b/lang/vym_es.ts	Tue Sep 05 10:03:29 2006 +0000
@@ -10,31 +10,31 @@
     <name>EditXLinkDialog</name>
     <message>
         <source>Edit XLink</source>
-        <translation>Editar XEnlace</translation>
+        <translation type="obsolete">Editar XEnlace</translation>
     </message>
     <message>
         <source>XLink width:</source>
-        <translation>Ancho XEnlace:</translation>
+        <translation type="obsolete">Ancho XEnlace:</translation>
     </message>
     <message>
         <source>Set color of heading</source>
-        <translation>Configurar color de encabezado</translation>
+        <translation type="obsolete">Configurar color de encabezado</translation>
     </message>
     <message>
         <source>XLink color:</source>
-        <translation>Color XEnlace:</translation>
+        <translation type="obsolete">Color XEnlace:</translation>
     </message>
     <message>
         <source>Use as default:</source>
-        <translation>Use como por defecto:</translation>
+        <translation type="obsolete">Use como por defecto:</translation>
     </message>
     <message>
         <source>Delete XLink</source>
-        <translation>Borrar XEnlace</translation>
+        <translation type="obsolete">Borrar XEnlace</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
 </context>
 <context>
@@ -104,67 +104,67 @@
     <name>ExportXHTMLDialog</name>
     <message>
         <source>Export XHTML</source>
-        <translation>Exportar HTML</translation>
+        <translation type="obsolete">Exportar HTML</translation>
     </message>
     <message>
         <source>Export to directory:</source>
-        <translation>Exportar a directorio:</translation>
+        <translation type="obsolete">Exportar a directorio:</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation>Buscar</translation>
+        <translation type="obsolete">Buscar</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opciones</translation>
+        <translation type="obsolete">Opciones</translation>
     </message>
     <message>
         <source>Include image</source>
-        <translation>Incluir Imagen</translation>
+        <translation type="obsolete">Incluir Imagen</translation>
     </message>
     <message>
         <source>Colored headings in text</source>
-        <translation>Encabezados coloreados en texto</translation>
+        <translation type="obsolete">Encabezados coloreados en texto</translation>
     </message>
     <message>
         <source>Save settings in map</source>
-        <translation>Guardar configuraciones en mapa</translation>
+        <translation type="obsolete">Guardar configuraciones en mapa</translation>
     </message>
     <message>
         <source>showWarnings e.g. if directory is not empty</source>
-        <translation>Mostrar Advertencias eje: si el directorio no está vacio</translation>
+        <translation type="obsolete">Mostrar Advertencias eje: si el directorio no está vacio</translation>
     </message>
     <message>
         <source>show output of external scripts</source>
-        <translation>Mostrar salida de scripts externos</translation>
+        <translation type="obsolete">Mostrar salida de scripts externos</translation>
     </message>
     <message>
         <source>CSS:</source>
-        <translation>CSS:</translation>
+        <translation type="obsolete">CSS:</translation>
     </message>
     <message>
         <source>XSL:</source>
-        <translation>XSL:</translation>
+        <translation type="obsolete">XSL:</translation>
     </message>
     <message>
         <source>Before export:</source>
-        <translation>Antes de exportar:</translation>
+        <translation type="obsolete">Antes de exportar:</translation>
     </message>
     <message>
         <source>After Export:</source>
-        <translation>Después de Exportar:</translation>
+        <translation type="obsolete">Después de Exportar:</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation>Exportar</translation>
+        <translation type="obsolete">Exportar</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation>Advertencia</translation>
+        <translation type="obsolete">Advertencia</translation>
     </message>
     <message>
         <source>The settings saved in the map would like to run scripts:
@@ -180,23 +180,23 @@
     </message>
     <message>
         <source>VYM - Export HTML to directory</source>
-        <translation>VYM - Exportar HTML a directorio</translation>
+        <translation type="obsolete">VYM - Exportar HTML a directorio</translation>
     </message>
     <message>
         <source>VYM - Path to CSS file</source>
-        <translation>VYM - Ruta a archivo CSS</translation>
+        <translation type="obsolete">VYM - Ruta a archivo CSS</translation>
     </message>
     <message>
         <source>VYM - Path to XSL file</source>
-        <translation>VYM - Ruta a archivo XSL </translation>
+        <translation type="obsolete">VYM - Ruta a archivo XSL </translation>
     </message>
     <message>
         <source>VYM - Path to pre export script</source>
-        <translation>VYM - Ruta a script pre-exportado</translation>
+        <translation type="obsolete">VYM - Ruta a script pre-exportado</translation>
     </message>
     <message>
         <source>VYM - Path to post export script</source>
-        <translation>VYM - Ruta a script post-exportado</translation>
+        <translation type="obsolete">VYM - Ruta a script post-exportado</translation>
     </message>
     <message>
         <source> could not be opened!</source>
@@ -204,7 +204,7 @@
     </message>
     <message>
         <source>Critical Error</source>
-        <translation>Error crítico</translation>
+        <translation type="obsolete">Error crítico</translation>
     </message>
     <message>
         <source>Couldn&apos;t start </source>
@@ -222,69 +222,36 @@
         <source>Scripts:</source>
         <translation type="obsolete">Scripts:</translation>
     </message>
-    <message>
-        <source>Stylesheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scripts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The settings saved in the map would like to run scripts:
-
-%1
-
-Please check, if you really
-want to allow this in your system!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not write %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 didn&apos;t exit normally</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ExtraInfoDialog</name>
     <message>
         <source>VYM - Info</source>
-        <translation>VYM - Información</translation>
+        <translation type="obsolete">VYM - Información</translation>
     </message>
     <message>
         <source>Map:</source>
-        <translation>Mapa:</translation>
+        <translation type="obsolete">Mapa:</translation>
     </message>
     <message>
         <source>Author:</source>
-        <translation>Autor:</translation>
+        <translation type="obsolete">Autor:</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation>Comentario:</translation>
+        <translation type="obsolete">Comentario:</translation>
     </message>
     <message>
         <source>Statistics:</source>
-        <translation>Estadísticas:</translation>
+        <translation type="obsolete">Estadísticas:</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation type="obsolete">Cerrar</translation>
     </message>
 </context>
 <context>
@@ -730,7 +697,7 @@
     </message>
     <message>
         <source>Modes when using modifiers</source>
-        <translation>Modos cuando usa modificadores</translation>
+        <translation type="obsolete">Modos cuando usa modificadores</translation>
     </message>
     <message>
         <source>Use modifier to color branches</source>
@@ -834,7 +801,7 @@
     </message>
     <message>
         <source>Export map as image</source>
-        <translation type="obsolete">Exportar mapa como imagen</translation>
+        <translation type="unfinished">Exportar mapa como imagen</translation>
     </message>
     <message>
         <source>Export as ASCII (still experimental)</source>
@@ -1081,7 +1048,7 @@
     </message>
     <message>
         <source>Goto XLink</source>
-        <translation>Ir al XEnlace</translation>
+        <translation type="obsolete">Ir al XEnlace</translation>
     </message>
     <message>
         <source>This map does not exist:
@@ -1177,14 +1144,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set application to open pdf files  ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set application to open external links...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1338,10 +1297,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Couldn&apos;t save %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Import</source>
         <translation type="unfinished">Importar</translation>
     </message>
@@ -1491,6 +1446,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Actions</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modes when using modifiers</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished">Modos cuando usa modificadores</translation>
+    </message>
+    <message>
+        <source>Standard Flags</source>
+        <comment>Standard Flag Toolbar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow XLink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Couldn&apos;t find configuration for export to Open Office
 </source>
         <translation type="unfinished"></translation>
@@ -1879,15 +1866,11 @@
     <name>ShowTextDialog</name>
     <message>
         <source>VYM - Info</source>
-        <translation>VYM - Información</translation>
+        <translation type="obsolete">VYM - Información</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-    <message>
-        <source>History of %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Cerrar</translation>
     </message>
 </context>
 <context>
@@ -1998,7 +1981,7 @@
     </message>
     <message>
         <source>Convert paragraphs to linebreaks</source>
-        <translation>Convertir párrafos a líneas sueltas</translation>
+        <translation type="obsolete">Convertir párrafos a líneas sueltas</translation>
     </message>
     <message>
         <source>&amp;Convert Paragraphs</source>
@@ -2006,7 +1989,7 @@
     </message>
     <message>
         <source>Join all lines of a paragraph</source>
-        <translation>Unir todas las líneas de un párrafo</translation>
+        <translation type="obsolete">Unir todas las líneas de un párrafo</translation>
     </message>
     <message>
         <source>&amp;Join lines</source>
@@ -2128,36 +2111,32 @@
         <source>F&amp;ormat</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Print Document</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WarningDialog</name>
     <message>
-        <source>VYM - Warning : Foo...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>textLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>showAgainBox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proceed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show this message again</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
+        <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
 </context>
 </TS>
diff -r cd7558fa3ffc -r 1f6263d403a0 lang/vym_it.ts
--- a/lang/vym_it.ts	Tue Sep 05 10:03:29 2006 +0000
+++ b/lang/vym_it.ts	Tue Sep 05 10:03:29 2006 +0000
@@ -10,31 +10,31 @@
     <name>EditXLinkDialog</name>
     <message>
         <source>Edit XLink</source>
-        <translation>Edita il XLink</translation>
+        <translation type="obsolete">Edita il XLink</translation>
     </message>
     <message>
         <source>XLink width:</source>
-        <translation>spessore XLink:</translation>
+        <translation type="obsolete">spessore XLink:</translation>
     </message>
     <message>
         <source>Set color of heading</source>
-        <translation>Cambia colore del titolo</translation>
+        <translation type="obsolete">Cambia colore del titolo</translation>
     </message>
     <message>
         <source>XLink color:</source>
-        <translation>colore del XLink:</translation>
+        <translation type="obsolete">colore del XLink:</translation>
     </message>
     <message>
         <source>Use as default:</source>
-        <translation>Usa come predefinito:</translation>
+        <translation type="obsolete">Usa come predefinito:</translation>
     </message>
     <message>
         <source>Delete XLink</source>
-        <translation>Elimina XLink</translation>
+        <translation type="obsolete">Elimina XLink</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
 </context>
 <context>
@@ -104,67 +104,67 @@
     <name>ExportXHTMLDialog</name>
     <message>
         <source>Export XHTML</source>
-        <translation>Esporta in XHTML</translation>
+        <translation type="obsolete">Esporta in XHTML</translation>
     </message>
     <message>
         <source>Export to directory:</source>
-        <translation>Esporta nella cartella:</translation>
+        <translation type="obsolete">Esporta nella cartella:</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation>Naviga</translation>
+        <translation type="obsolete">Naviga</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opzioni</translation>
+        <translation type="obsolete">Opzioni</translation>
     </message>
     <message>
         <source>Include image</source>
-        <translation>Includi immagine</translation>
+        <translation type="obsolete">Includi immagine</translation>
     </message>
     <message>
         <source>Colored headings in text</source>
-        <translation>Colori i titoli nel testo</translation>
+        <translation type="obsolete">Colori i titoli nel testo</translation>
     </message>
     <message>
         <source>Save settings in map</source>
-        <translation>Salva le impostazioni della mappa</translation>
+        <translation type="obsolete">Salva le impostazioni della mappa</translation>
     </message>
     <message>
         <source>showWarnings e.g. if directory is not empty</source>
-        <translation>mostra i Warning es. se la cartella non è vuota</translation>
+        <translation type="obsolete">mostra i Warning es. se la cartella non è vuota</translation>
     </message>
     <message>
         <source>show output of external scripts</source>
-        <translation>mostra l&apos;output degli script esterni</translation>
+        <translation type="obsolete">mostra l&apos;output degli script esterni</translation>
     </message>
     <message>
         <source>CSS:</source>
-        <translation>CSS:</translation>
+        <translation type="obsolete">CSS:</translation>
     </message>
     <message>
         <source>XSL:</source>
-        <translation>XSL:</translation>
+        <translation type="obsolete">XSL:</translation>
     </message>
     <message>
         <source>Before export:</source>
-        <translation>Prima di esportare:</translation>
+        <translation type="obsolete">Prima di esportare:</translation>
     </message>
     <message>
         <source>After Export:</source>
-        <translation>Dopo l&apos;esportazione:</translation>
+        <translation type="obsolete">Dopo l&apos;esportazione:</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation>Esporta</translation>
+        <translation type="obsolete">Esporta</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancella</translation>
+        <translation type="obsolete">Cancella</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation>Attenzione</translation>
+        <translation type="obsolete">Attenzione</translation>
     </message>
     <message>
         <source>The settings saved in the map would like to run scripts:
@@ -182,23 +182,23 @@
     </message>
     <message>
         <source>VYM - Export HTML to directory</source>
-        <translation>VYM - Esporta HTML in cartella </translation>
+        <translation type="obsolete">VYM - Esporta HTML in cartella </translation>
     </message>
     <message>
         <source>VYM - Path to CSS file</source>
-        <translation>VYM - Percorso del file CSS</translation>
+        <translation type="obsolete">VYM - Percorso del file CSS</translation>
     </message>
     <message>
         <source>VYM - Path to XSL file</source>
-        <translation>VYM - Percorso del file XSL</translation>
+        <translation type="obsolete">VYM - Percorso del file XSL</translation>
     </message>
     <message>
         <source>VYM - Path to pre export script</source>
-        <translation>VYM - Percorso dello script di pre esportazione</translation>
+        <translation type="obsolete">VYM - Percorso dello script di pre esportazione</translation>
     </message>
     <message>
         <source>VYM - Path to post export script</source>
-        <translation>VYM - Percorso dello script di post esportazione</translation>
+        <translation type="obsolete">VYM - Percorso dello script di post esportazione</translation>
     </message>
     <message>
         <source> could not be opened!</source>
@@ -206,7 +206,7 @@
     </message>
     <message>
         <source>Critical Error</source>
-        <translation>Errore Critico</translation>
+        <translation type="obsolete">Errore Critico</translation>
     </message>
     <message>
         <source>Couldn&apos;t start </source>
@@ -224,69 +224,36 @@
         <source>Scripts:</source>
         <translation type="obsolete">Script:</translation>
     </message>
-    <message>
-        <source>Stylesheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scripts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The settings saved in the map would like to run scripts:
-
-%1
-
-Please check, if you really
-want to allow this in your system!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not write %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 didn&apos;t exit normally</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ExtraInfoDialog</name>
     <message>
         <source>VYM - Info</source>
-        <translation>VIM - Info</translation>
+        <translation type="obsolete">VIM - Info</translation>
     </message>
     <message>
         <source>Map:</source>
-        <translation>Mappa:</translation>
+        <translation type="obsolete">Mappa:</translation>
     </message>
     <message>
         <source>Author:</source>
-        <translation>Autore:</translation>
+        <translation type="obsolete">Autore:</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation>Commenti:</translation>
+        <translation type="obsolete">Commenti:</translation>
     </message>
     <message>
         <source>Statistics:</source>
-        <translation>Statistiche:</translation>
+        <translation type="obsolete">Statistiche:</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancella</translation>
+        <translation type="obsolete">Cancella</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Chiudi</translation>
+        <translation type="obsolete">Chiudi</translation>
     </message>
 </context>
 <context>
@@ -732,7 +699,7 @@
     </message>
     <message>
         <source>Modes when using modifiers</source>
-        <translation>Metodi nell&apos;uso dei modifier</translation>
+        <translation type="obsolete">Metodi nell&apos;uso dei modifier</translation>
     </message>
     <message>
         <source>Use modifier to color branches</source>
@@ -836,7 +803,7 @@
     </message>
     <message>
         <source>Export map as image</source>
-        <translation type="obsolete">Esporta mappa come immagine</translation>
+        <translation type="unfinished">Esporta mappa come immagine</translation>
     </message>
     <message>
         <source>Export as ASCII (still experimental)</source>
@@ -1088,7 +1055,7 @@
     </message>
     <message>
         <source>Goto XLink</source>
-        <translation>Vai al XLink</translation>
+        <translation type="obsolete">Vai al XLink</translation>
     </message>
     <message>
         <source>This map does not exist:
@@ -1297,18 +1264,10 @@
         <translation type="unfinished">Questo aiuta</translation>
     </message>
     <message>
-        <source>Set application to open pdf files  ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set application to open external links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set application to open external links...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Pasting into new branch</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1392,10 +1351,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Couldn&apos;t save %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Export as ASCII</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1500,6 +1455,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Actions</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modes when using modifiers</source>
+        <comment>Toolbars</comment>
+        <translation type="unfinished">Metodi nell&apos;uso dei modifier</translation>
+    </message>
+    <message>
+        <source>Standard Flags</source>
+        <comment>Standard Flag Toolbar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Follow XLink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Couldn&apos;t find configuration for export to Open Office
 </source>
         <translation type="unfinished"></translation>
@@ -1884,15 +1871,11 @@
     <name>ShowTextDialog</name>
     <message>
         <source>VYM - Info</source>
-        <translation>VIM - Info</translation>
+        <translation type="obsolete">VIM - Info</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Chiudi</translation>
-    </message>
-    <message>
-        <source>History of %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Chiudi</translation>
     </message>
 </context>
 <context>
@@ -2003,7 +1986,7 @@
     </message>
     <message>
         <source>Convert paragraphs to linebreaks</source>
-        <translation>Converti paragrafi in &apos;a capo&apos;</translation>
+        <translation type="obsolete">Converti paragrafi in &apos;a capo&apos;</translation>
     </message>
     <message>
         <source>&amp;Convert Paragraphs</source>
@@ -2011,7 +1994,7 @@
     </message>
     <message>
         <source>Join all lines of a paragraph</source>
-        <translation>Unire tutte le linee del paragrafo</translation>
+        <translation type="obsolete">Unire tutte le linee del paragrafo</translation>
     </message>
     <message>
         <source>&amp;Join lines</source>
@@ -2133,36 +2116,32 @@
         <source>F&amp;ormat</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Print Document</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WarningDialog</name>
     <message>
-        <source>VYM - Warning : Foo...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>textLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>showAgainBox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proceed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show this message again</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
-        <translation type="unfinished">Cancella</translation>
+        <translation type="obsolete">Cancella</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
 </context>
 </TS>
diff -r cd7558fa3ffc -r 1f6263d403a0 tex/newbranch.png
Binary file tex/newbranch.png has changed
diff -r cd7558fa3ffc -r 1f6263d403a0 tex/vym.changelog
--- a/tex/vym.changelog	Tue Sep 05 10:03:29 2006 +0000
+++ b/tex/vym.changelog	Tue Sep 05 10:03:29 2006 +0000
@@ -1,19 +1,58 @@
 -------------------------------------------------------------------
-Thu Jul 13 10:51:37 CEST 2006 - uwedr
+Tue Sep  5 09:55:55 CEST 2006 - uwedr
 
-- 
+- Bugfix: More undo/redo (move of floatimages, relinking of branches) 
+
+-------------------------------------------------------------------
+Thu Aug 31 13:54:30 CEST 2006 - uwedr
+
+- Bugfix: More undo/redo commands
+- Bugfix: Actions updated after moving a branch now
+- Bugfix: vym refuses to start if vymTmpDir can't be created
+
+-------------------------------------------------------------------
+Wed Aug 30 14:14:56 CEST 2006 - uwedr
+
+- Version: 1.8.54
+- Bugfix: Editing headings now works both on Mac and Linux
+
+-------------------------------------------------------------------
+Mon Aug 28 13:15:35 CEST 2006 - uwe
+
+- Version: 1.8.53
+- Feature: Opening of all URLs in a subtree
+- Feature: Opening of all vymLinks in a subtree
+
+-------------------------------------------------------------------
+Tue Aug 15 13:39:42 CEST 2006 - uwedr
+
+- Version: 1.8.52
+- Feature: Changed format of configuration file a bit (new file anyway
+  with introduction of QT4)
+- Feature: Toolbar Layout is saved now
+
+-------------------------------------------------------------------
+Thu Jul 27 14:28:54 CEST 2006 - uwedr
+
+- Bugfix: Floatimages internally are saved as png, preserving the alpha 
+          channel
 
 -------------------------------------------------------------------
 Thu Jul 13 10:39:26 CEST 2006 - uwedr
 
-- Version: 1.8.1
 - Bugfix: Fixed broken check for non-existent OO-export configuration 
 
 -------------------------------------------------------------------
-Fri Jun 16 10:26:01 CEST 2006 - uwedr
+Tue Jul  4 12:32:28 CEST 2006 - uwedr
 
-- Version 1.8.0
-- Feature: Added icon for creating a new branch to toolbar
+- Feature: Moved floats in XML Export, e.g. XHTML  shows floatimages at
+  beginning of export now
+
+-------------------------------------------------------------------
+Mon July 10 16:53:29 CEST 2006 - uwedr
+
+- Version: 1.8.50
+- Feature: Beginning of QT4 port
 
 -------------------------------------------------------------------
 Thu June 1 16:53:29 CEST 2006 - uwedr
diff -r cd7558fa3ffc -r 1f6263d403a0 tex/vym.tex
--- a/tex/vym.tex	Tue Sep 05 10:03:29 2006 +0000
+++ b/tex/vym.tex	Tue Sep 05 10:03:29 2006 +0000
@@ -34,7 +34,7 @@
 \title{
 	\includegraphics[width=8cm]{vym-logo-new.png}
 	\\
-VYM \\ -- \\View Your Mind}
+VYM \\ -- \\View Your Mind\\ {\small Version 1.8.0}}
 \author{\textcopyright Uwe Drechsel  }
 
 
@@ -222,9 +222,7 @@
 left-clicking with the mouse. It will turn yellow to show that is
 selected. There are several ways to add a new branch to the center:
 \begin{itemize}
-	\item In the toolbar click on this icon
-		\includegraphics [width=0.5cm]{newbranch.png}
-	\item Using the context menu by clicking with the
+	\item Using the mouse: Open the context meny by clicking with the
 	right mouse button (CTRL-Click on Mac) onto the
 	mapcenter and choose Add \ra Add as child
 	\item Press \key{Ins} or \key{A}