More fighting with i18n woes.

4 files changed, 20 insertions, 20 deletions

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index f6dc587c9..71b8ff6c4 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -284,7 +284,7 @@ private:
 	void file_changed (string f)
 	{
 		stringstream s;
-		s << _("DVD-o-matic");
+		s << wx_to_std (_("DVD-o-matic"));
 		if (!f.empty ()) {
 			s << " - " << f;
 		}
@@ -328,7 +328,7 @@ private:
 			} catch (std::exception& e) {
 				wxString p = c->GetPath ();
 				wxCharBuffer b = p.ToUTF8 ();
-				error_dialog (this, std_to_wx (String::compose (wx_to_std (_("Could not open film at %1 (%2)")), wx_to_std (p), e.what())));
+				error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
 			}
 		}
 
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 5b3330b70..23b2c9cdc 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -76,13 +76,13 @@ msgid "About"
 msgstr "Acerca de"
 
 #: src/tools/dvdomatic.cc:516
-msgid "Could not load film %1 (%2)"
-msgstr "No se pudo cargar la película %1 (%2)"
+msgid "Could not load film %s (%s)"
+msgstr "No se pudo cargar la película %s (%s)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %1 (%2)"
-msgstr "No se pudo cargar la película en %1 (%2)"
+msgid "Could not open film at %s (%s)"
+msgstr "No se pudo cargar la película en %s (%s)"
 
 #: 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 %1 already exists."
-msgstr "La carpeta %1 ya existe."
+msgid "The directory %s already exists."
+msgstr "La carpeta %s ya existe."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 857e5b512..b0c46117d 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -75,13 +75,13 @@ msgid "About"
 msgstr "A Propos"
 
 #: src/tools/dvdomatic.cc:516
-msgid "Could not load film %1 (%2)"
-msgstr "Impossible de charger le film %1 (%2)"
+msgid "Could not load film %s (%s)"
+msgstr "Impossible de charger le film %s (%s)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %1 (%2)"
-msgstr "Impossible d'ouvrir le film à %1 (%2)"
+msgid "Could not open film at %s (%s)"
+msgstr "Impossible d'ouvrir le film à %s (%s)"
 
 #: 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 %1 already exists."
-msgstr "Le dossier %1 existe déjà."
+msgid "The directory %s already exists."
+msgstr "Le dossier %s existe déjà."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 2ce0cb11e..906653093 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -76,13 +76,13 @@ msgid "About"
 msgstr "Informazioni"
 
 #: src/tools/dvdomatic.cc:516
-msgid "Could not load film %1 (%2)"
-msgstr "Non posso caricare il film %1 (%2)"
+msgid "Could not load film %s (%s)"
+msgstr "Non posso caricare il film %s (%s)"
 
 #: src/tools/dvdomatic.cc:331
 #, c-format
-msgid "Could not open film at %1 (%2)"
-msgstr "Non posso aprire il film in %1 (%2)"
+msgid "Could not open film at %s (%s)"
+msgstr "Non posso aprire il film in %s (%s)"
 
 #: 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 %1 already exists."
-msgstr "La directory %1 esiste gia'."
+msgid "The directory %s already exists."
+msgstr "La directory %s esiste gia'."