# 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 @@ + AboutDialog + + Ok + Ok + + + EditXLinkDialog Edit XLink @@ -165,7 +172,7 @@ Stylesheets - Stylesheets + Stylesheets CSS: @@ -197,7 +204,7 @@ Scripts - Skripte + Skripte Before export: @@ -231,11 +238,11 @@ Stylesheets: - Stylesheets: + Stylesheets: Scripts: - Skripte: + Skripte: @@ -324,7 +331,7 @@ Import Dir - Importiere Verzeichnis + Importiere Verzeichnis Export (png) @@ -614,7 +621,7 @@ Set &Link Color - &Farbe der Verbindungen + &Farbe der Verbindungen Set Background Color @@ -674,7 +681,7 @@ Set application to open an URL - URLs öffnen mit... + URLs öffnen mit... Edit branch after adding it @@ -694,15 +701,15 @@ Enable pasting into new branch - Einfügen in neuen Zweig + Einfügen in neuen Zweig Enable Delete key for deleting branches - Delete Taste zum Löschen von Zweigen verwenden + Delete Taste zum Löschen von Zweigen verwenden Enable Delete key - Delete Taste zum Löschen von Zweigen verwenden + Delete Taste zum Löschen von Zweigen verwenden &Test @@ -774,12 +781,12 @@ The file - Die Datei + Die Datei exists already. Do you want to - gibt es bereits. Wollen Sie sie + gibt es bereits. Wollen Sie sie Overwrite @@ -799,15 +806,15 @@ Couldn't save - Diese Datei konnte nicht gespeichert werden: + Diese Datei konnte nicht gespeichert werden: The map - Die Map + Die Map has been modified but not saved yet. Do you want to - wurde verändert aber noch nicht gespeichert. Wollen Sie + wurde verändert aber noch nicht gespeichert. Wollen Sie Save modified map before closing it @@ -859,7 +866,7 @@ Export (ASCII) - als ASCII + als ASCII Edit Map Info @@ -875,17 +882,17 @@ The directory - Das Verzeichnis + Das Verzeichnis is not empty. Do you risk to overwrite its contents? - ist nicht leer.Riskieren sie es, das Verzeichnis zu überschreiben? + ist nicht leer.Riskieren sie es, das Verzeichnis zu überschreiben? is already opened.Opening the same map in multiple editors may lead to confusion when finishing working with vym.Do you want to - + ist bereits geöffnet. Die gleiche Map mehrfach in verschiedenen Ansichten zu öffnen kann beim Beenden von vym zu Problemen führen. Wollen Sie @@ -933,7 +940,7 @@ Edit vym link - vym Verknüpfung ändern + vym Verknüpfung ändern Delete link to another vym map @@ -994,7 +1001,7 @@ Saved - Gespeichert: + Gespeichert: VYM -Information: @@ -1002,7 +1009,7 @@ No matches found for - Keine Treffer gefunden für + Keine Treffer gefunden für Export XHTML @@ -1015,7 +1022,7 @@ and flags and thus may overwrite files in the given directory Do you want to write the map - + 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 @@ This map does not exist: - Diese Map gibt es nicht: + Diese Map gibt es nicht: Do you want to create a new one? - Wollen Sie eine neue anlegen? + Wollen Sie eine neue anlegen? Use modifier to draw xLinks @@ -1165,8 +1172,103 @@ Enable exclusive flags + Exklusive Flags + + + Set application to open external links + Anwendung zum Öffnen externen Verweise + + + Pasting into new branch + In neuen Zweig einfügen + + + pasting into new branch + In neuen Zweig einfügen + + + Delete key for deleting branches + Entfernen Taste für das Löschen von Zweigen + + + Delete key + Entfernen Taste + + + Exclusive flags Exklusive Flags + + The directory %1 is not empty. +Do you risk to overwrite its contents? + Das Verzeichnis %1 ist nicht leer. +Riskieren Sie es dessen Inhalt zu überschreiben? + + + 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 + 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 + + + This map does not exist: + %1 +Do you want to create a new one? + Diese Map gibt es nich: + %1 +Wollen Sie eine neue anlegen? + + + 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 + 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 + + + + Saved %1 + %1 gespeichert + + + The file %1 +exists already. Do you want to + Die Datei %1 gibt es bereits. +Wollen Sie sie überschreiben? + + + The map %1 has been modified but not saved yet. Do you want to + Die Map %1 wurde geändert, +aber noch nicht gespeichert. Wollen Sie + + + No matches found for <b>%1</b> + Kein Treffer gefunden für <b>%1</b> + + + Couldn't open map %1 + Konnte die Map %1 nicht öffnen + + + Set application to open pdf files ... + Anwendung zum Öffnen von PDF Dateien... + + + Set application to open external links... + Anwendung zum Öffnen externer Verweise... + MapEditor @@ -1294,11 +1396,11 @@ The file - Die Datei + Die Datei exists already. Do you want to overwrite it? - gibt es bereits. Wollen Sie sie + gibt es bereits. Wollen Sie sie Overwrite @@ -1310,11 +1412,11 @@ Critical Export Error - Kritischer Fehler beim Exportieren + Kritischer Fehler beim Exportieren Couldn't create directory - Konnte Verzeichnis nicht anlegen + Konnte Verzeichnis nicht anlegen VYM - Export to directory @@ -1346,7 +1448,7 @@ Maybe you want to reload your original data. Sorry for any inconveniences. - Vielleicht wollen sie die Orginaldaten erneut laden + Vielleicht wollen sie die Orginaldaten erneut laden Sorry für die Unannehmlichkeiten. @@ -1379,7 +1481,7 @@ vym - Save image as - vym - Speichere Bild als + vym - Speichere Bild als Critical Import Error @@ -1387,7 +1489,7 @@ Cannot find the directory - Kann das Verzeichnis nicht finden + Kann das Verzeichnis nicht finden VYM - Choose directory structur to import @@ -1412,7 +1514,7 @@ MapEditor::exportXML couldn't open - MapEditor::exportXML konnte nicht öffnen: + MapEditor::exportXML konnte nicht öffnen: Note @@ -1528,6 +1630,42 @@ Critcal Save error Kritischer Fehler beim Speichern + + The file %1 exists already. +Do you want to overwrite it? + Die Datei %1 gibt es bereits. +Wollen Sie sie überschreiben? + + + MapEditor::exportXML couldn't open %1 + MapEditor::exportXML konnte %1 nicht öffnen + + + 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. + 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. + + + + vym - Save image as %1 + vym - Bild speichern als %1 + + + The file %1 exists already. Do you want to overwrite it? + Die Datei %1 gibt es bereits. +Wollen Sie sie überschreiben? + + + Cannot find the directory %1 + Konnte das Verzeichnis %1 nicht finden + QMessageBox @@ -1808,5 +1946,13 @@ &Font hint Zeichensatz &umschalten + + Subs&cript + &Tiefgestellt + + + Su&perscript + &Hochgestellt + 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 @@ + AboutDialog + + Ok + + + + EditXLinkDialog Edit XLink @@ -207,11 +214,11 @@ - Stylesheets: + Stylesheets - Scripts: + Scripts @@ -310,10 +317,6 @@ - Import Dir - - - Export @@ -442,10 +445,6 @@ - Edit vym link - - - Delete link to another vym map @@ -631,10 +630,6 @@ - Set &Link Color - - - Set Background Color @@ -699,10 +694,6 @@ - Set application to open an URL - - - Edit branch after adding it @@ -719,18 +710,6 @@ - Enable pasting into new branch - - - - Enable Delete key for deleting branches - - - - Enable Delete key - - - &Test @@ -795,10 +774,6 @@ - Export (ASCII) - - - Export XML @@ -811,14 +786,6 @@ - The directory - - - - is not empty. Do you risk to overwrite its contents? - - - Overwrite @@ -827,16 +794,6 @@ - The map - - - - - is already opened.Opening the same map in multiple editors may lead -to confusion when finishing working with vym.Do you want to - - - Open anyway @@ -883,15 +840,6 @@ - -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 - - - compressed (vym default) @@ -912,31 +860,14 @@ - Saved - - - Couldn't save - The file - - - - -exists already. Do you want to - - - Export XML to directory - has been modified but not saved yet. Do you want to - - - Save modified map before closing it @@ -957,10 +888,6 @@ - No matches found for - - - Critical Error @@ -1031,16 +958,6 @@ - This map does not exist: - - - - - -Do you want to create a new one? - - - Use modifier to draw xLinks @@ -1049,7 +966,86 @@ - Enable exclusive flags + Set application to open external links + + + + Pasting into new branch + + + + pasting into new branch + + + + Delete key for deleting branches + + + + Delete key + + + + Exclusive flags + + + + The directory %1 is not empty. +Do you risk to overwrite its contents? + + + + 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 + + + + This map does not exist: + %1 +Do you want to create a new one? + + + + 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 + + + + Saved %1 + + + + Couldn't save + + + + The file %1 +exists already. Do you want to + + + + The map %1 has been modified but not saved yet. Do you want to + + + + No matches found for <b>%1</b> + + + + Couldn't open map %1 + + + + Set application to open pdf files ... + + + + Set application to open external links... @@ -1072,14 +1068,6 @@ - The file - - - - exists already. Do you want to overwrite it? - - - Overwrite @@ -1088,22 +1076,10 @@ - Critical Export Error - - - - Couldn't create directory - - - Critical Export Error - MapEditor::exportXML couldn't open - - - Critical Parse Error by reading backupFile @@ -1112,14 +1088,6 @@ - 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. - - - Enter URL: @@ -1148,18 +1116,10 @@ - vym - Save image as - - - Critical Import Error - Cannot find the directory - - - VYM - Choose directory structur to import @@ -1277,6 +1237,35 @@ Critcal Save error + + The file %1 exists already. +Do you want to overwrite it? + + + + MapEditor::exportXML couldn't open %1 + + + + 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. + + + + vym - Save image as %1 + + + + The file %1 exists already. Do you want to overwrite it? + + + + Cannot find the directory %1 + + QObject @@ -1518,5 +1507,13 @@ Export Note to single file (ASCII) + + Subs&cript + + + + Su&perscript + + 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 @@ + AboutDialog + + Ok + Ok + + + EditXLinkDialog Edit XLink @@ -209,11 +216,19 @@ Stylesheets: - Estilo de Hojas: + Estilo de Hojas: Scripts: - Scripts: + Scripts: + + + Stylesheets + + + + Scripts + @@ -312,7 +327,7 @@ Import Dir - Importar Directorio + Importar Directorio Export @@ -444,7 +459,7 @@ Edit vym link - Editar enlace de vym + Editar enlace de vym Delete link to another vym map @@ -634,7 +649,7 @@ Set &Link Color - Configurar &Color de Enlace + Configurar &Color de Enlace Set Background Color @@ -702,7 +717,7 @@ Set application to open an URL - Configurar aplicación para abrir una URL + Configurar aplicación para abrir una URL Edit branch after adding it @@ -722,15 +737,15 @@ Enable pasting into new branch - Habilitar pegado en una nueva rama + Habilitar pegado en una nueva rama Enable Delete key for deleting branches - Habilitar tecla Delete para borrar ramas + Habilitar tecla Delete para borrar ramas Enable Delete key - Habilitar tecla Delete + Habilitar tecla Delete &Test @@ -798,7 +813,7 @@ Export (ASCII) - Exportar (ASCII) + Exportar (ASCII) Export XML @@ -814,11 +829,11 @@ The directory - El directorio + El directorio is not empty. Do you risk to overwrite its contents? - no está vacio. ¿Se arriesga a sobrescribir su contenido? + no está vacio. ¿Se arriesga a sobrescribir su contenido? Overwrite @@ -830,13 +845,13 @@ The map - El mapa + El mapa is already opened.Opening the same map in multiple editors may lead to confusion when finishing working with vym.Do you want to - ya está abierto. Abrir el mismo mapa en múltiples editores puede + ya está abierto. Abrir el mismo mapa en múltiples editores puede generar confusión cuando termine de trabajar con vym. Desea hacerlo @@ -892,7 +907,7 @@ and flags and thus may overwrite files in the given directory Do you want to write the map - no usó el formato de compresión archivo vym. + 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 @@ Saved - Guardado + Guardado Couldn't save @@ -928,12 +943,12 @@ The file - El archivo + El archivo exists already. Do you want to - ya existe. Desea hacerlo + ya existe. Desea hacerlo Export XML to directory @@ -941,7 +956,7 @@ has been modified but not saved yet. Do you want to - ha sido modificado pero no está guardado aún. Desea hacerlo + ha sido modificado pero no está guardado aún. Desea hacerlo Save modified map before closing it @@ -965,7 +980,7 @@ No matches found for - No se encuentra concordancia con + No se encuentra concordancia con Critical Error @@ -1042,12 +1057,12 @@ This map does not exist: - Este mapa no existe: + Este mapa no existe: Do you want to create a new one? - ¿Desea crear uno nuevo? + ¿Desea crear uno nuevo? Use modifier to draw xLinks @@ -1059,7 +1074,90 @@ Enable exclusive flags - Habilitar banderas exclusivas + Habilitar banderas exclusivas + + + Set application to open external links + + + + Pasting into new branch + + + + pasting into new branch + + + + Delete key for deleting branches + + + + Delete key + + + + Exclusive flags + + + + The directory %1 is not empty. +Do you risk to overwrite its contents? + + + + 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 + + + + This map does not exist: + %1 +Do you want to create a new one? + + + + 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 + + + + Saved %1 + + + + Couldn't save + + + + The file %1 +exists already. Do you want to + + + + The map %1 has been modified but not saved yet. Do you want to + + + + No matches found for <b>%1</b> + + + + Couldn't open map %1 + + + + Set application to open pdf files ... + + + + Set application to open external links... + @@ -1082,11 +1180,11 @@ The file - El archivo + El archivo exists already. Do you want to overwrite it? - ya existe. ¿Desea sobrescribir? + ya existe. ¿Desea sobrescribir? Overwrite @@ -1098,11 +1196,11 @@ Critical Export Error - Error de exportación crítico + Error de exportación crítico Couldn't create directory - No puede crear el directorio + No puede crear el directorio Critical Export Error @@ -1110,7 +1208,7 @@ MapEditor::exportXML couldn't open - Editor de Mapa::exportarXML no pudo abrir + Editor de Mapa::exportarXML no pudo abrir Critical Parse Error by reading backupFile @@ -1126,7 +1224,7 @@ Maybe you want to reload your original data. Sorry for any inconveniences. - usos para deshacer no hay. + 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 @@ vym - Save image as - vym - Guardar imagen como + vym - Guardar imagen como Critical Import Error @@ -1170,7 +1268,7 @@ Cannot find the directory - No puede encontrar el directorio + No puede encontrar el directorio VYM - Choose directory structur to import @@ -1290,6 +1388,35 @@ Critcal Save error Error Crítico de Guardado + + The file %1 exists already. +Do you want to overwrite it? + + + + MapEditor::exportXML couldn't open %1 + + + + 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. + + + + vym - Save image as %1 + + + + The file %1 exists already. Do you want to overwrite it? + + + + Cannot find the directory %1 + + QObject @@ -1531,5 +1658,13 @@ Export Note to single file (ASCII) Exportar Nota a archivo simple (ASCII) + + Subs&cript + + + + Su&perscript + + 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 ")+ - ""+s+""); + tr("No matches found for %1").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