# HG changeset patch
# User insilmaril
# Date 1125588918 0
# Node ID e44baadd495854431e2cab9df8f0b54084d18338
# Parent a33a2bdd82993efb15ea5ff7f57c9d33730dec9d
changed some strings for easier translation
diff -r a33a2bdd8299 -r e44baadd4958 demos/todo.vym
Binary file demos/todo.vym has changed
diff -r a33a2bdd8299 -r e44baadd4958 lang/vym_de.ts
--- a/lang/vym_de.ts Tue Aug 30 14:09:19 2005 +0000
+++ b/lang/vym_de.ts Thu Sep 01 15:35:18 2005 +0000
@@ -1,5 +1,12 @@
<!DOCTYPE TS><TS>
<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>Ok</source>
+ <translation>Ok</translation>
+ </message>
+</context>
+<context>
<name>EditXLinkDialog</name>
<message>
<source>Edit XLink</source>
@@ -165,7 +172,7 @@
</message>
<message>
<source>Stylesheets</source>
- <translation type="obsolete">Stylesheets</translation>
+ <translation>Stylesheets</translation>
</message>
<message>
<source>CSS:</source>
@@ -197,7 +204,7 @@
</message>
<message>
<source>Scripts</source>
- <translation type="obsolete">Skripte</translation>
+ <translation>Skripte</translation>
</message>
<message>
<source>Before export:</source>
@@ -231,11 +238,11 @@
</message>
<message>
<source>Stylesheets:</source>
- <translation>Stylesheets:</translation>
+ <translation type="obsolete">Stylesheets:</translation>
</message>
<message>
<source>Scripts:</source>
- <translation>Skripte:</translation>
+ <translation type="obsolete">Skripte:</translation>
</message>
</context>
<context>
@@ -324,7 +331,7 @@
</message>
<message>
<source>Import Dir</source>
- <translation>Importiere Verzeichnis</translation>
+ <translation type="obsolete">Importiere Verzeichnis</translation>
</message>
<message>
<source>Export (png)</source>
@@ -614,7 +621,7 @@
</message>
<message>
<source>Set &Link Color</source>
- <translation>&Farbe der Verbindungen</translation>
+ <translation type="obsolete">&Farbe der Verbindungen</translation>
</message>
<message>
<source>Set Background Color</source>
@@ -674,7 +681,7 @@
</message>
<message>
<source>Set application to open an URL</source>
- <translation>URLs öffnen mit...</translation>
+ <translation type="obsolete">URLs öffnen mit...</translation>
</message>
<message>
<source>Edit branch after adding it</source>
@@ -694,15 +701,15 @@
</message>
<message>
<source>Enable pasting into new branch</source>
- <translation>Einfügen in neuen Zweig</translation>
+ <translation type="obsolete">Einfügen in neuen Zweig</translation>
</message>
<message>
<source>Enable Delete key for deleting branches</source>
- <translation>Delete Taste zum Löschen von Zweigen verwenden</translation>
+ <translation type="obsolete">Delete Taste zum Löschen von Zweigen verwenden</translation>
</message>
<message>
<source>Enable Delete key</source>
- <translation>Delete Taste zum Löschen von Zweigen verwenden</translation>
+ <translation type="obsolete">Delete Taste zum Löschen von Zweigen verwenden</translation>
</message>
<message>
<source>&Test</source>
@@ -774,12 +781,12 @@
</message>
<message>
<source>The file </source>
- <translation>Die Datei</translation>
+ <translation type="obsolete">Die Datei</translation>
</message>
<message>
<source>
exists already. Do you want to</source>
- <translation>gibt es bereits. Wollen Sie sie</translation>
+ <translation type="obsolete">gibt es bereits. Wollen Sie sie</translation>
</message>
<message>
<source>Overwrite</source>
@@ -799,15 +806,15 @@
</message>
<message>
<source>Couldn't save </source>
- <translation type="obsolete">Diese Datei konnte nicht gespeichert werden: </translation>
+ <translation>Diese Datei konnte nicht gespeichert werden: </translation>
</message>
<message>
<source>The map </source>
- <translation>Die Map </translation>
+ <translation type="obsolete">Die Map </translation>
</message>
<message>
<source> has been modified but not saved yet. Do you want to</source>
- <translation>wurde verändert aber noch nicht gespeichert. Wollen Sie</translation>
+ <translation type="obsolete">wurde verändert aber noch nicht gespeichert. Wollen Sie</translation>
</message>
<message>
<source>Save modified map before closing it</source>
@@ -859,7 +866,7 @@
</message>
<message>
<source>Export (ASCII)</source>
- <translation>als ASCII</translation>
+ <translation type="obsolete">als ASCII</translation>
</message>
<message>
<source>Edit Map Info</source>
@@ -875,17 +882,17 @@
</message>
<message>
<source>The directory </source>
- <translation>Das Verzeichnis</translation>
+ <translation type="obsolete">Das Verzeichnis</translation>
</message>
<message>
<source> is not empty. Do you risk to overwrite its contents?</source>
- <translation>ist nicht leer.Riskieren sie es, das Verzeichnis zu überschreiben?</translation>
+ <translation type="obsolete">ist nicht leer.Riskieren sie es, das Verzeichnis zu überschreiben?</translation>
</message>
<message>
<source>
is already opened.Opening the same map in multiple editors may lead
to confusion when finishing working with vym.Do you want to</source>
- <translation>
+ <translation type="obsolete">
ist bereits geöffnet. Die gleiche Map mehrfach in verschiedenen Ansichten zu öffnen
kann beim Beenden von vym zu Problemen führen. Wollen Sie</translation>
</message>
@@ -933,7 +940,7 @@
</message>
<message>
<source>Edit vym link</source>
- <translation>vym Verknüpfung ändern</translation>
+ <translation type="obsolete">vym Verknüpfung ändern</translation>
</message>
<message>
<source>Delete link to another vym map</source>
@@ -994,7 +1001,7 @@
</message>
<message>
<source>Saved</source>
- <translation>Gespeichert: </translation>
+ <translation type="obsolete">Gespeichert: </translation>
</message>
<message>
<source>VYM -Information:</source>
@@ -1002,7 +1009,7 @@
</message>
<message>
<source>No matches found for </source>
- <translation>Keine Treffer gefunden für</translation>
+ <translation type="obsolete">Keine Treffer gefunden für</translation>
</message>
<message>
<source>Export XHTML</source>
@@ -1015,7 +1022,7 @@
and flags and thus may overwrite files in the given directory
Do you want to write the map</source>
- <translation>
+ <translation type="obsolete">
verwendet nicht das komprimierte vym Dateiformat.
Wenn die Map unkomprimiert geschrieben werden soll,
dann werden auch die Flags und Bilder im angegebenen
@@ -1147,13 +1154,13 @@
<message>
<source>This map does not exist:
</source>
- <translation>Diese Map gibt es nicht:
+ <translation type="obsolete">Diese Map gibt es nicht:
</translation>
</message>
<message>
<source>
Do you want to create a new one?</source>
- <translation>Wollen Sie eine neue anlegen?</translation>
+ <translation type="obsolete">Wollen Sie eine neue anlegen?</translation>
</message>
<message>
<source>Use modifier to draw xLinks</source>
@@ -1165,8 +1172,103 @@
</message>
<message>
<source>Enable exclusive flags</source>
+ <translation type="obsolete">Exklusive Flags</translation>
+ </message>
+ <message>
+ <source>Set application to open external links</source>
+ <translation>Anwendung zum Öffnen externen Verweise</translation>
+ </message>
+ <message>
+ <source>Pasting into new branch</source>
+ <translation>In neuen Zweig einfügen</translation>
+ </message>
+ <message>
+ <source>pasting into new branch</source>
+ <translation>In neuen Zweig einfügen</translation>
+ </message>
+ <message>
+ <source>Delete key for deleting branches</source>
+ <translation>Entfernen Taste für das Löschen von Zweigen</translation>
+ </message>
+ <message>
+ <source>Delete key</source>
+ <translation>Entfernen Taste</translation>
+ </message>
+ <message>
+ <source>Exclusive flags</source>
<translation>Exklusive Flags</translation>
</message>
+ <message>
+ <source>The directory %1 is not empty.
+Do you risk to overwrite its contents?</source>
+ <translation>Das Verzeichnis %1 ist nicht leer.
+Riskieren Sie es dessen Inhalt zu überschreiben?</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>
+ <translation>Die Map %1
+ist bereits in vym geöffnet. Die gleiche Map gleichzeitig in mehreren Editoren
+zu bearbeiten kann beim Beenden von vym zu Verwirrung führen.
+Wollen Sie</translation>
+ </message>
+ <message>
+ <source>This map does not exist:
+ %1
+Do you want to create a new one?</source>
+ <translation>Diese Map gibt es nich:
+ %1
+Wollen Sie eine neue anlegen?</translation>
+ </message>
+ <message>
+ <source>The map %1
+did not use the compressed vym file format.
+Writing it uncompressed will also write images
+and flags and thus may overwrite files in the given directory
+
+Do you want to write the map</source>
+ <translation>Die Map %1
+wurde unkomprimiert gespeichert, also nicht im
+normalerweise von vym verwendeten Format.
+Beim nochmaligen unkomprimierten Speichern
+werden auch Grafiken gespeichert und so evtl.
+Daten im angegeben Verzeichnis überschrieben.
+
+Wollen Sie
+</translation>
+ </message>
+ <message>
+ <source>Saved %1</source>
+ <translation>%1 gespeichert</translation>
+ </message>
+ <message>
+ <source>The file %1
+exists already. Do you want to</source>
+ <translation>Die Datei %1 gibt es bereits.
+Wollen Sie sie überschreiben?</translation>
+ </message>
+ <message>
+ <source>The map %1 has been modified but not saved yet. Do you want to</source>
+ <translation>Die Map %1 wurde geändert,
+aber noch nicht gespeichert. Wollen Sie </translation>
+ </message>
+ <message>
+ <source>No matches found for <b>%1</b></source>
+ <translation>Kein Treffer gefunden für <b>%1</b></translation>
+ </message>
+ <message>
+ <source>Couldn't open map %1</source>
+ <translation>Konnte die Map %1 nicht öffnen</translation>
+ </message>
+ <message>
+ <source>Set application to open pdf files ...</source>
+ <translation>Anwendung zum Öffnen von PDF Dateien...</translation>
+ </message>
+ <message>
+ <source>Set application to open external links...</source>
+ <translation>Anwendung zum Öffnen externer Verweise...</translation>
+ </message>
</context>
<context>
<name>MapEditor</name>
@@ -1294,11 +1396,11 @@
</message>
<message>
<source>The file </source>
- <translation>Die Datei</translation>
+ <translation type="obsolete">Die Datei</translation>
</message>
<message>
<source> exists already. Do you want to overwrite it?</source>
- <translation>gibt es bereits. Wollen Sie sie</translation>
+ <translation type="obsolete">gibt es bereits. Wollen Sie sie</translation>
</message>
<message>
<source>Overwrite</source>
@@ -1310,11 +1412,11 @@
</message>
<message>
<source>Critical Export Error </source>
- <translation>Kritischer Fehler beim Exportieren</translation>
+ <translation type="obsolete">Kritischer Fehler beim Exportieren</translation>
</message>
<message>
<source>Couldn't create directory </source>
- <translation>Konnte Verzeichnis nicht anlegen</translation>
+ <translation type="obsolete">Konnte Verzeichnis nicht anlegen</translation>
</message>
<message>
<source>VYM - Export to directory</source>
@@ -1346,7 +1448,7 @@
Maybe you want to reload your original data.
Sorry for any inconveniences.</source>
- <translation>Vielleicht wollen sie die Orginaldaten erneut laden
+ <translation type="obsolete">Vielleicht wollen sie die Orginaldaten erneut laden
Sorry für die Unannehmlichkeiten.</translation>
</message>
<message>
@@ -1379,7 +1481,7 @@
</message>
<message>
<source>vym - Save image as </source>
- <translation>vym - Speichere Bild als</translation>
+ <translation type="obsolete">vym - Speichere Bild als</translation>
</message>
<message>
<source>Critical Import Error</source>
@@ -1387,7 +1489,7 @@
</message>
<message>
<source>Cannot find the directory</source>
- <translation>Kann das Verzeichnis nicht finden</translation>
+ <translation type="obsolete">Kann das Verzeichnis nicht finden</translation>
</message>
<message>
<source>VYM - Choose directory structur to import</source>
@@ -1412,7 +1514,7 @@
</message>
<message>
<source>MapEditor::exportXML couldn't open </source>
- <translation>MapEditor::exportXML konnte nicht öffnen:</translation>
+ <translation type="obsolete">MapEditor::exportXML konnte nicht öffnen:</translation>
</message>
<message>
<source>Note</source>
@@ -1528,6 +1630,42 @@
<source>Critcal Save error</source>
<translation>Kritischer Fehler beim Speichern</translation>
</message>
+ <message>
+ <source>The file %1 exists already.
+Do you want to overwrite it?</source>
+ <translation>Die Datei %1 gibt es bereits.
+Wollen Sie sie überschreiben?</translation>
+ </message>
+ <message>
+ <source>MapEditor::exportXML couldn't open %1</source>
+ <translation>MapEditor::exportXML konnte %1 nicht öffnen</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>Um einen Schritt rückgängig machen zu können, wird das Verzeichnis
+%1 benutzt - leider ist verschwunden.
+Am besten Sie starten vym neu und laden Ihre Daten nochmal.
+
+Sorry für die Umstände.
+</translation>
+ </message>
+ <message>
+ <source>vym - Save image as %1</source>
+ <translation>vym - Bild speichern als %1</translation>
+ </message>
+ <message>
+ <source>The file %1 exists already. Do you want to overwrite it?</source>
+ <translation>Die Datei %1 gibt es bereits.
+Wollen Sie sie überschreiben?</translation>
+ </message>
+ <message>
+ <source>Cannot find the directory %1</source>
+ <translation>Konnte das Verzeichnis %1 nicht finden</translation>
+ </message>
</context>
<context>
<name>QMessageBox</name>
@@ -1808,5 +1946,13 @@
<source>&Font hint</source>
<translation>Zeichensatz &umschalten</translation>
</message>
+ <message>
+ <source>Subs&cript</source>
+ <translation>&Tiefgestellt</translation>
+ </message>
+ <message>
+ <source>Su&perscript</source>
+ <translation>&Hochgestellt</translation>
+ </message>
</context>
</TS>
diff -r a33a2bdd8299 -r e44baadd4958 lang/vym_en.ts
--- a/lang/vym_en.ts Tue Aug 30 14:09:19 2005 +0000
+++ b/lang/vym_en.ts Thu Sep 01 15:35:18 2005 +0000
@@ -1,5 +1,12 @@
<!DOCTYPE TS><TS>
<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>Ok</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditXLinkDialog</name>
<message>
<source>Edit XLink</source>
@@ -207,11 +214,11 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Stylesheets:</source>
+ <source>Stylesheets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Scripts:</source>
+ <source>Scripts</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -310,10 +317,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Import Dir</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Export</source>
<translation type="unfinished"></translation>
</message>
@@ -442,10 +445,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Edit vym link</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Delete link to another vym map</source>
<translation type="unfinished"></translation>
</message>
@@ -631,10 +630,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Set &Link Color</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Set Background Color</source>
<translation type="unfinished"></translation>
</message>
@@ -699,10 +694,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Set application to open an URL</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Edit branch after adding it</source>
<translation type="unfinished"></translation>
</message>
@@ -719,18 +710,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Enable pasting into new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Enable Delete key for deleting branches</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Enable Delete key</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>&Test</source>
<translation type="unfinished"></translation>
</message>
@@ -795,10 +774,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Export (ASCII)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Export XML</source>
<translation type="unfinished"></translation>
</message>
@@ -811,14 +786,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>The directory </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source> is not empty. Do you risk to overwrite its contents?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
@@ -827,16 +794,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>The map </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>
- is already opened.Opening the same map in multiple editors may lead
-to confusion when finishing working with vym.Do you want to</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Open anyway</source>
<translation type="unfinished"></translation>
</message>
@@ -883,15 +840,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>
-did not use the compressed vym file format.
-Writing it uncompressed will also write images
-and flags and thus may overwrite files in the given directory
-
-Do you want to write the map</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>compressed (vym default)</source>
<translation type="unfinished"></translation>
</message>
@@ -912,31 +860,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Saved</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Couldn't save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The file </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>
-exists already. Do you want to</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Export XML to directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source> has been modified but not saved yet. Do you want to</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Save modified map before closing it</source>
<translation type="unfinished"></translation>
</message>
@@ -957,10 +888,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>No matches found for </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Critical Error</source>
<translation type="unfinished"></translation>
</message>
@@ -1031,16 +958,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>This map does not exist:
- </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>
-Do you want to create a new one?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Use modifier to draw xLinks</source>
<translation type="unfinished"></translation>
</message>
@@ -1049,7 +966,86 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Enable exclusive flags</source>
+ <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>
+ <message>
+ <source>pasting into new branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete key for deleting branches</source>
+ <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>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>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>This map does not exist:
+ %1
+Do you want to create a new one?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The map %1
+did not use the compressed vym file format.
+Writing it uncompressed will also write images
+and flags and thus may overwrite files in the given directory
+
+Do you want to write the map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Saved %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't save </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The file %1
+exists already. Do you want to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The map %1 has been modified but not saved yet. Do you want to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No matches found for <b>%1</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't open map %1</source>
+ <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>
</context>
@@ -1072,14 +1068,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>The file </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source> exists already. Do you want to overwrite it?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Overwrite</source>
<translation type="unfinished"></translation>
</message>
@@ -1088,22 +1076,10 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Critical Export Error </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Couldn't create directory </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Critical Export Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>MapEditor::exportXML couldn't open </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Critical Parse Error by reading backupFile</source>
<translation type="unfinished"></translation>
</message>
@@ -1112,14 +1088,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source> 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>Enter URL:</source>
<translation type="unfinished"></translation>
</message>
@@ -1148,18 +1116,10 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>vym - Save image as </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Critical Import Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Cannot find the directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>VYM - Choose directory structur to import</source>
<translation type="unfinished"></translation>
</message>
@@ -1277,6 +1237,35 @@
<source>Critcal Save error</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>The file %1 exists already.
+Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>MapEditor::exportXML couldn't open %1</source>
+ <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>vym - Save image as %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The file %1 exists already. Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cannot find the directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QObject</name>
@@ -1518,5 +1507,13 @@
<source>Export Note to single file (ASCII)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Subs&cript</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Su&perscript</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff -r a33a2bdd8299 -r e44baadd4958 lang/vym_es.ts
--- a/lang/vym_es.ts Tue Aug 30 14:09:19 2005 +0000
+++ b/lang/vym_es.ts Thu Sep 01 15:35:18 2005 +0000
@@ -1,5 +1,12 @@
<!DOCTYPE TS><TS>
<context>
+ <name>AboutDialog</name>
+ <message>
+ <source>Ok</source>
+ <translation type="unfinished">Ok</translation>
+ </message>
+</context>
+<context>
<name>EditXLinkDialog</name>
<message>
<source>Edit XLink</source>
@@ -209,11 +216,19 @@
</message>
<message>
<source>Stylesheets:</source>
- <translation>Estilo de Hojas:</translation>
+ <translation type="obsolete">Estilo de Hojas:</translation>
</message>
<message>
<source>Scripts:</source>
- <translation>Scripts:</translation>
+ <translation type="obsolete">Scripts:</translation>
+ </message>
+ <message>
+ <source>Stylesheets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Scripts</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -312,7 +327,7 @@
</message>
<message>
<source>Import Dir</source>
- <translation>Importar Directorio</translation>
+ <translation type="obsolete">Importar Directorio</translation>
</message>
<message>
<source>Export</source>
@@ -444,7 +459,7 @@
</message>
<message>
<source>Edit vym link</source>
- <translation>Editar enlace de vym</translation>
+ <translation type="obsolete">Editar enlace de vym</translation>
</message>
<message>
<source>Delete link to another vym map</source>
@@ -634,7 +649,7 @@
</message>
<message>
<source>Set &Link Color</source>
- <translation>Configurar &Color de Enlace</translation>
+ <translation type="obsolete">Configurar &Color de Enlace</translation>
</message>
<message>
<source>Set Background Color</source>
@@ -702,7 +717,7 @@
</message>
<message>
<source>Set application to open an URL</source>
- <translation>Configurar aplicación para abrir una URL</translation>
+ <translation type="obsolete">Configurar aplicación para abrir una URL</translation>
</message>
<message>
<source>Edit branch after adding it</source>
@@ -722,15 +737,15 @@
</message>
<message>
<source>Enable pasting into new branch</source>
- <translation>Habilitar pegado en una nueva rama</translation>
+ <translation type="obsolete">Habilitar pegado en una nueva rama</translation>
</message>
<message>
<source>Enable Delete key for deleting branches</source>
- <translation>Habilitar tecla Delete para borrar ramas</translation>
+ <translation type="obsolete">Habilitar tecla Delete para borrar ramas</translation>
</message>
<message>
<source>Enable Delete key</source>
- <translation>Habilitar tecla Delete</translation>
+ <translation type="obsolete">Habilitar tecla Delete</translation>
</message>
<message>
<source>&Test</source>
@@ -798,7 +813,7 @@
</message>
<message>
<source>Export (ASCII)</source>
- <translation>Exportar (ASCII)</translation>
+ <translation type="obsolete">Exportar (ASCII)</translation>
</message>
<message>
<source>Export XML</source>
@@ -814,11 +829,11 @@
</message>
<message>
<source>The directory </source>
- <translation>El directorio</translation>
+ <translation type="obsolete">El directorio</translation>
</message>
<message>
<source> is not empty. Do you risk to overwrite its contents?</source>
- <translation>no está vacio. ¿Se arriesga a sobrescribir su contenido?</translation>
+ <translation type="obsolete">no está vacio. ¿Se arriesga a sobrescribir su contenido?</translation>
</message>
<message>
<source>Overwrite</source>
@@ -830,13 +845,13 @@
</message>
<message>
<source>The map </source>
- <translation>El mapa</translation>
+ <translation type="obsolete">El mapa</translation>
</message>
<message>
<source>
is already opened.Opening the same map in multiple editors may lead
to confusion when finishing working with vym.Do you want to</source>
- <translation>ya está abierto. Abrir el mismo mapa en múltiples editores puede
+ <translation type="obsolete">ya está abierto. Abrir el mismo mapa en múltiples editores puede
generar confusión cuando termine de trabajar con vym. Desea hacerlo</translation>
</message>
<message>
@@ -892,7 +907,7 @@
and flags and thus may overwrite files in the given directory
Do you want to write the map</source>
- <translation>no usó el formato de compresión archivo vym.
+ <translation type="obsolete">no usó el formato de compresión archivo vym.
Escribiendo este descompreso también escribirá imágenes
y banderas y así puede sobreescribir en el directorio dado
@@ -920,7 +935,7 @@
</message>
<message>
<source>Saved</source>
- <translation>Guardado</translation>
+ <translation type="obsolete">Guardado</translation>
</message>
<message>
<source>Couldn't save</source>
@@ -928,12 +943,12 @@
</message>
<message>
<source>The file </source>
- <translation>El archivo</translation>
+ <translation type="obsolete">El archivo</translation>
</message>
<message>
<source>
exists already. Do you want to</source>
- <translation>ya existe. Desea hacerlo</translation>
+ <translation type="obsolete">ya existe. Desea hacerlo</translation>
</message>
<message>
<source>Export XML to directory</source>
@@ -941,7 +956,7 @@
</message>
<message>
<source> has been modified but not saved yet. Do you want to</source>
- <translation>ha sido modificado pero no está guardado aún. Desea hacerlo</translation>
+ <translation type="obsolete">ha sido modificado pero no está guardado aún. Desea hacerlo</translation>
</message>
<message>
<source>Save modified map before closing it</source>
@@ -965,7 +980,7 @@
</message>
<message>
<source>No matches found for </source>
- <translation>No se encuentra concordancia con</translation>
+ <translation type="obsolete">No se encuentra concordancia con</translation>
</message>
<message>
<source>Critical Error</source>
@@ -1042,12 +1057,12 @@
<message>
<source>This map does not exist:
</source>
- <translation>Este mapa no existe:</translation>
+ <translation type="obsolete">Este mapa no existe:</translation>
</message>
<message>
<source>
Do you want to create a new one?</source>
- <translation>¿Desea crear uno nuevo?</translation>
+ <translation type="obsolete">¿Desea crear uno nuevo?</translation>
</message>
<message>
<source>Use modifier to draw xLinks</source>
@@ -1059,7 +1074,90 @@
</message>
<message>
<source>Enable exclusive flags</source>
- <translation>Habilitar banderas exclusivas</translation>
+ <translation type="obsolete">Habilitar banderas exclusivas</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>
+ <message>
+ <source>pasting into new branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Delete key for deleting branches</source>
+ <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>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>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>This map does not exist:
+ %1
+Do you want to create a new one?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The map %1
+did not use the compressed vym file format.
+Writing it uncompressed will also write images
+and flags and thus may overwrite files in the given directory
+
+Do you want to write the map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Saved %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't save </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The file %1
+exists already. Do you want to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The map %1 has been modified but not saved yet. Do you want to</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>No matches found for <b>%1</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't open map %1</source>
+ <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>
</context>
<context>
@@ -1082,11 +1180,11 @@
</message>
<message>
<source>The file </source>
- <translation>El archivo</translation>
+ <translation type="obsolete">El archivo</translation>
</message>
<message>
<source> exists already. Do you want to overwrite it?</source>
- <translation>ya existe. ¿Desea sobrescribir?</translation>
+ <translation type="obsolete">ya existe. ¿Desea sobrescribir?</translation>
</message>
<message>
<source>Overwrite</source>
@@ -1098,11 +1196,11 @@
</message>
<message>
<source>Critical Export Error </source>
- <translation>Error de exportación crítico</translation>
+ <translation type="obsolete">Error de exportación crítico</translation>
</message>
<message>
<source>Couldn't create directory </source>
- <translation>No puede crear el directorio</translation>
+ <translation type="obsolete">No puede crear el directorio</translation>
</message>
<message>
<source>Critical Export Error</source>
@@ -1110,7 +1208,7 @@
</message>
<message>
<source>MapEditor::exportXML couldn't open </source>
- <translation>Editor de Mapa::exportarXML no pudo abrir</translation>
+ <translation type="obsolete">Editor de Mapa::exportarXML no pudo abrir</translation>
</message>
<message>
<source>Critical Parse Error by reading backupFile</source>
@@ -1126,7 +1224,7 @@
Maybe you want to reload your original data.
Sorry for any inconveniences.</source>
- <translation>usos para deshacer no hay.
+ <translation type="obsolete">usos para deshacer no hay.
Creare uno nuevo, pero por el momento no está disponible deshacer.
Pueda que dese recargar su información original.
@@ -1162,7 +1260,7 @@
</message>
<message>
<source>vym - Save image as </source>
- <translation>vym - Guardar imagen como</translation>
+ <translation type="obsolete">vym - Guardar imagen como</translation>
</message>
<message>
<source>Critical Import Error</source>
@@ -1170,7 +1268,7 @@
</message>
<message>
<source>Cannot find the directory</source>
- <translation>No puede encontrar el directorio</translation>
+ <translation type="obsolete">No puede encontrar el directorio</translation>
</message>
<message>
<source>VYM - Choose directory structur to import</source>
@@ -1290,6 +1388,35 @@
<source>Critcal Save error</source>
<translation>Error Crítico de Guardado</translation>
</message>
+ <message>
+ <source>The file %1 exists already.
+Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>MapEditor::exportXML couldn't open %1</source>
+ <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>vym - Save image as %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The file %1 exists already. Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cannot find the directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QObject</name>
@@ -1531,5 +1658,13 @@
<source>Export Note to single file (ASCII)</source>
<translation>Exportar Nota a archivo simple (ASCII)</translation>
</message>
+ <message>
+ <source>Subs&cript</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Su&perscript</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff -r a33a2bdd8299 -r e44baadd4958 mainwindow.cpp
--- a/mainwindow.cpp Tue Aug 30 14:09:19 2005 +0000
+++ b/mainwindow.cpp Thu Sep 01 15:35:18 2005 +0000
@@ -794,11 +794,11 @@
QAction *a;
- a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files")+QString("...") , 0, this, "setPDF" );
+ a = new QAction( tr( "Set application to open pdf files"), QPixmap(), tr( "Set application to open pdf files ...") , 0, this, "setPDF" );
connect( a, SIGNAL( activated() ), this, SLOT( settingsPDF() ) );
a->addTo( menu );
- a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links")+QString("..."), 0, this, "setURL" );
+ a = new QAction( tr( "Set application to open external links"), QPixmap(), tr( "Set application to open external links..."), 0, this, "setURL" );
connect( a, SIGNAL( activated() ), this, SLOT( settingsURL() ) );
a->addTo( menu );
@@ -1057,8 +1057,7 @@
if (!eList.isEmpty())
{
QMessageBox mb( "VYM",
- tr("The directory ") + dir +
- tr(" is not empty. Do you risk to overwrite its contents?"),
+ tr("The directory %1 is not empty.\nDo you risk to overwrite its contents?").arg(dir),
QMessageBox::Warning,
QMessageBox::Yes ,
QMessageBox::Cancel | QMessageBox::Default,
@@ -1163,10 +1162,10 @@
{
// Already there, ask for confirmation
QMessageBox mb( "VYM",
- tr("The map ") + fn + tr ("\n is already opened."
+ tr("The map %1\nis already opened."
"Opening the same map in multiple editors may lead \n"
"to confusion when finishing working with vym."
- "Do you want to"),
+ "Do you want to").arg(fn),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::Cancel | QMessageBox::Escape,
@@ -1211,7 +1210,7 @@
if (!QFile(fn).exists() )
{
QMessageBox mb( "VYM",
- tr("This map does not exist:\n ")+fn+tr("\nDo you want to create a new one?"),
+ tr("This map does not exist:\n %1\nDo you want to create a new one?").arg(fn),
QMessageBox::Question,
QMessageBox::Yes ,
QMessageBox::Cancel | QMessageBox::Default,
@@ -1446,11 +1445,10 @@
if (!saveZipped)
{
QMessageBox mb( "VYM",
- tr("The map ") + fn +
- tr ("\ndid not use the compressed "
+ tr("The map %1\ndid not use the compressed "
"vym file format.\nWriting it uncompressed will also write images \n"
"and flags and thus may overwrite files in the "
- "given directory\n\nDo you want to write the map"),
+ "given directory\n\nDo you want to write the map").arg(fn),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No ,
@@ -1551,13 +1549,13 @@
if (err==success)
{
statusBar()->message(
- tr("Saved")+" " + me->getFilePath(),
+ tr("Saved %1").arg(me->getFilePath()),
statusbarTime );
lastMaps.prepend(me->getFilePath() );
setupLastMapsMenu();
} else
statusBar()->message(
- tr("Couldn't save")+" " + me->getFilePath(),
+ tr("Couldn't save ").arg(me->getFilePath()),
statusbarTime );
}
@@ -1583,7 +1581,7 @@
if (QFile (fn).exists())
{
QMessageBox mb( "VYM",
- tr("The file ") + fn + tr ("\nexists already. Do you want to"),
+ tr("The file %1\nexists already. Do you want to").arg(fn),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::Cancel | QMessageBox::Escape,
@@ -1712,7 +1710,7 @@
{
currentMapEditor()->exportImage(fn,item);
} else {
- statusBar()->message( tr("Couldn't save") + fn, statusbarTime );
+ statusBar()->message( tr("Couldn't save %1").arg(fn), statusbarTime );
}
}
}
@@ -1730,8 +1728,7 @@
if (currentMapEditor()->hasChanged())
{
QMessageBox mb( "VYM",
- tr("The map ") + currentMapEditor()->getFileName() +
- tr(" has been modified but not saved yet. Do you want to"),
+ tr("The map %1 has been modified but not saved yet. Do you want to").arg(currentMapEditor()->getFileName()),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No,
@@ -1864,8 +1861,7 @@
} else
{
QMessageBox::information( findWindow, tr( "VYM -Information:" ),
- tr("No matches found for ")+
- "<b>"+s+"</b>");
+ tr("No matches found for <b>%1</b>").arg(s));
}
}
@@ -1923,7 +1919,7 @@
{
if (!QFile(currentVymLink).exists() )
QMessageBox::critical( 0, tr( "Critical Error" ),
- tr("Couldn't open map " +currentVymLink)+".");
+ tr("Couldn't open map %1").arg(currentVymLink));
else
{
fileLoad (currentVymLink, NewMap);
diff -r a33a2bdd8299 -r e44baadd4958 mapeditor.cpp
--- a/mapeditor.cpp Tue Aug 30 14:09:19 2005 +0000
+++ b/mapeditor.cpp Thu Sep 01 15:35:18 2005 +0000
@@ -1200,8 +1200,7 @@
if (QFile (fd->selectedFile()).exists() )
{
QMessageBox mb( "VYM",
- tr("The file ") + fd->selectedFile() +
- tr(" exists already. Do you want to overwrite it?"),
+ tr("The file %1 exists already.\nDo you want to overwrite it?").arg(fd->selectedFile()),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::Cancel | QMessageBox::Escape,
@@ -1240,7 +1239,7 @@
if ( !file.open( IO_WriteOnly ) )
{
// This should neverever happen
- QMessageBox::critical (0,tr("Critical Export Error"),tr("MapEditor::exportXML couldn't open ")+file.name());
+ QMessageBox::critical (0,tr("Critical Export Error"),tr("MapEditor::exportXML couldn't open %1").arg(file.name()));
return;
}
@@ -1387,11 +1386,10 @@
} else
{
QMessageBox::critical( 0, tr( "Critical Error" ),
- "Temporary directory " +bakMapDir +
- tr (" used for undo is gone. \n"
+ tr("Temporary directory %1 used for undo is gone. \n"
"I will create a new one, but at the moment no undo is available.\n"
"Maybe you want to reload your original data.\n\n"
- "Sorry for any inconveniences.") );
+ "Sorry for any inconveniences.").arg(bakMapDir) );
makeTmpDirs();
}
}
@@ -2821,7 +2819,7 @@
fd->addFilter ("GIF (*.gif)");
fd->addFilter ("PNM (*.pnm)");
fd->addFilter (QString (tr("Images") + " (*.png *.bmp *.xbm *.jpg *.png *.xpm *.gif *.pnm)"));
- fd->setCaption(tr("vym - Save image as ") + fmt);
+ fd->setCaption(tr("vym - Save image as %1").arg(fmt));
fd->setMode( QFileDialog::AnyFile );
fd->setSelection (fio->getOriginalFilename());
fd->show();
@@ -2832,9 +2830,8 @@
if (QFile (fd->selectedFile()).exists() )
{
QMessageBox mb( "VYM",
- tr("The file ") + fd->selectedFile() +
- tr(" exists already. "
- "Do you want to overwrite it?"),
+ tr("The file %1 exists already.\n"
+ "Do you want to overwrite it?").arg(fd->selectedFile()),
QMessageBox::Warning,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::Cancel | QMessageBox::Escape,
@@ -2905,7 +2902,7 @@
bo->setColor (QColor("blue"),false);
bo->toggleScroll();
if ( !d.cd(fi->fileName()) )
- QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory"));
+ QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory %1").arg(fi->fileName()));
else
{
// Recursively add subdirs
diff -r a33a2bdd8299 -r e44baadd4958 tex/vym.changelog
--- a/tex/vym.changelog Tue Aug 30 14:09:19 2005 +0000
+++ b/tex/vym.changelog Thu Sep 01 15:35:18 2005 +0000
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 1 12:26:24 CEST 2005 - uwedr
+
+- Bugfix: Some minor changes so that translations use arguments now
+ instead of several calls to tr()
+
-------------------------------------------------------------------
Tue Aug 30 13:38:31 CEST 2005 - uwedr
diff -r a33a2bdd8299 -r e44baadd4958 version.h
--- a/version.h Tue Aug 30 14:09:19 2005 +0000
+++ b/version.h Thu Sep 01 15:35:18 2005 +0000
@@ -2,6 +2,6 @@
#define VERSION_H
#define __VYM_VERSION__ "1.7.3"
-#define __BUILD_DATE__ "August 30, 2005"
+#define __BUILD_DATE__ "September 1, 2005"
#endif