diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-24 13:14:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-24 13:14:48 +0000 |
| commit | 5e247b6e439f8e717991d1bc5df27ddb732b1865 (patch) | |
| tree | 238c080e6239dd3e1762623b7813503af9354add | |
| parent | 912bce0b8cdeca9849dd257ca95566b009719d53 (diff) | |
| download | openttd-5e247b6e439f8e717991d1bc5df27ddb732b1865.tar.xz | |
(svn r18267) -Codechange: make the music window big font aware
53 files changed, 56 insertions, 72 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 34647e9ea..bfabd079f 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -574,7 +574,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Op Bestelling 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musiek Volume STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effek Volume -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index b3da99f1f..c06bbe461 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}معدل2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}مستوى الصوت STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}مؤثرات الصوت -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}مرتفع. . . . . .منخفض STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}----- diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 0e66e12a8..f43e30d79 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personaliz. 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume da Música STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume dos efeitos -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 50b0f4aa8..453aea9e8 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -576,7 +576,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Персонален 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Сила на музиката STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Сила на ефектите -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 21d1f548f..30f6d9db5 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Opcional 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volum de la música STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volum dels efectes -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index c7fea82b6..e211e038a 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -644,7 +644,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Proizvoljno 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Glasnoća glazbe STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Glasnoća zvukova -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 827b7c984..57dd4117f 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -645,7 +645,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Volba 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Hlasitost hudby STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hlasitost efektů -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 80b410038..a636cd7e1 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Custom 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musik lydstyrke STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effekt lydstyrke -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 3877cdb34..3267df6b6 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Aangepast 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muziekvolume STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Geluidsvolume -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/english.txt b/src/lang/english.txt index 3558323bf..cd5e77ce4 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -579,7 +579,9 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Custom 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Music Volume STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effects Volume -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX +STR_MUSIC_RULER_MIN :{TINYFONT}{BLACK}MIN +STR_MUSIC_RULER_MAX :{TINYFONT}{BLACK}MAX +STR_MUSIC_RULER_MARKER :{TINYFONT}{BLACK}' STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 1b07a8158..b1aeb28ad 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Custom 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Music Volume STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effects Volume -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index fe3b531f8..5615978d8 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -574,7 +574,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Propra 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muzika Volumeno STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efekta Volumeno -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}- ' ' ' ' ' ' + STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 4d519cb95..493c26865 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -635,7 +635,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Omatehtud 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muusika helitugevus STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektide helitugevus -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}Vähim ' ' ' ' ' ' Suurim STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 8a9f6b0b8..01c9ab96e 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Oma 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musiikin voimakkuus STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Äänitehosteiden voimakkuus -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/french.txt b/src/lang/french.txt index 3aef85c84..4ae539a99 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personnalisé 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume Musique STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume Effets Sonores -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 27a73fe85..4d198fcf1 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -571,7 +571,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Persoal 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume da Música STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume dos Efectos de Son -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MÍN ' ' ' ' ' ' MÁX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/german.txt b/src/lang/german.txt index 77c52b8d0..c25792fae 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Benutzerdef. 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musiklautstärke STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Soundlautstärke -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 22c06aa49..9176cf759 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -674,7 +674,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Προσαρμοσμένο 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Ένταση Μουσικής STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Ένταση Εφέ -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}ΕΛΑΧ ' ' ' ' ' ' ΜΕΓ STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index a80771321..4802bd625 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}מותאם אישית 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}עוצמת מנגינת רקע STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}עוצמת הצלילים -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 2458bdcc0..bed944b87 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -612,7 +612,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}SAJÁT 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}ZENE HANGEREJE STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}HANGOK HANGEREJE -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 7ac85cc4a..3fd933e21 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -574,7 +574,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Sérval 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Tónlistarstyrkur STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hljóðstyrkur -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}LÁG ' ' ' ' ' ' HÁM STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index a9bf7f37f..766fea1f3 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Bebas 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume Musik STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume Efek -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 311bdbc84..1c52a9a16 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -581,7 +581,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personale 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume musica STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume effetti -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index ecc6e8083..959d3e361 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -569,7 +569,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}カスタム 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}音楽の音量 STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}エフェクトの音量 -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 03cad6fde..ede6f77da 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}사용자 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}음량 STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}효과 음량 -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}최소 ' ' ' ' ' ' 최대 STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 753adcc34..b80a911f4 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Speciālais 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Mūzikas skaļums STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektu skaļums -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index b1c4bd625..1ef5a0256 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -613,7 +613,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Speciali 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muzikos garsas STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektų garsas -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}TYLU ' ' ' ' ' ' GARSU STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 59709a1dc..8e03743e5 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -573,7 +573,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Benotzerdéf. 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musék Lautstärkt STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lautstärkt vun den Effekter -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 9880c558b..dadb5baed 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Egendefinert 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikkvolum STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lydeffektvolum -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index d67ebde64..acd08a876 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -571,7 +571,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Eigendefinert 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikkvolum STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lydeffektvolum -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 03acc7fa6..5035a6eef 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -958,7 +958,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Własny 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Głośność muzyki STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Głośność efektów -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index ed38ea8a4..818b8a938 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personaliz. 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume da Música STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume dos efeitos -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 63d695956..6d229d9e4 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personale 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volumul muzicii STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volumul efectelor sonore -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 0e0c2c0dd..71b53b286 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -716,7 +716,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Пользоват. 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Громкость музыки STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Громкость звука -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}МИН ' ' ' ' ' ' МАКС STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 9dd0c91a5..889c85d89 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -757,7 +757,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Lični raspored 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Jačina muzike STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Jačina ambijenta -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index ce46b8c1a..fbc2077fb 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}自定义2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}音乐音量 STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}音效音量 -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}小' ' '' ' '大 STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index a427ffdf7..56b8d2d4a 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -642,7 +642,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Vlastné 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Hlasitost hudby STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hlasitost zvuk. efektov -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index cf092472f..de668cd16 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -615,7 +615,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Po meri 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Glasnost glasbe STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Glasnost zvokov -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 0c7991f71..e2f4fa247 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personal 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volumen música STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volumen efectos -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 82dc2ed31..e65a14a4e 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personlig 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikvolym STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effektvolym -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index b7195e276..bb025540f 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}自訂二 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}背景音樂音量 STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}音效音量 -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}最小 ' ' ' ' ' ' 最大 STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index c3a411b44..5b961ccec 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Özel 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Müzik Sesi STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efekt Sesi -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}Düşük ' ' ' ' ' ' Yüksek STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index b99301931..d54d1a36f 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -704,7 +704,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Набір 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Гучність музики STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Гучність ефектів -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}Мін ' ' ' ' ' ' Макс STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/unfinished/basque.txt b/src/lang/unfinished/basque.txt index d24584796..06dba9bbc 100644 --- a/src/lang/unfinished/basque.txt +++ b/src/lang/unfinished/basque.txt @@ -573,7 +573,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Pertsonalizatua 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikaren Bolumena STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektuen Bolumena -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index f40c7ac35..ff9871ebb 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -496,7 +496,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Eigen 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musyk Folume STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effekten Folume -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index ed32ee607..e166f721c 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -431,7 +431,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Свое 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Гласност на музка STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Гласност на ефекти -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}МИН ' ' ' ' ' ' МАКС STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt index 571ed287f..2fc62403c 100644 --- a/src/lang/unfinished/malay.txt +++ b/src/lang/unfinished/malay.txt @@ -463,7 +463,6 @@ STR_MUSIC_PLAYLIST_NEW_STYLE :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_EZY_STREET :{TINYFONT}{BLACK}Lorong Ezy STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Kekuatan muzik STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Kekuatan Kesan Bunyi -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index 63de9bc20..599e7c977 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -475,7 +475,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}انتخابی 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}شدت صدای موسیقی STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}شدت صدای محیط -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}حد اکثر . . . . . . . . . حد اقل STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index cff5f5887..9f35e672d 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -531,7 +531,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}กำหนดเอง 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}ระดับเสียงดนตรี STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}ระดับเสียงเอฟเฟกต์ -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}เงียบ ' ' ' ' ' ' ดัง STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt index b01f13010..6f01cefac 100644 --- a/src/lang/unfinished/vietnamese.txt +++ b/src/lang/unfinished/vietnamese.txt @@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Tự Chọn 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Âm Lượng STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hiệu Ứng Tiếng -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 6b2aa0c48..dccbe2209 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -573,7 +573,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Cyfaddas 2 STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Lefel Sain Cerddoriaeth STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lefel Sain Effeithiau -STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}ISAF ' ' ' ' ' ' MWYAF STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}-- STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM} STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------ diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 31b86bec1..218007a4e 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -451,8 +451,6 @@ enum MusicWidgets { }; struct MusicWindow : public Window { - static const int slider_bar_height = 4; - static const int slider_height = 7; static const int slider_width = 3; MusicWindow(const WindowDesc *desc, WindowNumber number) : Window() @@ -525,7 +523,7 @@ struct MusicWindow : public Window { StringID str = STR_MUSIC_TRACK_NONE; if (_song_is_active != 0 && _music_wnd_cursong != 0) { SetDParam(0, _music_wnd_cursong); - SetDParam(0, 2); + SetDParam(1, 2); str = STR_MUSIC_TRACK_DIGIT; } DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, str); @@ -543,11 +541,7 @@ struct MusicWindow : public Window { } 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); - y = (r.top + r.bottom - slider_height) / 2; + DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED); byte volume = (widget == MW_MUSIC_VOL) ? msf.music_vol : msf.effect_vol; int x = (volume * (r.right - r.left) / 127); if (_dynlang.text_dir == TD_RTL) { @@ -555,7 +549,7 @@ struct MusicWindow : public Window { } else { x += r.left; } - DrawFrameRect(x, y, x + slider_width, y + slider_height, COLOUR_GREY, FR_NONE); + DrawFrameRect(x, r.top, x + slider_width, r.bottom, COLOUR_GREY, FR_NONE); } break; } } @@ -650,31 +644,68 @@ static const NWidgetPart _nested_music_window_widgets[] = { EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PREV), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_NEXT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_STOP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC), - NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PLAY), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC), + NWidget(NWID_VERTICAL), + NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PREV), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_NEXT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_STOP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC), + NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PLAY), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC), + EndContainer(), + NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(), + EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, MW_SLIDERS), NWidget(NWID_HORIZONTAL), SetPIP(20, 0, 20), - NWidget(WWT_EMPTY, COLOUR_GREY, MW_MUSIC_VOL), SetMinimalSize(67, 22), SetFill(0, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), + NWidget(NWID_VERTICAL), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_MUSIC_VOLUME, STR_NULL), + NWidget(WWT_EMPTY, COLOUR_GREY, MW_MUSIC_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MAX, STR_NULL), + EndContainer(), + EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, MW_GAUGE), SetMinimalSize(16, 20), SetPadding(1, 11, 1, 11), SetFill(0, 0), EndContainer(), - NWidget(WWT_EMPTY, COLOUR_GREY, MW_EFFECT_VOL), SetMinimalSize(67, 22), SetFill(0, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), - NWidget(NWID_SPACER), SetFill(1, 0), + NWidget(NWID_VERTICAL), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_EFFECTS_VOLUME, STR_NULL), + NWidget(WWT_EMPTY, COLOUR_GREY, MW_EFFECT_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), + NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MAX, STR_NULL), + EndContainer(), + EndContainer(), EndContainer(), EndContainer(), EndContainer(), 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), + NWidget(NWID_SPACER), SetFill(0, 1), + NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_SHUFFLE), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE), + NWidget(NWID_SPACER), SetFill(0, 1), + EndContainer(), NWidget(NWID_VERTICAL), SetPadding(0, 0, 3, 3), - NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK), SetDataTip(STR_MUSIC_TRACK, STR_NULL), + NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK), SetFill(0, 0), 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(1, 0), SetDataTip(STR_MUSIC_XTITLE, STR_NULL), - NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NAME), EndContainer(), + NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NAME), SetFill(1, 0), EndContainer(), + EndContainer(), + NWidget(NWID_VERTICAL), + NWidget(NWID_SPACER), SetFill(0, 1), + 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(0, 1), EndContainer(), - NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, MW_PROGRAMME), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION), EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), diff --git a/src/widget.cpp b/src/widget.cpp index 320a34e80..f4a64f412 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1693,7 +1693,8 @@ Dimension NWidgetLeaf::closebox_dimension = {0, 0}; */ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data, StringID tip) : NWidgetCore(tp, colour, 1, 1, data, tip) { - this->SetIndex(index); + assert(index >= 0 || tp == WWT_LABEL || tp == WWT_TEXT); + if (index >= 0) this->SetIndex(index); this->SetMinimalSize(0, 0); this->SetResize(0, 0); |