Fix translated strings appearing in the metafile (#233)

2020-03-06 00:20:05 +01:00 · 2020-03-06 00:20:05 +01:00 · 2cf8661b97
parent 680391580b
commit 2cf8661b97
4 changed files with 114 additions and 108 deletions
--- a/tsMuxerGUI/translations/tsmuxergui_en.ts
+++ b/tsMuxerGUI/translations/tsmuxergui_en.ts
@ -760,7 +760,7 @@
    </message>
    <message>
        <location filename="../tsmuxerwindow.ui" line="2709"/>
-        <location filename="../tsmuxerwindow.cpp" line="1414"/>
+        <location filename="../tsmuxerwindow.cpp" line="1397"/>
        <source>Demux</source>
        <translation type="unfinished"></translation>
    </message>
@ -771,7 +771,7 @@
    </message>
    <message>
        <location filename="../tsmuxerwindow.ui" line="2743"/>
-        <location filename="../tsmuxerwindow.cpp" line="2379"/>
+        <location filename="../tsmuxerwindow.cpp" line="2362"/>
        <source>File name</source>
        <translation type="unfinished"></translation>
    </message>
@ -787,7 +787,7 @@
    </message>
    <message>
        <location filename="../tsmuxerwindow.ui" line="2862"/>
-        <location filename="../tsmuxerwindow.cpp" line="2365"/>
+        <location filename="../tsmuxerwindow.cpp" line="2348"/>
        <source>Sta&amp;rt muxing</source>
        <translation type="unfinished"></translation>
    </message>
@ -797,15 +797,10 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="25"/>
+        <location filename="../tsmuxerwindow.cpp" line="27"/>
        <source>All supported media files (*.aac *.mpv *.mpa *.avc *.mvc *.264 *.h264 *.ac3 *.dts *.ts *.m2ts *.mts *.ssif *.mpg *.mpeg *.vob *.evo *.mkv *.mka *.mks *.mp4 *.m4a *.m4v *.mov *.sup *.wav *.w64 *.pcm *.m1v *.m2v *.vc1 *.hevc *.hvc *.265 *.h265 *.mpls *.mpl *.srt);;AC3/E-AC3 (*.ac3 *.ddp);;AAC (advanced audio coding) (*.aac);;AVC/MVC/H.264 elementary stream (*.avc *.mvc *.264 *.h264);;HEVC (High Efficiency Video Codec) (*.hevc *.hvc *.265 *.h265);;Digital Theater System (*.dts);;Mpeg video elementary stream (*.mpv *.m1v *.m2v);;Mpeg audio elementary stream (*.mpa);;Transport Stream (*.ts);;BDAV Transport Stream (*.m2ts *.mts *.ssif);;Program Stream (*.mpg *.mpeg *.vob *.evo);;Matroska audio/video files (*.mkv *.mka *.mks);;MP4 audio/video files (*.mp4 *.m4a *.m4v);;Quick time audio/video files (*.mov);;Blu-ray play list (*.mpls *.mpl);;Blu-ray PGS subtitles (*.sup);;Text subtitles (*.srt);;WAVE - Uncompressed PCM audio (*.wav *.w64);;RAW LPCM Stream (*.pcm);;All files (*.*)</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../tsmuxerwindow.cpp" line="48"/>
-        <source>tsMuxeR project file (*.meta);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <location filename="../tsmuxerwindow.cpp" line="54"/>
        <source>Transport stream (*.ts);;all files (*.*)</source>
@ -822,156 +817,156 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="545"/>
+        <location filename="../tsmuxerwindow.cpp" line="536"/>
        <source>Not supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="611"/>
-        <location filename="../tsmuxerwindow.cpp" line="1128"/>
+        <location filename="../tsmuxerwindow.cpp" line="602"/>
+        <location filename="../tsmuxerwindow.cpp" line="1139"/>
        <source>Unsupported format</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="612"/>
+        <location filename="../tsmuxerwindow.cpp" line="603"/>
        <source>Can&apos;t detect stream type. File name: &quot;%1&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="882"/>
+        <location filename="../tsmuxerwindow.cpp" line="893"/>
        <source>Add media file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="919"/>
+        <location filename="../tsmuxerwindow.cpp" line="930"/>
        <source>File already exists</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="920"/>
+        <location filename="../tsmuxerwindow.cpp" line="931"/>
        <source>File &quot;%1&quot; already exists</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1133"/>
+        <location filename="../tsmuxerwindow.cpp" line="1145"/>
        <source>Unsupported format or all tracks are not recognized. File name: &quot;%1&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1144"/>
-        <source>Some tracks not recognized. This tracks was ignored. File name: &quot;%1&quot;</source>
+        <location filename="../tsmuxerwindow.cpp" line="1155"/>
+        <source>Track %1 was not recognized and ignored. File name: &quot;%2&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1414"/>
+        <location filename="../tsmuxerwindow.cpp" line="1397"/>
        <source>Mux</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1433"/>
+        <location filename="../tsmuxerwindow.cpp" line="1416"/>
        <source>tsMuxeR error</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1437"/>
+        <location filename="../tsmuxerwindow.cpp" line="1420"/>
        <source>tsMuxeR not found!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1455"/>
+        <location filename="../tsmuxerwindow.cpp" line="1438"/>
        <source>Can&apos;t execute tsMuxeR!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2219"/>
-        <location filename="../tsmuxerwindow.cpp" line="2220"/>
+        <location filename="../tsmuxerwindow.cpp" line="2202"/>
+        <location filename="../tsmuxerwindow.cpp" line="2203"/>
        <source>No track selected</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2227"/>
+        <location filename="../tsmuxerwindow.cpp" line="2210"/>
        <source>Append media file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2264"/>
+        <location filename="../tsmuxerwindow.cpp" line="2247"/>
        <source>Invalid file extension</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2265"/>
+        <location filename="../tsmuxerwindow.cpp" line="2248"/>
        <source>Appended file must have same file extension.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2363"/>
+        <location filename="../tsmuxerwindow.cpp" line="2346"/>
        <source>Sta&amp;rt demuxing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2375"/>
+        <location filename="../tsmuxerwindow.cpp" line="2358"/>
        <source>Folder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2465"/>
+        <location filename="../tsmuxerwindow.cpp" line="2448"/>
        <source>Select file for muxing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2487"/>
-        <location filename="../tsmuxerwindow.cpp" line="2503"/>
+        <location filename="../tsmuxerwindow.cpp" line="2470"/>
+        <location filename="../tsmuxerwindow.cpp" line="2486"/>
        <source>Invalid file name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2488"/>
+        <location filename="../tsmuxerwindow.cpp" line="2471"/>
        <source>The output file &quot;%1&quot; has invalid extension. Please, change file extension to &quot;.m2ts&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2504"/>
+        <location filename="../tsmuxerwindow.cpp" line="2487"/>
        <source>The output file &quot;%1&quot; has invalid extension. Please, change file extension to &quot;.iso&quot;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2518"/>
+        <location filename="../tsmuxerwindow.cpp" line="2501"/>
        <source>file</source>
        <extracomment>Used in expressions &quot;Overwrite existing %1&quot; and &quot;The output %1 already exists&quot;.</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2518"/>
+        <location filename="../tsmuxerwindow.cpp" line="2501"/>
        <source>directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2520"/>
+        <location filename="../tsmuxerwindow.cpp" line="2503"/>
        <source>Overwrite existing %1?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2521"/>
+        <location filename="../tsmuxerwindow.cpp" line="2504"/>
        <source>The output %1 &quot;%2&quot; already exists. Do you want to overwrite it?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2538"/>
+        <location filename="../tsmuxerwindow.cpp" line="2521"/>
        <source>Muxing in progress</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2538"/>
+        <location filename="../tsmuxerwindow.cpp" line="2521"/>
        <source>Demuxing in progress</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2567"/>
+        <location filename="../tsmuxerwindow.cpp" line="2550"/>
        <source>Can&apos;t create temporary meta file</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2568"/>
+        <location filename="../tsmuxerwindow.cpp" line="2551"/>
        <source>Can&apos;t create temporary meta file &quot;%1&quot;</source>
        <translation type="unfinished"></translation>
    </message>
--- a/tsMuxerGUI/translations/tsmuxergui_ru.ts
+++ b/tsMuxerGUI/translations/tsmuxergui_ru.ts
@ -760,7 +760,7 @@
    </message>
    <message>
        <location filename="../tsmuxerwindow.ui" line="2709"/>
-        <location filename="../tsmuxerwindow.cpp" line="1414"/>
+        <location filename="../tsmuxerwindow.cpp" line="1397"/>
        <source>Demux</source>
        <translation>Демукс</translation>
    </message>
@ -771,7 +771,7 @@
    </message>
    <message>
        <location filename="../tsmuxerwindow.ui" line="2743"/>
-        <location filename="../tsmuxerwindow.cpp" line="2379"/>
+        <location filename="../tsmuxerwindow.cpp" line="2362"/>
        <source>File name</source>
        <translation>Имя Файла</translation>
    </message>
@ -787,7 +787,7 @@
    </message>
    <message>
        <location filename="../tsmuxerwindow.ui" line="2862"/>
-        <location filename="../tsmuxerwindow.cpp" line="2365"/>
+        <location filename="../tsmuxerwindow.cpp" line="2348"/>
        <source>Sta&amp;rt muxing</source>
        <translation>Ста&amp;рт муксинга</translation>
    </message>
@ -797,15 +797,10 @@
        <translation>Сохранить проект</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="25"/>
+        <location filename="../tsmuxerwindow.cpp" line="27"/>
        <source>All supported media files (*.aac *.mpv *.mpa *.avc *.mvc *.264 *.h264 *.ac3 *.dts *.ts *.m2ts *.mts *.ssif *.mpg *.mpeg *.vob *.evo *.mkv *.mka *.mks *.mp4 *.m4a *.m4v *.mov *.sup *.wav *.w64 *.pcm *.m1v *.m2v *.vc1 *.hevc *.hvc *.265 *.h265 *.mpls *.mpl *.srt);;AC3/E-AC3 (*.ac3 *.ddp);;AAC (advanced audio coding) (*.aac);;AVC/MVC/H.264 elementary stream (*.avc *.mvc *.264 *.h264);;HEVC (High Efficiency Video Codec) (*.hevc *.hvc *.265 *.h265);;Digital Theater System (*.dts);;Mpeg video elementary stream (*.mpv *.m1v *.m2v);;Mpeg audio elementary stream (*.mpa);;Transport Stream (*.ts);;BDAV Transport Stream (*.m2ts *.mts *.ssif);;Program Stream (*.mpg *.mpeg *.vob *.evo);;Matroska audio/video files (*.mkv *.mka *.mks);;MP4 audio/video files (*.mp4 *.m4a *.m4v);;Quick time audio/video files (*.mov);;Blu-ray play list (*.mpls *.mpl);;Blu-ray PGS subtitles (*.sup);;Text subtitles (*.srt);;WAVE - Uncompressed PCM audio (*.wav *.w64);;RAW LPCM Stream (*.pcm);;All files (*.*)</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../tsmuxerwindow.cpp" line="48"/>
-        <source>tsMuxeR project file (*.meta);;All files (*.*)</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <location filename="../tsmuxerwindow.cpp" line="54"/>
        <source>Transport stream (*.ts);;all files (*.*)</source>
@ -822,157 +817,157 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="545"/>
+        <location filename="../tsmuxerwindow.cpp" line="536"/>
        <source>Not supported</source>
        <translation>Не поддерживается</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="611"/>
-        <location filename="../tsmuxerwindow.cpp" line="1128"/>
+        <location filename="../tsmuxerwindow.cpp" line="602"/>
+        <location filename="../tsmuxerwindow.cpp" line="1139"/>
        <source>Unsupported format</source>
        <translation>Неподдерживаемый формат</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="612"/>
+        <location filename="../tsmuxerwindow.cpp" line="603"/>
        <source>Can&apos;t detect stream type. File name: &quot;%1&quot;</source>
        <translation>Не определён тип потока. Имя файла: &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="882"/>
+        <location filename="../tsmuxerwindow.cpp" line="893"/>
        <source>Add media file</source>
        <translation>Добавить медиафайл</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="919"/>
+        <location filename="../tsmuxerwindow.cpp" line="930"/>
        <source>File already exists</source>
        <translation>Файл уже есть</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="920"/>
+        <location filename="../tsmuxerwindow.cpp" line="931"/>
        <source>File &quot;%1&quot; already exists</source>
        <translation>Файл &quot;%1&quot; уже есть</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1133"/>
+        <location filename="../tsmuxerwindow.cpp" line="1145"/>
        <source>Unsupported format or all tracks are not recognized. File name: &quot;%1&quot;</source>
        <translation>Неподдерживаемый формат или все дорожки не распознаны. Имя файла: &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1144"/>
-        <source>Some tracks not recognized. This tracks was ignored. File name: &quot;%1&quot;</source>
-        <translation>Некоторые дорожки не распознаны. Эта дорожка была проигнорирована. Имя файла: &quot;%1&quot;</translation>
+        <location filename="../tsmuxerwindow.cpp" line="1155"/>
+        <source>Track %1 was not recognized and ignored. File name: &quot;%2&quot;</source>
+        <translation>Дорожка %1 не распознана и проигнорирована. Имя файла: &quot;%2&quot;</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1414"/>
+        <location filename="../tsmuxerwindow.cpp" line="1397"/>
        <source>Mux</source>
        <translation>Создать</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1433"/>
+        <location filename="../tsmuxerwindow.cpp" line="1416"/>
        <source>tsMuxeR error</source>
        <translation>Ошибка tsMuxeR</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1437"/>
+        <location filename="../tsmuxerwindow.cpp" line="1420"/>
        <source>tsMuxeR not found!</source>
        <translation>tsMuxeR не найден!</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="1455"/>
+        <location filename="../tsmuxerwindow.cpp" line="1438"/>
        <source>Can&apos;t execute tsMuxeR!</source>
        <translation>Не возможно запустить tsMuxeR!</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2219"/>
-        <location filename="../tsmuxerwindow.cpp" line="2220"/>
+        <location filename="../tsmuxerwindow.cpp" line="2202"/>
+        <location filename="../tsmuxerwindow.cpp" line="2203"/>
        <source>No track selected</source>
        <translation>Не выбрана дорожка</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2227"/>
+        <location filename="../tsmuxerwindow.cpp" line="2210"/>
        <source>Append media file</source>
        <translation>Присоединить медиафайл</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2264"/>
+        <location filename="../tsmuxerwindow.cpp" line="2247"/>
        <source>Invalid file extension</source>
        <translation>Неверное расширение файла</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2265"/>
+        <location filename="../tsmuxerwindow.cpp" line="2248"/>
        <source>Appended file must have same file extension.</source>
        <translation>Присоединяемый файл должен иметь тоже самое расширение файла.</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2363"/>
+        <location filename="../tsmuxerwindow.cpp" line="2346"/>
        <source>Sta&amp;rt demuxing</source>
        <translation>Ста&amp;rт демуксинга</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2375"/>
+        <location filename="../tsmuxerwindow.cpp" line="2358"/>
        <source>Folder</source>
        <translation>Папка</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2465"/>
+        <location filename="../tsmuxerwindow.cpp" line="2448"/>
        <source>Select file for muxing</source>
        <translation>Выберите файл для муксинга</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2487"/>
-        <location filename="../tsmuxerwindow.cpp" line="2503"/>
+        <location filename="../tsmuxerwindow.cpp" line="2470"/>
+        <location filename="../tsmuxerwindow.cpp" line="2486"/>
        <source>Invalid file name</source>
        <translation>Неверное имя файла</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2488"/>
+        <location filename="../tsmuxerwindow.cpp" line="2471"/>
        <source>The output file &quot;%1&quot; has invalid extension. Please, change file extension to &quot;.m2ts&quot;</source>
        <translation>Выходной файл &quot;%1&quot; имеет недопустимое расширение. Пожалуйста, измените расширение файла на &quot;.m2ts&quot;</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2504"/>
+        <location filename="../tsmuxerwindow.cpp" line="2487"/>
        <source>The output file &quot;%1&quot; has invalid extension. Please, change file extension to &quot;.iso&quot;</source>
        <translation>Выходной файл &quot;%1&quot; имеет недопустимое расширение. Пожалуйста, измените расширение файла на &quot;.iso&quot;</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2518"/>
+        <location filename="../tsmuxerwindow.cpp" line="2501"/>
        <source>file</source>
        <extracomment>Used in expressions &quot;Overwrite existing %1&quot; and &quot;The output %1 already exists&quot;.</extracomment>
        <translatorcomment>Используется в фразах &quot;Переписать существующий %1&quot; и &quot;Файл %1 уже существует&quot;.</translatorcomment>
        <translation>файл</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2518"/>
+        <location filename="../tsmuxerwindow.cpp" line="2501"/>
        <source>directory</source>
        <translation>каталог</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2520"/>
+        <location filename="../tsmuxerwindow.cpp" line="2503"/>
        <source>Overwrite existing %1?</source>
        <translation>Переписать существующий %1?</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2521"/>
+        <location filename="../tsmuxerwindow.cpp" line="2504"/>
        <source>The output %1 &quot;%2&quot; already exists. Do you want to overwrite it?</source>
        <translation>Результат %1 &quot;%2&quot; уже есть. Хотите его перезаписать?</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2538"/>
+        <location filename="../tsmuxerwindow.cpp" line="2521"/>
        <source>Muxing in progress</source>
        <translation>Выполняется муксинг</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2538"/>
+        <location filename="../tsmuxerwindow.cpp" line="2521"/>
        <source>Demuxing in progress</source>
        <translation>Выполняется демуксинг</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2567"/>
+        <location filename="../tsmuxerwindow.cpp" line="2550"/>
        <source>Can&apos;t create temporary meta file</source>
        <translation>Не возможно создать временный файл проекта</translation>
    </message>
    <message>
-        <location filename="../tsmuxerwindow.cpp" line="2568"/>
+        <location filename="../tsmuxerwindow.cpp" line="2551"/>
        <source>Can&apos;t create temporary meta file &quot;%1&quot;</source>
        <translation>Не возможно создать временный файл проекта &quot;%1&quot;</translation>
    </message>
--- a/tsMuxerGUI/tsmuxerwindow.cpp
+++ b/tsMuxerGUI/tsmuxerwindow.cpp
@ -20,6 +20,8 @@
 #include "muxForm.h"
 #include "ui_tsmuxerwindow.h"

+namespace
+{
 QString fileDialogFilter()
 {
    return TsMuxerWindow::tr(
@ -45,8 +47,6 @@ RAW LPCM Stream (*.pcm);;\
 All files (*.*)");
 }

-QString saveMetaFilter() { return TsMuxerWindow::tr("tsMuxeR project file (*.meta);;All files (*.*)"); }
-
 QString TI_DEFAULT_TAB_NAME() { return TsMuxerWindow::tr("General track options"); }

 QString TI_DEMUX_TAB_NAME() { return TsMuxerWindow::tr("Demux options"); }
@ -69,8 +69,6 @@ enum FileCustomData

 static const QString FILE_JOIN_PREFIX(" ++ ");

-namespace
-{
 bool doubleCompare(double a, double b) { return qAbs(a - b) < 1e-6; }

 QString closeDirPath(const QString &src)
@ -280,6 +278,7 @@ TsMuxerWindow::TsMuxerWindow()
      m_3dMode(false)
 {
    ui->setupUi(this);
+    setUiMetaItemsData();
    qApp->installTranslator(&qtCoreTranslator);
    qApp->installTranslator(&tsMuxerTranslator);
    initLanguageComboBox(ui->languageSelectComboBox);
@ -639,9 +638,8 @@ QtvCodecInfo *TsMuxerWindow::getCurrentCodec()
    return getCodecInfo(row);
 }

-void TsMuxerWindow::onVideoComboBoxChanged(int index)
+void TsMuxerWindow::onVideoComboBoxChanged(int)
 {
-    Q_UNUSED(index);
    if (disableUpdatesCnt)
        return;
    QtvCodecInfo *codecInfo = getCurrentCodec();
@ -649,7 +647,7 @@ void TsMuxerWindow::onVideoComboBoxChanged(int index)
        return;
    codecInfo->fpsText = ui->comboBoxFPS->itemText(ui->comboBoxFPS->currentIndex());
    codecInfo->levelText = ui->comboBoxLevel->itemText(ui->comboBoxLevel->currentIndex());
-    codecInfo->arText = ui->comboBoxAR->itemText(ui->comboBoxAR->currentIndex());
+    codecInfo->arText = ui->comboBoxAR->currentData().toString();
    updateMetaLines();
 }

@ -791,6 +789,27 @@ void TsMuxerWindow::postMoveComboBoxUpdate(QComboBox *comboBox, const QVariant &
    comboBox->setCurrentIndex(idx);
 }

+void TsMuxerWindow::setUiMetaItemsData()
+{
+    // unfortunately, the .ui files don't allow the user to specify "item data" for combo boxes, which is the most
+    // convenient way to associate some extra data that's not displayed in the UI in a combo box item without having
+    // to resort to some kind of external containers which need to be kept synchronised.
+    // as some of the combo boxes are taken as input for the meta file, it would end up having translated strings in it
+    // if a non-English translation is active, and thus being invalid. item data for these UI items should always
+    // contain the valid metafile tokens, as they are the actual things incorporated into the metafile content.
+    ui->comboBoxAR->setItemData(0, QString());
+    ui->comboBoxAR->setItemData(1, "1:1");
+    ui->comboBoxAR->setItemData(2, "4:3");
+    ui->comboBoxAR->setItemData(3, "16:9");
+    ui->comboBoxAR->setItemData(4, "2.21:1");
+    ui->comboBoxMeasure->setItemData(0, "KB");
+    ui->comboBoxMeasure->setItemData(1, "KiB");
+    ui->comboBoxMeasure->setItemData(2, "MB");
+    ui->comboBoxMeasure->setItemData(3, "MiB");
+    ui->comboBoxMeasure->setItemData(4, "GB");
+    ui->comboBoxMeasure->setItemData(5, "GiB");
+}
+
 void TsMuxerWindow::onAudioSubtitlesParamsChanged()
 {
    if (disableUpdatesCnt)
@ -986,13 +1005,13 @@ void TsMuxerWindow::trackLVItemSelectionChanged()
                ui->tabWidgetTracks->addTab(ui->demuxLpcmOptions, TI_DEMUX_TAB_NAME());

            if (codecInfo->displayName == "DTS-HD")
-                ui->dtsDwnConvert->setText("Downconvert DTS-HD to DTS");
+                ui->dtsDwnConvert->setText(tr("Downconvert DTS-HD to DTS"));
            else if (codecInfo->displayName == "TRUE-HD")
-                ui->dtsDwnConvert->setText("Downconvert TRUE-HD to AC3");
+                ui->dtsDwnConvert->setText(tr("Downconvert TRUE-HD to AC3"));
            else if (codecInfo->displayName == "E-AC3 (DD+)")
-                ui->dtsDwnConvert->setText("Downconvert E-AC3 to AC3");
+                ui->dtsDwnConvert->setText(tr("Downconvert E-AC3 to AC3"));
            else
-                ui->dtsDwnConvert->setText("Downconvert HD audio");
+                ui->dtsDwnConvert->setText(tr("Downconvert HD audio"));
            ui->dtsDwnConvert->setEnabled(codecInfo->displayName == "DTS-HD" || codecInfo->displayName == "TRUE-HD" ||
                                          codecInfo->displayName == "E-AC3 (DD+)");
            ui->secondaryCheckBox->setEnabled(codecInfo->descr.contains("(DTS Express)") ||
@ -1122,9 +1141,8 @@ void TsMuxerWindow::continueAddFile()
            msgBox.setStandardButtons(QMessageBox::Ok);
            if (codecList.size() == 0)
            {
-                msgBox.setText(tr("Unsupported format or all tracks are not "
-                                  "recognized. File name: \"%1\"")
-                                   .arg(newFileName));
+                msgBox.setText(
+                    tr("Unsupported format or all tracks are not recognized. File name: \"%1\"").arg(newFileName));
                msgBox.exec();
                disableUpdatesCnt--;
                return;
@ -1133,9 +1151,8 @@ void TsMuxerWindow::continueAddFile()
            {
                if (firstWarn)
                {
-                    msgBox.setText(tr("Some tracks not recognized. This tracks was "
-                                      "ignored. File name: \"%1\"")
-                                       .arg(newFileName));
+                    msgBox.setText(
+                        tr("Track %1 was not recognized and ignored. File name: \"%2\"").arg(i).arg(newFileName));
                    msgBox.exec();
                    firstWarn = false;
                }
@ -1597,7 +1614,7 @@ QString TsMuxerWindow::getMuxOpts()
    if (ui->splitByDuration->isChecked())
        rez += QString(" --split-duration=") + ui->spinEditSplitDuration->text();
    if (ui->splitBySize->isChecked())
-        rez += QString(" --split-size=") + ui->editSplitSize->text() + ui->comboBoxMeasure->currentText();
+        rez += QString(" --split-size=") + ui->editSplitSize->text() + ui->comboBoxMeasure->currentData().toString();

    int startCut = qTimeToMsec(ui->cutStartTimeEdit->time());
    int endCut = qTimeToMsec(ui->cutEndTimeEdit->time());
@ -1797,7 +1814,7 @@ QString TsMuxerWindow::getVideoMetaInfo(QtvCodecInfo *codecInfo)
        rezStr += QString(", ") + "contSPS";
    if (codecInfo->delPulldown == 1)
        rezStr += QString(", ") + "delPulldown";
-    if (codecInfo->arText != "Not change" && !codecInfo->arText.isEmpty())
+    if (!codecInfo->arText.isEmpty())
        rezStr += QString(", ") + "ar=" + codecInfo->arText;

    if (codecInfo->isSecondary)
--- a/tsMuxerGUI/tsmuxerwindow.h
+++ b/tsMuxerGUI/tsmuxerwindow.h
@ -146,9 +146,8 @@ class TsMuxerWindow : public QWidget
    void updateTracksComboBox(QComboBox*);
    void moveTrackInDefaultComboBox(int oldIndex, int newIndex);
    void postMoveComboBoxUpdate(QComboBox*, const QVariant& preMoveIndex, int oldIndex, int newIndex);
+    void setUiMetaItemsData();

-    // QTemporaryFile* tempFile;
-    // QString tempFileName;
    QString metaName;
    Ui::TsMuxerWindow* ui;
    QFileDialog* openFileDialog;