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

20 files changed, 37 insertions, 38 deletions

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a4ddd3a7c..58ab3a0ae 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -27,7 +27,6 @@
 #include "audio_buffers.h"
 #include "audio_content.h"
 #include "audio_decoder.h"
-#include "compose.hpp"
 #include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "ffmpeg_audio_stream.h"
@@ -375,7 +374,7 @@ deinterleave_audio(AVFrame* frame)
 	break;
 
 	default:
-		throw DecodeError (String::compose(_("Unrecognised audio sample format (%1)"), static_cast<int>(format)));
+		throw DecodeError(fmt::format(_("Unrecognised audio sample format ({})"), static_cast<int>(format)));
 	}
 
 	return audio;
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index bf82424de..5a277370b 100644
--- a/src/lib/po/cs_CZ.po
+++ b/src/lib/po/cs_CZ.po
@@ -1833,8 +1833,8 @@ msgid "Unknown error"
 msgstr "Neznáma chyba"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Nerozpoznaná vzorkovací frekvence audia (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Nerozpoznaná vzorkovací frekvence audia ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index cc864bfc8..b1ce5fbb3 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -1825,8 +1825,8 @@ msgid "Unknown error"
 msgstr "Ukendt fejl"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Kunne ikke genkende lydsekvensens format (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Kunne ikke genkende lydsekvensens format ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index c5e4c67eb..dbbbca854 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -1925,8 +1925,8 @@ msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Audio Sample Format (%1) nicht erkannt."
+msgid "Unrecognised audio sample format ({})"
+msgstr "Audio Sample Format ({}) nicht erkannt."
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 47393e164..f060c5f84 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -1849,8 +1849,8 @@ msgid "Unknown error"
 msgstr "Error desconocido"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Formato de audio desconocido (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Formato de audio desconocido ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/fa_IR.po b/src/lib/po/fa_IR.po
index 400ebd494..e5826cfef 100644
--- a/src/lib/po/fa_IR.po
+++ b/src/lib/po/fa_IR.po
@@ -1825,8 +1825,8 @@ msgid "Unknown error"
 msgstr "خطای ناشناخته"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "فرمت نمونه صدای غیرقابل تشخیص(%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "فرمت نمونه صدای غیرقابل تشخیص({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 8bc99be89..c6820d699 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -1858,8 +1858,8 @@ msgid "Unknown error"
 msgstr "Erreur inconnue"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Format d'échantillon audio non reconnu (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Format d'échantillon audio non reconnu ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/hu_HU.po b/src/lib/po/hu_HU.po
index 4a9e9701b..ab379a896 100644
--- a/src/lib/po/hu_HU.po
+++ b/src/lib/po/hu_HU.po
@@ -1773,7 +1773,7 @@ msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
+msgid "Unrecognised audio sample format ({})"
 msgstr ""
 
 #: src/lib/filter.cc:102
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index adb05ece1..03533597e 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -1799,8 +1799,8 @@ msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Formato campionamento audio non riconosciuto (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Formato campionamento audio non riconosciuto ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index e4d224678..496cd713b 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -1876,8 +1876,8 @@ msgid "Unknown error"
 msgstr "Onbekende fout"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Niet-herkend audio sample-formaat (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Niet-herkend audio sample-formaat ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 4cac0cf09..6ab70213f 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -1855,8 +1855,8 @@ msgid "Unknown error"
 msgstr "Nieznany błąd"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Nieznany rodzaj pliku dźwiękowego (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Nieznany rodzaj pliku dźwiękowego ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index 69d5c85a6..53ab66026 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -1815,8 +1815,8 @@ msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Formato de amostragem de áudio desconhecido (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Formato de amostragem de áudio desconhecido ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 1b5f2d98a..12d3471cd 100644
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -1791,8 +1791,8 @@ msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Formato de amostragem áudio desconhecido (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Formato de amostragem áudio desconhecido ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 3c9a53c9d..f22fcfcb4 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -1855,8 +1855,8 @@ msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Нераспознанный формат аудио (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Нераспознанный формат аудио ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index ac57f2a09..c1bed6477 100644
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -1785,8 +1785,8 @@ msgid "Unknown error"
 msgstr "Neznáma chyba"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Nerozpoznaná vzorkovacia frekvencia audia (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Nerozpoznaná vzorkovacia frekvencia audia ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/sl_SI.po b/src/lib/po/sl_SI.po
index 9ec5c815e..25bc0be63 100644
--- a/src/lib/po/sl_SI.po
+++ b/src/lib/po/sl_SI.po
@@ -1858,8 +1858,8 @@ msgid "Unknown error"
 msgstr "Neznana napaka"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Neprepoznana oblika vzorca zvoka (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Neprepoznana oblika vzorca zvoka ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 5673dde58..2bbc3fc94 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -1864,8 +1864,8 @@ msgid "Unknown error"
 msgstr "Okänt fel"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Okänt ljudsamplingsformat (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Okänt ljudsamplingsformat ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index 7a2be80a2..90627baa3 100644
--- a/src/lib/po/tr_TR.po
+++ b/src/lib/po/tr_TR.po
@@ -1663,7 +1663,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
+msgid "Unrecognised audio sample format ({})"
 msgstr ""
 
 #: src/lib/filter.cc:102
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index c2a8a985b..c6179199f 100644
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -1797,8 +1797,8 @@ msgid "Unknown error"
 msgstr "Невідома помилка"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "Нерозпізнаний формат аудіо (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "Нерозпізнаний формат аудіо ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index a6a1e2362..e477404ee 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -1765,8 +1765,8 @@ msgid "Unknown error"
 msgstr "未知错误"
 
 #: src/lib/ffmpeg_decoder.cc:378
-msgid "Unrecognised audio sample format (%1)"
-msgstr "无法识别的音频采样格式 (%1)"
+msgid "Unrecognised audio sample format ({})"
+msgstr "无法识别的音频采样格式 ({})"
 
 #: src/lib/filter.cc:102
 msgid "Unsharp mask and Gaussian blur"