diff options
| author | yexo <yexo@openttd.org> | 2009-09-01 21:30:14 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-09-01 21:30:14 +0000 |
| commit | f3d2be7581420baf219779c9bdd491ac81ab8bd7 (patch) | |
| tree | a0a8a592b9ba7d81801aa67f1ba9372687308813 | |
| parent | 2db855e00c26034b74825a70f8e6137a06c5c031 (diff) | |
| download | openttd-f3d2be7581420baf219779c9bdd491ac81ab8bd7.tar.xz | |
(svn r17360) -Fix (r17329): the 'track' and 'title' texts were lost in the conversion to nested widgets
49 files changed, 149 insertions, 63 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 73cd8d01d..b6443eb19 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -577,7 +577,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Liedjie{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Liedjie +STR_MUSIC_XTITLE: {TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Skommel STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Musiek lys STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Gaan terug na vorig liedjie in seleksie diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index b85abc898..7b1bced24 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -578,7 +578,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}----- STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK} مسار {SETX 88}{BLACK}{TINYFONT} عنوان +STR_MUSIC_TRACK :{TINYFONT}{BLACK} مسار +STR_MUSIC_XTITLE :{TINYFONT}{BLACK} عنوان STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK} عشوائي STR_MUSIC_PROGRAM :{TINYFONT}{BLACK} برنامج STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}تجاوز للمسار السابق diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 86f7e6cdb..6525e4177 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}'{STRING}' -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Faixa{SETX 88}{BLACK}{TINYFONT}Título +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Faixa +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Título STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Embaralhar STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programa STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Mudar para a faixa anterior da seleção diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 738f99ad8..ebbba7e07 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -580,7 +580,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Песен{SETX 88}{BLACK}{TINYFONT}Заглавие +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Песен +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Заглавие STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Разбъркано STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Програма STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Превърти до предишната песен diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index fa78e0156..7806a9e70 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Pista{SETX 88}{BLACK}{TINYFONT}Títol +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Pista +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Títol STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Aleatori STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programa STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Salta a la pista anterior de la selecció diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index ef82a9ac6..7687286a0 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -643,7 +643,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Traka{SETX 88}{BLACK}{TINYFONT}Naslov +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Traka +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Naslov STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Miješaj STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Prethodna traka u izboru diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 3eb251e87..756edabb0 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -650,7 +650,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Skladba{SETX 88}{BLACK}{TINYFONT}Název +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Skladba +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Název STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Náhodně STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Skočit na předchozí skladbu ve výběru diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 488231344..e8414c45e 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Nummer{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Nummer +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Bland STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programmer STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Hop til forrige nummer diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index a95f8db50..7b68d723d 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -582,7 +582,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Nummer{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Nummer +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Shuffle STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programma STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Vorige nummer in selectie diff --git a/src/lang/english.txt b/src/lang/english.txt index 76d51e22c..682bab0a8 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -582,7 +582,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING1}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Track{SETX 88}{BLACK}{TINYFONT}Title +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Track +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Title STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Shuffle STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programme STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Skip to previous track in selection diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index df3344d7d..e1322e6dd 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Track{SETX 88}{BLACK}{TINYFONT}Title +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Track +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Title STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Shuffle STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Skip to previous track in selection diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 39bd75eaf..85feb0ab6 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -574,7 +574,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Numero{SETX 88}{BLACK}{TINYFONT}Titolo +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Numero +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titolo STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Miksu STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programo STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Saltu al antaŭa numero diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 212bf4664..739da155b 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -635,7 +635,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Lugu{SETX 88}{BLACK}{TINYFONT}Pealkiri +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Lugu +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Pealkiri STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Sega STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programm STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Eelmine lugu diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 0665980bc..5e757fb49 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Raita{SETX 88}{BLACK}{TINYFONT}Nimi +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Raita +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Nimi STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Sekoita STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Soittolista STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Hyppää edelliseen raitaan. diff --git a/src/lang/french.txt b/src/lang/french.txt index da46ba407..4d28eff19 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -583,7 +583,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Piste{SETX 88}{BLACK}{TINYFONT}Titre +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Piste +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titre STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Aléatoire STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programme STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Sauter à la piste précédente dans la sélection diff --git a/src/lang/galician.txt b/src/lang/galician.txt index cb53a55eb..9dc70aeb0 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -576,7 +576,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Pista{SETX 88}{BLACK}{TINYFONT}Título +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Pista +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Título STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Mezclar STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programa STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Saltar á pista anterior da selección diff --git a/src/lang/german.txt b/src/lang/german.txt index fba7a4293..021879a3e 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -580,7 +580,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Track{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Track +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Mischen STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programm STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Springe zum vorherigen Titel diff --git a/src/lang/greek.txt b/src/lang/greek.txt index dac74e093..0470a2510 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -578,7 +578,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Κομμάτι{SETX 88}{BLACK}{TINYFONT}Τίτλος +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Κομμάτι +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Τίτλος STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Τυχαία αναπαραγωγή STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Πρόγραμμα STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Πλοήγηση στο προηγούμενο κομμάτι της συλλογής diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index cc2c13c61..9533a90ce 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -575,7 +575,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}רצועה{SETX 88}{BLACK}{TINYFONT}כותרת +STR_MUSIC_TRACK :{TINYFONT}{BLACK}רצועה +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}כותרת STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}ערבב STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}תכנית STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}דלג לרצועה הקודמת ברשימה diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 3898bfca6..292170068 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -612,7 +612,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}SZÁM{SETX 88}{BLACK}{TINYFONT}CIM +STR_MUSIC_TRACK :{TINYFONT}{BLACK}SZÁM +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}CIM STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}KEVER STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}MÜSOR STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Előző szám @@ -690,7 +691,7 @@ STR_SMALLMAP_LEGENDA_SHIPS :{TINYFONT}{BLAC STR_SMALLMAP_LEGENDA_AIRCRAFT :{TINYFONT}{BLACK}REPÜLÖGÉP STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES :{TINYFONT}{BLACK}SZÁLLITÁSI ÚTVONAL STR_SMALLMAP_LEGENDA_FOREST :{TINYFONT}{BLACK}ERDÖ -STR_SMALLMAP_LEGENDA_FOREST.t :{BLACK}{TINYFONT}erdőt +STR_SMALLMAP_LEGENDA_FOREST.t :{TINYFONT}{BLACK}erdőt STR_SMALLMAP_LEGENDA_RAILROAD_STATION :{TINYFONT}{BLACK}VASÚTÁLLOMÁS STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY :{TINYFONT}{BLACK}TEHERAUTÓ-RAKODÓHELY STR_SMALLMAP_LEGENDA_BUS_STATION :{TINYFONT}{BLACK}BUSZMEGÁLLÓ diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 328935dc1..1e870fd86 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Lag{SETX 88}{BLACK}{TINYFONT}Titill +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Lag +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titill STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Stokka STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Listar STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Skipta yfir í fyrra lag diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index cf1c05c8c..444842a4a 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Track{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Track +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Acak STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Kembali ke musik sebelumnya @@ -3981,7 +3982,7 @@ STR_SILVER_CROSS :{SILVER}{CROSS} STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT} STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG} STR_SHORT_DATE :{WHITE}{DATE_TINY} -STR_DATE_LONG_SMALL :{BLACK}{TINYFONT}{DATE_LONG} +STR_DATE_LONG_SMALL :{TINYFONT}{BLACK}{DATE_LONG} STR_TINT_GROUP :{TINYFONT}{GROUP} STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 4642ac0a4..2d60e561d 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -581,7 +581,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Brano{SETX 88}{BLACK}{TINYFONT}Titolo +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Brano +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titolo STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Casuale STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programma STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Salta al brano precedente diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index d3d7a6816..d09947812 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -574,7 +574,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}曲{SETX 88}{BLACK}{TINYFONT}タイトル +STR_MUSIC_TRACK :{TINYFONT}{BLACK}曲 +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}タイトル STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}シャッフル STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}プレイリスト STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}選択部分の前の曲へジャンプ diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 403d00184..107569074 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -580,7 +580,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}트랙{SETX 88}{BLACK}{TINYFONT}제목 +STR_MUSIC_TRACK :{TINYFONT}{BLACK}트랙 +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}제목 STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}무작위 STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}프로그램 STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}이전 트랙으로 건너뛰기 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index e27337a23..ef65b69eb 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -581,7 +581,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Treks{SETX 88}{BLACK}{TINYFONT}Nosaukums +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Treks +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Nosaukums STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Sajaukt STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programma STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Pārlēkt uz iepriekšējo dziesmu diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index aebc05071..107bf0a4e 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -613,7 +613,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}„{STRING}“ -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Takelis{SETX 88}{BLACK}{TINYFONT}Pavadinimas +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Takelis +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Pavadinimas STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Atsitiktinis STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programa STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Pereiti prie buvusio garso takelio diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 948f804b0..307ef9176 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -578,7 +578,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Nummer{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Nummer +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Shuffle STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programm STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Sprang op d'Stéck firdrun vun der Selektioun diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index e6233b022..032192133 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -578,7 +578,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Spor{SETX 88}{BLACK}{TINYFONT}Tittel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Spor +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Tittel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Tilfeldig STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Spill forrige spor diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 9c8f72c49..f6124f332 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -575,7 +575,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Spor{SETX 88}{BLACK}{TINYFONT}Tittel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Spor +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Tittel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Tilfeldig STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Spel førre spor diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 57c85efb7..b561a9ae5 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -958,7 +958,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Ścieżka{SETX 88}{BLACK}{TINYFONT}Tytuł +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Ścieżka +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Tytuł STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Przypadkowo STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Przejdź do następnej ścieżki @@ -1036,7 +1037,7 @@ STR_SMALLMAP_LEGENDA_SHIPS :{TINYFONT}{BLAC STR_SMALLMAP_LEGENDA_AIRCRAFT :{TINYFONT}{BLACK}Samoloty STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES :{TINYFONT}{BLACK}Trasy transportowe STR_SMALLMAP_LEGENDA_FOREST :{G=m}{TINYFONT}{BLACK}Las -STR_SMALLMAP_LEGENDA_FOREST.d :{G=m}{BLACK}{TINYFONT}Lasu +STR_SMALLMAP_LEGENDA_FOREST.d :{G=m}{TINYFONT}{BLACK}Lasu STR_SMALLMAP_LEGENDA_RAILROAD_STATION :{TINYFONT}{BLACK}Stacja kolejowa STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY :{TINYFONT}{BLACK}Załadunek ciężarówek STR_SMALLMAP_LEGENDA_BUS_STATION :{TINYFONT}{BLACK}Przystanek diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 13f24c41c..6a8089137 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}'{STRING}' -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Faixa{SETX 88}{BLACK}{TINYFONT}Título +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Faixa +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Título STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Baralhar STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programa STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Mudar para a faixa anterior da selecção diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 2dd7a73d6..d1bd595bd 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -579,7 +579,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Piesa nr: {SETX 88}{BLACK}{TINYFONT}Titlul +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Piesa nr: +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titlul STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Aleator STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Sări la piesa precedentă din selecţie diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 548911c8e..4490042ca 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -718,7 +718,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}«{STRING}» -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Дорожка{SETX 88}{BLACK}{TINYFONT}Название +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Дорожка +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Название STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Случ. выбор STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Программа STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Играть предыдущий трек в программе @@ -4152,7 +4153,7 @@ STR_SILVER_CROSS :{SILVER}{CROSS} STR_WHITE_DATE_SHORT :{WHITE}{DATE_SHORT} STR_WHITE_DATE_LONG :{WHITE}{DATE_LONG} STR_SHORT_DATE :{WHITE}{DATE_TINY} -STR_DATE_LONG_SMALL :{BLACK}{TINYFONT}{DATE_LONG} +STR_DATE_LONG_SMALL :{TINYFONT}{BLACK}{DATE_LONG} STR_TINT_GROUP :{TINYFONT}{GROUP} STR_WHITE_SIGN :{WHITE}{SIGN} STR_TINY_BLACK_STATIONL :{TINYFONT}{BLACK}{STATION} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 6684bdeb7..959df7356 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -757,7 +757,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Numera{SETX 88}{BLACK}{TINYFONT}Naziv +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Numera +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Naziv STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Puštaj nasumično STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Skoči na prethodnu numeru u izboru diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index fc1befda6..b07e3d4b1 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -580,7 +580,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}音轨{SETX 88}{BLACK}{TINYFONT}乐曲主题 +STR_MUSIC_TRACK :{TINYFONT}{BLACK}音轨 +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}乐曲主题 STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}随机播放 STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}列表播放 STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}跳到上一首曲子 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 982ef9847..bc3385785 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -642,7 +642,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Stopa{SETX 88}{BLACK}{TINYFONT}Title +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Stopa +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Title STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Náhodne STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Predchádzajúca stopa diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 4a0f41bd9..da68ed766 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -620,7 +620,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Skladba{SETX 88}{BLACK}{TINYFONT}Naslov +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Skladba +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Naslov STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Mešano STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Skoči na prejšnjo skladbo v izboru diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index ce723f6c7..437844107 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -583,7 +583,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Pista{SETX 88}{BLACK}{TINYFONT}Título +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Pista +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Título STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Mezclar STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programa STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Pasar a pista anterior de la selección diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 2626eceda..a030e16e9 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -578,7 +578,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Spår{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Spår +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Slumpa STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Byt till föregående spår diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 8aa2c64da..c4d483b2e 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -578,7 +578,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}「{STRING}」 -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}音軌{SETX 88}{BLACK}{TINYFONT}標題 +STR_MUSIC_TRACK :{TINYFONT}{BLACK}音軌 +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}標題 STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}亂序 STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}播放清單 STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}跳至所選的上一首樂軌 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 6dd13fb95..5a0ef08ae 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -580,7 +580,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Şarkı{SETX 88}{BLACK}{TINYFONT}Başlığı +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Şarkı +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Başlığı STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Rastgele STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Önceki şarkı diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 6d9e27ea6..33b981cf3 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -703,7 +703,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Доріжка{SETX 88}{BLACK}{TINYFONT}Заголовок +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Доріжка +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Заголовок STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Випадково STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Програма STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Попередня diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index a19ca981e..35586e7f5 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -499,7 +499,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Nûmer{SETX 88}{BLACK}{TINYFONT}Titel +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Nûmer +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Titel STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Wikselje STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Programma STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Werom nei foargeand nûmer yn seleksje diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 2f960887f..2838f9728 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -438,7 +438,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Песна{SETX 88}{BLACK}{TINYFONT}Наслов +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Песна +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Наслов STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Измешај STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Програм STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Прескокни на претходна избрана песна diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt index a80a2a171..1c94c6aa5 100644 --- a/src/lang/unfinished/malay.txt +++ b/src/lang/unfinished/malay.txt @@ -470,7 +470,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Tajuk {SETX 88}{BLACK}{TINYFONT}Trek +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Tajuk +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Trek STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Kocok STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Program STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Lompat ke lagu sebelumnya diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index c68f3f885..4506dddff 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -482,7 +482,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}เพลงที่{SETX 88}{BLACK}{TINYFONT}ชื่อเพลง +STR_MUSIC_TRACK :{TINYFONT}{BLACK}เพลงที่ +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}ชื่อเพลง STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}สลับลำดับ STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}โปรแกรม STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}ย้อนไปฟังเพลงก่อนหน้า diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 714702fb2..0edb25401 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -578,7 +578,8 @@ STR_MUSIC_TRACK_SINGLE_DIGIT :{TINYFONT}{DKGR STR_MUSIC_TRACK_DOUBLE_DIGIT :{TINYFONT}{DKGREEN}{COMMA} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ STR_MUSIC_TITLE_NAME :{TINYFONT}{DKGREEN}"{STRING}" -STR_MUSIC_TRACK_XTITLE :{TINYFONT}{BLACK}Teitl{SETX 88}{BLACK}{TINYFONT}Trac +STR_MUSIC_TRACK :{TINYFONT}{BLACK}Teitl +STR_MUSIC_XTITLE :{TINYFONT}{BLACK}Trac STR_MUSIC_SHUFFLE :{TINYFONT}{BLACK}Cymysgu Trefn STR_MUSIC_PROGRAM :{TINYFONT}{BLACK}Rhaglen STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK :{BLACK}Neidio i'r gân ddiwethaf yn y rhestr diff --git a/src/music_gui.cpp b/src/music_gui.cpp index ebdfbe2c7..3c64c8842 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -407,7 +407,10 @@ enum MusicWidgets { MW_GAUGE, MW_EFFECT_VOL, MW_BACKGROUND, - MW_INFO, + MW_TRACK, + MW_TRACK_NR, + MW_TRACK_TITLE, + MW_TRACK_NAME, MW_SHUFFLE, MW_PROGRAMME, MW_ALL, @@ -442,6 +445,25 @@ struct MusicWindow : public Window { d.height += padding.height; *size = maxdim(*size, d); } break; + + case MW_TRACK_NR: { + Dimension d = GetStringBoundingBox(STR_MUSIC_TRACK_NONE); + d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT; + d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; + *size = maxdim(*size, d); + } break; + + case MW_TRACK_NAME: { + Dimension d = GetStringBoundingBox(STR_MUSIC_TITLE_NONE); + for (int i = 0; i < NUM_SONGS_AVAILABLE; i++) { + SetDParam(0, SPECSTR_SONGNAME); + SetDParam(1, i); + d = maxdim(d, GetStringBoundingBox(STR_MUSIC_TITLE_NAME)); + } + d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT; + d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; + *size = maxdim(*size, d); + } break; } } @@ -463,28 +485,37 @@ struct MusicWindow : public Window { } break; - case MW_INFO: { - GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, 0); + case MW_TRACK_NR: { + GfxFillRect(r.left + 1, r.top + 1, r.right, r.bottom, 0); StringID str = STR_MUSIC_TRACK_NONE; if (_song_is_active != 0 && _music_wnd_cursong != 0) { SetDParam(0, _music_wnd_cursong); str = (_music_wnd_cursong < 10) ? STR_MUSIC_TRACK_SINGLE_DIGIT : STR_MUSIC_TRACK_DOUBLE_DIGIT; } - DrawString(r.left + 3, r.right - 3, r.top + 1, str); - str = STR_MUSIC_TITLE_NONE; + DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, str); + } break; + + case MW_TRACK_NAME: { + GfxFillRect(r.left, r.top + 1, r.right - 1, r.bottom, 0); + StringID str = STR_MUSIC_TITLE_NONE; if (_song_is_active != 0 && _music_wnd_cursong != 0) { str = STR_MUSIC_TITLE_NAME; SetDParam(0, SPECSTR_SONGNAME); SetDParam(1, _music_wnd_cursong); } - DrawString(r.left, r.right, r.top + 1, str, TC_FROMSTRING, SA_CENTER); + DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, str, TC_FROMSTRING, SA_CENTER); } break; case MW_MUSIC_VOL: case MW_EFFECT_VOL: { DrawString(r.left, r.right, r.top + 1, (widget == MW_MUSIC_VOL) ? STR_MUSIC_MUSIC_VOLUME : STR_MUSIC_EFFECTS_VOLUME, TC_FROMSTRING, SA_CENTER); int y = (r.top + r.bottom - slider_bar_height) / 2; DrawFrameRect(r.left, y, r.right, y + slider_bar_height, COLOUR_GREY, FR_LOWERED); - DrawString(r.left, r.right, r.bottom - FONT_HEIGHT_SMALL, STR_MUSIC_MIN_MAX_RULER, TC_FROMSTRING, SA_CENTER); + DrawString(r.left, r.right, r.bottom - FONT_HEIGHT_SMALL, STR_MUSIC_MIN, TC_FROMSTRING, SA_LEFT); + DrawString(r.left, r.right, r.bottom - FONT_HEIGHT_SMALL, STR_MUSIC_MAX, TC_FROMSTRING, SA_RIGHT); + for (int i = 0; i <= 10; i++) { + int x = r.left + (r.right - r.left) * i / 10; + DrawFrameRect(x, y + slider_bar_height, x, y + slider_bar_height + 2, COLOUR_DARK_BLUE, FR_NONE); + } y = (r.top + r.bottom - slider_height) / 2; byte volume = (widget == MW_MUSIC_VOL) ? msf.music_vol : msf.effect_vol; int x = r.left + (volume * (r.right - r.left) / 127); @@ -504,11 +535,13 @@ struct MusicWindow : public Window { case MW_PREV: // skip to prev if (!_song_is_active) return; SkipToPrevSong(); + this->SetDirty(); break; case MW_NEXT: // skip to next if (!_song_is_active) return; SkipToNextSong(); + this->SetDirty(); break; case MW_STOP: // stop playing @@ -540,6 +573,7 @@ struct MusicWindow : public Window { this->InvalidateWidget(MW_SHUFFLE); StopMusic(); SelectSongToPlay(); + this->SetDirty(); break; case MW_PROGRAMME: // show track selection @@ -555,6 +589,7 @@ struct MusicWindow : public Window { InvalidateWindow(WC_MUSIC_TRACK_SELECTION, 0); StopMusic(); SelectSongToPlay(); + this->SetDirty(); break; } } @@ -590,12 +625,15 @@ static const NWidgetPart _nested_music_window_widgets[] = { NWidget(WWT_PANEL, COLOUR_GREY, MW_BACKGROUND), NWidget(NWID_HORIZONTAL), SetPIP(6, 0, 6), NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_SHUFFLE), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE), - NWidget(NWID_VERTICAL), SetPadding(0, 3, 3, 3), - NWidget(NWID_SPACER), SetMinimalSize(0, 9), - NWidget(WWT_PANEL, COLOUR_GREY, MW_INFO), SetMinimalSize(182, 9), SetFill(false, false), EndContainer(), + NWidget(NWID_VERTICAL), SetPadding(0, 0, 3, 3), + NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK), SetDataTip(STR_MUSIC_TRACK, STR_NULL), + NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NR), EndContainer(), + EndContainer(), + NWidget(NWID_VERTICAL), SetPadding(0, 3, 3, 0), + NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK_TITLE), SetFill(true, false), SetDataTip(STR_MUSIC_XTITLE, STR_NULL), + NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NAME), EndContainer(), EndContainer(), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, MW_PROGRAMME), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION), - NWidget(NWID_SPACER), SetFill(true, false), EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), |