Replace String::compose with fmt.

sed -i "/Plural-Forms/n;/%100/n;/scanf/n;s/%[123456789]/{}/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc src/lib/po/*.po src/wx/po/*.po src/tools/po/*.po test/*.cc
sed -i "s/String::compose */fmt::format/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc test/*.cc

28 files changed, 201 insertions, 201 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d8e79d667..852106757 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1488,7 +1488,7 @@ private:
 		for (size_t i = 0; i < history.size(); ++i) {
 			string s;
 			if (i < 9) {
-				s = String::compose ("&%1 %2", i + 1, history[i].string());
+				s = fmt::format("&{} {}", i + 1, history[i].string());
 			} else {
 				s = history[i].string();
 			}
@@ -1655,7 +1655,7 @@ private:
 			setvbuf(hf_in, NULL, _IONBF, 128);
 			*stdin = *hf_in;
 
-			cout << variant::insert_dcpomatic("%1 is starting.") << "\n";
+			cout << variant::insert_dcpomatic("{} is starting.") << "\n";
 		}
 #endif
 			wxInitAllImageHandlers ();
@@ -1732,7 +1732,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, std_to_wx(fmt::format(wx_to_std(_("Could not load film {} ({})")), _film_to_load)), std_to_wx(e.what()));
 				}
 			}
 
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index c6a58f741..baa799aad 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -493,7 +493,7 @@ class App : public wxApp
 				} catch (exception& e) {
 					error_dialog (
 						0,
-						std_to_wx(String::compose(wx_to_std(_("Could not load film %1")), i.string())),
+						std_to_wx(fmt::format(wx_to_std(_("Could not load film {}")), i.string())),
 						std_to_wx(e.what())
 						);
 				}
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 098025ddb..b9db5fb8c 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -162,7 +162,7 @@ private:
 			if (!confirm_dialog (
 				    this,
 				    std_to_wx (
-					    String::compose(wx_to_std(_("The directory %1 already exists and is not empty.  "
+					    fmt::format(wx_to_std(_("The directory {} already exists and is not empty.  "
 									"Are you sure you want to use it?")),
 							    output.string())
 					    )
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 56b30590f..287efb901 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -181,7 +181,7 @@ public:
 		 */
 		dcpomatic_log = make_shared<FileLog>(State::write_path("disk.log"));
 		dcpomatic_log->set_types (dcpomatic_log->types() | LogEntry::TYPE_DISK);
-		LOG_DISK("dcpomatic_disk %1 started", dcpomatic_git_commit);
+		LOG_DISK("dcpomatic_disk {} started", dcpomatic_git_commit);
 
 		{
 			int constexpr seconds_to_look = 3;
@@ -202,7 +202,7 @@ public:
 
 #ifdef DCPOMATIC_WINDOWS
 		/* We must use ::shell here, it seems, to avoid error code 740 (related to privilege escalation) */
-		LOG_DISK("Starting writer process %1", disk_writer_path().string());
+		LOG_DISK("Starting writer process {}", disk_writer_path().string());
 		_writer = new boost::process::child (disk_writer_path(), boost::process::shell, boost::process::windows::hide);
 #endif
 
@@ -210,7 +210,7 @@ public:
 		if (getenv("DCPOMATIC_NO_START_WRITER")) {
 			LOG_DISK_NC("Not starting writer process as DCPOMATIC_NO_START_WRITER is set");
 		} else {
-			LOG_DISK("Starting writer process %1", disk_writer_path().string());
+			LOG_DISK("Starting writer process {}", disk_writer_path().string());
 			_writer = new boost::process::child (disk_writer_path());
 		}
 #endif
@@ -252,7 +252,7 @@ private:
 #ifdef DCPOMATIC_OSX
 	void uninstall()
 	{
-		system(String::compose("osascript \"%1/uninstall_disk.applescript\"", resources_path().string()).c_str());
+		system(fmt::format("osascript \"{}/uninstall_disk.applescript\"", resources_path().string()).c_str());
 	}
 #endif
 
@@ -303,12 +303,12 @@ private:
 				if (reply && reply->type() == DiskWriterBackEndResponse::Type::PONG) {
 					return true;
 				} else if (reply) {
-					LOG_DISK("Unexpected response %1 to ping received (attempt %2)", static_cast<int>(reply->type()), attempt);
+					LOG_DISK("Unexpected response {} to ping received (attempt {})", static_cast<int>(reply->type()), attempt);
 				} else {
-					LOG_DISK("No reply received from ping (attempt %1)", attempt);
+					LOG_DISK("No reply received from ping (attempt {})", attempt);
 				}
 			} else {
-				LOG_DISK("Could not send ping to writer (attempt %1)", attempt);
+				LOG_DISK("Could not send ping to writer (attempt {})", attempt);
 			}
 			dcpomatic_sleep_seconds (1);
 			return false;
@@ -353,7 +353,7 @@ private:
 				return;
 			}
 
-			LOG_DISK("Sending unmount request to disk writer for %1", drive.as_xml());
+			LOG_DISK("Sending unmount request to disk writer for {}", drive.as_xml());
 			if (!_nanomsg.send(DISK_WRITER_UNMOUNT "\n", 2000)) {
 				LOG_DISK_NC("Failed to send unmount request.");
 				throw CommunicationFailedError ();
diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index b54bc33ef..1880baefd 100644
--- a/src/tools/dcpomatic_disk_writer.cc
+++ b/src/tools/dcpomatic_disk_writer.cc
@@ -100,7 +100,7 @@ polkit_callback (GObject *, GAsyncResult* res, gpointer data)
 	bool failed = false;
 
 	if (error) {
-		LOG_DISK("polkit authority check failed (check_authorization_finish failed with %1)", error->message);
+		LOG_DISK("polkit authority check failed (check_authorization_finish failed with {})", error->message);
 		failed = true;
 	} else {
 		if (polkit_authorization_result_get_is_authorized(result)) {
@@ -159,7 +159,7 @@ try
 		return true;
 	}
 
-	LOG_DISK("Writer receives command: %1", *s);
+	LOG_DISK("Writer receives command: {}", *s);
 
 	if (*s == DISK_WRITER_QUIT) {
 		exit (EXIT_SUCCESS);
@@ -220,21 +220,21 @@ try
 
 #ifdef DCPOMATIC_OSX
 		if (!starts_with(device, "/dev/disk")) {
-			LOG_DISK ("Will not write to %1", device);
+			LOG_DISK ("Will not write to {}", device);
 			DiskWriterBackEndResponse::error("Refusing to write to this drive", 1, 0).write_to_nanomsg(*nanomsg, LONG_TIMEOUT);
 			return true;
 		}
 #endif
 #ifdef DCPOMATIC_LINUX
 		if (!starts_with(device, "/dev/sd") && !starts_with(device, "/dev/hd")) {
-			LOG_DISK ("Will not write to %1", device);
+			LOG_DISK ("Will not write to {}", device);
 			DiskWriterBackEndResponse::error("Refusing to write to this drive", 1, 0).write_to_nanomsg(*nanomsg, LONG_TIMEOUT);
 			return true;
 		}
 #endif
 #ifdef DCPOMATIC_WINDOWS
 		if (!starts_with(device, "\\\\.\\PHYSICALDRIVE")) {
-			LOG_DISK ("Will not write to %1", device);
+			LOG_DISK ("Will not write to {}", device);
 			DiskWriterBackEndResponse::error("Refusing to write to this drive", 1, 0).write_to_nanomsg(*nanomsg, LONG_TIMEOUT);
 			return true;
 		}
@@ -250,19 +250,19 @@ try
 		}
 
 		if (!on_drive_list) {
-			LOG_DISK ("Will not write to %1 as it's not recognised as a drive", device);
+			LOG_DISK ("Will not write to {} as it's not recognised as a drive", device);
 			DiskWriterBackEndResponse::error("Refusing to write to this drive", 1, 0).write_to_nanomsg(*nanomsg, LONG_TIMEOUT);
 			return true;
 		}
 		if (mounted) {
-			LOG_DISK ("Will not write to %1 as it's mounted", device);
+			LOG_DISK ("Will not write to {} as it's mounted", device);
 			DiskWriterBackEndResponse::error("Refusing to write to this drive", 1, 0).write_to_nanomsg(*nanomsg, LONG_TIMEOUT);
 			return true;
 		}
 
-		LOG_DISK("Here we go writing these to %1", device);
+		LOG_DISK("Here we go writing these to {}", device);
 		for (auto dcp: dcp_paths) {
-			LOG_DISK("  %1", dcp.string());
+			LOG_DISK("  {}", dcp.string());
 		}
 
 		request_privileges (
@@ -293,7 +293,7 @@ try
 
 	return true;
 } catch (exception& e) {
-	LOG_DISK("Exception (from idle): %1", e.what());
+	LOG_DISK("Exception (from idle): {}", e.what());
 	return true;
 }
 
@@ -308,7 +308,7 @@ main ()
 	 * redirect this to a file in /var/log
 	 */
 	dcpomatic_log.reset(new StdoutLog(LogEntry::TYPE_DISK));
-	LOG_DISK("dcpomatic_disk_writer %1 started uid=%2 euid=%3", dcpomatic_git_commit, getuid(), geteuid());
+	LOG_DISK("dcpomatic_disk_writer {} started uid={} euid={}", dcpomatic_git_commit, getuid(), geteuid());
 #else
 	/* XXX: this is a hack, but I expect we'll need logs and I'm not sure if there's
 	 * a better place to put them.
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index d596f8ca2..acab8c682 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -131,7 +131,7 @@ public:
 			setvbuf(hf_in, NULL, _IONBF, 128);
 			*stdin = *hf_in;
 
-			std::cout << variant::insert_dcpomatic_kdm_creator("%1 is starting.\n");
+			std::cout << variant::insert_dcpomatic_kdm_creator("{} is starting.\n");
 		}
 #endif
 
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 9fb4a049b..db5bb5d81 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -330,7 +330,7 @@ public:
 			 */
 			_viewer.stop();
 		} catch (std::exception& e) {
-			LOG_ERROR("Destructor threw %1", e.what());
+			LOG_ERROR("Destructor threw {}", e.what());
 		} catch (...) {
 			LOG_ERROR_NC("Destructor threw");
 		}
@@ -966,17 +966,17 @@ private:
 			_viewer.panel()->Reparent(_dual_screen);
 			_viewer.panel()->SetFocus();
 			_dual_screen->Show ();
-			LOG_DEBUG_PLAYER("Setting up dual screen mode with %1 displays", wxDisplay::GetCount());
+			LOG_DEBUG_PLAYER("Setting up dual screen mode with {} displays", wxDisplay::GetCount());
 			for (auto index = 0U; index < wxDisplay::GetCount(); ++index) {
 				wxDisplay display(index);
 				auto client = display.GetClientArea();
 				auto mode = display.GetCurrentMode();
 				auto geometry = display.GetGeometry();
-				LOG_DEBUG_PLAYER("Display %1", index);
-				LOG_DEBUG_PLAYER("  ClientArea position=(%1, %2) size=(%3, %4)", client.GetX(), client.GetY(), client.GetWidth(), client.GetHeight());
-				LOG_DEBUG_PLAYER("  Geometry   position=(%1, %2) size=(%3, %4)", geometry.GetX(), geometry.GetY(), geometry.GetWidth(), geometry.GetHeight());
-				LOG_DEBUG_PLAYER("  Mode       size=(%1, %2)", mode.GetWidth(), mode.GetHeight());
-				LOG_DEBUG_PLAYER("  Primary?   %1", static_cast<int>(display.IsPrimary()));
+				LOG_DEBUG_PLAYER("Display {}", index);
+				LOG_DEBUG_PLAYER("  ClientArea position=({}, {}) size=({}, {})", client.GetX(), client.GetY(), client.GetWidth(), client.GetHeight());
+				LOG_DEBUG_PLAYER("  Geometry   position=({}, {}) size=({}, {})", geometry.GetX(), geometry.GetY(), geometry.GetWidth(), geometry.GetHeight());
+				LOG_DEBUG_PLAYER("  Mode       size=({}, {})", mode.GetWidth(), mode.GetHeight());
+				LOG_DEBUG_PLAYER("  Primary?   {}", static_cast<int>(display.IsPrimary()));
 			}
 			if (wxDisplay::GetCount() > 1) {
 				wxRect geometry[2] = {
@@ -1138,7 +1138,7 @@ private:
 				_http_server_thread = boost::thread(boost::bind(&HTTPServer::run, _http_server.get()));
 			}
 		} catch (std::exception& e) {
-			LOG_DEBUG_PLAYER("Failed to start player HTTP server (%1)", e.what());
+			LOG_DEBUG_PLAYER("Failed to start player HTTP server ({})", e.what());
 		}
 	}
 
@@ -1152,7 +1152,7 @@ private:
 			/* This is not the end of the world; probably a failure to bind the server socket
 			 * because there's already another player running.
 			 */
-			LOG_DEBUG_PLAYER("Failed to start internal player server (%1)", e.what());
+			LOG_DEBUG_PLAYER("Failed to start internal player server ({})", e.what());
 		}
 	}
 
@@ -1181,7 +1181,7 @@ private:
 		for (size_t i = 0; i < history.size(); ++i) {
 			string s;
 			if (i < 9) {
-				s = String::compose ("&%1 %2", i + 1, history[i].string());
+				s = fmt::format("&{} {}", i + 1, history[i].string());
 			} else {
 				s = history[i].string();
 			}
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index e5d8b0a90..23ecdc9df 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -253,7 +253,7 @@ public:
 #else
 		string const colour = gui_is_dark() ? "white" : "black";
 		wxBitmap bitmap (
-			bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
+			bitmap_path(fmt::format("dcpomatic_small_{}.png", colour)),
 			wxBITMAP_TYPE_PNG
 			);
 		wxIcon icon;
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index ea78d41a5..a20b14f68 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -56,7 +56,7 @@ static void
 help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION]\n"
-	     << variant::insert_dcpomatic("  -v, --version      show %1 version\n")
+	     << variant::insert_dcpomatic("  -v, --version      show {} version\n")
 	     << "  -h, --help         show this help\n"
 	     << "  -t, --threads      number of parallel encoding threads to use\n"
 	     << "  --verbose          be verbose to stdout\n"
@@ -127,7 +127,7 @@ main (int argc, char* argv[])
 		server.run ();
 	} catch (boost::system::system_error& e) {
 		if (e.code() == boost::system::errc::address_in_use) {
-			cerr << program_name << variant::insert_dcpomatic(": address already in use.  Is another %1 server instance already running?\n");
+			cerr << program_name << variant::insert_dcpomatic(": address already in use.  Is another {} server instance already running?\n");
 			exit (EXIT_FAILURE);
 		}
 		cerr << program_name << ": " << e.what() << "\n";
diff --git a/src/tools/po/cs_CZ.po b/src/tools/po/cs_CZ.po
index 45a6da67d..7cb3b3206 100644
--- a/src/tools/po/cs_CZ.po
+++ b/src/tools/po/cs_CZ.po
@@ -401,12 +401,12 @@ msgid "Could not load a DCP from %s"
 msgstr "Nelze načíst DCP z %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Nelze načíst film %1"
+msgid "Could not load film {}"
+msgstr "Nelze načíst film {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Nelze načíst film %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Nelze načíst film {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, c-format
@@ -1108,9 +1108,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Složka %1 již existuje a není prázdná. Chcete pokračovat?"
+msgstr "Složka {} již existuje a není prázdná. Chcete pokračovat?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/da_DK.po b/src/tools/po/da_DK.po
index efd9008c8..60252faee 100644
--- a/src/tools/po/da_DK.po
+++ b/src/tools/po/da_DK.po
@@ -33,7 +33,7 @@ msgstr "%d KDMer skrevet til %s"
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
 msgstr ""
-"%1 findes allerede som en fil, så du kan ikke bruge dette navn til en ny "
+"{} findes allerede som en fil, så du kan ikke bruge dette navn til en ny "
 "film."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
@@ -379,12 +379,12 @@ msgstr "Kunne ikke danne DCP: %s."
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "Kunne ikke indlæse DCP %1."
+msgstr "Kunne ikke indlæse DCP {}."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "Kunne ikke indlæse DCP %1."
+msgstr "Kunne ikke indlæse DCP {}."
 
 #: src/tools/dcpomatic_player.cc:626
 #, fuzzy, c-format
@@ -392,7 +392,7 @@ msgid ""
 "Could not load DCP.\n"
 "\n"
 "%s."
-msgstr "Kunne ikke indlæse DCP %1."
+msgstr "Kunne ikke indlæse DCP {}."
 
 #: src/tools/dcpomatic_player.cc:814
 msgid "Could not load KDM."
@@ -405,17 +405,17 @@ msgid "Could not load a DCP from %s"
 msgstr "Kunne ikke indlæse DCP fra %s."
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Kunne ikke indlæse film %1"
+msgid "Could not load film {}"
+msgstr "Kunne ikke indlæse film {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Kunne ikke indlæse film %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Kunne ikke indlæse film {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Kunne ikke indlæse film %1"
+msgstr "Kunne ikke indlæse film {}"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1080,10 +1080,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Folderen %1 eksisterer allerede og er ikke tom. Er du sikker på, at du vil "
+"Folderen {} eksisterer allerede og er ikke tom. Er du sikker på, at du vil "
 "benytte den?"
 
 #: src/tools/dcpomatic_disk.cc:293
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index d3bf0fd34..536a26866 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -407,12 +407,12 @@ msgid "Could not load a DCP from %s"
 msgstr "DCP aus %s konnte nicht geladen werden"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Projekt %1 konnte nicht geladen werden"
+msgid "Could not load film {}"
+msgstr "Projekt {} konnte nicht geladen werden"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Projekt %1 (%2) konnte nicht geladen werden"
+msgid "Could not load film {} ({})"
+msgstr "Projekt {} ({}) konnte nicht geladen werden"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, c-format
@@ -1120,10 +1120,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
+"Der Ordner {} existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
 "benutzen ?"
 
 #: src/tools/dcpomatic_disk.cc:293
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index eb224f2ae..2fd20a263 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -30,7 +30,7 @@ msgstr "%d KDMs guardadas en %s"
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
+msgstr "{} ya existe como fichero, no puedes usarlo para una nueva película."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -374,12 +374,12 @@ msgstr "No se pudo cargar el DCP"
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "No se pudo cargar el DCP %1."
+msgstr "No se pudo cargar el DCP {}."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "No se pudo cargar el DCP %1."
+msgstr "No se pudo cargar el DCP {}."
 
 #: src/tools/dcpomatic_player.cc:626
 #, fuzzy, c-format
@@ -387,7 +387,7 @@ msgid ""
 "Could not load DCP.\n"
 "\n"
 "%s."
-msgstr "No se pudo cargar el DCP %1."
+msgstr "No se pudo cargar el DCP {}."
 
 #: src/tools/dcpomatic_player.cc:814
 msgid "Could not load KDM."
@@ -400,17 +400,17 @@ msgid "Could not load a DCP from %s"
 msgstr ""
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "No se pudo cargar la película %1"
+msgid "Could not load film {}"
+msgstr "No se pudo cargar la película {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "No se pudo cargar la película %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "No se pudo cargar la película {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "No se pudo cargar la película %1"
+msgstr "No se pudo cargar la película {}"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1082,10 +1082,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
+"El directorio {} ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
@@ -1382,5 +1382,5 @@ msgstr ""
 #~ msgstr "&Analizar audio"
 
 #, fuzzy
-#~ msgid "The directory %1 already exists."
+#~ msgid "The directory {} already exists."
 #~ msgstr "La carpeta %s ya existe."
diff --git a/src/tools/po/fa_IR.po b/src/tools/po/fa_IR.po
index 4f25883f2..0f2a46bc1 100644
--- a/src/tools/po/fa_IR.po
+++ b/src/tools/po/fa_IR.po
@@ -406,12 +406,12 @@ msgid "Could not load a DCP from %s"
 msgstr "نمیتوان یک دی سی پی از این محل فراخوانی کرد  %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "فیلم قابل فراخوانی نیست%1"
+msgid "Could not load film {}"
+msgstr "فیلم قابل فراخوانی نیست{}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "فیلم قابل فراخوانی نیست %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "فیلم قابل فراخوانی نیست {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, c-format
@@ -1114,10 +1114,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"پوشه %1 وجود دارد و خالی نیست. مطمئن هستید که می خواهید از آن استفاده کنید؟"
+"پوشه {} وجود دارد و خالی نیست. مطمئن هستید که می خواهید از آن استفاده کنید؟"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 361c7d9a1..7a0e6a44b 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -405,12 +405,12 @@ msgid "Could not load a DCP from %s"
 msgstr "Impossible de charger un DCP depuis %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Impossible de charger le film %1"
+msgid "Could not load film {}"
+msgstr "Impossible de charger le film {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Impossible de charger le film %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Impossible de charger le film {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, c-format
@@ -1123,10 +1123,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Le répertoire %1 existe déjà et n'est pas vide. Êtes-vous sûr de vouloir "
+"Le répertoire {} existe déjà et n'est pas vide. Êtes-vous sûr de vouloir "
 "l'utiliser ?"
 
 #: src/tools/dcpomatic_disk.cc:293
@@ -1509,5 +1509,5 @@ msgstr ""
 #~ msgstr "&Analyser le son"
 
 #, fuzzy
-#~ msgid "The directory %1 already exists."
+#~ msgid "The directory {} already exists."
 #~ msgstr "Le dossier %s existe déjà."
diff --git a/src/tools/po/hu_HU.po b/src/tools/po/hu_HU.po
index 50e538449..c62881d03 100644
--- a/src/tools/po/hu_HU.po
+++ b/src/tools/po/hu_HU.po
@@ -368,17 +368,17 @@ msgstr ""
 #: src/tools/dcpomatic_editor.cc:399
 #, fuzzy
 msgid "Could not load DCP"
-msgstr "Nem sikerült a DCP %1 betöltése."
+msgstr "Nem sikerült a DCP {} betöltése."
 
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "Nem sikerült a DCP %1 betöltése."
+msgstr "Nem sikerült a DCP {} betöltése."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "Nem sikerült a DCP %1 betöltése."
+msgstr "Nem sikerült a DCP {} betöltése."
 
 #: src/tools/dcpomatic_player.cc:626
 #, c-format
@@ -402,17 +402,17 @@ msgid "Could not load a DCP from %s"
 msgstr "Nem sikerült a DCP betöltése a(z) %s helyről"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Nem sikerült a film %1 betöltése"
+msgid "Could not load film {}"
+msgstr "Nem sikerült a film {} betöltése"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Nem sikerült a film %1 (%s) betöltése."
+msgid "Could not load film {} ({})"
+msgstr "Nem sikerült a film {} (%s) betöltése."
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Nem sikerült a film %1 betöltése"
+msgstr "Nem sikerült a film {} betöltése"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1101,7 +1101,7 @@ msgstr ""
 #: src/tools/dcpomatic_combiner.cc:165
 #, fuzzy
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "Befejezetlen művelet vannak, biztosan ki akarsz lépni?"
 
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 92ac14d25..4c4dfffeb 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -30,7 +30,7 @@ msgstr "%d KDM scritte in %s"
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
+msgstr "{} esiste già il file, non è possibile usarlo per un nuovo film"
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -378,12 +378,12 @@ msgstr "Impossibile caricare DCP"
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "Impossibile caricare DCP %1."
+msgstr "Impossibile caricare DCP {}."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "Impossibile caricare DCP %1."
+msgstr "Impossibile caricare DCP {}."
 
 #: src/tools/dcpomatic_player.cc:626
 #, fuzzy, c-format
@@ -391,7 +391,7 @@ msgid ""
 "Could not load DCP.\n"
 "\n"
 "%s."
-msgstr "Impossibile caricare DCP %1."
+msgstr "Impossibile caricare DCP {}."
 
 #: src/tools/dcpomatic_player.cc:814
 msgid "Could not load KDM."
@@ -404,17 +404,17 @@ msgid "Could not load a DCP from %s"
 msgstr ""
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Impossibile caricare il film %1"
+msgid "Could not load film {}"
+msgstr "Impossibile caricare il film {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Impossibile caricare il film %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Impossibile caricare il film {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Impossibile caricare il film %1"
+msgstr "Impossibile caricare il film {}"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1084,9 +1084,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
+msgstr "La cartella {} esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
@@ -1368,5 +1368,5 @@ msgstr ""
 #~ msgid "&Analyse audio"
 #~ msgstr "&Analizza audio"
 
-#~ msgid "The directory %1 already exists."
+#~ msgid "The directory {} already exists."
 #~ msgstr "La directory %s esiste gia'."
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 4fd120b6f..ec27f2bc2 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -406,12 +406,12 @@ msgid "Could not load a DCP from %s"
 msgstr "Kan DCP niet laden van %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Kan film %1 niet laden"
+msgid "Could not load film {}"
+msgstr "Kan film {} niet laden"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Kan film %1 niet laden (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Kan film {} niet laden ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, c-format
@@ -1123,9 +1123,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "De map %1 bestaat al en is niet leeg.  Wilt u deze toch gebruiken?"
+msgstr "De map {} bestaat al en is niet leeg.  Wilt u deze toch gebruiken?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/pl_PL.po b/src/tools/po/pl_PL.po
index 78d484fae..4c3a14b2c 100644
--- a/src/tools/po/pl_PL.po
+++ b/src/tools/po/pl_PL.po
@@ -32,7 +32,7 @@ msgstr "%d KDMy zapisane do %s"
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "%1 już istnieje jako plik, więc nie możesz go użyć w Nowy Film."
+msgstr "{} już istnieje jako plik, więc nie możesz go użyć w Nowy Film."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -375,12 +375,12 @@ msgstr "Nie udało się stworzyć DCP: %s."
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "Nie można załadować DCP %1."
+msgstr "Nie można załadować DCP {}."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "Nie można załadować DCP %1."
+msgstr "Nie można załadować DCP {}."
 
 #: src/tools/dcpomatic_player.cc:626
 #, c-format
@@ -404,17 +404,17 @@ msgid "Could not load a DCP from %s"
 msgstr "Nie można załadować DCP z %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Nie można załadować Projektu %1"
+msgid "Could not load film {}"
+msgstr "Nie można załadować Projektu {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Nie można załadować Projektu %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Nie można załadować Projektu {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Nie można załadować Projektu %1"
+msgstr "Nie można załadować Projektu {}"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1108,10 +1108,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Katalog %1 już istnieje i nie jest pusty. Czy jesteś pewien, że chcesz go "
+"Katalog {} już istnieje i nie jest pusty. Czy jesteś pewien, że chcesz go "
 "użyć?"
 
 #: src/tools/dcpomatic_disk.cc:293
diff --git a/src/tools/po/pt_BR.po b/src/tools/po/pt_BR.po
index 53d48f59b..d7dc5c421 100644
--- a/src/tools/po/pt_BR.po
+++ b/src/tools/po/pt_BR.po
@@ -30,7 +30,7 @@ msgstr "%d KDMs salvos em %s"
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "%1 é um arquivo já existente, você não pode usá-lo para um novo filme."
+msgstr "{} é um arquivo já existente, você não pode usá-lo para um novo filme."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -374,17 +374,17 @@ msgstr ""
 #: src/tools/dcpomatic_editor.cc:399
 #, fuzzy
 msgid "Could not load DCP"
-msgstr "Não foi possível carregar o DCP %1."
+msgstr "Não foi possível carregar o DCP {}."
 
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "Não foi possível carregar o DCP %1."
+msgstr "Não foi possível carregar o DCP {}."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "Não foi possível carregar o DCP %1."
+msgstr "Não foi possível carregar o DCP {}."
 
 #: src/tools/dcpomatic_player.cc:626
 #, fuzzy, c-format
@@ -392,7 +392,7 @@ msgid ""
 "Could not load DCP.\n"
 "\n"
 "%s."
-msgstr "Não foi possível carregar o DCP %1."
+msgstr "Não foi possível carregar o DCP {}."
 
 #: src/tools/dcpomatic_player.cc:814
 msgid "Could not load KDM."
@@ -405,17 +405,17 @@ msgid "Could not load a DCP from %s"
 msgstr ""
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Não foi possível carregar o filme %1"
+msgid "Could not load film {}"
+msgstr "Não foi possível carregar o filme {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Não conseguiu carregar o filme %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Não conseguiu carregar o filme {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Não foi possível carregar o filme %1"
+msgstr "Não foi possível carregar o filme {}"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1086,10 +1086,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"O diretório %1 já existe e não está vazio. Tem certeza de que quer usá-lo?"
+"O diretório {} já existe e não está vazio. Tem certeza de que quer usá-lo?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/pt_PT.po b/src/tools/po/pt_PT.po
index 64ab3588f..18900c2f9 100644
--- a/src/tools/po/pt_PT.po
+++ b/src/tools/po/pt_PT.po
@@ -31,7 +31,7 @@ msgstr ""
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "O ficheiro %1 já existe, não o pode usar para um novo filme."
+msgstr "O ficheiro {} já existe, não o pode usar para um novo filme."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -406,17 +406,17 @@ msgstr "Não foi possível produzir o DCP: %s"
 
 #: src/tools/dcpomatic_batch.cc:496
 #, fuzzy
-msgid "Could not load film %1"
-msgstr "Não foi possível carregar o filme %1 (%2)"
+msgid "Could not load film {}"
+msgstr "Não foi possível carregar o filme {} ({})"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Não foi possível carregar o filme %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Não foi possível carregar o filme {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Não foi possível carregar o filme %1 (%2)"
+msgstr "Não foi possível carregar o filme {} ({})"
 
 #: src/tools/dcpomatic.cc:879
 #, fuzzy
@@ -1086,10 +1086,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"O directório %1 já existe e não se encontra vazio. Tem a certeza que "
+"O directório {} já existe e não se encontra vazio. Tem a certeza que "
 "pretende utilizá-lo?"
 
 #: src/tools/dcpomatic_disk.cc:293
@@ -1359,5 +1359,5 @@ msgstr ""
 #~ msgstr "&Analyser le son"
 
 #, fuzzy
-#~ msgid "The directory %1 already exists."
+#~ msgid "The directory {} already exists."
 #~ msgstr "Le dossier %s existe déjà."
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index ea9c40fa8..828b32518 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -403,12 +403,12 @@ msgid "Could not load a DCP from %s"
 msgstr "Не удалось загрузить DCP из %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Не удалось загрузить проект %1"
+msgid "Could not load film {}"
+msgstr "Не удалось загрузить проект {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Не удалось загрузить проект %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Не удалось загрузить проект {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, c-format
@@ -1111,9 +1111,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Папка %1 уже существует и не пуста. Вы точно хотите использовать её?"
+msgstr "Папка {} уже существует и не пуста. Вы точно хотите использовать её?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/sk_SK.po b/src/tools/po/sk_SK.po
index 50ffa0c91..0fbefa36a 100644
--- a/src/tools/po/sk_SK.po
+++ b/src/tools/po/sk_SK.po
@@ -31,7 +31,7 @@ msgstr ""
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "%1 už existuje ako súbor, takže ho nemôžete použiť pre nový film."
+msgstr "{} už existuje ako súbor, takže ho nemôžete použiť pre nový film."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -406,17 +406,17 @@ msgstr "Nemôžem vytvoriť DCP: %s"
 
 #: src/tools/dcpomatic_batch.cc:496
 #, fuzzy
-msgid "Could not load film %1"
-msgstr "Nemôžem načítať film %1 (%2)"
+msgid "Could not load film {}"
+msgstr "Nemôžem načítať film {} ({})"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Nemôžem načítať film %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Nemôžem načítať film {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Nemôžem načítať film %1 (%2)"
+msgstr "Nemôžem načítať film {} ({})"
 
 #: src/tools/dcpomatic.cc:879
 #, fuzzy
@@ -1082,9 +1082,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Priečinok %1 už existuje a nie je prázdny. Chcete pokračovať ?"
+msgstr "Priečinok {} už existuje a nie je prázdny. Chcete pokračovať ?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/sl_SI.po b/src/tools/po/sl_SI.po
index 3eb609c4d..853b26dd5 100644
--- a/src/tools/po/sl_SI.po
+++ b/src/tools/po/sl_SI.po
@@ -30,7 +30,7 @@ msgstr "%d KDM-jev, zapisanih v %s"
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "%1 že obstaja kot datoteka, zato je ne morete uporabiti za DCP."
+msgstr "{} že obstaja kot datoteka, zato je ne morete uporabiti za DCP."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -373,12 +373,12 @@ msgstr "DCP-ja ni mogoče naložiti."
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "DCP-ja %1 ni bilo mogoče naložiti."
+msgstr "DCP-ja {} ni bilo mogoče naložiti."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "DCP-ja %1 ni bilo mogoče naložiti."
+msgstr "DCP-ja {} ni bilo mogoče naložiti."
 
 #: src/tools/dcpomatic_player.cc:626
 #, c-format
@@ -402,17 +402,17 @@ msgid "Could not load a DCP from %s"
 msgstr "DCP-ja ni bilo mogoče naložiti iz %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Filma %1 ni bilo mogoče naložiti"
+msgid "Could not load film {}"
+msgstr "Filma {} ni bilo mogoče naložiti"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Filma %1 (%2) ni bilo mogoče naložiti"
+msgid "Could not load film {} ({})"
+msgstr "Filma {} ({}) ni bilo mogoče naložiti"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Filma %1 ni bilo mogoče naložiti"
+msgstr "Filma {} ni bilo mogoče naložiti"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1119,10 +1119,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Mapa %1 že obstaja in ni prazna; ali ste prepričani, da jo želite uporabiti?"
+"Mapa {} že obstaja in ni prazna; ali ste prepričani, da jo želite uporabiti?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index da5819c61..de58df339 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -30,7 +30,7 @@ msgstr "%d KDM:er skrivna till %s"
 #: src/tools/dcpomatic_combiner.cc:175
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
-msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
+msgstr "{} finns redan som fil, så du kan inte använda den för en ny film."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
 #: src/tools/dcpomatic_player.cc:1391
@@ -372,12 +372,12 @@ msgstr "Kunde inte ladda DCP"
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "Kunde inte ladda DCP %1."
+msgstr "Kunde inte ladda DCP {}."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "Kunde inte ladda DCP %1."
+msgstr "Kunde inte ladda DCP {}."
 
 #: src/tools/dcpomatic_player.cc:626
 #, c-format
@@ -401,17 +401,17 @@ msgid "Could not load a DCP from %s"
 msgstr "Kunde inte ladda DCP från %s"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Kunde inte ladda film %1"
+msgid "Could not load film {}"
+msgstr "Kunde inte ladda film {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Kunde inte ladda film %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Kunde inte ladda film {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Kunde inte ladda film %1"
+msgstr "Kunde inte ladda film {}"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1110,10 +1110,10 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
-"Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
+"Foldern {} finns redan och är inte tom. Är du säker på att du vill använda "
 "den?"
 
 #: src/tools/dcpomatic_disk.cc:293
@@ -1407,5 +1407,5 @@ msgstr "Du har inte valt en mapp. Välj en mapp innan du klickar på öppna."
 #~ msgid "&Analyse audio"
 #~ msgstr "&Analysera audio"
 
-#~ msgid "The directory %1 already exists."
-#~ msgstr "Katalogen %1 finns redan."
+#~ msgid "The directory {} already exists."
+#~ msgstr "Katalogen {} finns redan."
diff --git a/src/tools/po/tr_TR.po b/src/tools/po/tr_TR.po
index 47a6809ab..ba8610e14 100644
--- a/src/tools/po/tr_TR.po
+++ b/src/tools/po/tr_TR.po
@@ -390,11 +390,11 @@ msgid "Could not load a DCP from %s"
 msgstr ""
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
+msgid "Could not load film {}"
 msgstr ""
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
+msgid "Could not load film {} ({})"
 msgstr ""
 
 #: src/tools/dcpomatic_player.cc:1376
@@ -1054,7 +1054,7 @@ msgstr ""
 #: src/tools/dcpomatic_combiner.cc:165
 #, fuzzy
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "Bitmemiş görevler var, çıkmak istediğinize emin misiniz?"
 
diff --git a/src/tools/po/uk_UA.po b/src/tools/po/uk_UA.po
index aaaea2cb6..ab1f07f71 100644
--- a/src/tools/po/uk_UA.po
+++ b/src/tools/po/uk_UA.po
@@ -29,7 +29,7 @@ msgstr "%d KDM-ключі записані в %s"
 #, fuzzy, c-format
 msgid "%s already exists as a file, so you cannot use it for a DCP."
 msgstr ""
-"%1 вже існує як файл, тому ви не можете використовувати його для нового "
+"{} вже існує як файл, тому ви не можете використовувати його для нового "
 "проекту."
 
 #: src/tools/dcpomatic_disk.cc:507 src/tools/dcpomatic_kdm.cc:945
@@ -378,12 +378,12 @@ msgstr "Не вдалося завантажити DCP"
 #: src/tools/dcpomatic_player.cc:1368
 #, fuzzy, c-format
 msgid "Could not load DCP %s"
-msgstr "Не вдалося завантажити DCP %1."
+msgstr "Не вдалося завантажити DCP {}."
 
 #: src/tools/dcpomatic_player.cc:866
 #, fuzzy, c-format
 msgid "Could not load DCP %s."
-msgstr "Не вдалося завантажити DCP %1."
+msgstr "Не вдалося завантажити DCP {}."
 
 #: src/tools/dcpomatic_player.cc:626
 #, fuzzy, c-format
@@ -391,7 +391,7 @@ msgid ""
 "Could not load DCP.\n"
 "\n"
 "%s."
-msgstr "Не вдалося завантажити DCP %1."
+msgstr "Не вдалося завантажити DCP {}."
 
 #: src/tools/dcpomatic_player.cc:814
 msgid "Could not load KDM."
@@ -404,17 +404,17 @@ msgid "Could not load a DCP from %s"
 msgstr ""
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "Не вдалося завантажити проект %1"
+msgid "Could not load film {}"
+msgstr "Не вдалося завантажити проект {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "Не вдалося завантажити проект %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "Не вдалося завантажити проект {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, fuzzy, c-format
 msgid "Could not load stress test file %s"
-msgstr "Не вдалося завантажити проект %1"
+msgstr "Не вдалося завантажити проект {}"
 
 #: src/tools/dcpomatic.cc:879
 msgid "Could not make DCP."
@@ -1081,9 +1081,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "Папка %1 вже існує і не пуста. Ви точно хочете використовувати її?"
+msgstr "Папка {} вже існує і не пуста. Ви точно хочете використовувати її?"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index e3fddf6ec..b9cd4b336 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -405,12 +405,12 @@ msgid "Could not load a DCP from %s"
 msgstr "无法从 %s 载入DCP"
 
 #: src/tools/dcpomatic_batch.cc:496
-msgid "Could not load film %1"
-msgstr "无法加载工程 %1"
+msgid "Could not load film {}"
+msgstr "无法加载工程 {}"
 
 #: src/tools/dcpomatic.cc:1735
-msgid "Could not load film %1 (%2)"
-msgstr "无法加载工程 %1 (%2)"
+msgid "Could not load film {} ({})"
+msgstr "无法加载工程 {} ({})"
 
 #: src/tools/dcpomatic_player.cc:1376
 #, c-format
@@ -1083,9 +1083,9 @@ msgstr ""
 
 #: src/tools/dcpomatic_combiner.cc:165
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
+"The directory {} already exists and is not empty.  Are you sure you want to "
 "use it?"
-msgstr "目录 %1 已经存在且不为空。确定要使用它？"
+msgstr "目录 {} 已经存在且不为空。确定要使用它？"
 
 #: src/tools/dcpomatic_disk.cc:293
 msgid "The disk you selected is no longer available.  Please choose another."
@@ -1456,5 +1456,5 @@ msgstr "您没有选择文件夹。请确保您单击打开之前，选择一个
 #~ msgstr "&Analizar audio"
 
 #, fuzzy
-#~ msgid "The directory %1 already exists."
+#~ msgid "The directory {} already exists."
 #~ msgstr "La carpeta %s ya existe."