Replace String::compose with fmt (with i18n).

20 files changed, 37 insertions, 38 deletions

diff --git a/src/lib/curl_uploader.cc b/src/lib/curl_uploader.cc
index cbdf08707..dd97df213 100644
--- a/src/lib/curl_uploader.cc
+++ b/src/lib/curl_uploader.cc
@@ -24,7 +24,6 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include <iostream>
 
@@ -99,7 +98,7 @@ CurlUploader::upload_file(boost::filesystem::path from, boost::filesystem::path
 
 	dcp::File file(from, "rb");
 	if (!file) {
-		throw NetworkError(String::compose(_("Could not open %1 to send"), from));
+		throw NetworkError(fmt::format(_("Could not open {} to send"), from.string()));
 	}
 	_file = file.get();
 	_transferred = &transferred;
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 842cbb38b..2f939b5b5 100644
--- a/src/lib/po/cs_CZ.po
+++ b/src/lib/po/cs_CZ.po
@@ -763,8 +763,8 @@ msgid "Could not open %1"
 msgstr "Nemohu otevřít %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Nemohu otevřít %1 k poslání"
+msgid "Could not open {} to send"
+msgstr "Nemohu otevřít {} k poslání"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index d96479191..b09438ade 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -763,8 +763,8 @@ msgid "Could not open %1"
 msgstr "Kunne ikke åbne %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Kunne ikke åbne %1 til afsendelse"
+msgid "Could not open {} to send"
+msgstr "Kunne ikke åbne {} til afsendelse"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 5bdb057ff..acda38e71 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -816,8 +816,8 @@ msgid "Could not open %1"
 msgstr "%1 konnte nicht geöffnet werden."
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "%1 konnte nicht zum Senden geöffnet werden"
+msgid "Could not open {} to send"
+msgstr "{} konnte nicht zum Senden geöffnet werden"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 2b398cf61..f882d8caf 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -777,8 +777,8 @@ msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "No se pudo abrir %1 para enviar"
+msgid "Could not open {} to send"
+msgstr "No se pudo abrir {} para enviar"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/fa_IR.po b/src/lib/po/fa_IR.po
index 1c584e449..a448dec14 100644
--- a/src/lib/po/fa_IR.po
+++ b/src/lib/po/fa_IR.po
@@ -764,8 +764,8 @@ msgid "Could not open %1"
 msgstr "باز نشد %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "برای ارسال باز نشد %1"
+msgid "Could not open {} to send"
+msgstr "برای ارسال باز نشد {}"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 25c593109..1318cdd99 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -774,8 +774,8 @@ msgid "Could not open %1"
 msgstr "Impossible d'ouvrir %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Impossible d'ouvrir %1 pour l'envoi"
+msgid "Could not open {} to send"
+msgstr "Impossible d'ouvrir {} pour l'envoi"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/hu_HU.po b/src/lib/po/hu_HU.po
index f54c3a48a..c94b09fe8 100644
--- a/src/lib/po/hu_HU.po
+++ b/src/lib/po/hu_HU.po
@@ -765,7 +765,7 @@ msgid "Could not open %1"
 msgstr ""
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
+msgid "Could not open {} to send"
 msgstr ""
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index dc7bbf686..1263fc27a 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -754,8 +754,8 @@ msgid "Could not open %1"
 msgstr "Impossibile aprire %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Impossibile aprire %1 da inviare"
+msgid "Could not open {} to send"
+msgstr "Impossibile aprire {} da inviare"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 86d18a0b0..33b86d5ac 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -790,8 +790,8 @@ msgid "Could not open %1"
 msgstr "Kan %1 niet openen"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Kan %1 niet openen om te verzenden"
+msgid "Could not open {} to send"
+msgstr "Kan {} niet openen om te verzenden"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 6dcb5fb6f..19101bf77 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -786,8 +786,8 @@ msgid "Could not open %1"
 msgstr "Nie udało się otworzyć %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Nie udało się otworzyć %1 do wysłania"
+msgid "Could not open {} to send"
+msgstr "Nie udało się otworzyć {} do wysłania"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index 7dca17ac1..371537283 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -773,8 +773,8 @@ msgid "Could not open %1"
 msgstr "Impossível abrir %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Impossível abrir %1 para enviar"
+msgid "Could not open {} to send"
+msgstr "Impossível abrir {} para enviar"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 8a71b2caf..a6a77c4b7 100644
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -743,8 +743,8 @@ msgid "Could not open %1"
 msgstr "Não foi possível abrir %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Não foi possível abrir %1 para enviar"
+msgid "Could not open {} to send"
+msgstr "Não foi possível abrir {} para enviar"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 32458ada3..de3cb4dcd 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -779,8 +779,8 @@ msgid "Could not open %1"
 msgstr "Не удалось открыть %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Не удалось открыть %1 для отправки"
+msgid "Could not open {} to send"
+msgstr "Не удалось открыть {} для отправки"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index 97ca48dba..89300851c 100644
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -739,8 +739,8 @@ msgid "Could not open %1"
 msgstr "Nemôžem otvoriť %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Nemôžem otvoriť %1 na poslanie"
+msgid "Could not open {} to send"
+msgstr "Nemôžem otvoriť {} na poslanie"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/sl_SI.po b/src/lib/po/sl_SI.po
index 751706ecf..2902495b4 100644
--- a/src/lib/po/sl_SI.po
+++ b/src/lib/po/sl_SI.po
@@ -787,8 +787,8 @@ msgid "Could not open %1"
 msgstr "Ni mogoče odpreti: %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Za pošiljanje ni bilo mogoče odpreti %1"
+msgid "Could not open {} to send"
+msgstr "Za pošiljanje ni bilo mogoče odpreti {}"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 4fc3a678b..8ec93eef3 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -794,8 +794,8 @@ msgid "Could not open %1"
 msgstr "Kunde inte öppna %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Kunde inte öppna %1 för att skicka"
+msgid "Could not open {} to send"
+msgstr "Kunde inte öppna {} för att skicka"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index 5c7f648d8..879d7d30b 100644
--- a/src/lib/po/tr_TR.po
+++ b/src/lib/po/tr_TR.po
@@ -685,7 +685,7 @@ msgid "Could not open %1"
 msgstr ""
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
+msgid "Could not open {} to send"
 msgstr ""
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index 6cce37b4e..61bac3830 100644
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -755,8 +755,8 @@ msgid "Could not open %1"
 msgstr "Не вдалося відкрити %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "Не вдалося відкрити %1 для відправки"
+msgid "Could not open {} to send"
+msgstr "Не вдалося відкрити {} для відправки"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 110186b6c..601194136 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -735,8 +735,8 @@ msgid "Could not open %1"
 msgstr "无法打开 %1"
 
 #: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:122
-msgid "Could not open %1 to send"
-msgstr "无法打开 %1 并发送"
+msgid "Could not open {} to send"
+msgstr "无法打开 {} 并发送"
 
 #: src/lib/internet.cc:167 src/lib/internet.cc:172
 msgid "Could not open downloaded ZIP file"