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

20 files changed, 37 insertions, 38 deletions

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index b5a3a4499..6261c4003 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -20,7 +20,6 @@
 */
 
 #include "audio_content.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "exceptions.h"
@@ -561,7 +560,7 @@ FFmpegContent::add_properties (shared_ptr<const Film> film, list<UserProperty>&
 			case AVCOL_RANGE_JPEG:
 				/// TRANSLATORS: this means that the range of pixel values used in this
 				/// file is full, so that all possible pixel values are valid.
-				p.push_back(UserProperty(UserProperty::VIDEO, _("Colour range"), String::compose(_("Full (0-%1)"), total - 1)));
+				p.push_back(UserProperty(UserProperty::VIDEO, _("Colour range"), fmt::format(_("Full (0-{})"), total - 1)));
 				break;
 			default:
 				DCPOMATIC_ASSERT (false);
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 81a05f71e..bf82424de 100644
--- a/src/lib/po/cs_CZ.po
+++ b/src/lib/po/cs_CZ.po
@@ -1035,8 +1035,8 @@ msgid "Full"
 msgstr "Full"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Full (0-%1)"
+msgid "Full (0-{})"
+msgstr "Full (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index b2891e4e5..cc864bfc8 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -1041,8 +1041,8 @@ msgid "Full"
 msgstr "Fuld"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Fuld (0-%1)"
+msgid "Full (0-{})"
+msgstr "Fuld (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 56243e7e9..c5e4c67eb 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -1092,8 +1092,8 @@ msgid "Full"
 msgstr "Voll"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Voll (0-%1)"
+msgid "Full (0-{})"
+msgstr "Voll (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 0dc160664..47393e164 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -1047,8 +1047,8 @@ msgid "Full"
 msgstr "Completo"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Completo (0-%1)"
+msgid "Full (0-{})"
+msgstr "Completo (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/fa_IR.po b/src/lib/po/fa_IR.po
index bfdca7a47..400ebd494 100644
--- a/src/lib/po/fa_IR.po
+++ b/src/lib/po/fa_IR.po
@@ -1037,8 +1037,8 @@ msgid "Full"
 msgstr "کامل"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "کامل(0-%1)"
+msgid "Full (0-{})"
+msgstr "کامل(0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 117cf78a8..8bc99be89 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -1049,8 +1049,8 @@ msgid "Full"
 msgstr "Plein"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Entier (0-%1)"
+msgid "Full (0-{})"
+msgstr "Entier (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/hu_HU.po b/src/lib/po/hu_HU.po
index d8d4f0c7f..4a9e9701b 100644
--- a/src/lib/po/hu_HU.po
+++ b/src/lib/po/hu_HU.po
@@ -1034,7 +1034,7 @@ msgid "Full"
 msgstr "Teljes"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
+msgid "Full (0-{})"
 msgstr ""
 
 #: src/lib/ratio.cc:54
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 8ac195fbf..adb05ece1 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -1036,8 +1036,8 @@ msgid "Full"
 msgstr "Completo"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Completo (0-%1)"
+msgid "Full (0-{})"
+msgstr "Completo (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index a2523166f..e4d224678 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -1062,8 +1062,8 @@ msgid "Full"
 msgstr "Full"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Full (0-%1)"
+msgid "Full (0-{})"
+msgstr "Full (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index ed2b70b77..4cac0cf09 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -1057,8 +1057,8 @@ msgid "Full"
 msgstr "Pełny"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Pełny (0-%1)"
+msgid "Full (0-{})"
+msgstr "Pełny (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index dcaed808e..69d5c85a6 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -1055,8 +1055,8 @@ msgid "Full"
 msgstr "Full"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Full (0-%1)"
+msgid "Full (0-{})"
+msgstr "Full (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 56e2b69ec..1b5f2d98a 100644
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -1031,8 +1031,8 @@ msgid "Full"
 msgstr "Full"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Full (0-%1)"
+msgid "Full (0-{})"
+msgstr "Full (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index e1aca6313..3c9a53c9d 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -1054,8 +1054,8 @@ msgid "Full"
 msgstr "Полный"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Полный (0-%1)"
+msgid "Full (0-{})"
+msgstr "Полный (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index 50d4aaaa8..ac57f2a09 100644
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -1029,8 +1029,8 @@ msgid "Full"
 msgstr "Full"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Full (0-%1)"
+msgid "Full (0-{})"
+msgstr "Full (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/sl_SI.po b/src/lib/po/sl_SI.po
index 06daac8e3..9ec5c815e 100644
--- a/src/lib/po/sl_SI.po
+++ b/src/lib/po/sl_SI.po
@@ -1055,8 +1055,8 @@ msgid "Full"
 msgstr "Polno"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Polno (0-%1)"
+msgid "Full (0-{})"
+msgstr "Polno (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 8c2e3680d..5673dde58 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -1067,8 +1067,8 @@ msgid "Full"
 msgstr "Komplett"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Komplett (0-%1)"
+msgid "Full (0-{})"
+msgstr "Komplett (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index e117b236f..7a2be80a2 100644
--- a/src/lib/po/tr_TR.po
+++ b/src/lib/po/tr_TR.po
@@ -940,7 +940,7 @@ msgid "Full"
 msgstr ""
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
+msgid "Full (0-{})"
 msgstr ""
 
 #: src/lib/ratio.cc:54
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index 8a7c076b9..c2a8a985b 100644
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -1037,8 +1037,8 @@ msgid "Full"
 msgstr "Повний"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "Повний (0-%1)"
+msgid "Full (0-{})"
+msgstr "Повний (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 3ea5a8806..a6a1e2362 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -1005,8 +1005,8 @@ msgid "Full"
 msgstr "Full(全幅/1.90)"
 
 #: src/lib/ffmpeg_content.cc:570
-msgid "Full (0-%1)"
-msgstr "全幅 (0-%1)"
+msgid "Full (0-{})"
+msgstr "全幅 (0-{})"
 
 #: src/lib/ratio.cc:54
 msgid "Full frame"