diff options
28 files changed, 392 insertions, 252 deletions
diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_bg.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_bg.ts index 353f21c09..0791126f2 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_bg.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_bg.ts @@ -14,32 +14,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_cs.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_cs.ts index af62b1546..20569b0ce 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_cs.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_cs.ts @@ -14,32 +14,32 @@ <translation>Soubory MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>O modulu MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Kompilováno s:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Zdrojový kód je založen na projektech mq3 a madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Třetí:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Kódování</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Kódování ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Kódování ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_de.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_de.ts index 056c04446..0e79119d7 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_de.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_de.ts @@ -14,32 +14,32 @@ <translation>MPEG-Dateien</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Über MPEG-Audiomodul</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Kompiliert gegen:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Geschrieben von: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Basiert auf Code von den mq3- und madplay-Projekten</translation> </message> @@ -141,17 +141,22 @@ <translation>Dritter:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Kodierungen</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ID3v1-Kodierung:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ID3v2-Kodierung:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_el.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_el.ts index 1871f2b38..4ee3d61b3 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_el.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_el.ts @@ -14,32 +14,32 @@ <translation>Αρχεία MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Σχετικά με το πρόσθετο ήχου MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>MPEG 1.0/2.0/2.5 στρώση 1/2/3 αποκωδικοποιητής ήχου</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Μεταγλωττίστηκε χρησιμοποιώντας:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, API έκδοση: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Γράφτηκε από τον: Ilya Kotov <forkotov02@hotmail.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Ο πηγαίος κώδικας έχει βασιστεί στα έργα mq3 και madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Τρίτη:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Κωδικοποιήσεις</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Κωδικοποίηση ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Κωδικοποίηση ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_en.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_en.ts index ca7d7cd3d..22e5e815e 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_en.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_en.ts @@ -14,32 +14,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_es.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_es.ts index e04692fb3..357c40f8d 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_es.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_es.ts @@ -14,32 +14,32 @@ <translation>Archivos MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Acerca del módulo de audio MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>Decodificador de audio MPEG 1.0/2.0/2.5 capas 1/2/3</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Compilado contra:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, versión de API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Escrito por: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Código fuente basado sobre proyectos mq3 y madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Tercera:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Codificaciones</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Codificación ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Codificación ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_fi.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_fi.ts index 8bdac75df..2d8c1253e 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_fi.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_fi.ts @@ -14,32 +14,32 @@ <translation>MPEG-tiedostot</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Tietoja - MPEG-ääniliitännäinen</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Toteuttanut: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_fr.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_fr.ts index b2ca0d5f7..013bf886a 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_fr.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_fr.ts @@ -14,32 +14,32 @@ <translation>Fichiers MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>À propos du greffon audio MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Compilé contre :</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Écrit par : Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Code source basé sur les projets mq3 et madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Troisième:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Encodages</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Encodage ID3v1</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Encodage ID3v2</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_gl_ES.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_gl_ES.ts index 16aa2fa34..15a14ac65 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_gl_ES.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_gl_ES.ts @@ -14,32 +14,32 @@ <translation>Ficheiros MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Sobre o engadido MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>Decodificador de audio MPEG 1.0/2.0/2.5 capa 1/2/3</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Compilado usando:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, versión API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Escrito por: LLya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Código fonte baseado nos proxectos mq3 e madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Terceira:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Codificacións</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Codificación ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Codificación ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_he.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_he.ts index 3300277b7..cd06be26c 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_he.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_he.ts @@ -14,32 +14,32 @@ <translation>קבצי MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>אודות תוסף שמע MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>הודר כנגד:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>קוד מקור מבוסס על המיזמים mq3 וגם madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>שלישית:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>קידודים</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>קידוד ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>קידוד ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_hu.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_hu.ts index 127918299..b2c65733d 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_hu.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_hu.ts @@ -14,32 +14,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_id.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_id.ts index 5e29e3720..7c7e6554e 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_id.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_id.ts @@ -14,32 +14,32 @@ <translation>File MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Tentang Plugin Audio MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Dikompilasi terhadap:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, versi API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Ditulis oleh: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Kode sumber berdasarkan pada mq3 dan proyek madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Ketiga:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Pengkodean</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Pengkodean ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Pengkodean ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_it.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_it.ts index f5d44d00d..163f510b6 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_it.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_it.ts @@ -14,32 +14,32 @@ <translation>File MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Informazioni sull'estensione audio MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>Decodificatore per audio MPEG 1.0/2.0/2.5 layer 1/2/3</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Compilato con:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, versione API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Autori: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Codice sorgente basato sui progetti mq3 e madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Terza:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Codifiche</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Codifica ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Codifica ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_ja.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_ja.ts index df125af0f..6ca51a8ae 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_ja.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_ja.ts @@ -14,32 +14,32 @@ <translation type="unfinished">MPEG ファイル</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished">MPEG 音響プラグインについて</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished">制作: Илья Котов (Ilya Kotov) <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished">ソースコードは mq3 と madplay の両プロジェクトから流用</translation> </message> @@ -141,17 +141,22 @@ <translation>第三:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>文字符号化の形式</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ID3v1 用文字符号化形式:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ID3v2 用文字符号化形式:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_kk.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_kk.ts index e6ba3f09a..fe28186a5 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_kk.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_kk.ts @@ -14,32 +14,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_lt.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_lt.ts index 7c8cc8233..3ac4d18fd 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_lt.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_lt.ts @@ -14,32 +14,32 @@ <translation type="unfinished">MPEG bylos</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished">Apie MPEG audio įskiepį</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished">Sukūrė: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished">Kodas sukurtas mq3 ir madplay projektų kodais </translation> </message> @@ -87,12 +87,12 @@ <translation>ID3v2</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ID3v1 koduotė:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ID3v2 koduotė:</translation> </message> @@ -151,7 +151,12 @@ <translation>Trečias:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Koduotės</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_nl.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_nl.ts index b5564e85b..7a07b70d7 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_nl.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_nl.ts @@ -14,32 +14,32 @@ <translation>MPEG Bestanden</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Over de MPEG Audio Module</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Auteur: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Broncode gebasseerd op 'mq3' en 'madplay' projecten</translation> </message> @@ -141,17 +141,22 @@ <translation>Tertiair:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Codering</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ID3v1 codering:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ID3v2 codering:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_pl_PL.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_pl_PL.ts index b6a55b331..1c06a68e6 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_pl_PL.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_pl_PL.ts @@ -14,32 +14,32 @@ <translation>Pliki MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>O wtyczce dźwiękowej MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>Dekoder dźwięku MPEG 1.0/2.0/2.5 layer 1/2/3</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Skompilowana z biblioteką:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, wersja API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Napisane przez: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Kod źródłowy oparty na projektach mq3 oraz madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Trzeci:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Kodowania</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Kodowanie ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Kodowanie ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_pt.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_pt.ts index a322bf77c..efb11c889 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_pt.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_pt.ts @@ -14,32 +14,32 @@ <translation>Ficheiros MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Sobre o suplemento MPEG Audio</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>Descodificador de áudio MPEG 1.0/2.0/2.5 layer 1/2/3</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Compilado com:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, versão da API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Desenvolvido por: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Baseado no código fonte dos projetos mq3 e madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Terceiro:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Codificação</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Codificação ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Codificação ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_pt_BR.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_pt_BR.ts index c1e209cd5..dab6713e9 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_pt_BR.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_pt_BR.ts @@ -14,32 +14,32 @@ <translation>Arquivos MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Sobre o plugin MPEG Audio</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Compilado com:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Baseado no código fonte dos projetos mq3 e madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Terceiro:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Codificação</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Codificação ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Codificação ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_ru.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_ru.ts index c1aeeb03a..afde50f51 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_ru.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_ru.ts @@ -14,32 +14,32 @@ <translation>Файлы MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Об аудио-модуле MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>MPEG 1.0/2.0/2.5 layer 1/2/3 аудио декодер</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Собрано с библиотеками:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, Версия API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Разработчик: Илья Котов <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Исходный код снован на проектах mq3 и madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Третий:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Кодировки</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Кодировка ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Кодировка ID3v2:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_sk.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_sk.ts index 215ee8f7e..b2b3168c1 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_sk.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_sk.ts @@ -14,32 +14,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Skompilovaný oproti:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_BA.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_BA.ts index 071011518..312b16587 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_BA.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_BA.ts @@ -14,32 +14,32 @@ <translation type="unfinished">МПЕГ фајлови</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation type="unfinished">О МПЕГ прикључку</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished">Аутор: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished">Заснован на пројектима mq3 и madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Трећа:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Кодирање</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ИД3в1 кодирање:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ИД3в2 кодирање:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_RS.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_RS.ts index 03cb6d800..7219e570f 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_RS.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_sr_RS.ts @@ -14,32 +14,32 @@ <translation>МПЕГ фајлови</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>О МПЕГ прикључку</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Компилован на:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Written by: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Заснован на пројектима mq3 и madplay</translation> </message> @@ -141,17 +141,22 @@ <translation>Трећа:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Кодирање</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ИД3в1 кодирање:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ИД3в2 кодирање:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_tr.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_tr.ts index 5b1bb4d02..c5b2626a2 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_tr.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_tr.ts @@ -14,32 +14,32 @@ <translation>MPEG Dosyaları</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>MPEG Ses Eklentisi Hakkında</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Yazan: Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation>Üçüncü:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Kodlamalar</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ID3v1 kodlaması:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ID3v2 kodlaması:</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_uk_UA.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_uk_UA.ts index f5ef4b7a9..518fd013e 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_uk_UA.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_uk_UA.ts @@ -14,32 +14,32 @@ <translation>Файли MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>Про аудіо-модуль MPEG</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation>MPEG 1.0/2.0/2.5 layer 1/2/3 аудіо декодер</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>Зібрано з:</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation>mpg123, версія API: %1</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>Розробник: Ілля Котов <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>Вихідні коди базуються на проектах mq3 та madplay</translation> </message> @@ -87,12 +87,12 @@ <translation></translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>Кодування ID3v1:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>Кодування ID3v2:</translation> </message> @@ -151,7 +151,12 @@ <translation>Третій:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>Кодування</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_CN.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_CN.ts index d76191968..fa0dd50f1 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_CN.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_CN.ts @@ -14,32 +14,32 @@ <translation>MPEG 文件</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>关于 MPEG 音频插件</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>在以下文件的基础上进行的编译：</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation>源代码基于mq3及madplay项目</translation> </message> @@ -141,17 +141,22 @@ <translation>第三：</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>编码</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ID3v1 编码：</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ID3v2 编码：</translation> </message> diff --git a/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_TW.ts b/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_TW.ts index d1695c81f..cc013d0f1 100644 --- a/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_TW.ts +++ b/src/plugins/Input/mpeg/translations/mpeg_plugin_zh_TW.ts @@ -14,32 +14,32 @@ <translation>MPEG 檔案</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="386"/> + <location filename="../decodermpegfactory.cpp" line="396"/> <source>About MPEG Audio Plugin</source> <translation>關於 MPEG 聲訊插件</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="387"/> + <location filename="../decodermpegfactory.cpp" line="397"/> <source>MPEG 1.0/2.0/2.5 layer 1/2/3 audio decoder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="388"/> + <location filename="../decodermpegfactory.cpp" line="398"/> <source>Compiled against:</source> <translation>編譯使用：</translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="397"/> + <location filename="../decodermpegfactory.cpp" line="407"/> <source>mpg123, API version: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="401"/> + <location filename="../decodermpegfactory.cpp" line="411"/> <source>Written by: Ilya Kotov <forkotov02@ya.ru></source> <translation>程式編寫：Ilya Kotov <forkotov02@ya.ru></translation> </message> <message> - <location filename="../decodermpegfactory.cpp" line="402"/> + <location filename="../decodermpegfactory.cpp" line="412"/> <source>Source code based on mq3 and madplay projects</source> <translation type="unfinished"></translation> </message> @@ -141,17 +141,22 @@ <translation>第三：</translation> </message> <message> - <location filename="../settingsdialog.ui" line="252"/> + <location filename="../settingsdialog.ui" line="243"/> + <source>Merge selected tag types</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="262"/> <source>Encodings</source> <translation>編碼</translation> </message> <message> - <location filename="../settingsdialog.ui" line="264"/> + <location filename="../settingsdialog.ui" line="274"/> <source>ID3v1 encoding:</source> <translation>ID3v1 編碼：</translation> </message> <message> - <location filename="../settingsdialog.ui" line="290"/> + <location filename="../settingsdialog.ui" line="300"/> <source>ID3v2 encoding:</source> <translation>ID3v2 編碼：</translation> </message> |