Yet another try at the wxString / std::string / i18n mess.

4 files changed, 15 insertions, 15 deletions

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 2ad41b2cb..f6dc587c9 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -71,7 +71,7 @@ public:
 	{
 		_dialog = new wxMessageDialog (
 			0,
-			std_to_wx (String::compose ("Save changes to film \"%1\" before closing?", film->name())),
+			std_to_wx (String::compose (wx_to_std (_("Save changes to film \"%1\" before closing?")), film->name())),
 			_("Film changed"),
 			wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
 			);
@@ -300,7 +300,7 @@ private:
 		if (r == wxID_OK) {
 
 			if (boost::filesystem::exists (d->get_path())) {
-				error_dialog (this, wxString::Format (_("The directory %s already exists."), d->get_path().c_str()));
+				error_dialog (this, std_to_wx (String::compose (wx_to_std (_("The directory %1 already exists.")), d->get_path().c_str())));
 				return;
 			}
 			
@@ -328,7 +328,7 @@ private:
 			} catch (std::exception& e) {
 				wxString p = c->GetPath ();
 				wxCharBuffer b = p.ToUTF8 ();
-				error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what())));
+				error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not open film at %1 (%2)")), wx_to_std (p), e.what())));
 			}
 		}
 
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index c330b69cf..5b3330b70 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -81,8 +81,8 @@ msgstr "No se pudo cargar la película %1 (%2)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %s (%s)"
-msgstr "No se pudo cargar la película en %s (%s)"
+msgid "Could not open film at %1 (%2)"
+msgstr "No se pudo cargar la película en %1 (%2)"
 
 #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
 #: src/tools/dvdomatic.cc:520
@@ -113,5 +113,5 @@ msgstr "Selecciona la película a abrir"
 
 #: src/tools/dvdomatic.cc:303
 #, c-format
-msgid "The directory %s already exists."
-msgstr "La carpeta %s ya existe."
+msgid "The directory %1 already exists."
+msgstr "La carpeta %1 ya existe."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 54fb2d070..857e5b512 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -80,8 +80,8 @@ msgstr "Impossible de charger le film %1 (%2)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %s (%s)"
-msgstr "Impossible d'ouvrir le film à %s (%s)"
+msgid "Could not open film at %1 (%2)"
+msgstr "Impossible d'ouvrir le film à %1 (%2)"
 
 #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
 #: src/tools/dvdomatic.cc:520
@@ -110,5 +110,5 @@ msgstr "Sélectionner le film à ouvrir"
 
 #: src/tools/dvdomatic.cc:303
 #, c-format
-msgid "The directory %s already exists."
-msgstr "Le dossier %s existe déjà."
+msgid "The directory %1 already exists."
+msgstr "Le dossier %1 existe déjà."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index dce686281..2ce0cb11e 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -81,8 +81,8 @@ msgstr "Non posso caricare il film %1 (%2)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %s (%s)"
-msgstr "Non posso aprire il film in %s (%s)"
+msgid "Could not open film at %1 (%2)"
+msgstr "Non posso aprire il film in %1 (%2)"
 
 #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
 #: src/tools/dvdomatic.cc:520
@@ -111,5 +111,5 @@ msgstr "Seleziona il film da aprire"
 
 #: src/tools/dvdomatic.cc:303
 #, c-format
-msgid "The directory %s already exists."
-msgstr "La directory %s esiste gia'."
+msgid "The directory %1 already exists."
+msgstr "La directory %1 esiste gia'."