Switch to a wxString::Format.

20 files changed, 38 insertions, 39 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index af1738888..dd8d9d119 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -62,7 +62,6 @@
 #include "lib/audio_content.h"
 #include "lib/check_content_job.h"
 #include "lib/cinema.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/constants.h"
 #include "lib/content.h"
@@ -1732,7 +1731,7 @@ private:
 				try {
 					_frame->load_film (_film_to_load);
 				} catch (exception& e) {
-					error_dialog (nullptr, std_to_wx(String::compose(wx_to_std(_("Could not load film %1 (%2)")), _film_to_load)), std_to_wx(e.what()));
+					error_dialog(nullptr, wxString::Format(_("Could not load film %s"), std_to_wx(_film_to_load)), std_to_wx(e.what()));
 				}
 			}
 
diff --git a/src/tools/po/cs_CZ.po b/src/tools/po/cs_CZ.po
index dda148393..afc3d8091 100644
--- a/src/tools/po/cs_CZ.po
+++ b/src/tools/po/cs_CZ.po
@@ -405,8 +405,8 @@ msgid "Could not load film %1"
 msgstr "Nelze načíst film %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Nelze načíst film %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Nelze načíst film %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, c-format
diff --git a/src/tools/po/da_DK.po b/src/tools/po/da_DK.po
index 3f9b5ebce..265833914 100644
--- a/src/tools/po/da_DK.po
+++ b/src/tools/po/da_DK.po
@@ -409,8 +409,8 @@ msgid "Could not load film %1"
 msgstr "Kunne ikke indlæse film %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Kunne ikke indlæse film %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Kunne ikke indlæse film %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 6dae28106..95b595e66 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -411,8 +411,8 @@ msgid "Could not load film %1"
 msgstr "Projekt %1 konnte nicht geladen werden"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Projekt %1 (%2) konnte nicht geladen werden"
+msgid "Could not load film %s"
+msgstr "Projekt %s konnte nicht geladen werden"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, c-format
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 3337079b7..9020aefff 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -404,8 +404,8 @@ msgid "Could not load film %1"
 msgstr "No se pudo cargar la película %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "No se pudo cargar la película %1 (%2)"
+msgid "Could not load film %s"
+msgstr "No se pudo cargar la película %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/fa_IR.po b/src/tools/po/fa_IR.po
index 958068194..d74ff76dd 100644
--- a/src/tools/po/fa_IR.po
+++ b/src/tools/po/fa_IR.po
@@ -410,8 +410,8 @@ msgid "Could not load film %1"
 msgstr "فیلم قابل فراخوانی نیست%1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "فیلم قابل فراخوانی نیست %1 (%2)"
+msgid "Could not load film %s"
+msgstr "فیلم قابل فراخوانی نیست %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, c-format
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index a08c35518..c93178859 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -409,8 +409,8 @@ msgid "Could not load film %1"
 msgstr "Impossible de charger le film %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Impossible de charger le film %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Impossible de charger le film %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, c-format
diff --git a/src/tools/po/hu_HU.po b/src/tools/po/hu_HU.po
index 472db39f5..184fc47be 100644
--- a/src/tools/po/hu_HU.po
+++ b/src/tools/po/hu_HU.po
@@ -406,8 +406,8 @@ msgid "Could not load film %1"
 msgstr "Nem sikerült a film %1 betöltése"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Nem sikerült a film %1 (%s) betöltése."
+msgid "Could not load film %s"
+msgstr "Nem sikerült a film %s betöltése."
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index a82901136..0006edb4b 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -408,8 +408,8 @@ msgid "Could not load film %1"
 msgstr "Impossibile caricare il film %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Impossibile caricare il film %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Impossibile caricare il film %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index a9a55ed06..8a80367f3 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -410,8 +410,8 @@ msgid "Could not load film %1"
 msgstr "Kan film %1 niet laden"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Kan film %1 niet laden (%2)"
+msgid "Could not load film %s"
+msgstr "Kan film %s niet laden"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, c-format
diff --git a/src/tools/po/pl_PL.po b/src/tools/po/pl_PL.po
index f3103135f..c3c199c84 100644
--- a/src/tools/po/pl_PL.po
+++ b/src/tools/po/pl_PL.po
@@ -408,8 +408,8 @@ msgid "Could not load film %1"
 msgstr "Nie można załadować Projektu %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Nie można załadować Projektu %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Nie można załadować Projektu %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/pt_BR.po b/src/tools/po/pt_BR.po
index 3b659ca4e..002d5ddd8 100644
--- a/src/tools/po/pt_BR.po
+++ b/src/tools/po/pt_BR.po
@@ -409,8 +409,8 @@ msgid "Could not load film %1"
 msgstr "Não foi possível carregar o filme %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Não conseguiu carregar o filme %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Não conseguiu carregar o filme %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index 14a5f3082..c762f3017 100644
--- a/src/tools/po/pt_PT.po
+++ b/src/tools/po/pt_PT.po
@@ -410,8 +410,8 @@ msgid "Could not load film %1"
 msgstr "Não foi possível carregar o filme %1 (%2)"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Não foi possível carregar o filme %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Não foi possível carregar o filme %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index a5313ad9e..9b987f1b7 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -407,8 +407,8 @@ msgid "Could not load film %1"
 msgstr "Не удалось загрузить проект %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Не удалось загрузить проект %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Не удалось загрузить проект %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, c-format
diff --git a/src/tools/po/sk_SK.po b/src/tools/po/sk_SK.po
index e0bb3a22f..2a6a4fd62 100644
--- a/src/tools/po/sk_SK.po
+++ b/src/tools/po/sk_SK.po
@@ -410,8 +410,8 @@ msgid "Could not load film %1"
 msgstr "Nemôžem načítať film %1 (%2)"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Nemôžem načítať film %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Nemôžem načítať film %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/sl_SI.po b/src/tools/po/sl_SI.po
index 91aec8c28..300801572 100644
--- a/src/tools/po/sl_SI.po
+++ b/src/tools/po/sl_SI.po
@@ -406,8 +406,8 @@ msgid "Could not load film %1"
 msgstr "Filma %1 ni bilo mogoče naložiti"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Filma %1 (%2) ni bilo mogoče naložiti"
+msgid "Could not load film %s"
+msgstr "Filma %s ni bilo mogoče naložiti"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index e240d8274..48c831cec 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -405,8 +405,8 @@ msgid "Could not load film %1"
 msgstr "Kunde inte ladda film %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Kunde inte ladda film %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Kunde inte ladda film %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/tr_TR.po b/src/tools/po/tr_TR.po
index eb35cbcca..ed8a87ede 100644
--- a/src/tools/po/tr_TR.po
+++ b/src/tools/po/tr_TR.po
@@ -394,7 +394,7 @@ msgid "Could not load film %1"
 msgstr ""
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
+msgid "Could not load film %s"
 msgstr ""
 
 #: src/tools/dcpomatic_player.cc:1349
diff --git a/src/tools/po/uk_UA.po b/src/tools/po/uk_UA.po
index 19b4dedd6..27e4555f4 100644
--- a/src/tools/po/uk_UA.po
+++ b/src/tools/po/uk_UA.po
@@ -408,8 +408,8 @@ msgid "Could not load film %1"
 msgstr "Не вдалося завантажити проект %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "Не вдалося завантажити проект %1 (%2)"
+msgid "Could not load film %s"
+msgstr "Не вдалося завантажити проект %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, fuzzy, c-format
diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index 955686819..8d16c90d1 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -409,8 +409,8 @@ msgid "Could not load film %1"
 msgstr "无法加载工程 %1"
 
 #: src/tools/dcpomatic.cc:1734
-msgid "Could not load film %1 (%2)"
-msgstr "无法加载工程 %1 (%2)"
+msgid "Could not load film %s"
+msgstr "无法加载工程 %s"
 
 #: src/tools/dcpomatic_player.cc:1349
 #, c-format