# HG changeset patch
# User insilmaril
# Date 1162211977 0
# Node ID 39aa64b24375b453c03e295712ffd5ece28fc444
# Parent  445a5d5ee20ba32c547010ef5bf4ac066613d434
Spanish doc is found, if LANG is set. Fixed wrong position of floatimages

diff -r 445a5d5ee20b -r 39aa64b24375 lang/vym_it.ts
--- a/lang/vym_it.ts	Mon Oct 30 12:39:37 2006 +0000
+++ b/lang/vym_it.ts	Mon Oct 30 12:39:37 2006 +0000
@@ -12,26 +12,48 @@
     </message>
 </context>
 <context>
+    <name>AboutTextBrowser</name>
+    <message>
+        <source>Please use Settings-&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set application to open an URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <comment>About window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t find a viewer to open %1.
+</source>
+        <comment>About window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>EditXLinkDialog</name>
     <message>
         <source>Edit XLink</source>
-        <translation type="obsolete">Edita il XLink</translation>
+        <translation type="unfinished">Edita il XLink</translation>
     </message>
     <message>
         <source>XLink width:</source>
-        <translation type="obsolete">spessore XLink:</translation>
+        <translation type="unfinished">spessore XLink:</translation>
     </message>
     <message>
         <source>Set color of heading</source>
-        <translation type="obsolete">Cambia colore del titolo</translation>
+        <translation type="unfinished">Cambia colore del titolo</translation>
     </message>
     <message>
         <source>XLink color:</source>
-        <translation type="obsolete">colore del XLink:</translation>
+        <translation type="unfinished">colore del XLink:</translation>
     </message>
     <message>
         <source>Use as default:</source>
-        <translation type="obsolete">Usa come predefinito:</translation>
+        <translation type="unfinished">Usa come predefinito:</translation>
     </message>
     <message>
         <source>Delete XLink</source>
@@ -39,7 +61,11 @@
     </message>
     <message>
         <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <source>Quit and delete XLink</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -109,67 +135,67 @@
     <name>ExportXHTMLDialog</name>
     <message>
         <source>Export XHTML</source>
-        <translation type="obsolete">Esporta in XHTML</translation>
+        <translation type="unfinished">Esporta in XHTML</translation>
     </message>
     <message>
         <source>Export to directory:</source>
-        <translation type="obsolete">Esporta nella cartella:</translation>
+        <translation type="unfinished">Esporta nella cartella:</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation type="obsolete">Naviga</translation>
+        <translation type="unfinished">Naviga</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="obsolete">Opzioni</translation>
+        <translation type="unfinished">Opzioni</translation>
     </message>
     <message>
         <source>Include image</source>
-        <translation type="obsolete">Includi immagine</translation>
+        <translation type="unfinished">Includi immagine</translation>
     </message>
     <message>
         <source>Colored headings in text</source>
-        <translation type="obsolete">Colori i titoli nel testo</translation>
+        <translation type="unfinished">Colori i titoli nel testo</translation>
     </message>
     <message>
         <source>Save settings in map</source>
-        <translation type="obsolete">Salva le impostazioni della mappa</translation>
+        <translation type="unfinished">Salva le impostazioni della mappa</translation>
     </message>
     <message>
         <source>showWarnings e.g. if directory is not empty</source>
-        <translation type="obsolete">mostra i Warning es. se la cartella non è vuota</translation>
+        <translation type="unfinished">mostra i Warning es. se la cartella non è vuota</translation>
     </message>
     <message>
         <source>show output of external scripts</source>
-        <translation type="obsolete">mostra l&apos;output degli script esterni</translation>
+        <translation type="unfinished">mostra l&apos;output degli script esterni</translation>
     </message>
     <message>
         <source>CSS:</source>
-        <translation type="obsolete">CSS:</translation>
+        <translation type="unfinished">CSS:</translation>
     </message>
     <message>
         <source>XSL:</source>
-        <translation type="obsolete">XSL:</translation>
+        <translation type="unfinished">XSL:</translation>
     </message>
     <message>
         <source>Before export:</source>
-        <translation type="obsolete">Prima di esportare:</translation>
+        <translation type="unfinished">Prima di esportare:</translation>
     </message>
     <message>
         <source>After Export:</source>
-        <translation type="obsolete">Dopo l&apos;esportazione:</translation>
+        <translation type="unfinished">Dopo l&apos;esportazione:</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation type="obsolete">Esporta</translation>
+        <translation type="unfinished">Esporta</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="obsolete">Cancella</translation>
+        <translation type="unfinished">Cancella</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="obsolete">Attenzione</translation>
+        <translation type="unfinished">Attenzione</translation>
     </message>
     <message>
         <source>The settings saved in the map would like to run scripts:
@@ -187,23 +213,23 @@
     </message>
     <message>
         <source>VYM - Export HTML to directory</source>
-        <translation type="obsolete">VYM - Esporta HTML in cartella </translation>
+        <translation type="unfinished">VYM - Esporta HTML in cartella </translation>
     </message>
     <message>
         <source>VYM - Path to CSS file</source>
-        <translation type="obsolete">VYM - Percorso del file CSS</translation>
+        <translation type="unfinished">VYM - Percorso del file CSS</translation>
     </message>
     <message>
         <source>VYM - Path to XSL file</source>
-        <translation type="obsolete">VYM - Percorso del file XSL</translation>
+        <translation type="unfinished">VYM - Percorso del file XSL</translation>
     </message>
     <message>
         <source>VYM - Path to pre export script</source>
-        <translation type="obsolete">VYM - Percorso dello script di pre esportazione</translation>
+        <translation type="unfinished">VYM - Percorso dello script di pre esportazione</translation>
     </message>
     <message>
         <source>VYM - Path to post export script</source>
-        <translation type="obsolete">VYM - Percorso dello script di post esportazione</translation>
+        <translation type="unfinished">VYM - Percorso dello script di post esportazione</translation>
     </message>
     <message>
         <source> could not be opened!</source>
@@ -211,7 +237,7 @@
     </message>
     <message>
         <source>Critical Error</source>
-        <translation type="obsolete">Errore Critico</translation>
+        <translation type="unfinished">Errore Critico</translation>
     </message>
     <message>
         <source>Couldn&apos;t start </source>
@@ -229,36 +255,69 @@
         <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 type="obsolete">VIM - Info</translation>
+        <translation type="unfinished">VIM - Info</translation>
     </message>
     <message>
         <source>Map:</source>
-        <translation type="obsolete">Mappa:</translation>
+        <translation type="unfinished">Mappa:</translation>
     </message>
     <message>
         <source>Author:</source>
-        <translation type="obsolete">Autore:</translation>
+        <translation type="unfinished">Autore:</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation type="obsolete">Commenti:</translation>
+        <translation type="unfinished">Commenti:</translation>
     </message>
     <message>
         <source>Statistics:</source>
-        <translation type="obsolete">Statistiche:</translation>
+        <translation type="unfinished">Statistiche:</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="obsolete">Cancella</translation>
+        <translation type="unfinished">Cancella</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="obsolete">Chiudi</translation>
+        <translation type="unfinished">Chiudi</translation>
     </message>
 </context>
 <context>
@@ -316,15 +375,22 @@
     </message>
     <message>
         <source>Action</source>
+        <comment>Table with actions</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Comment</source>
+        <comment>Table with actions</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Undo action</source>
+        <comment>Table with actions</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>now</source>
-        <comment>now bar in history hwindow</comment>
+        <source>Current state</source>
+        <comment>Current bar in history hwindow</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -337,44 +403,44 @@
     <message>
         <source>New map</source>
         <comment>File menu</comment>
-        <translation>Nuova Mappa</translation>
+        <translation type="obsolete">Nuova Mappa</translation>
     </message>
     <message>
         <source>&amp;New...</source>
-        <translation>&amp;Nuovo...</translation>
+        <translation type="obsolete">&amp;Nuovo...</translation>
     </message>
     <message>
         <source>Open</source>
         <comment>File menu</comment>
-        <translation>Apri</translation>
+        <translation type="obsolete">Apri</translation>
     </message>
     <message>
         <source>&amp;Open...</source>
-        <translation>&amp;Apri...</translation>
+        <translation type="obsolete">&amp;Apri...</translation>
     </message>
     <message>
         <source>Open Recent</source>
-        <translation>Apri Recente</translation>
+        <translation type="obsolete">Apri Recente</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Salva</translation>
+        <translation type="obsolete">Salva</translation>
     </message>
     <message>
         <source>&amp;Save...</source>
-        <translation>&amp;Salva...</translation>
+        <translation type="obsolete">&amp;Salva...</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
-        <translation>Salva &amp;Con nome</translation>
+        <translation type="obsolete">Salva &amp;Con nome</translation>
     </message>
     <message>
         <source>Save &amp;As...</source>
-        <translation>Salva &amp;Con nome...</translation>
+        <translation type="obsolete">Salva &amp;Con nome...</translation>
     </message>
     <message>
         <source>Import directory structure (experimental)</source>
-        <translation>Importare la struttura di una cartella (sperimentale)</translation>
+        <translation type="obsolete">Importare la struttura di una cartella (sperimentale)</translation>
     </message>
     <message>
         <source>Import Dir</source>
@@ -382,11 +448,11 @@
     </message>
     <message>
         <source>Export</source>
-        <translation>Esporta</translation>
+        <translation type="obsolete">Esporta</translation>
     </message>
     <message>
         <source>Print</source>
-        <translation>Stampa</translation>
+        <translation type="obsolete">Stampa</translation>
     </message>
     <message>
         <source>&amp;Print...</source>
@@ -398,7 +464,7 @@
     </message>
     <message>
         <source>&amp;Close Map</source>
-        <translation>C&amp;hiudi Mappa</translation>
+        <translation type="obsolete">C&amp;hiudi Mappa</translation>
     </message>
     <message>
         <source>Exit VYM</source>
@@ -410,7 +476,7 @@
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Modifica</translation>
+        <translation type="obsolete">&amp;Modifica</translation>
     </message>
     <message>
         <source>Undo</source>
@@ -418,7 +484,7 @@
     </message>
     <message>
         <source>&amp;Undo</source>
-        <translation>Annu&amp;lla</translation>
+        <translation type="obsolete">Annu&amp;lla</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -426,7 +492,7 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>Co&amp;pia</translation>
+        <translation type="obsolete">Co&amp;pia</translation>
     </message>
     <message>
         <source>Cut</source>
@@ -434,7 +500,7 @@
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation>Ta&amp;glia</translation>
+        <translation type="obsolete">Ta&amp;glia</translation>
     </message>
     <message>
         <source>Paste</source>
@@ -442,7 +508,7 @@
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Incolla</translation>
+        <translation type="obsolete">&amp;Incolla</translation>
     </message>
     <message>
         <source>Move branch up</source>
@@ -450,7 +516,7 @@
     </message>
     <message>
         <source>Move up</source>
-        <translation>Vai sopra</translation>
+        <translation type="obsolete">Vai sopra</translation>
     </message>
     <message>
         <source>Move branch down</source>
@@ -458,7 +524,7 @@
     </message>
     <message>
         <source>Move down</source>
-        <translation>Vai giù</translation>
+        <translation type="obsolete">Vai giù</translation>
     </message>
     <message>
         <source>Scroll branch</source>
@@ -470,7 +536,7 @@
     </message>
     <message>
         <source>Unscroll all scrolled branches</source>
-        <translation>Mostra tutti i rami nascosti</translation>
+        <translation type="obsolete">Mostra tutti i rami nascosti</translation>
     </message>
     <message>
         <source>Find</source>
@@ -490,7 +556,7 @@
     </message>
     <message>
         <source>Use heading for URL</source>
-        <translation>Usa titoli per gli URL</translation>
+        <translation type="obsolete">Usa titoli per gli URL</translation>
     </message>
     <message>
         <source>Create URL to Bugzilla</source>
@@ -518,7 +584,7 @@
     </message>
     <message>
         <source>Delete vym link</source>
-        <translation>Cancella link vym</translation>
+        <translation type="obsolete">Cancella link vym</translation>
     </message>
     <message>
         <source>Edit Map Info</source>
@@ -530,7 +596,7 @@
     </message>
     <message>
         <source>Edit heading</source>
-        <translation>Edita Titolo</translation>
+        <translation type="obsolete">Edita Titolo</translation>
     </message>
     <message>
         <source>Delete Selection</source>
@@ -542,7 +608,7 @@
     </message>
     <message>
         <source>Add branch as child</source>
-        <translation>Aggiungi ramo come figlio</translation>
+        <translation type="obsolete">Aggiungi ramo come figlio</translation>
     </message>
     <message>
         <source>Add a branch above selection</source>
@@ -550,7 +616,7 @@
     </message>
     <message>
         <source>Add branch above</source>
-        <translation>Aggiungi ramo sopra</translation>
+        <translation type="obsolete">Aggiungi ramo sopra</translation>
     </message>
     <message>
         <source>Add a branch below selection</source>
@@ -558,7 +624,7 @@
     </message>
     <message>
         <source>Add branch below</source>
-        <translation>Aggiungi ramo sotto</translation>
+        <translation type="obsolete">Aggiungi ramo sotto</translation>
     </message>
     <message>
         <source>Add map at selection</source>
@@ -598,7 +664,7 @@
     </message>
     <message>
         <source>Select child branch</source>
-        <translation>Seleziona il ramo figlio</translation>
+        <translation type="obsolete">Seleziona il ramo figlio</translation>
     </message>
     <message>
         <source>Select first branch</source>
@@ -632,7 +698,7 @@
     </message>
     <message>
         <source>Pic&amp;k color</source>
-        <translation>P&amp;rendi colore</translation>
+        <translation type="obsolete">P&amp;rendi colore</translation>
     </message>
     <message>
         <source>Color branch</source>
@@ -640,7 +706,7 @@
     </message>
     <message>
         <source>Color &amp;branch</source>
-        <translation>Colore &amp;del ramo</translation>
+        <translation type="obsolete">Colore &amp;del ramo</translation>
     </message>
     <message>
         <source>Color Subtree</source>
@@ -648,7 +714,7 @@
     </message>
     <message>
         <source>Color sub&amp;tree</source>
-        <translation>Colore del so&amp;ttoalbero</translation>
+        <translation type="obsolete">Colore del so&amp;ttoalbero</translation>
     </message>
     <message>
         <source>Line</source>
@@ -692,7 +758,7 @@
     </message>
     <message>
         <source>&amp;Use color of heading for link</source>
-        <translation>&amp;Usa colore dei titoli per i collegamenti</translation>
+        <translation type="obsolete">&amp;Usa colore dei titoli per i collegamenti</translation>
     </message>
     <message>
         <source>Set Link Color</source>
@@ -720,7 +786,7 @@
     </message>
     <message>
         <source>reset Zoom</source>
-        <translation>reset Zoom</translation>
+        <translation type="obsolete">reset Zoom</translation>
     </message>
     <message>
         <source>Zoom in</source>
@@ -740,7 +806,7 @@
     </message>
     <message>
         <source>Next Window</source>
-        <translation>Prossima Finestra</translation>
+        <translation type="obsolete">Prossima Finestra</translation>
     </message>
     <message>
         <source>&amp;Previous Window</source>
@@ -748,7 +814,7 @@
     </message>
     <message>
         <source>Previous Window</source>
-        <translation>Finestra Precedente</translation>
+        <translation type="obsolete">Finestra Precedente</translation>
     </message>
     <message>
         <source>Modes when using modifiers</source>
@@ -784,7 +850,7 @@
     </message>
     <message>
         <source>Select existing heading</source>
-        <translation>Seleziona il titolo esistente</translation>
+        <translation type="obsolete">Seleziona il titolo esistente</translation>
     </message>
     <message>
         <source>Enable pasting into new branch</source>
@@ -808,7 +874,7 @@
     </message>
     <message>
         <source>test flag</source>
-        <translation>test flag</translation>
+        <translation type="obsolete">test flag</translation>
     </message>
     <message>
         <source>Show Clipboard</source>
@@ -820,7 +886,7 @@
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Aiuto</translation>
+        <translation type="obsolete">&amp;Aiuto</translation>
     </message>
     <message>
         <source>Open VYM Documentation (pdf)</source>
@@ -828,7 +894,7 @@
     </message>
     <message>
         <source>Open VYM Documentation (pdf) </source>
-        <translation> Apri la documentazione di VYM (pdf)</translation>
+        <translation type="obsolete"> Apri la documentazione di VYM (pdf)</translation>
     </message>
     <message>
         <source>Information about VYM</source>
@@ -844,11 +910,11 @@
     </message>
     <message>
         <source>About QT</source>
-        <translation>Riguardo le QT</translation>
+        <translation type="obsolete">Riguardo le QT</translation>
     </message>
     <message>
         <source>Save image</source>
-        <translation>Salva immagine</translation>
+        <translation type="obsolete">Salva immagine</translation>
     </message>
     <message>
         <source>Use for Export</source>
@@ -1072,7 +1138,7 @@
     </message>
     <message>
         <source>Add branch (insert)</source>
-        <translation>Aggiungi ramo (inserisci)</translation>
+        <translation type="obsolete">Aggiungi ramo (inserisci)</translation>
     </message>
     <message>
         <source>Remove only branch and keep its childs</source>
@@ -1080,7 +1146,7 @@
     </message>
     <message>
         <source>Remove only branch </source>
-        <translation> Rimuovi solo il ramo</translation>
+        <translation type="obsolete"> Rimuovi solo il ramo</translation>
     </message>
     <message>
         <source>Remove childs of branch</source>
@@ -1088,7 +1154,7 @@
     </message>
     <message>
         <source>Remove childs</source>
-        <translation>Rimuovi i figli</translation>
+        <translation type="obsolete">Rimuovi i figli</translation>
     </message>
     <message>
         <source>Use modifier to copy</source>
@@ -1100,11 +1166,11 @@
     </message>
     <message>
         <source>Remove</source>
-        <translation>Rimuovi</translation>
+        <translation type="obsolete">Rimuovi</translation>
     </message>
     <message>
         <source>Edit XLink</source>
-        <translation>Edita il XLink</translation>
+        <translation type="obsolete">Edita il XLink</translation>
     </message>
     <message>
         <source>Goto XLink</source>
@@ -1151,16 +1217,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>E&amp;xit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Redo</source>
         <translation type="unfinished">Rifai</translation>
     </message>
     <message>
         <source>&amp;Redo</source>
-        <translation type="unfinished">&amp;Rifai</translation>
+        <translation type="obsolete">&amp;Rifai</translation>
     </message>
     <message>
         <source>Create URL to FATE</source>
@@ -1171,42 +1233,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide in exports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add map (insert)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add map (replace)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Include top and bottom position of images into branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Include images vertically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Include left and right position of images into branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Include images horizontally</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Hide link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide link if object is not selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Note</source>
         <comment>Systemflag</comment>
         <translation type="unfinished">Note</translation>
@@ -1325,43 +1363,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exclusive flags</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Use hide flag during exports </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use hide flags</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Call test function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export in Open Document Format used e.g. in Open Office </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>(still experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The directory %1 is not empty.
-Do you risk to overwrite its contents?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>The map %1
 is already opened.Opening the same map in multiple editors may lead 
 to confusion when finishing working with vym.Do you want to</source>
@@ -1480,10 +1489,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>F&amp;ormat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Show Note Editor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1500,23 +1505,9 @@
         <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>
+        <translation type="obsolete">Metodi nell&apos;uso dei modifier</translation>
     </message>
     <message>
         <source>Standard Flags</source>
@@ -1524,10 +1515,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Follow XLink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Couldn&apos;t find configuration for export to Open Office
 </source>
         <translation type="unfinished"></translation>
@@ -1541,26 +1528,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open all URLs in subtree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open xlinked map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open all vym links in subtree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URLs and vymLinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Couldn&apos;t create temporary directory before load
 </source>
         <translation type="unfinished"></translation>
@@ -1574,6 +1549,559 @@
         <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;New...</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">&amp;Nuovo...</translation>
+    </message>
+    <message>
+        <source>New map</source>
+        <comment>Status tip File menu</comment>
+        <translation type="unfinished">Nuova Mappa</translation>
+    </message>
+    <message>
+        <source>&amp;Open...</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">&amp;Apri...</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <comment>Status tip File menu</comment>
+        <translation type="unfinished">Apri</translation>
+    </message>
+    <message>
+        <source>Open Recent</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">Apri Recente</translation>
+    </message>
+    <message>
+        <source>&amp;Save...</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">&amp;Salva...</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <comment>Status tip file menu</comment>
+        <translation type="unfinished">Salva</translation>
+    </message>
+    <message>
+        <source>Save &amp;As...</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">Salva &amp;Con nome...</translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <comment>Status tip file menu</comment>
+        <translation type="unfinished">Salva &amp;Con nome</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">Importa</translation>
+    </message>
+    <message>
+        <source>Import %1</source>
+        <comment>Status tip file menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KDE bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Firefox Bookmarks</source>
+        <comment>File menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import %1</source>
+        <comment>status tip file menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Dir%1</source>
+        <comment>File menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import directory structure (experimental)</source>
+        <comment>status tip file menu</comment>
+        <translation type="unfinished">Importare la struttura di una cartella (sperimentale)</translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">Esporta</translation>
+    </message>
+    <message>
+        <source>Image%1</source>
+        <comment>File export menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export map as image</source>
+        <comment>status tip file menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export in Open Document Format used e.g. in Open Office </source>
+        <comment>status tip file menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export as %1</source>
+        <comment>status tip file menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> webpage (XHTML)</source>
+        <comment>status tip file menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KDE Bookmarks</source>
+        <comment>File menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">Stampa</translation>
+    </message>
+    <message>
+        <source>&amp;Close Map</source>
+        <comment>File menu</comment>
+        <translation type="unfinished">C&amp;hiudi Mappa</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <comment>File menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Actions toolbar</source>
+        <comment>Toolbar name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">&amp;Modifica</translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">&amp;Rifai</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit heading</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Edita Titolo</translation>
+    </message>
+    <message>
+        <source>Delete Selection</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Cancella la Selezione</translation>
+    </message>
+    <message>
+        <source>Add branch as child</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Aggiungi ramo come figlio</translation>
+    </message>
+    <message>
+        <source>Add branch (insert)</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Aggiungi ramo (inserisci)</translation>
+    </message>
+    <message>
+        <source>Add branch above</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Aggiungi ramo sopra</translation>
+    </message>
+    <message>
+        <source>Add branch below</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Aggiungi ramo sotto</translation>
+    </message>
+    <message>
+        <source>Move up</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Vai sopra</translation>
+    </message>
+    <message>
+        <source>Move down</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Vai giù</translation>
+    </message>
+    <message>
+        <source>Scroll branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Nascondi/Mostra ramificazione</translation>
+    </message>
+    <message>
+        <source>Unscroll all scrolled branches</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Mostra tutti i rami nascosti</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open URL</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Apri URL</translation>
+    </message>
+    <message>
+        <source>Open URL in new tab</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open all URLs in subtree</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit URL...</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use heading for URL</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Usa titoli per gli URL</translation>
+    </message>
+    <message>
+        <source>Create URL to Bugzilla</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Crea URL a Bugzilla</translation>
+    </message>
+    <message>
+        <source>Create URL to FATE</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open linked map</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open all vym links in subtree</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit vym link...</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete vym link</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Cancella link vym</translation>
+    </message>
+    <message>
+        <source>Hide in exports</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Map Info...</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add map (insert)</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add map (replace)</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save selection</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Salva selezione</translation>
+    </message>
+    <message>
+        <source>Remove only branch </source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"> Rimuovi solo il ramo</translation>
+    </message>
+    <message>
+        <source>Remove childs</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Rimuovi i figli</translation>
+    </message>
+    <message>
+        <source>Select upper branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Seleziona il ramo superiore</translation>
+    </message>
+    <message>
+        <source>Select lower branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Seleziona il ramo inferiore</translation>
+    </message>
+    <message>
+        <source>Select left branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Seleziona il ramo sinistro</translation>
+    </message>
+    <message>
+        <source>Select child branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Seleziona il ramo figlio</translation>
+    </message>
+    <message>
+        <source>Select first branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Seleziona il primo ramo</translation>
+    </message>
+    <message>
+        <source>Select last branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Seleziona l&apos;ultimo ramo</translation>
+    </message>
+    <message>
+        <source>Add Image...</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F&amp;ormat</source>
+        <comment>Format menu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Actions</source>
+        <comment>Format Toolbar name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pic&amp;k color</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">P&amp;rendi colore</translation>
+    </message>
+    <message>
+        <source>Color &amp;branch</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Colore &amp;del ramo</translation>
+    </message>
+    <message>
+        <source>Color sub&amp;tree</source>
+        <comment>Edit menu</comment>
+        <translation type="unfinished">Colore del so&amp;ttoalbero</translation>
+    </message>
+    <message>
+        <source>No Frame</source>
+        <comment>Branch attribute</comment>
+        <translation type="unfinished">Senza Frame</translation>
+    </message>
+    <message>
+        <source>RectangleBranch attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Include images vertically</source>
+        <comment>Branch attribute</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Include images horizontally</source>
+        <comment>Branch attribute</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide link if object is not selected</source>
+        <comment>Branch attribute</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use color of heading for link</source>
+        <comment>Branch attribute</comment>
+        <translation type="unfinished">&amp;Usa colore dei titoli per i collegamenti</translation>
+    </message>
+    <message>
+        <source>View Actions</source>
+        <comment>View Toolbar name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reset Zoom</source>
+        <comment>View action</comment>
+        <translation type="unfinished">reset Zoom</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <comment>View action</comment>
+        <translation type="unfinished">Zoom dentro</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <comment>View action</comment>
+        <translation type="unfinished">Zoom fuori</translation>
+    </message>
+    <message>
+        <source>Show Note Editor</source>
+        <comment>View action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show history window</source>
+        <comment>View action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next Window</source>
+        <comment>View action</comment>
+        <translation type="unfinished">Prossima Finestra</translation>
+    </message>
+    <message>
+        <source>Previous Window</source>
+        <comment>View action</comment>
+        <translation type="unfinished">Finestra Precedente</translation>
+    </message>
+    <message>
+        <source>Modes when using modifiers</source>
+        <comment>Modifier Toolbar name</comment>
+        <translation type="unfinished">Metodi nell&apos;uso dei modifier</translation>
+    </message>
+    <message>
+        <source>Use modifier to color branches</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished">Usa i modifier per colorare i rami</translation>
+    </message>
+    <message>
+        <source>Use modifier to copy</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished">Usa i modifier per copiare</translation>
+    </message>
+    <message>
+        <source>Use modifier to draw xLinks</source>
+        <comment>Mode modifier</comment>
+        <translation type="unfinished">Usa i modifier per disegnare XLink</translation>
+    </message>
+    <message>
+        <source>Set application to open pdf files</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished">Scegli il programma per aprire i file pdf</translation>
+    </message>
+    <message>
+        <source>Set application to open external links</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit branch after adding it</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished">Edita il ramo dopo averlo aggiunto</translation>
+    </message>
+    <message>
+        <source>Select branch after adding it</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished">Seleziona il ramo dopo averlo aggiunto</translation>
+    </message>
+    <message>
+        <source>Select existing heading</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished">Seleziona il titolo esistente</translation>
+    </message>
+    <message>
+        <source>Delete key</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exclusive flags</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use hide flags</source>
+        <comment>Settings action</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <comment>Help menubar entry</comment>
+        <translation type="unfinished">&amp;Aiuto</translation>
+    </message>
+    <message>
+        <source>Open VYM Documentation (pdf) </source>
+        <comment>Help action</comment>
+        <translation type="unfinished"> Apri la documentazione di VYM (pdf)</translation>
+    </message>
+    <message>
+        <source>About VYM</source>
+        <comment>Help action</comment>
+        <translation type="unfinished">A proposito di VYM</translation>
+    </message>
+    <message>
+        <source>About QT</source>
+        <comment>Help action</comment>
+        <translation type="unfinished">Riguardo le QT</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <comment>Context menu name</comment>
+        <translation type="unfinished">Rimuovi</translation>
+    </message>
+    <message>
+        <source>URLs and vymLinks</source>
+        <comment>Context menu name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit XLink</source>
+        <comment>Context menu name</comment>
+        <translation type="unfinished">Edita il XLink</translation>
+    </message>
+    <message>
+        <source>Follow XLink</source>
+        <comment>Context menu name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save image</source>
+        <comment>Context action</comment>
+        <translation type="unfinished">Salva immagine</translation>
+    </message>
+    <message>
+        <source>The directory %1 is not empty.
+Do you risk to overwrite its contents?</source>
+        <comment>write directory</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MapEditor</name>
@@ -1627,7 +2155,7 @@
     </message>
     <message>
         <source>Critical Parse Error by reading backupFile</source>
-        <translation>Errore Critico di Interpretazione nel leggere il file di backup</translation>
+        <translation type="obsolete">Errore Critico di Interpretazione nel leggere il file di backup</translation>
     </message>
     <message>
         <source>Critical Error</source>
@@ -1808,14 +2336,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Temporary directory %1 used for undo is gone. 
-I will create a new one, but at the moment no undo is available.
-Maybe you want to reload your original data.
-
-Sorry for any inconveniences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Link to another map</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1842,7 +2362,7 @@
     </message>
     <message>
         <source>Warning</source>
-        <translation type="obsolete">Attenzione</translation>
+        <translation type="unfinished">Attenzione</translation>
     </message>
     <message>
         <source>History for </source>
@@ -1852,6 +2372,19 @@
         <source>Save image</source>
         <translation type="unfinished">Salva immagine</translation>
     </message>
+    <message>
+        <source>Critical Parse Error while reading %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get color of heading,
+there&apos;s no branch selected</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1977,7 +2510,7 @@
     </message>
     <message>
         <source>Import</source>
-        <translation>Importa</translation>
+        <translation type="obsolete">Importa</translation>
     </message>
     <message>
         <source>&amp;Import...</source>
@@ -1985,7 +2518,7 @@
     </message>
     <message>
         <source>Export Note (HTML)</source>
-        <translation>Esporta Note (HTML)</translation>
+        <translation type="obsolete">Esporta Note (HTML)</translation>
     </message>
     <message>
         <source>&amp;Export...</source>
@@ -1993,7 +2526,7 @@
     </message>
     <message>
         <source>Export Note As (HTML) </source>
-        <translation> Esporta Note come (HTML)</translation>
+        <translation type="obsolete"> Esporta Note come (HTML)</translation>
     </message>
     <message>
         <source>Export &amp;As... (HTML)</source>
@@ -2001,7 +2534,7 @@
     </message>
     <message>
         <source>Export Note As (ASCII) </source>
-        <translation>  Esporta Note come (ASCII)</translation>
+        <translation type="obsolete">  Esporta Note come (ASCII)</translation>
     </message>
     <message>
         <source>Export &amp;As...(ASCII)</source>
@@ -2021,7 +2554,7 @@
     </message>
     <message>
         <source>Undo</source>
-        <translation>Annulla</translation>
+        <translation type="obsolete">Annulla</translation>
     </message>
     <message>
         <source>&amp;Undo</source>
@@ -2029,7 +2562,7 @@
     </message>
     <message>
         <source>Redo</source>
-        <translation>Rifai</translation>
+        <translation type="obsolete">Rifai</translation>
     </message>
     <message>
         <source>&amp;Redo</source>
@@ -2037,7 +2570,7 @@
     </message>
     <message>
         <source>Select and copy all</source>
-        <translation>Seleziona e copia tutto</translation>
+        <translation type="obsolete">Seleziona e copia tutto</translation>
     </message>
     <message>
         <source>Select and copy &amp;all</source>
@@ -2045,7 +2578,7 @@
     </message>
     <message>
         <source>Copy</source>
-        <translation>Copia</translation>
+        <translation type="obsolete">Copia</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
@@ -2053,7 +2586,7 @@
     </message>
     <message>
         <source>Cut</source>
-        <translation>Taglia</translation>
+        <translation type="obsolete">Taglia</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
@@ -2061,7 +2594,7 @@
     </message>
     <message>
         <source>Paste</source>
-        <translation>Incolla</translation>
+        <translation type="obsolete">Incolla</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
@@ -2069,7 +2602,7 @@
     </message>
     <message>
         <source>Delete all</source>
-        <translation>Cancella tutto</translation>
+        <translation type="obsolete">Cancella tutto</translation>
     </message>
     <message>
         <source>&amp;Delete All</source>
@@ -2081,7 +2614,7 @@
     </message>
     <message>
         <source>&amp;Convert Paragraphs</source>
-        <translation>Converti para&amp;grafi</translation>
+        <translation type="obsolete">Converti para&amp;grafi</translation>
     </message>
     <message>
         <source>Join all lines of a paragraph</source>
@@ -2089,7 +2622,7 @@
     </message>
     <message>
         <source>&amp;Join lines</source>
-        <translation>&amp;Unisci linee</translation>
+        <translation type="obsolete">&amp;Unisci linee</translation>
     </message>
     <message>
         <source>&amp;Format</source>
@@ -2097,7 +2630,7 @@
     </message>
     <message>
         <source>Toggle font hint for the whole text</source>
-        <translation>(mostra/nascondi) suggerimento caratteri per tutto il testo</translation>
+        <translation type="obsolete">(mostra/nascondi) suggerimento caratteri per tutto il testo</translation>
     </message>
     <message>
         <source>&amp;Font hint</source>
@@ -2141,7 +2674,7 @@
     </message>
     <message>
         <source>Set fixed font</source>
-        <translation>Scegli Caratteri fissi</translation>
+        <translation type="obsolete">Scegli Caratteri fissi</translation>
     </message>
     <message>
         <source>Set &amp;fixed font</source>
@@ -2149,7 +2682,7 @@
     </message>
     <message>
         <source>Set variable font</source>
-        <translation>Scegli Caratteri Variabili</translation>
+        <translation type="obsolete">Scegli Caratteri Variabili</translation>
     </message>
     <message>
         <source>Set &amp;variable font</source>
@@ -2157,7 +2690,7 @@
     </message>
     <message>
         <source>Used fixed font by default</source>
-        <translation>Usa caretteri fissi come predefinito</translation>
+        <translation type="obsolete">Usa caretteri fissi come predefinito</translation>
     </message>
     <message>
         <source>&amp;fixed font is default</source>
@@ -2169,11 +2702,11 @@
     </message>
     <message>
         <source>The file </source>
-        <translation> Il file</translation>
+        <translation type="obsolete"> Il file</translation>
     </message>
     <message>
         <source> exists already. Do you want to overwrite it?</source>
-        <translation> esiste già. Vuoi sovvrascriverlo?</translation>
+        <translation type="obsolete"> esiste già. Vuoi sovvrascriverlo?</translation>
     </message>
     <message>
         <source>Overwrite</source>
@@ -2185,7 +2718,7 @@
     </message>
     <message>
         <source>Couldn&apos;t export note </source>
-        <translation> Non è possibile esportare la nota</translation>
+        <translation type="obsolete"> Non è possibile esportare la nota</translation>
     </message>
     <message>
         <source>Export Note to single file (ASCII)</source>
@@ -2216,27 +2749,143 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Print Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Note Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Ready</source>
+        <comment>Statusbar message</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No filename available for this note.</source>
+        <comment>Statusbar message</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note Editor</source>
+        <comment>Window caption</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;Note</source>
+        <comment>Menubar</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Import</source>
+        <comment>Status tip for Note menu</comment>
+        <translation type="unfinished">Importa</translation>
+    </message>
+    <message>
+        <source>Export Note (HTML)</source>
+        <comment>Status tip for Note menu</comment>
+        <translation type="unfinished">Esporta Note (HTML)</translation>
+    </message>
+    <message>
+        <source>Export Note As (HTML) </source>
+        <comment>Status tip for Note Menu</comment>
+        <translation type="unfinished"> Esporta Note come (HTML)</translation>
+    </message>
+    <message>
+        <source>Export Note As (ASCII) </source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">  Esporta Note come (ASCII)</translation>
+    </message>
+    <message>
+        <source>Print Note</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Stampa Nota</translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Annulla</translation>
+    </message>
+    <message>
+        <source>Redo</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Rifai</translation>
+    </message>
+    <message>
+        <source>Select and copy all</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Seleziona e copia tutto</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Copia</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Taglia</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Incolla</translation>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Cancella tutto</translation>
+    </message>
+    <message>
+        <source>Toggle font hint for the whole text</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">(mostra/nascondi) suggerimento caratteri per tutto il testo</translation>
+    </message>
+    <message>
+        <source>Set fixed font</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Scegli Caratteri fissi</translation>
+    </message>
+    <message>
+        <source>Set variable font</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Scegli Caratteri Variabili</translation>
+    </message>
+    <message>
+        <source>Used fixed font by default</source>
+        <comment>Status tip for note menu</comment>
+        <translation type="unfinished">Usa caretteri fissi come predefinito</translation>
+    </message>
+    <message>
+        <source>The file %1
+exists already.
+Do you want to overwrite it?</source>
+        <comment>dialog &apos;save note as&apos;</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t export note </source>
+        <comment>dialog &apos;save note as&apos;</comment>
+        <translation type="unfinished"> Non è possibile esportare la nota</translation>
+    </message>
 </context>
 <context>
     <name>WarningDialog</name>
     <message>
         <source>Cancel</source>
-        <translation type="obsolete">Cancella</translation>
+        <translation type="unfinished">Cancella</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
+        <translation type="unfinished">Ok</translation>
+    </message>
+    <message>
+        <source>VYM - Warning : Foo...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>showAgainBox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Proceed</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff -r 445a5d5ee20b -r 39aa64b24375 tex/vym.changelog
--- a/tex/vym.changelog	Mon Oct 30 12:39:37 2006 +0000
+++ b/tex/vym.changelog	Mon Oct 30 12:39:37 2006 +0000
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 30 10:28:55 CEST 2006 - uwe
+
+- Feature: vym opens spanish documentation, if locale is es*
+- Bugfix: Position of floatimages is saved again 
+- Bugfix: Position of floatimages survives adjustCanvasSize()
+- Bugfix: Adding branch to scrolled branch unscroll the former 
+
 -------------------------------------------------------------------
 Tue Oct 24 17:24:22 CEST 2006 - uwedr