Switch to a wxString::Format.

20 files changed, 39 insertions, 41 deletions

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 098025ddb..0998146ed 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -161,11 +161,8 @@ private:
 		if (is_directory(output) && !is_empty(output)) {
 			if (!confirm_dialog (
 				    this,
-				    std_to_wx (
-					    String::compose(wx_to_std(_("The directory %1 already exists and is not empty.  "
-									"Are you sure you want to use it?")),
-							    output.string())
-					    )
+				    wxString::Format(_("The directory %s already exists and is not empty.  "
+						       "Are you sure you want to use it?"), std_to_wx(output.string()))
 				    )) {
 				return;
 			}
diff --git a/src/tools/po/cs_CZ.po b/src/tools/po/cs_CZ.po
index 4d144bf4a..dda148393 100644
--- a/src/tools/po/cs_CZ.po
+++ b/src/tools/po/cs_CZ.po
@@ -1108,9 +1108,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Složka %1 již existuje a není prázdná. Chcete pokračovat?"
+msgstr "Složka %s již existuje a není prázdná. Chcete pokračovat?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/da_DK.po b/src/tools/po/da_DK.po
index 74bbdae93..3f9b5ebce 100644
--- a/src/tools/po/da_DK.po
+++ b/src/tools/po/da_DK.po
@@ -1080,10 +1080,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Folderen %1 eksisterer allerede og er ikke tom. Er du sikker på, at du vil "
+"Folderen %s eksisterer allerede og er ikke tom. Er du sikker på, at du vil "
 "benytte den?"
 
 #: src/tools/dcpomatic_disk.cc:292
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index fec36ef15..6dae28106 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -1120,10 +1120,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
+"Der Ordner %s existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
 "benutzen ?"
 
 #: src/tools/dcpomatic_disk.cc:292
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index ce51eb231..3337079b7 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -1082,10 +1082,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
+"El directorio %s ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/fa_IR.po b/src/tools/po/fa_IR.po
index 1cd858b26..958068194 100644
--- a/src/tools/po/fa_IR.po
+++ b/src/tools/po/fa_IR.po
@@ -1113,11 +1113,12 @@ msgstr ""
 "و کلیدها را بسازید؟"
 
 #: src/tools/dcpomatic_combiner.cc:164
+#, c-format
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"پوشه %1 وجود دارد و خالی نیست. مطمئن هستید که می خواهید از آن استفاده کنید؟"
+"پوشه %s وجود دارد و خالی نیست. مطمئن هستید که می خواهید از آن استفاده کنید؟"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 8f1d07631..a08c35518 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -1123,10 +1123,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Le répertoire %1 existe déjà et n'est pas vide. Êtes-vous sûr de vouloir "
+"Le répertoire %s existe déjà et n'est pas vide. Êtes-vous sûr de vouloir "
 "l'utiliser ?"
 
 #: src/tools/dcpomatic_disk.cc:292
diff --git a/src/tools/po/hu_HU.po b/src/tools/po/hu_HU.po
index d2477c0f6..472db39f5 100644
--- a/src/tools/po/hu_HU.po
+++ b/src/tools/po/hu_HU.po
@@ -1101,7 +1101,7 @@ msgstr ""
 #: src/tools/dcpomatic_combiner.cc:164
 #, fuzzy
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "Befejezetlen művelet vannak, biztosan ki akarsz lépni?"
 
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 270db3373..a82901136 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -1084,9 +1084,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
+msgstr "La cartella %s esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 030b7bcf1..a9a55ed06 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -1123,9 +1123,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "De map %1 bestaat al en is niet leeg.  Wilt u deze toch gebruiken?"
+msgstr "De map %s bestaat al en is niet leeg.  Wilt u deze toch gebruiken?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/pl_PL.po b/src/tools/po/pl_PL.po
index 5574f58ba..f3103135f 100644
--- a/src/tools/po/pl_PL.po
+++ b/src/tools/po/pl_PL.po
@@ -1108,10 +1108,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Katalog %1 już istnieje i nie jest pusty. Czy jesteś pewien, że chcesz go "
+"Katalog %s już istnieje i nie jest pusty. Czy jesteś pewien, że chcesz go "
 "użyć?"
 
 #: src/tools/dcpomatic_disk.cc:292
diff --git a/src/tools/po/pt_BR.po b/src/tools/po/pt_BR.po
index 2b9f76223..3b659ca4e 100644
--- a/src/tools/po/pt_BR.po
+++ b/src/tools/po/pt_BR.po
@@ -1086,10 +1086,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"O diretório %1 já existe e não está vazio. Tem certeza de que quer usá-lo?"
+"O diretório %s já existe e não está vazio. Tem certeza de que quer usá-lo?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index d7892fa50..14a5f3082 100644
--- a/src/tools/po/pt_PT.po
+++ b/src/tools/po/pt_PT.po
@@ -1086,10 +1086,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"O directório %1 já existe e não se encontra vazio. Tem a certeza que "
+"O directório %s já existe e não se encontra vazio. Tem a certeza que "
 "pretende utilizá-lo?"
 
 #: src/tools/dcpomatic_disk.cc:292
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index ac7933301..a5313ad9e 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -1111,9 +1111,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Папка %1 уже существует и не пуста. Вы точно хотите использовать её?"
+msgstr "Папка %s уже существует и не пуста. Вы точно хотите использовать её?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/sk_SK.po b/src/tools/po/sk_SK.po
index cb091aee9..e0bb3a22f 100644
--- a/src/tools/po/sk_SK.po
+++ b/src/tools/po/sk_SK.po
@@ -1082,9 +1082,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Priečinok %1 už existuje a nie je prázdny. Chcete pokračovať ?"
+msgstr "Priečinok %s už existuje a nie je prázdny. Chcete pokračovať ?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/sl_SI.po b/src/tools/po/sl_SI.po
index 86429cf0c..91aec8c28 100644
--- a/src/tools/po/sl_SI.po
+++ b/src/tools/po/sl_SI.po
@@ -1119,10 +1119,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Mapa %1 že obstaja in ni prazna; ali ste prepričani, da jo želite uporabiti?"
+"Mapa %s že obstaja in ni prazna; ali ste prepričani, da jo želite uporabiti?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 007b5228e..e240d8274 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -1110,10 +1110,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
+"Foldern %s finns redan och är inte tom. Är du säker på att du vill använda "
 "den?"
 
 #: src/tools/dcpomatic_disk.cc:292
diff --git a/src/tools/po/tr_TR.po b/src/tools/po/tr_TR.po
index 775f7a2e5..eb35cbcca 100644
--- a/src/tools/po/tr_TR.po
+++ b/src/tools/po/tr_TR.po
@@ -1054,7 +1054,7 @@ msgstr ""
 #: src/tools/dcpomatic_combiner.cc:164
 #, fuzzy
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "Bitmemiş görevler var, çıkmak istediğinize emin misiniz?"
 
diff --git a/src/tools/po/uk_UA.po b/src/tools/po/uk_UA.po
index e2111ed4f..19b4dedd6 100644
--- a/src/tools/po/uk_UA.po
+++ b/src/tools/po/uk_UA.po
@@ -1081,9 +1081,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Папка %1 вже існує і не пуста. Ви точно хочете використовувати її?"
+msgstr "Папка %s вже існує і не пуста. Ви точно хочете використовувати її?"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index 970f49824..955686819 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -1083,9 +1083,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:164
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory %s already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "目录 %1 已经存在且不为空。确定要使用它？"
+msgstr "目录 %s 已经存在且不为空。确定要使用它？"
 
 #: src/tools/dcpomatic_disk.cc:292
 msgid "The disk you selected is no longer available.  Please choose another."