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

20 files changed, 39 insertions, 41 deletions

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index df044a5d4..fbb744b37 100644
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -21,13 +21,13 @@
 
 #include "atmos_content.h"
 #include "atmos_mxf_content.h"
-#include "compose.hpp"
 #include "film.h"
 #include "job.h"
 #include <asdcp/KM_log.h>
 #include <dcp/atmos_asset.h>
 #include <dcp/exceptions.h>
 #include <libxml++/libxml++.h>
+#include <fmt/format.h>
 
 #include "i18n.h"
 
@@ -93,7 +93,7 @@ AtmosMXFContent::examine(shared_ptr<const Film> film, shared_ptr<Job> job, bool
 string
 AtmosMXFContent::summary () const
 {
-	return String::compose (_("%1 [Atmos]"), path_summary());
+	return fmt::format(_("{} [Atmos]"), path_summary());
 }
 
 
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 08a447682..d39b7e02a 100644
--- a/src/lib/po/cs_CZ.po
+++ b/src/lib/po/cs_CZ.po
@@ -104,8 +104,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index 3a5f3635c..dc3191a28 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 52b619bad..cdeb2e53f 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -105,8 +105,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index b64e1c1c7..0f3b60185 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/fa_IR.po b/src/lib/po/fa_IR.po
index af8f87f9f..d080782c8 100644
--- a/src/lib/po/fa_IR.po
+++ b/src/lib/po/fa_IR.po
@@ -104,8 +104,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [دالبی اتمز]"
+msgid "{} [Atmos]"
+msgstr "{} [دالبی اتمز]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index aef3e1aa7..75c197697 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/hu_HU.po b/src/lib/po/hu_HU.po
index d5de48b2d..35f987d8d 100644
--- a/src/lib/po/hu_HU.po
+++ b/src/lib/po/hu_HU.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 123dc5409..5f627b841 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index f0ab654b5..419080038 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -104,8 +104,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index dc1e2987d..05fec1f4b 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -106,8 +106,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index df958c51d..dfadf5703 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Dolby Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Dolby Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 18a2cdc03..01d35cd71 100644
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -97,9 +97,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:96
-#, fuzzy
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 78399253c..e28d29a72 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 ГБ) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index 9fd4e0c9e..914670243 100644
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -97,9 +97,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:96
-#, fuzzy
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/sl_SI.po b/src/lib/po/sl_SI.po
index 0341ce3bb..ede57cd72 100644
--- a/src/lib/po/sl_SI.po
+++ b/src/lib/po/sl_SI.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 332d4e5c6..7a2d79c28 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -103,8 +103,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index c71f34422..2c4062b49 100644
--- a/src/lib/po/tr_TR.po
+++ b/src/lib/po/tr_TR.po
@@ -83,7 +83,7 @@ msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
+msgid "{} [Atmos]"
 msgstr ""
 
 #: src/lib/dcp_content.cc:366
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index b8aefacf5..0538c8821 100644
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -101,8 +101,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [Atmos]"
+msgid "{} [Atmos]"
+msgstr "{} [Atmos]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 71df045b2..0c521a6be 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -110,8 +110,8 @@ msgid "%1 (%2 GB) [%3]"
 msgstr "%1 (%2 GB) [%3]"
 
 #: src/lib/atmos_mxf_content.cc:96
-msgid "%1 [Atmos]"
-msgstr "%1 [全景声]"
+msgid "{} [Atmos]"
+msgstr "{} [全景声]"
 
 #: src/lib/dcp_content.cc:366
 msgid "%1 [DCP]"