Merge remote-tracking branch 'origin/main' into v2.17.x

21 files changed, 78 insertions, 78 deletions

diff --git a/src/wx/po/cs_CZ.po b/src/wx/po/cs_CZ.po
index d618046d6..13007ca97 100644
--- a/src/wx/po/cs_CZ.po
+++ b/src/wx/po/cs_CZ.po
@@ -2952,8 +2952,8 @@ msgid "Split by video content"
 msgstr "Rozdělení podle obsahu videa"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Stabilní verze "
+msgid "Stable version %s"
+msgstr "Stabilní verze %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3083,8 +3083,8 @@ msgid "Test email sent."
 msgstr "Testovací e-mail odeslán."
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Testovací verze "
+msgid "Test version %s"
+msgstr "Testovací verze %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index 0d70311ca..3e4b44785 100644
--- a/src/wx/po/da_DK.po
+++ b/src/wx/po/da_DK.po
@@ -3011,8 +3011,8 @@ msgid "Split by video content"
 msgstr "Opdel efter video indhold"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Stabil version "
+msgid "Stable version %s"
+msgstr "Stabil version %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3152,8 +3152,8 @@ msgid "Test email sent."
 msgstr "Debug: afsendelse af e-mail"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Testversion "
+msgid "Test version %s"
+msgstr "Testversion %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index ce8cd20eb..283710124 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -3096,8 +3096,8 @@ msgid "Split by video content"
 msgstr "An Inhaltsgrenzen aufteilen"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Stabile Version"
+msgid "Stable version %s"
+msgstr "Stabile Version %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3237,8 +3237,8 @@ msgid "Test email sent."
 msgstr "Debug: Emailversand"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Test Version"
+msgid "Test version %s"
+msgstr "Test Version %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 976a384fb..c15997078 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -3040,8 +3040,8 @@ msgid "Split by video content"
 msgstr "Dividir por contenido"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Versión estable "
+msgid "Stable version %s"
+msgstr "Versión estable %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3182,8 +3182,8 @@ msgid "Test email sent."
 msgstr "Depurar: envío de correo"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Versión de prueba "
+msgid "Test version %s"
+msgstr "Versión de prueba %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/fa_IR.po b/src/wx/po/fa_IR.po
index 7a3ec4e50..b85b88ea2 100644
--- a/src/wx/po/fa_IR.po
+++ b/src/wx/po/fa_IR.po
@@ -2945,8 +2945,8 @@ msgid "Split by video content"
 msgstr "تقسیم بر اساس محتوای ویدیو"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "نسخه پایدار "
+msgid "Stable version %s"
+msgstr "نسخه پایدار %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3076,8 +3076,8 @@ msgid "Test email sent."
 msgstr "ایمیل آزمایشی ارسال شد."
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "نسخه آزمایشی "
+msgid "Test version %s"
+msgstr "نسخه آزمایشی %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 0fc1e434d..df1f90e26 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -2994,8 +2994,8 @@ msgid "Split by video content"
 msgstr "Séparer par contenu vidéo"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Version stable "
+msgid "Stable version %s"
+msgstr "Version stable %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3128,8 +3128,8 @@ msgid "Test email sent."
 msgstr "L'email de test a été envoyé."
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Version de test "
+msgid "Test version %s"
+msgstr "Version de test %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/hu_HU.po b/src/wx/po/hu_HU.po
index 96fc49c2a..598d0c342 100644
--- a/src/wx/po/hu_HU.po
+++ b/src/wx/po/hu_HU.po
@@ -2886,7 +2886,7 @@ msgid "Split by video content"
 msgstr ""
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
+msgid "Stable version %s"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
@@ -3017,7 +3017,7 @@ msgid "Test email sent."
 msgstr ""
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
+msgid "Test version %s"
 msgstr ""
 
 #: src/wx/about_dialog.cc:237
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index c47347af3..31b0027d0 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -3020,8 +3020,8 @@ msgid "Split by video content"
 msgstr "Dividi per contenuto video"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Versione stabile "
+msgid "Stable version %s"
+msgstr "Versione stabile %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3162,8 +3162,8 @@ msgid "Test email sent."
 msgstr "Debug: invio email"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Versione di test "
+msgid "Test version %s"
+msgstr "Versione di test %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/ka_KA.po b/src/wx/po/ka_KA.po
index 5b2d862ae..09344261e 100644
--- a/src/wx/po/ka_KA.po
+++ b/src/wx/po/ka_KA.po
@@ -2886,7 +2886,7 @@ msgid "Split by video content"
 msgstr ""
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
+msgid "Stable version %s"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
@@ -3017,7 +3017,7 @@ msgid "Test email sent."
 msgstr ""
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
+msgid "Test version %s"
 msgstr ""
 
 #: src/wx/about_dialog.cc:237
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index b6c9a3ad6..ad0a7dc28 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -2970,8 +2970,8 @@ msgid "Split by video content"
 msgstr "Splits per video-content"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Stabiele versie "
+msgid "Stable version %s"
+msgstr "Stabiele versie %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3101,8 +3101,8 @@ msgid "Test email sent."
 msgstr "Test e-mail verzonden."
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Test-versie "
+msgid "Test version %s"
+msgstr "Test-versie %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index b3d403b05..8f1e1b72a 100644
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -3005,8 +3005,8 @@ msgid "Split by video content"
 msgstr "Podziel zgodnie z zawartością"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Wersja stabilna "
+msgid "Stable version %s"
+msgstr "Wersja stabilna %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3141,8 +3141,8 @@ msgid "Test email sent."
 msgstr "Debug: wysyłanie emaili"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Wersja testowa "
+msgid "Test version %s"
+msgstr "Wersja testowa %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/pt_BR.po b/src/wx/po/pt_BR.po
index 85460ac47..769445817 100644
--- a/src/wx/po/pt_BR.po
+++ b/src/wx/po/pt_BR.po
@@ -3035,8 +3035,8 @@ msgid "Split by video content"
 msgstr "Dividir por arquivo de vídeo"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Versão estável "
+msgid "Stable version %s"
+msgstr "Versão estável %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3179,8 +3179,8 @@ msgid "Test email sent."
 msgstr "Debug: envio de email"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Versão de teste "
+msgid "Test version %s"
+msgstr "Versão de teste %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/pt_PT.po b/src/wx/po/pt_PT.po
index 8f34422e0..dd67798fd 100644
--- a/src/wx/po/pt_PT.po
+++ b/src/wx/po/pt_PT.po
@@ -3055,8 +3055,8 @@ msgid "Split by video content"
 msgstr "Dividir por conteúdo de vídeo"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Versão estável"
+msgid "Stable version %s"
+msgstr "Versão estável %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3197,8 +3197,8 @@ msgid "Test email sent."
 msgstr "Depuração: envio de email"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Versão de teste"
+msgid "Test version %s"
+msgstr "Versão de teste %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index b1974bbbd..ba35dd965 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -2996,8 +2996,8 @@ msgid "Split by video content"
 msgstr "Разделять по видеоконтенту"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Стабильная версия "
+msgid "Stable version %s"
+msgstr "Стабильная версия %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3134,8 +3134,8 @@ msgid "Test email sent."
 msgstr "Отладка: отправка email"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Тестовая версия "
+msgid "Test version %s"
+msgstr "Тестовая версия %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/sk_SK.po b/src/wx/po/sk_SK.po
index b90e1522b..e674aea9a 100644
--- a/src/wx/po/sk_SK.po
+++ b/src/wx/po/sk_SK.po
@@ -3060,8 +3060,8 @@ msgid "Split by video content"
 msgstr "Rozdelenie podľa obsahu videa"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Stabilná verzia"
+msgid "Stable version %s"
+msgstr "Stabilná verzia %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3202,8 +3202,8 @@ msgid "Test email sent."
 msgstr "Ladenie: odosielanie emailu"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Test verzia"
+msgid "Test version %s"
+msgstr "Test verzia %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/sl_SI.po b/src/wx/po/sl_SI.po
index 8d33dae69..d63745dce 100644
--- a/src/wx/po/sl_SI.po
+++ b/src/wx/po/sl_SI.po
@@ -2954,8 +2954,8 @@ msgid "Split by video content"
 msgstr "Razdeli po video vsebini"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Stabilna različica "
+msgid "Stable version %s"
+msgstr "Stabilna različica %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3085,8 +3085,8 @@ msgid "Test email sent."
 msgstr "Poskusno e-sporočilo poslano."
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Preskusna različica "
+msgid "Test version %s"
+msgstr "Preskusna različica %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 16984708b..a866fd802 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -2997,8 +2997,8 @@ msgid "Split by video content"
 msgstr "Dela i akter baserat på källmaterial för bild"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Stabil version "
+msgid "Stable version %s"
+msgstr "Stabil version %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3133,8 +3133,8 @@ msgid "Test email sent."
 msgstr "Debug: epost skickas"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Testversion "
+msgid "Test version %s"
+msgstr "Testversion %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/tr_TR.po b/src/wx/po/tr_TR.po
index 5b2d862ae..09344261e 100644
--- a/src/wx/po/tr_TR.po
+++ b/src/wx/po/tr_TR.po
@@ -2886,7 +2886,7 @@ msgid "Split by video content"
 msgstr ""
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
+msgid "Stable version %s"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
@@ -3017,7 +3017,7 @@ msgid "Test email sent."
 msgstr ""
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
+msgid "Test version %s"
 msgstr ""
 
 #: src/wx/about_dialog.cc:237
diff --git a/src/wx/po/uk_UA.po b/src/wx/po/uk_UA.po
index efde30cf9..a58400747 100644
--- a/src/wx/po/uk_UA.po
+++ b/src/wx/po/uk_UA.po
@@ -3031,8 +3031,8 @@ msgid "Split by video content"
 msgstr "Розділяти по відео-контенту"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "Стабільна версія"
+msgid "Stable version %s"
+msgstr "Стабільна версія %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3173,8 +3173,8 @@ msgid "Test email sent."
 msgstr "Відладка: відправка email"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "Тестова версія"
+msgid "Test version %s"
+msgstr "Тестова версія %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index f37cbe633..d9990c156 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -2950,8 +2950,8 @@ msgid "Split by video content"
 msgstr "根据视频内容进行分割"
 
 #: src/wx/update_dialog.cc:53
-msgid "Stable version "
-msgstr "稳定版 "
+msgid "Stable version %s"
+msgstr "稳定版 %s"
 
 #: src/wx/dcp_panel.cc:120 src/wx/metadata_dialog.cc:78
 #: src/wx/rating_dialog.cc:50
@@ -3082,8 +3082,8 @@ msgid "Test email sent."
 msgstr "测试邮件已发送。"
 
 #: src/wx/update_dialog.cc:59
-msgid "Test version "
-msgstr "测试版 "
+msgid "Test version %s"
+msgstr "测试版 %s"
 
 #: src/wx/about_dialog.cc:237
 msgid "Tested by"
diff --git a/src/wx/update_dialog.cc b/src/wx/update_dialog.cc
index 0c8a55f8e..4552628d6 100644
--- a/src/wx/update_dialog.cc
+++ b/src/wx/update_dialog.cc
@@ -51,14 +51,14 @@ UpdateDialog::UpdateDialog (wxWindow* parent, optional<string> stable, optional<
 	auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
 	if (stable) {
-		add_label_to_sizer (table, this, _("Stable version ") + std_to_wx(stable.get()), true, 0, wxALIGN_CENTER_VERTICAL);
-		auto h = new wxHyperlinkCtrl(this, wxID_ANY, char_to_wx("dcpomatic.com/download"), char_to_wx("https://dcpomatic.com/download"));
+		add_label_to_sizer(table, this, wxString::Format(_("Stable version %s"), std_to_wx(stable.get())), true, 0, wxALIGN_CENTER_VERTICAL);
+		auto h = new wxHyperlinkCtrl (this, wxID_ANY, char_to_wx("dcpomatic.com/download"), char_to_wx("https://dcpomatic.com/download"));
 		table->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_DIALOG_BORDER);
 	}
 
 	if (test) {
-		add_label_to_sizer (table, this, _("Test version ") + std_to_wx(test.get()), true, 0, wxALIGN_CENTER_VERTICAL);
-		auto h = new wxHyperlinkCtrl(this, wxID_ANY, char_to_wx("dcpomatic.com/test-download"), char_to_wx("https://dcpomatic.com/test-download"));
+		add_label_to_sizer(table, this, wxString::Format(_("Test version %s"), std_to_wx(test.get())), true, 0, wxALIGN_CENTER_VERTICAL);
+		auto h = new wxHyperlinkCtrl (this, wxID_ANY, char_to_wx("dcpomatic.com/test-download"), char_to_wx("https://dcpomatic.com/test-download"));
 		table->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_DIALOG_BORDER);
 	}