From 6199a00bbda47d96b34d28f965711fcf57516cdd Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Mon, 30 Jun 2025 14:56:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Use=20U+00D7=20=C3=97=20to=20display=20mult?= =?UTF-8?q?iplication=20on=20UI...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...instead of lowercase letter x --- po/aegisub.pot | 8 ++------ po/ar.po | 12 ++++-------- po/be.po | 12 ++++-------- po/bg.po | 12 ++++-------- po/ca.po | 12 ++++-------- po/cs.po | 12 ++++-------- po/da.po | 12 ++++-------- po/de.po | 12 ++++-------- po/el.po | 12 ++++-------- po/es.po | 12 ++++-------- po/eu.po | 12 ++++-------- po/fa.po | 12 ++++-------- po/fi.po | 8 ++------ po/fr_FR.po | 12 ++++-------- po/gl.po | 12 ++++-------- po/hu.po | 12 ++++-------- po/id.po | 12 ++++-------- po/it.po | 12 ++++-------- po/ja.po | 12 ++++-------- po/ko.po | 12 ++++-------- po/nl.po | 12 ++++-------- po/pl.po | 12 ++++-------- po/pt_BR.po | 12 ++++-------- po/pt_PT.po | 12 ++++-------- po/ru.po | 12 ++++-------- po/sr_RS.po | 12 ++++-------- po/sr_RS@latin.po | 12 ++++-------- po/tr.po | 12 ++++-------- po/uk_UA.po | 12 ++++-------- po/vi.po | 12 ++++-------- po/zh_CN.po | 8 ++------ po/zh_TW.po | 8 ++------ src/dialog_dummy_video.cpp | 26 +++++++++++++------------- src/dialog_properties.cpp | 2 +- src/dialog_resample.cpp | 4 ++-- src/dialog_video_properties.cpp | 2 +- 36 files changed, 137 insertions(+), 265 deletions(-) diff --git a/po/aegisub.pot b/po/aegisub.pot index 74db332fda..d1a2468f01 100644 --- a/po/aegisub.pot +++ b/po/aegisub.pot @@ -3512,10 +3512,6 @@ msgstr "" msgid "Margin offset" msgstr "" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4662,8 +4658,8 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" diff --git a/po/ar.po b/po/ar.po index 7224182e02..e46273d3e9 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3543,10 +3543,6 @@ msgstr "" msgid "Margin offset" msgstr "هوامش الإزاحة" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "س" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4728,15 +4724,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "دقة الفيديو المحمّل ودقة الترجمات لا تتطابق.\n" "\n" -"دقة الفيديو:\t%d x %d\n" -"دقة السكرِبت:\t%d x %d\n" +"دقة الفيديو:\t%d × %d\n" +"دقة السكرِبت:\t%d × %d\n" "\n" "تغيير دقة الترجمات لتطابق الفيديو؟" diff --git a/po/be.po b/po/be.po index 454859221f..99ca2aa97f 100644 --- a/po/be.po +++ b/po/be.po @@ -3608,10 +3608,6 @@ msgstr "Апрацоўка суадносін бакоў" msgid "Margin offset" msgstr "Змяшчэнне межаў" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Матрыца YCbCr:" @@ -4801,15 +4797,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Разрозненне загружанага відэа і разрозненне субтытраў не супадаюць.\n" "\n" -"Разрозненне відэа:\t%d x %d\n" -"Разрозненне субтытраў :\t%d x %d\n" +"Разрозненне відэа:\t%d × %d\n" +"Разрозненне субтытраў :\t%d × %d\n" "\n" "Змяніць разрозненне субтытраў на разрозненне відэа?" diff --git a/po/bg.po b/po/bg.po index 1a1e5d8b47..9c3ea5210c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3595,10 +3595,6 @@ msgstr "Съотношение на страните" msgid "Margin offset" msgstr "Преместване на границите на работната област" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Матрица:" @@ -4782,15 +4778,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Резолюцията на зареденото видео не съвпада с резолюцията на скрипта.\n" "\n" -"Резолюция на видеото:\t%d x %d\n" -"Резолюция на скрипта:\t%d x %d\n" +"Резолюция на видеото:\t%d × %d\n" +"Резолюция на скрипта:\t%d × %d\n" "\n" "Да променя ли резолюцията на субтитрите като резолюцията на видеото?" diff --git a/po/ca.po b/po/ca.po index 92b9ebc928..e92635ec20 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3639,10 +3639,6 @@ msgstr "Gestió de la relació d’aspecte" msgid "Margin offset" msgstr "Compensació del marge" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matriu YCbCr:" @@ -4831,16 +4827,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "La resolució del vídeo carregat i la resolució especificada als subtítols no " "coincideixen.\n" "\n" -"Resolució del vídeo: %d x %d\n" -"Resolució de l’script: %d x %d\n" +"Resolució del vídeo: %d × %d\n" +"Resolució de l’script: %d × %d\n" "\n" "Voleu canviar la resolució dels subtítols perquè coincideixi amb la del " "vídeo?" diff --git a/po/cs.po b/po/cs.po index 5c88d4ecdf..e07f758699 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3564,10 +3564,6 @@ msgstr "" msgid "Margin offset" msgstr "Offset okraje" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4757,15 +4753,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Rozlišení načteného videa neodpovídá zvolenému rozlišení titulků.\n" "\n" -"Rozlišení videa:\t%d x %d\n" -"Rozlišení skriptu:\t%d x %d\n" +"Rozlišení videa:\t%d × %d\n" +"Rozlišení skriptu:\t%d × %d\n" "\n" "Přejete si změnit rozlišení titulků, aby odpovídalo videu?" diff --git a/po/da.po b/po/da.po index d40c03bc14..7d46f83b72 100644 --- a/po/da.po +++ b/po/da.po @@ -3536,10 +3536,6 @@ msgstr "" msgid "Margin offset" msgstr "Margin" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "×" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4712,16 +4708,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Opløsningen på den indlæste video og underteksternes opløsning stemmer ikke " "overens.\n" "\n" -"Video opløsning:\t%d x %d\n" -"Undertekstopløsning:\t%d x %d\n" +"Video opløsning:\t%d × %d\n" +"Undertekstopløsning:\t%d × %d\n" "\n" "Vil du ændre underteksternes opløsning til at stemme med videoen?" diff --git a/po/de.po b/po/de.po index 016183ea6e..3e473ce10b 100644 --- a/po/de.po +++ b/po/de.po @@ -3616,10 +3616,6 @@ msgstr "Seitenverhältnisanpassung" msgid "Margin offset" msgstr "Ränderversatz" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Farbmatrix:" @@ -4807,16 +4803,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Die Auflösung des geladenen Videos und die im Skript angegebene " "Untertitelauflösung stimmen nicht überein.\n" "\n" -"Videoauflösung:\t%d x %d\n" -"Untertitelauflösung:\t%d x %d\n" +"Videoauflösung:\t%d × %d\n" +"Untertitelauflösung:\t%d × %d\n" "\n" "Untertitel-Auflösung anpassen, sodaß sie zum Video passt?" diff --git a/po/el.po b/po/el.po index c4f63036a2..0593e05ac3 100644 --- a/po/el.po +++ b/po/el.po @@ -3647,10 +3647,6 @@ msgstr "" msgid "Margin offset" msgstr "Offset περιθωρίου" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4844,16 +4840,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Η ανάλυση του φορτωμένου βίντεο και η ανάλυση που έχει καθοριστεί για τους " "υπότιτλους δεν ταιριάζουν.\n" "\n" -"Ανάλυση του βίντεο:\t%d x %d\n" -"Ανάλυση του script:\t%d x %d\n" +"Ανάλυση του βίντεο:\t%d × %d\n" +"Ανάλυση του script:\t%d × %d\n" "\n" "Επιθυμείτε αλλαγή της ανάλυσης των υποτίτλων σε αυτήν του βίντεο;" diff --git a/po/es.po b/po/es.po index 7b5b0557aa..37ee3533b7 100644 --- a/po/es.po +++ b/po/es.po @@ -3650,10 +3650,6 @@ msgstr "Manejo de relación de aspecto" msgid "Margin offset" msgstr "Desplazamiento de margen" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matriz YCbCr:" @@ -4844,16 +4840,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "La resolución del video cargado y la resolución especificada para los " "subtítulos no coinciden.\n" "\n" -"Resolución del video:\t%d x %d\n" -"Resolución de la secuencia:\t%d x %d\n" +"Resolución del video:\t%d × %d\n" +"Resolución de la secuencia:\t%d × %d\n" "\n" "¿Cambiar la resolución de los subtítulos para coincidir con la del video?" diff --git a/po/eu.po b/po/eu.po index cc6f61c90c..275eb4a43c 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3607,10 +3607,6 @@ msgstr "Ikuspegi Maila Kudeaketa" msgid "Margin offset" msgstr "Bazter oreka" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Matrizea:" @@ -4797,16 +4793,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Gertaturiko bideoaren eta adierazitako azpidatziaren bereizmena ez datoz " "bat.\n" "\n" -"Bideo bereizmena:\t%d x %d\n" -"Eskript bereizmena:\t%d x %d\n" +"Bideo bereizmena:\t%d × %d\n" +"Eskript bereizmena:\t%d × %d\n" "\n" "Aldatu azpidatziaren bereizmena bideoarenera?" diff --git a/po/fa.po b/po/fa.po index 551edd344d..dba01c4858 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3520,10 +3520,6 @@ msgstr "" msgid "Margin offset" msgstr "جایجایی حاشیه" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4685,15 +4681,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "ابعاد تصویر ویدیو با ابعادی که شما مشخص کرده اید همخوانی ندارد\n" "\n" -"ابعاد ویدیو :\t%d x %d\n" -"ابعاد اسکرییپت :\t%d x %d\n" +"ابعاد ویدیو :\t%d × %d\n" +"ابعاد اسکرییپت :\t%d × %d\n" "\n" "آیا مایلید که ابعاد زیرنویس به تناسب ویدیو تغییر کند؟ " diff --git a/po/fi.po b/po/fi.po index f8661186ad..39d822af54 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3626,10 +3626,6 @@ msgstr "Kuvasuhteen käsittely" msgid "Margin offset" msgstr "Reunuksen siirtymä" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "×" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr-matriisi:" @@ -4844,8 +4840,8 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index 281efaddd4..9903c66b47 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -3640,10 +3640,6 @@ msgstr "Gestion du rapport de forme" msgid "Margin offset" msgstr "Décalage marge" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matrice YCbCr :" @@ -4828,15 +4824,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "La définition de la vidéo chargée et des sous-titres ne correspondent pas.\n" "\n" -"Définition vidéo : \t%d x %d\n" -"Définition script : \t%d x %d\n" +"Définition vidéo : \t%d × %d\n" +"Définition script : \t%d × %d\n" "\n" "Changer la définition des sous-titres pour correspondre à la vidéo ?" diff --git a/po/gl.po b/po/gl.po index 9bb085afe2..9daf29e1c1 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3573,10 +3573,6 @@ msgstr "" msgid "Margin offset" msgstr "Desprazamento de marxe" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4764,15 +4760,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "A resolución do vídeo cargado e a resolución especificada para os subtítulos " "non coinciden.\n" -"Resolución do vídeo:\t%d x %d\n" -"Resolución do documento:\t%d x %d\n" +"Resolución do vídeo:\t%d × %d\n" +"Resolución do documento:\t%d × %d\n" "\n" "Cambiar a resolución dos subtítulos para coincidir coa do vídeo?" diff --git a/po/hu.po b/po/hu.po index 492d670b0b..a22ec89707 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3590,10 +3590,6 @@ msgstr "Képarány kezelése" msgid "Margin offset" msgstr "Margó eltolás" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr mátrix:" @@ -4772,15 +4768,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "A felirat- és a videofájl felbontása nem egyezik.\n" "\n" -"Videó felbontása: \t%d x %d\n" -"Felirat felbontása: \t%d x %d\n" +"Videó felbontása: \t%d × %d\n" +"Felirat felbontása: \t%d × %d\n" "\n" "Megváltoztatja a felirat felbontását, hogy az egyezzen a videóval?" diff --git a/po/id.po b/po/id.po index cffea55097..9ab4ba6fa2 100644 --- a/po/id.po +++ b/po/id.po @@ -3591,10 +3591,6 @@ msgstr "Pengendali Asperk Rasio" msgid "Margin offset" msgstr "Imbangi penjajaran" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Matrix:" @@ -4775,15 +4771,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Resolusi video dan resolusi dari takarir tidak cocok.\n" "\n" -"Resolusi Video: \t%d x %d\n" -"Resolusi Skrip: \t%d x %d\n" +"Resolusi Video: \t%d × %d\n" +"Resolusi Skrip: \t%d × %d\n" "\n" "Ubah resolusi skrip sesuai dengan resolusi video?" diff --git a/po/it.po b/po/it.po index f66c75d331..ddeae147b5 100644 --- a/po/it.po +++ b/po/it.po @@ -3572,10 +3572,6 @@ msgstr "" msgid "Margin offset" msgstr "Margine offset" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4762,16 +4758,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "La risoluzione del video caricato e la risoluzione specificata per i " "sottotitoli non corrispondono.\n" "\n" -"Risoluzione video:\t%d x%d\n" -"Risoluzione script:\t%d x%d\n" +"Risoluzione video:\t%d × %d\n" +"Risoluzione script:\t%d × %d\n" "\n" "Eguagliare la risoluzione dei sottotitoli a quella del video?" diff --git a/po/ja.po b/po/ja.po index 19589bdb4b..5f3e18e40f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3532,10 +3532,6 @@ msgstr "" msgid "Margin offset" msgstr "余白の設定" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4707,15 +4703,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "読み込まれた動画の解像度と字幕ファイルに記述された解像度が違います\n" "\n" -"動画ファイルから取得された解像度 :\t%d x %d\n" -"字幕ファイルに記述されてる解像度 :\t%d x %d\n" +"動画ファイルから取得された解像度 :\t%d × %d\n" +"字幕ファイルに記述されてる解像度 :\t%d × %d\n" "\n" "字幕ファイルの解像度を、動画ファイルから取得された解像度に置き換えますか?" diff --git a/po/ko.po b/po/ko.po index ee8f052d45..020ca5809b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3523,10 +3523,6 @@ msgstr "" msgid "Margin offset" msgstr "여백 설정" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4686,15 +4682,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "지정된 자막과 로드된 비디오의 해상도가 일치 하지 않습니다.\n" "\n" -"비디오 해상도:\t%d x %d\n" -"스크립트 해상도::\t%d x %d\n" +"비디오 해상도:\t%d × %d\n" +"스크립트 해상도::\t%d × %d\n" "\n" "비디오에 맞게 자막 해상도 바꾸시겠습니까?" diff --git a/po/nl.po b/po/nl.po index 47fd14c038..d2a6dd2c41 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3587,10 +3587,6 @@ msgstr "" msgid "Margin offset" msgstr "Marge-offset" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4783,16 +4779,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "De resolutie van de geladen video en de resolutie opgegeven voor de " "ondertitels komen niet overeen.\n" "\n" -"Videoresolutie:\t%d x %d\n" -"Scriptresolutie:\t%d x %d\n" +"Videoresolutie:\t%d × %d\n" +"Scriptresolutie:\t%d × %d\n" "\n" "Resolutie van ondertitels aanpassen zodat ze overeenkomt met die van de " "video?" diff --git a/po/pl.po b/po/pl.po index 120e643cd0..9cbd8b096b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3527,10 +3527,6 @@ msgstr "" msgid "Margin offset" msgstr "Wyrównanie marginesu" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4696,15 +4692,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Wczytane wideo ma inną rozdzielczość niż ta podana we właściwościach pliku.\n" "\n" -"Rozdzielczość wideo:\t%d x %d\n" -"Rozdzielczość skryptu:\t%d x %d\n" +"Rozdzielczość wideo:\t%d × %d\n" +"Rozdzielczość skryptu:\t%d × %d\n" "\n" "Czy chcesz zmienić rozdzielczość we właściwościach na tą z wideo?" diff --git a/po/pt_BR.po b/po/pt_BR.po index e1654d8573..04a5fcbda5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3634,10 +3634,6 @@ msgstr "Manipulação de Proporção de Imagem" msgid "Margin offset" msgstr "Deslocamento de margens" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matriz YCbCr:" @@ -4824,15 +4820,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "A resolução do vídeo e a das legendas não coincidem.\n" "\n" -"Resolução do vídeo:\t%d x %d\n" -"Resolução do script:\t%d x %d\n" +"Resolução do vídeo:\t%d × %d\n" +"Resolução do script:\t%d × %d\n" "\n" "Deseja ajustar a resolução das legendas para coincidir com a do vídeo?" diff --git a/po/pt_PT.po b/po/pt_PT.po index 1eebd19593..ff2d8e3e17 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -3631,10 +3631,6 @@ msgstr "" msgid "Margin offset" msgstr "Deslocamento de margens" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4821,16 +4817,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "A resolução do vídeo carregado e a resolução especificada nas legendas não " "coincidem.\n" "\n" -"Resolução do vídeo:\t%d x %d\n" -"Resolução do documento:\t%d x %d\n" +"Resolução do vídeo:\t%d × %d\n" +"Resolução do documento:\t%d × %d\n" "\n" "Mudar a resolução das legendas para coincidir com o vídeo?" diff --git a/po/ru.po b/po/ru.po index c1c8017ef3..a2eb9f4be2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3563,10 +3563,6 @@ msgstr "" msgid "Margin offset" msgstr "Cмещение границ рабочей области" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4752,15 +4748,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Разрешение загруженного видео и разрешение скрипта не совпадают.\n" "\n" -"Разрешение видео:\t%d x %d\n" -"Разрешение скрипта:\t%d x %d\n" +"Разрешение видео:\t%d × %d\n" +"Разрешение скрипта:\t%d × %d\n" "\n" "Изменить разрешение субтитров на разрешение видео?" diff --git a/po/sr_RS.po b/po/sr_RS.po index f2fbb93045..a0bc81adea 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -3560,10 +3560,6 @@ msgstr "" msgid "Margin offset" msgstr "Маргине" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "×" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4740,15 +4736,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Резолуција снимка и резолуција одређена за титл се не поклапају.\n" "\n" -"Видео: \t%d x %d\n" -"Скрипт: \t%d x %d\n" +"Видео: \t%d × %d\n" +"Скрипт: \t%d × %d\n" "\n" "Променити резолуцију титла тако да се поклапа са снимком?" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 26da2507ca..e89b2f5f42 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -3560,10 +3560,6 @@ msgstr "" msgid "Margin offset" msgstr "Margine" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "×" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" @@ -4740,15 +4736,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Rezolucija snimka i rezolucija određena za titl se ne poklapaju.\n" "\n" -"Video: \t%d x %d\n" -"Skript: \t%d x %d\n" +"Video: \t%d × %d\n" +"Skript: \t%d × %d\n" "\n" "Promeniti rezoluciju titla tako da se poklapa sa snimkom?" diff --git a/po/tr.po b/po/tr.po index a78076c667..f45084d684 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3598,10 +3598,6 @@ msgstr "En-boy oranı yönetimi" msgid "Margin offset" msgstr "Kenar boşluğu konumu" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Matrisi:" @@ -4785,15 +4781,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Yüklenen videonun ve altyazıların spesifik çözünürlüğü uyuşmuyor.\n" "\n" -"Video çözünürlüğü:\t%d x %d\n" -"Betik çözünürlüğü:\t%d x %d\n" +"Video çözünürlüğü:\t%d × %d\n" +"Betik çözünürlüğü:\t%d × %d\n" "\n" "Altyazının çözünürlüğünü video ile eşleştir?" diff --git a/po/uk_UA.po b/po/uk_UA.po index 2ad68095d9..45f6ecc61b 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -3592,10 +3592,6 @@ msgstr "Зміна співвідношення сторін" msgid "Margin offset" msgstr "Зсув меж" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Матриця YCbCr:" @@ -4781,16 +4777,16 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Роздільна здатність, вказана у скрипті, і роздільна здатність завантаженого " "відео не збігаються.\n" "\n" -"Роздільна здатність відео:\t%d x %d\n" -"Роздільна здатність скрипта: \t%d x %d\n" +"Роздільна здатність відео:\t%d × %d\n" +"Роздільна здатність скрипта: \t%d × %d\n" "\n" "Встановити роздільну здатність скрипта, як у відео?" diff --git a/po/vi.po b/po/vi.po index b899d96a95..a6dc256a4e 100644 --- a/po/vi.po +++ b/po/vi.po @@ -3618,10 +3618,6 @@ msgstr "Xử lí tỉ lệ khung hình" msgid "Margin offset" msgstr "Khoảng bù lề" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "x" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Ma trận YCbCr" @@ -4805,15 +4801,15 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" "Độ phân giải của video được nạp và độ phân giải của phụ đề không được khớp\n" "\n" -"Độ phân giải video:\t%d x %d\n" -"Độ phân giải phụ đề:\t%d x %d\n" +"Độ phân giải video:\t%d × %d\n" +"Độ phân giải phụ đề:\t%d × %d\n" "\n" "Thay đổi độ phân giải của phụ đề để khớp với video?" diff --git a/po/zh_CN.po b/po/zh_CN.po index 49b69a3e6e..3f10145224 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3556,10 +3556,6 @@ msgstr "宽高比处理" msgid "Margin offset" msgstr "边距偏移" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "×" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr 矩阵:" @@ -4709,8 +4705,8 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 4a22c74d6f..fc91917f52 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3556,10 +3556,6 @@ msgstr "長寬比處理" msgid "Margin offset" msgstr "邊距偏移" -#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 -msgid "x" -msgstr "×" - #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr 標準:" @@ -4713,8 +4709,8 @@ msgid "" "The resolution of the loaded video and the resolution specified for the " "subtitles don't match.\n" "\n" -"Video resolution:\t%d x %d\n" -"Script resolution:\t%d x %d\n" +"Video resolution:\t%d × %d\n" +"Script resolution:\t%d × %d\n" "\n" "Change subtitles resolution to match video?" msgstr "" diff --git a/src/dialog_dummy_video.cpp b/src/dialog_dummy_video.cpp index 3c67a6fcc9..713b3667d6 100644 --- a/src/dialog_dummy_video.cpp +++ b/src/dialog_dummy_video.cpp @@ -62,23 +62,23 @@ struct DialogDummyVideo { }; struct ResolutionShortcut { - const char *name; + const wchar_t *name; int width; int height; }; static ResolutionShortcut resolutions[] = { - {"640x480 (SD fullscreen)", 640, 480}, - {"704x480 (SD anamorphic)", 704, 480}, - {"640x360 (SD widescreen)", 640, 360}, - {"704x396 (SD widescreen)", 704, 396}, - {"640x352 (SD widescreen MOD16)", 640, 352}, - {"704x400 (SD widescreen MOD16)", 704, 400}, - {"1024x576 (SuperPAL widescreen)", 1024, 576}, - {"1280x720 (HD 720p)", 1280, 720}, - {"1920x1080 (FHD 1080p)", 1920, 1080}, - {"2560x1440 (QHD 1440p)", 2560, 1440}, - {"3840x2160 (4K UHD 2160p)", 3840, 2160}, + {L"640\u00D7480 (SD fullscreen)", 640, 480}, + {L"704\u00D7480 (SD anamorphic)", 704, 480}, + {L"640\u00D7360 (SD widescreen)", 640, 360}, + {L"704\u00D7396 (SD widescreen)", 704, 396}, + {L"640\u00D7352 (SD widescreen MOD16)", 640, 352}, + {L"704\u00D7400 (SD widescreen MOD16)", 704, 400}, + {L"1024\u00D7576 (SuperPAL widescreen)", 1024, 576}, + {L"1280\u00D7720 (HD 720p)", 1280, 720}, + {L"1920\u00D71080 (FHD 1080p)", 1920, 1080}, + {L"2560\u00D71440 (QHD 1440p)", 2560, 1440}, + {L"3840\u00D72160 (4K UHD 2160p)", 3840, 2160}, }; wxSpinCtrl *spin_ctrl(wxWindow *parent, int min, int max, int *value) { @@ -106,7 +106,7 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent) auto res_sizer = new wxBoxSizer(wxHORIZONTAL); res_sizer->Add(spin_ctrl(&d, 1, 10000, &width), wxSizerFlags(1).Expand()); - res_sizer->Add(new wxStaticText(&d, -1, " x "), wxSizerFlags().Center()); + res_sizer->Add(new wxStaticText(&d, -1, L" \u00D7 "), wxSizerFlags().Center()); res_sizer->Add(spin_ctrl(&d, 1, 10000, &height), wxSizerFlags(1).Expand()); auto color_sizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/src/dialog_properties.cpp b/src/dialog_properties.cpp index 8e8eb7c5f5..d35662c24d 100644 --- a/src/dialog_properties.cpp +++ b/src/dialog_properties.cpp @@ -127,7 +127,7 @@ DialogProperties::DialogProperties(agi::Context *c) auto res_sizer = new wxBoxSizer(wxHORIZONTAL); res_sizer->Add(ResX, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); - res_sizer->Add(new wxStaticText(&d, -1, "x"), 0, wxALIGN_CENTER | wxRIGHT, 5); + res_sizer->Add(new wxStaticText(&d, -1, L"\u00D7"), 0, wxALIGN_CENTER | wxRIGHT, 5); res_sizer->Add(ResY, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); res_sizer->Add(FromVideo, 1, 0, 0); diff --git a/src/dialog_resample.cpp b/src/dialog_resample.cpp index 514eb46990..4bbb6ee880 100644 --- a/src/dialog_resample.cpp +++ b/src/dialog_resample.cpp @@ -164,7 +164,7 @@ DialogResample::DialogResample(agi::Context *c, ResampleSettings &settings) auto source_res_sizer = new wxBoxSizer(wxHORIZONTAL); source_res_sizer->Add(source_x, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); - source_res_sizer->Add(new wxStaticText(&d, -1, _("x")), wxSizerFlags().Center().Border(wxRIGHT)); + source_res_sizer->Add(new wxStaticText(&d, -1, L"\u00D7"), wxSizerFlags().Center().Border(wxRIGHT)); source_res_sizer->Add(source_y, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); source_res_sizer->Add(from_script); @@ -178,7 +178,7 @@ DialogResample::DialogResample(agi::Context *c, ResampleSettings &settings) auto dest_res_sizer = new wxBoxSizer(wxHORIZONTAL); dest_res_sizer->Add(dest_x, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); - dest_res_sizer->Add(new wxStaticText(&d, -1, _("x")), wxSizerFlags().Center().Border(wxRIGHT)); + dest_res_sizer->Add(new wxStaticText(&d, -1, L"\u00D7"), wxSizerFlags().Center().Border(wxRIGHT)); dest_res_sizer->Add(dest_y, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); dest_res_sizer->Add(from_video); diff --git a/src/dialog_video_properties.cpp b/src/dialog_video_properties.cpp index 90c407844c..aff153cfe7 100644 --- a/src/dialog_video_properties.cpp +++ b/src/dialog_video_properties.cpp @@ -43,7 +43,7 @@ enum { int prompt(wxWindow *parent, bool ar_changed, int sx, int sy, int vx, int vy) { wxDialog d(parent, -1, _("Resolution mismatch")); - auto label_text = fmt_tl("The resolution of the loaded video and the resolution specified for the subtitles don't match.\n\nVideo resolution:\t%d x %d\nScript resolution:\t%d x %d\n\nChange subtitles resolution to match video?", vx, vy, sx, sy); + auto label_text = fmt_tl("The resolution of the loaded video and the resolution specified for the subtitles don't match.\n\nVideo resolution:\t%d \u00D7 %d\nScript resolution:\t%d \u00D7 %d\n\nChange subtitles resolution to match video?", vx, vy, sx, sy); auto sizer = new wxBoxSizer(wxVERTICAL); sizer->Add(new wxStaticText(&d, -1, label_text), wxSizerFlags().Border()); From 7dabfa3779ae84ebdf3187bb3cfd61dc2c3d15be Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Sat, 15 Nov 2025 00:51:48 +0800 Subject: [PATCH 2/5] 1 --- po/aegisub.pot | 4 ++++ po/ar.po | 4 ++++ po/be.po | 4 ++++ po/bg.po | 4 ++++ po/ca.po | 4 ++++ po/cs.po | 4 ++++ po/da.po | 4 ++++ po/de.po | 4 ++++ po/el.po | 4 ++++ po/es.po | 4 ++++ po/eu.po | 4 ++++ po/fa.po | 4 ++++ po/fi.po | 4 ++++ po/fr_FR.po | 4 ++++ po/gl.po | 4 ++++ po/hu.po | 4 ++++ po/id.po | 4 ++++ po/it.po | 4 ++++ po/ja.po | 4 ++++ po/ko.po | 4 ++++ po/nl.po | 4 ++++ po/pl.po | 4 ++++ po/pt_BR.po | 4 ++++ po/pt_PT.po | 4 ++++ po/ru.po | 4 ++++ po/sr_RS.po | 4 ++++ po/sr_RS@latin.po | 4 ++++ po/tr.po | 4 ++++ po/uk_UA.po | 4 ++++ po/vi.po | 4 ++++ po/zh_CN.po | 4 ++++ po/zh_TW.po | 4 ++++ 32 files changed, 128 insertions(+) diff --git a/po/aegisub.pot b/po/aegisub.pot index d1a2468f01..f669759dd9 100644 --- a/po/aegisub.pot +++ b/po/aegisub.pot @@ -3512,6 +3512,10 @@ msgstr "" msgid "Margin offset" msgstr "" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/ar.po b/po/ar.po index e46273d3e9..fecd6a0c07 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3543,6 +3543,10 @@ msgstr "" msgid "Margin offset" msgstr "هوامش الإزاحة" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/be.po b/po/be.po index 99ca2aa97f..90c5650fc8 100644 --- a/po/be.po +++ b/po/be.po @@ -3608,6 +3608,10 @@ msgstr "Апрацоўка суадносін бакоў" msgid "Margin offset" msgstr "Змяшчэнне межаў" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Матрыца YCbCr:" diff --git a/po/bg.po b/po/bg.po index 9c3ea5210c..07c385c78f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3595,6 +3595,10 @@ msgstr "Съотношение на страните" msgid "Margin offset" msgstr "Преместване на границите на работната област" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Матрица:" diff --git a/po/ca.po b/po/ca.po index e92635ec20..3cb3cb5609 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3639,6 +3639,10 @@ msgstr "Gestió de la relació d’aspecte" msgid "Margin offset" msgstr "Compensació del marge" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matriu YCbCr:" diff --git a/po/cs.po b/po/cs.po index e07f758699..7e608f0b7a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -3564,6 +3564,10 @@ msgstr "" msgid "Margin offset" msgstr "Offset okraje" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/da.po b/po/da.po index 7d46f83b72..083bc14d20 100644 --- a/po/da.po +++ b/po/da.po @@ -3536,6 +3536,10 @@ msgstr "" msgid "Margin offset" msgstr "Margin" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/de.po b/po/de.po index 3e473ce10b..4c98b8e2ae 100644 --- a/po/de.po +++ b/po/de.po @@ -3616,6 +3616,10 @@ msgstr "Seitenverhältnisanpassung" msgid "Margin offset" msgstr "Ränderversatz" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Farbmatrix:" diff --git a/po/el.po b/po/el.po index 0593e05ac3..a05112e5a2 100644 --- a/po/el.po +++ b/po/el.po @@ -3647,6 +3647,10 @@ msgstr "" msgid "Margin offset" msgstr "Offset περιθωρίου" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/es.po b/po/es.po index 37ee3533b7..9b43cbe3cd 100644 --- a/po/es.po +++ b/po/es.po @@ -3650,6 +3650,10 @@ msgstr "Manejo de relación de aspecto" msgid "Margin offset" msgstr "Desplazamiento de margen" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matriz YCbCr:" diff --git a/po/eu.po b/po/eu.po index 275eb4a43c..9a0b40e6b3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3607,6 +3607,10 @@ msgstr "Ikuspegi Maila Kudeaketa" msgid "Margin offset" msgstr "Bazter oreka" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Matrizea:" diff --git a/po/fa.po b/po/fa.po index dba01c4858..89f14242d2 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3520,6 +3520,10 @@ msgstr "" msgid "Margin offset" msgstr "جایجایی حاشیه" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/fi.po b/po/fi.po index 39d822af54..41cc351222 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3626,6 +3626,10 @@ msgstr "Kuvasuhteen käsittely" msgid "Margin offset" msgstr "Reunuksen siirtymä" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr-matriisi:" diff --git a/po/fr_FR.po b/po/fr_FR.po index 9903c66b47..82f4db7515 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -3640,6 +3640,10 @@ msgstr "Gestion du rapport de forme" msgid "Margin offset" msgstr "Décalage marge" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matrice YCbCr :" diff --git a/po/gl.po b/po/gl.po index 9daf29e1c1..ab3e47d594 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3573,6 +3573,10 @@ msgstr "" msgid "Margin offset" msgstr "Desprazamento de marxe" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/hu.po b/po/hu.po index a22ec89707..27d2ad59f4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3590,6 +3590,10 @@ msgstr "Képarány kezelése" msgid "Margin offset" msgstr "Margó eltolás" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr mátrix:" diff --git a/po/id.po b/po/id.po index 9ab4ba6fa2..9f7c3f1848 100644 --- a/po/id.po +++ b/po/id.po @@ -3591,6 +3591,10 @@ msgstr "Pengendali Asperk Rasio" msgid "Margin offset" msgstr "Imbangi penjajaran" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Matrix:" diff --git a/po/it.po b/po/it.po index ddeae147b5..bafe47b1f2 100644 --- a/po/it.po +++ b/po/it.po @@ -3572,6 +3572,10 @@ msgstr "" msgid "Margin offset" msgstr "Margine offset" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/ja.po b/po/ja.po index 5f3e18e40f..9871d5e502 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3532,6 +3532,10 @@ msgstr "" msgid "Margin offset" msgstr "余白の設定" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/ko.po b/po/ko.po index 020ca5809b..37ef776b3b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3523,6 +3523,10 @@ msgstr "" msgid "Margin offset" msgstr "여백 설정" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/nl.po b/po/nl.po index d2a6dd2c41..543c804c32 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3587,6 +3587,10 @@ msgstr "" msgid "Margin offset" msgstr "Marge-offset" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/pl.po b/po/pl.po index 9cbd8b096b..7feb672b13 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3527,6 +3527,10 @@ msgstr "" msgid "Margin offset" msgstr "Wyrównanie marginesu" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 04a5fcbda5..cb1053c8d1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3634,6 +3634,10 @@ msgstr "Manipulação de Proporção de Imagem" msgid "Margin offset" msgstr "Deslocamento de margens" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Matriz YCbCr:" diff --git a/po/pt_PT.po b/po/pt_PT.po index ff2d8e3e17..e1d432f00f 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -3631,6 +3631,10 @@ msgstr "" msgid "Margin offset" msgstr "Deslocamento de margens" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/ru.po b/po/ru.po index a2eb9f4be2..7823e4853f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3563,6 +3563,10 @@ msgstr "" msgid "Margin offset" msgstr "Cмещение границ рабочей области" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/sr_RS.po b/po/sr_RS.po index a0bc81adea..be9554b5dc 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -3560,6 +3560,10 @@ msgstr "" msgid "Margin offset" msgstr "Маргине" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index e89b2f5f42..ab2d551075 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -3560,6 +3560,10 @@ msgstr "" msgid "Margin offset" msgstr "Margine" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "" diff --git a/po/tr.po b/po/tr.po index f45084d684..1a9f061715 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3598,6 +3598,10 @@ msgstr "En-boy oranı yönetimi" msgid "Margin offset" msgstr "Kenar boşluğu konumu" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr Matrisi:" diff --git a/po/uk_UA.po b/po/uk_UA.po index 45f6ecc61b..90930b9694 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -3592,6 +3592,10 @@ msgstr "Зміна співвідношення сторін" msgid "Margin offset" msgstr "Зсув меж" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Матриця YCbCr:" diff --git a/po/vi.po b/po/vi.po index a6dc256a4e..958a54e45a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -3618,6 +3618,10 @@ msgstr "Xử lí tỉ lệ khung hình" msgid "Margin offset" msgstr "Khoảng bù lề" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "Ma trận YCbCr" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3f10145224..433535689b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3556,6 +3556,10 @@ msgstr "宽高比处理" msgid "Margin offset" msgstr "边距偏移" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr 矩阵:" diff --git a/po/zh_TW.po b/po/zh_TW.po index fc91917f52..4336d3ef1a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3556,6 +3556,10 @@ msgstr "長寬比處理" msgid "Margin offset" msgstr "邊距偏移" +#: ../src/dialog_resample.cpp:167 ../src/dialog_resample.cpp:181 +msgid "×" +msgstr "×" + #: ../src/dialog_resample.cpp:172 ../src/dialog_resample.cpp:186 msgid "YCbCr Matrix:" msgstr "YCbCr 標準:" From 91302669cee1c74e5d094578f4beecdec9cb24e5 Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Sat, 15 Nov 2025 01:13:30 +0800 Subject: [PATCH 3/5] 2 --- src/dialog_dummy_video.cpp | 2 +- src/dialog_properties.cpp | 2 +- src/dialog_resample.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dialog_dummy_video.cpp b/src/dialog_dummy_video.cpp index 713b3667d6..9d65105131 100644 --- a/src/dialog_dummy_video.cpp +++ b/src/dialog_dummy_video.cpp @@ -106,7 +106,7 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent) auto res_sizer = new wxBoxSizer(wxHORIZONTAL); res_sizer->Add(spin_ctrl(&d, 1, 10000, &width), wxSizerFlags(1).Expand()); - res_sizer->Add(new wxStaticText(&d, -1, L" \u00D7 "), wxSizerFlags().Center()); + res_sizer->Add(new wxStaticText(&d, -1, _(L" \u00D7 ")), wxSizerFlags().Center()); res_sizer->Add(spin_ctrl(&d, 1, 10000, &height), wxSizerFlags(1).Expand()); auto color_sizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/src/dialog_properties.cpp b/src/dialog_properties.cpp index d35662c24d..c29308c68f 100644 --- a/src/dialog_properties.cpp +++ b/src/dialog_properties.cpp @@ -127,7 +127,7 @@ DialogProperties::DialogProperties(agi::Context *c) auto res_sizer = new wxBoxSizer(wxHORIZONTAL); res_sizer->Add(ResX, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); - res_sizer->Add(new wxStaticText(&d, -1, L"\u00D7"), 0, wxALIGN_CENTER | wxRIGHT, 5); + res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), 0, wxALIGN_CENTER | wxRIGHT, 5); res_sizer->Add(ResY, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); res_sizer->Add(FromVideo, 1, 0, 0); diff --git a/src/dialog_resample.cpp b/src/dialog_resample.cpp index 4bbb6ee880..9eafb3f8a5 100644 --- a/src/dialog_resample.cpp +++ b/src/dialog_resample.cpp @@ -164,7 +164,7 @@ DialogResample::DialogResample(agi::Context *c, ResampleSettings &settings) auto source_res_sizer = new wxBoxSizer(wxHORIZONTAL); source_res_sizer->Add(source_x, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); - source_res_sizer->Add(new wxStaticText(&d, -1, L"\u00D7"), wxSizerFlags().Center().Border(wxRIGHT)); + source_res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), wxSizerFlags().Center().Border(wxRIGHT)); source_res_sizer->Add(source_y, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); source_res_sizer->Add(from_script); @@ -178,7 +178,7 @@ DialogResample::DialogResample(agi::Context *c, ResampleSettings &settings) auto dest_res_sizer = new wxBoxSizer(wxHORIZONTAL); dest_res_sizer->Add(dest_x, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); - dest_res_sizer->Add(new wxStaticText(&d, -1, L"\u00D7"), wxSizerFlags().Center().Border(wxRIGHT)); + dest_res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), wxSizerFlags().Center().Border(wxRIGHT)); dest_res_sizer->Add(dest_y, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); dest_res_sizer->Add(from_video); From 3cdcc519d7a4704095b368ceb457349910c6521e Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Sat, 15 Nov 2025 01:15:19 +0800 Subject: [PATCH 4/5] 3 --- src/dialog_dummy_video.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dialog_dummy_video.cpp b/src/dialog_dummy_video.cpp index 9d65105131..7e1ba3a039 100644 --- a/src/dialog_dummy_video.cpp +++ b/src/dialog_dummy_video.cpp @@ -106,7 +106,7 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent) auto res_sizer = new wxBoxSizer(wxHORIZONTAL); res_sizer->Add(spin_ctrl(&d, 1, 10000, &width), wxSizerFlags(1).Expand()); - res_sizer->Add(new wxStaticText(&d, -1, _(L" \u00D7 ")), wxSizerFlags().Center()); + res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), wxSizerFlags().Center().HorzBorder()); res_sizer->Add(spin_ctrl(&d, 1, 10000, &height), wxSizerFlags(1).Expand()); auto color_sizer = new wxBoxSizer(wxHORIZONTAL); From 8e6654207e24ede36fc746f5b9928d54343892ce Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Sat, 15 Nov 2025 01:49:52 +0800 Subject: [PATCH 5/5] 4 --- src/dialog_dummy_video.cpp | 4 ++-- src/dialog_properties.cpp | 2 +- src/dialog_resample.cpp | 2 +- src/dialog_video_properties.cpp | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/dialog_dummy_video.cpp b/src/dialog_dummy_video.cpp index 7e1ba3a039..64c26dec38 100644 --- a/src/dialog_dummy_video.cpp +++ b/src/dialog_dummy_video.cpp @@ -68,7 +68,7 @@ struct ResolutionShortcut { }; static ResolutionShortcut resolutions[] = { - {L"640\u00D7480 (SD fullscreen)", 640, 480}, + {L"640\u00D7480 (SD fullscreen)", 640, 480}, // U+00D7 multiplication sign {L"704\u00D7480 (SD anamorphic)", 704, 480}, {L"640\u00D7360 (SD widescreen)", 640, 360}, {L"704\u00D7396 (SD widescreen)", 704, 396}, @@ -106,7 +106,7 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent) auto res_sizer = new wxBoxSizer(wxHORIZONTAL); res_sizer->Add(spin_ctrl(&d, 1, 10000, &width), wxSizerFlags(1).Expand()); - res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), wxSizerFlags().Center().HorzBorder()); + res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), wxSizerFlags().Center().Border()); // U+00D7 multiplication sign res_sizer->Add(spin_ctrl(&d, 1, 10000, &height), wxSizerFlags(1).Expand()); auto color_sizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/src/dialog_properties.cpp b/src/dialog_properties.cpp index c29308c68f..38a9703158 100644 --- a/src/dialog_properties.cpp +++ b/src/dialog_properties.cpp @@ -127,7 +127,7 @@ DialogProperties::DialogProperties(agi::Context *c) auto res_sizer = new wxBoxSizer(wxHORIZONTAL); res_sizer->Add(ResX, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); - res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), 0, wxALIGN_CENTER | wxRIGHT, 5); + res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), 0, wxALIGN_CENTER | wxRIGHT, 5); // U+00D7 multiplication sign res_sizer->Add(ResY, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5); res_sizer->Add(FromVideo, 1, 0, 0); diff --git a/src/dialog_resample.cpp b/src/dialog_resample.cpp index 9eafb3f8a5..dad0658d09 100644 --- a/src/dialog_resample.cpp +++ b/src/dialog_resample.cpp @@ -164,7 +164,7 @@ DialogResample::DialogResample(agi::Context *c, ResampleSettings &settings) auto source_res_sizer = new wxBoxSizer(wxHORIZONTAL); source_res_sizer->Add(source_x, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); - source_res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), wxSizerFlags().Center().Border(wxRIGHT)); + source_res_sizer->Add(new wxStaticText(&d, -1, _(L"\u00D7")), wxSizerFlags().Center().Border(wxRIGHT)); // U+00D7 multiplication sign source_res_sizer->Add(source_y, wxSizerFlags(1).Border(wxRIGHT).Align(wxALIGN_CENTER_VERTICAL)); source_res_sizer->Add(from_script); diff --git a/src/dialog_video_properties.cpp b/src/dialog_video_properties.cpp index aff153cfe7..9623e37539 100644 --- a/src/dialog_video_properties.cpp +++ b/src/dialog_video_properties.cpp @@ -43,7 +43,11 @@ enum { int prompt(wxWindow *parent, bool ar_changed, int sx, int sy, int vx, int vy) { wxDialog d(parent, -1, _("Resolution mismatch")); - auto label_text = fmt_tl("The resolution of the loaded video and the resolution specified for the subtitles don't match.\n\nVideo resolution:\t%d \u00D7 %d\nScript resolution:\t%d \u00D7 %d\n\nChange subtitles resolution to match video?", vx, vy, sx, sy); + auto label_text = fmt_tl( + "The resolution of the loaded video and the resolution specified for the subtitles don't match.\n\n" + "Video resolution:\t%d \u00D7 %d\n" // U+00D7 multiplication sign + "Script resolution:\t%d \u00D7 %d\n\n" + "Change subtitles resolution to match video?", vx, vy, sx, sy); auto sizer = new wxBoxSizer(wxVERTICAL); sizer->Add(new wxStaticText(&d, -1, label_text), wxSizerFlags().Border());