diff options
| author | frosch <frosch@openttd.org> | 2012-12-23 21:08:42 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-12-23 21:08:42 +0000 |
| commit | 345c3203d74b485f5f6569b87c06ad9af79422a2 (patch) | |
| tree | ed4274819b03b7b8b15fba1cd7281d620543e547 | |
| parent | bc84f30fc12d01230b9cb4d091fd03186fa83f03 (diff) | |
| download | openttd-345c3203d74b485f5f6569b87c06ad9af79422a2.tar.xz | |
(svn r24845) -Add: News ticker sound setting to adv. settings window.
61 files changed, 26 insertions, 65 deletions
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 9da1beaf4..ae653f930 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -727,7 +727,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}'n Lys v STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Boodskap -STR_NEWS_MESSAGES_SOUND :{YELLOW}Speel geluid vir opsommige nuus boodskappe STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Af STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Opsomming STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Vol diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index d63d469e0..6141a6df5 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -725,7 +725,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}قائم STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}رسالة -STR_NEWS_MESSAGES_SOUND :{YELLOW}اصدار صوت عند عرض رسالة جديدة STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :اغلاق STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :ملخص STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :ممتلئ diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 8ceeca6bd..8a9207390 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -729,7 +729,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Azken al STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mezua -STR_NEWS_MESSAGES_SOUND :{YELLOW}Soinua entzun laburtutako notizi mezuetan STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Off STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sumarioa STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Betea diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index fd801b2e2..03097f2b0 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -1042,7 +1042,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Сьпі STR_MESSAGE_NEWS_FORMAT :{STRING} — {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Паведамленьне -STR_NEWS_MESSAGES_SOUND :{YELLOW}Прайграваць гукі пры атрыманьні сьціслых паведамленьняў STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Выкл. STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Сьцісла STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Цалкам diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 60c7e7669..aeb1d0069 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -727,7 +727,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Uma list STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mensagem -STR_NEWS_MESSAGES_SOUND :{YELLOW}Tocar som para mensagens de notícias resumidas STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Desligado STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Resumo STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Completa diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 228925149..a67dfe1c3 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -719,7 +719,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Спис STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Съобщение -STR_NEWS_MESSAGES_SOUND :{YELLOW}Покажи обобщените новини със звук STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :изключено STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Обобщение STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Пълно diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index adcf4194a..59ac8cd5e 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -730,7 +730,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Llista d STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Missatge -STR_NEWS_MESSAGES_SOUND :{YELLOW}Emetre so per als nous missatges resumits STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Fora STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Resum STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Complet diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index c210e91df..2353135ae 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -825,7 +825,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Popis ne STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Poruka -STR_NEWS_MESSAGES_SOUND :{YELLOW}Odsviraj zvuk za sve sažete novinske poruke STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Isključeno STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sažetak STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Puno diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 759fd923e..bee588a84 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -810,7 +810,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Seznam p STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Zpráva -STR_NEWS_MESSAGES_SOUND :{YELLOW}Přehrát zvuk pro stručné novinové zprávy STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Vypnuto STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Shrnutí STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Plná diff --git a/src/lang/danish.txt b/src/lang/danish.txt index e48b29e6b..995a97ac6 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -728,7 +728,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}En liste STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Besked -STR_NEWS_MESSAGES_SOUND :{YELLOW}Afspil lyd for refererede nyheder STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Fra STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Kortfattet STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Fuld diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 4edaa3cc7..31ff7cd5b 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -729,7 +729,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Een lijs STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Bericht -STR_NEWS_MESSAGES_SOUND :{YELLOW}Speel een geluid af voor samengevatte nieuwsberichten STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Uit STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Samengevat STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Volledig diff --git a/src/lang/english.txt b/src/lang/english.txt index 0a684a266..606812659 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -728,8 +728,6 @@ STR_MESSAGE_HISTORY :{WHITE}Message STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}A list of the recent news messages STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING5} -STR_NEWS_MESSAGES_SOUND :{YELLOW}Play sound for summarised news messages - STR_NEWS_MESSAGE_CAPTION :{WHITE}Message STR_NEWS_CUSTOM_ITEM :{BIG_FONT}{BLACK}{RAW_STRING} @@ -1351,6 +1349,9 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Keep the buildi STR_CONFIG_SETTING_EXPENSES_LAYOUT :Group expenses in company finance window: {STRING2} STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Define the layout for the company expenses window +STR_CONFIG_SETTING_SOUND_TICKER :News ticker: {STRING2} +STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Play sound for summarised news messages + STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING :Disable infrastructure building when no suitable vehicles are available: {STRING2} STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT :When enabled, infrastructure is only available if there are also vehicles available, preventing waste of time and money on unusable infrastructure STR_CONFIG_SETTING_MAX_TRAINS :Max trains per company: {STRING2} @@ -1536,6 +1537,7 @@ STR_CONFIG_SETTING_ECONOMY :{ORANGE}Economy STR_CONFIG_SETTING_AI :{ORANGE}Competitors STR_CONFIG_SETTING_DISPLAY_OPTIONS :{ORANGE}Display options STR_CONFIG_SETTING_INTERACTION :{ORANGE}Interaction +STR_CONFIG_SETTING_SOUND :{ORANGE}Sound effects STR_CONFIG_SETTING_NEWS :{ORANGE}News and messages STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS :{ORANGE}Signals STR_CONFIG_SETTING_STATIONS_CARGOHANDLING :{ORANGE}Cargo handling diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index cae6586cf..5e77a586b 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -726,7 +726,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}A list o STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Message -STR_NEWS_MESSAGES_SOUND :{YELLOW}Play sound for summarised news messages STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Off STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Summary STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Full diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 5b9c3cb91..0782ac285 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -729,7 +729,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}A list o STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Message -STR_NEWS_MESSAGES_SOUND :{YELLOW}Play sound for summarized newsmessages STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Off STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Summary STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Full diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index cd6d03013..d9e1909cb 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -720,7 +720,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Listo da STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mesaĝo -STR_NEWS_MESSAGES_SOUND :{YELLOW}Ludu sonon por resumaj novaĵoj STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Ne STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Resume STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Plene diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index fb6869c37..85b50bd14 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -783,7 +783,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Nimekiri STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Teade -STR_NEWS_MESSAGES_SOUND :{YELLOW}Mängi heli ka kokkuvõetud uudistele STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Väljas STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Lühike STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Täielik diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index a91bfd16d..269b25e05 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -729,7 +729,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Lista vi STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Viesti -STR_NEWS_MESSAGES_SOUND :{YELLOW}Soita ääni tiivistetyn uutisviestin kohdalla STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Pois STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Tiivistelmä STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Täysi diff --git a/src/lang/french.txt b/src/lang/french.txt index 23f0caba5..f20cac510 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -730,7 +730,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Liste de STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Message -STR_NEWS_MESSAGES_SOUND :{YELLOW}Émettre un son pour les bulletins sommaires STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Aucun STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sommaire STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Complet diff --git a/src/lang/galician.txt b/src/lang/galician.txt index b33d4d583..7d561c4b5 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -700,7 +700,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Unha lis STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mensaxe -STR_NEWS_MESSAGES_SOUND :{YELLOW}Reproducir son para mensaxes de noticias resumidas STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Apagado STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sumario STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Completo diff --git a/src/lang/german.txt b/src/lang/german.txt index 64b595a46..f9d40a5ea 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -730,7 +730,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Eine Lis STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mitteilung -STR_NEWS_MESSAGES_SOUND :{YELLOW}Sound für Tickermeldungen abspielen STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Aus STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Ticker STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Zeitung diff --git a/src/lang/greek.txt b/src/lang/greek.txt index a0370df2f..ee74f7228 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -821,7 +821,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Λίστ STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Μήνυμα -STR_NEWS_MESSAGES_SOUND :{YELLOW}Αναπαραγωγή ήχου για μηνύματα σε περιγραφή STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Απενεργοποιημένα STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Περιλήψεις STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Ολόκληρα diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 775089fd7..cf7b810a2 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -725,7 +725,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}רשימ STR_MESSAGE_NEWS_FORMAT :{1:STRING} - {0:STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}הודעה -STR_NEWS_MESSAGES_SOUND :{YELLOW}נגן סאונד להודעות תמציות STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :כבוי STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :תמצית STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :מלא diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 0f1b9d750..c79b533b6 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -790,7 +790,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Az előz STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Üzenet -STR_NEWS_MESSAGES_SOUND :{YELLOW}Figyelmeztető hang lejátszása rövid üzenetnél STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Ki STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Kivonat STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Teljes diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 177a498a7..bbced1cfa 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -713,7 +713,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Listi yf STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Skilaboð -STR_NEWS_MESSAGES_SOUND :{YELLOW}Spila hljóð með fréttaúrtaki STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Af STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Úrtak STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Allt diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index daef29fff..1da3b063d 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -725,7 +725,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Daftar p STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Pesan -STR_NEWS_MESSAGES_SOUND :{YELLOW}Mainkan suara untuk berita yang diringkas STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Mati STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Ringkasan STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Penuh diff --git a/src/lang/irish.txt b/src/lang/irish.txt index fa0454059..4a57c1063 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -724,7 +724,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Liosta d STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Teachtaireacht -STR_NEWS_MESSAGES_SOUND :{YELLOW}Seinn fuaim le haghaidh teachtaireachtaí nuachta achomair STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :As STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Achoimre STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Iomlán diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 0327659f4..76928b683 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -731,7 +731,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Elenco d STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Messaggio -STR_NEWS_MESSAGES_SOUND :{YELLOW}Riproduci un suono per le notizie ridotte a sommario STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :No STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sommario STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Completo diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 53d09d469..c706a46bd 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -723,7 +723,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}最近 STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}メッセージ -STR_NEWS_MESSAGES_SOUND :{YELLOW}ニュースを簡易表示するときに音を鳴らす。 STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :切 STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :簡易 STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :完全 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 8a00c3330..b78c3e635 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -730,7 +730,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}최근 STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}메시지 -STR_NEWS_MESSAGES_SOUND :{YELLOW}메시지를 하단 상태표시줄에 요약하여 효과음과 함께 알려줍니다 STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :끄기 STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :요약 STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :전체 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 99e388d73..53492f861 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -731,7 +731,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Neseno z STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Ziņojums -STR_NEWS_MESSAGES_SOUND :{YELLOW}Atskaņot signālu kopsavilkuma ziņojumiem STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Izslēgts STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Kopsavilkums STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Pilns diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 94b44252d..dc6e95457 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -923,7 +923,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Paskutin STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Pranešimas -STR_NEWS_MESSAGES_SOUND :{YELLOW}Groti garsus pasirodzius naujienu santraukoms STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Išjungta STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Santrauka STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Pilnas diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 30ba98471..b97d5837f 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -728,7 +728,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Eng Lës STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Meldung -STR_NEWS_MESSAGES_SOUND :{YELLOW}Sound ofspillen fir zesummegefaassten Meldungen STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Aus STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Resumé STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Ganz diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 068d7e0d6..1cf631c86 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -729,7 +729,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Senarai STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Pesanan -STR_NEWS_MESSAGES_SOUND :{YELLOW}Mainkan bunyi untuk mesej berita ringkas STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Padam STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Ringkasan STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Penuh diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 35bebe5b3..77517d1fb 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -728,7 +728,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}En liste STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Melding -STR_NEWS_MESSAGES_SOUND :{YELLOW}Spill av en lyd ved nyhetssammendrag STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Av STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sammendrag STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Fullt diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 96c8bf129..51fafce5c 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -727,7 +727,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Ei liste STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Melding -STR_NEWS_MESSAGES_SOUND :{YELLOW}Spel av lyd for nyhetssamandrag STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Av STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Samandrag STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Fullt diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 8dc0c5239..490d67355 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1109,7 +1109,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Lista os STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Wiadomość -STR_NEWS_MESSAGES_SOUND :{YELLOW}Graj dźwięki przy sumarycznych wiadomościach STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Wyłączone STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sumaryczne STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Pełne diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 63f2e9aa3..f43166698 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -728,7 +728,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Lista de STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mensagem -STR_NEWS_MESSAGES_SOUND :{YELLOW}Alerta sonoro para resumos de mensagens noticiosas STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Desligado STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Resumo STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Completo diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 06b1d610f..df72dd343 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -726,7 +726,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}O listă STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mesaj -STR_NEWS_MESSAGES_SOUND :{YELLOW}Sunet pentru ştirile scurte STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Oprit STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Pe scurt STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Pe larg diff --git a/src/lang/russian.txt b/src/lang/russian.txt index fa7427dfd..336fd143f 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -874,7 +874,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Спис STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Сообщение -STR_NEWS_MESSAGES_SOUND :{YELLOW}Проигрывать звук при получении новых сообщений STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Выкл STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Кратко STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Полно diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 9a4141ee4..4e6898235 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -921,7 +921,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Spisak s STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Poruka -STR_NEWS_MESSAGES_SOUND :{YELLOW}Zvučni signal za sažeta novinska obaveštenja STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Isključeno STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Sažeto STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Potpuno diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index ca17d5ed3..a443c7df2 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -728,7 +728,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}最新 STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}消息 -STR_NEWS_MESSAGES_SOUND :{YELLOW}为摘要的信息播放声音 STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :关闭 STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :摘要 STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :完全 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 02346287f..ce01da7e2 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -794,7 +794,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Zoznam p STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Správa -STR_NEWS_MESSAGES_SOUND :{YELLOW}Prehrať zvuk pre stručné novinové správy STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Vypnuté STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Obsah STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Plné diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 3d8af8f14..db0b0420e 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -879,7 +879,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Seznam z STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Sporočilo -STR_NEWS_MESSAGES_SOUND :{YELLOW}Zaigraj zvok ob povzetku novega sporočila STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Izključeno STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Povzetek STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Polno diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 47026c74c..a2f0e4219 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -730,7 +730,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Listado STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mensaje -STR_NEWS_MESSAGES_SOUND :{YELLOW}Reproducir sonido para resumen de noticias STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Apagado STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Resumen STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Completo diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index aab56f3ea..ce897c4e1 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -727,7 +727,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}En lista STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Meddelande -STR_NEWS_MESSAGES_SOUND :{YELLOW}Spela upp ljud för summariska nyhetsmeddelanden STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Av STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Summarisk STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :På diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 2fd5def59..3d742bf85 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -720,7 +720,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}列出 STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}訊息 -STR_NEWS_MESSAGES_SOUND :{YELLOW}摘要訊息發出聲音提示 STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :關閉 STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :摘要 STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :詳細 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 50294ee08..139fdb18d 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -730,7 +730,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}En son h STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Mesaj -STR_NEWS_MESSAGES_SOUND :{YELLOW}Özet haberler geçerken sesli uyar STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Kapalı STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Özet STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Tam diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 1a7809285..09e113c75 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -854,7 +854,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Спис STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Повідомлення -STR_NEWS_MESSAGES_SOUND :{YELLOW}Звукове сповіщення для підсумкових новин STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Не показувати STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Скорочено STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Повністю diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index de34f1622..b9c9d8ca3 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -720,7 +720,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}In list STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Berjocht -STR_NEWS_MESSAGES_SOUND :{YELLOW}Musykje ôfspielje by gearfette nijsberjochten STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Ut STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Gearfetting STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Folslein diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index 97583cfd1..8ea527ff2 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -724,7 +724,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Лист STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Порака -STR_NEWS_MESSAGES_SOUND :{YELLOW}Пушти звук за сумирани вести пораки STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :исклучен STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :резиме STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :целосна diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index adcdd6730..b32df7ac0 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -725,7 +725,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}لیست STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}پیغام -STR_NEWS_MESSAGES_SOUND :{YELLOW}پخش صدا برای پیام های خبری خلاصه STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :خاموش STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :خلاصه STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :کامل diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index fbc3b58ce..98a5b82fc 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -726,7 +726,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}รา STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}ข้อความ -STR_NEWS_MESSAGES_SOUND :{YELLOW}ให้มีเสียงเตือนเมื่อมีข้อความข่าว STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :ปิด STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :แสดงข้อความในแถบเลื่อน STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :แสดงข้อความแบบเต็ม diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index afe72bf8f..3f8cb41f1 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -723,7 +723,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}حالی STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}پیغام -STR_NEWS_MESSAGES_SOUND :{YELLOW}خبروں کے خلاصے کے لے آواز چلائیں STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :بند STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :خلاصہ STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :مکمل diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index a5e6b3767..116d91b9f 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -729,7 +729,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Danh sá STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Thông Điệp -STR_NEWS_MESSAGES_SOUND :{YELLOW}Phát âm thanh khi có thông báo tổng kết STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :Tắt STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Giản Lược STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Đủ diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index bbd15e5b8..33877d7df 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -726,7 +726,6 @@ STR_MESSAGE_HISTORY_TOOLTIP :{BLACK}Rhestr o STR_MESSAGE_NEWS_FORMAT :{STRING} - {STRING} STR_NEWS_MESSAGE_CAPTION :{WHITE}Neges -STR_NEWS_MESSAGES_SOUND :{YELLOW}Chwarae sain ar gyfer negeseuon newyddion cryno STR_CONFIG_SETTING_NEWS_MESSAGES_OFF :I Ffwrdd STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY :Crynodeb STR_CONFIG_SETTING_NEWS_MESSAGES_FULL :Llawn diff --git a/src/news_func.h b/src/news_func.h index 53765f314..cd0862f34 100644 --- a/src/news_func.h +++ b/src/news_func.h @@ -58,7 +58,6 @@ void NewsLoop(); void InitNewsItemStructs(); extern const NewsItem *_statusbar_news_item; -extern bool _news_ticker_sound; void DeleteInvalidEngineNews(); void DeleteVehicleNews(VehicleID vid, StringID news); diff --git a/src/news_gui.cpp b/src/news_gui.cpp index e6bf957a4..2490fbfd8 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -39,7 +39,6 @@ #include "table/strings.h" const NewsItem *_statusbar_news_item = NULL; -bool _news_ticker_sound; ///< Make a ticker sound when a news item is published. static uint MIN_NEWS_AMOUNT = 30; ///< prefered minimum amount of news messages static uint _total_news = 0; ///< current number of news items @@ -540,7 +539,7 @@ static void ShowNewspaper(const NewsItem *ni) /** Show news item in the ticker */ static void ShowTicker(const NewsItem *ni) { - if (_news_ticker_sound) SndPlayFx(SND_16_MORSE); + if (_settings_client.sound.news_ticker) SndPlayFx(SND_16_MORSE); _statusbar_news_item = ni; InvalidateWindowData(WC_STATUS_BAR, 0, SBI_SHOW_TICKER); diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 0287473e4..7289a581b 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1458,6 +1458,12 @@ static SettingEntry _settings_ui_interaction[] = { /** Interaction sub-page */ static SettingsPage _settings_ui_interaction_page = {_settings_ui_interaction, lengthof(_settings_ui_interaction)}; +static SettingEntry _settings_ui_sound[] = { + SettingEntry("sound.news_ticker"), +}; +/** Sound effects sub-page */ +static SettingsPage _settings_ui_sound_page = {_settings_ui_sound, lengthof(_settings_ui_sound)}; + static SettingEntry _settings_ui_news[] = { SettingEntry("news_display.arrival_player"), SettingEntry("news_display.arrival_other"), @@ -1474,6 +1480,7 @@ static SettingEntry _settings_ui_news[] = { SettingEntry("news_display.acceptance"), SettingEntry("news_display.subsidies"), SettingEntry("news_display.general"), + SettingEntry("gui.coloured_news_year"), }; /** News sub-page */ static SettingsPage _settings_ui_news_page = {_settings_ui_news, lengthof(_settings_ui_news)}; @@ -1481,6 +1488,7 @@ static SettingsPage _settings_ui_news_page = {_settings_ui_news, lengthof(_setti static SettingEntry _settings_ui[] = { SettingEntry(&_settings_ui_display_page, STR_CONFIG_SETTING_DISPLAY_OPTIONS), SettingEntry(&_settings_ui_interaction_page, STR_CONFIG_SETTING_INTERACTION), + SettingEntry(&_settings_ui_sound_page, STR_CONFIG_SETTING_SOUND), SettingEntry(&_settings_ui_news_page, STR_CONFIG_SETTING_NEWS), SettingEntry("gui.show_finances"), SettingEntry("gui.errmsg_duration"), @@ -1496,7 +1504,6 @@ static SettingEntry _settings_ui[] = { SettingEntry("gui.default_rail_type"), SettingEntry("gui.disable_unsuitable_building"), SettingEntry("gui.persistent_buildingtools"), - SettingEntry("gui.coloured_news_year"), }; /** Interface subpage */ static SettingsPage _settings_ui_page = {_settings_ui, lengthof(_settings_ui)}; diff --git a/src/settings_type.h b/src/settings_type.h index a6326c3df..6a20b700d 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -162,6 +162,11 @@ struct GUISettings { } }; +/** Settings related to sound effects. */ +struct SoundSettings { + bool news_ticker; ///< Play a ticker sound when a news item is published. +}; + /** Settings related to music. */ struct MusicSettings { byte playlist; ///< The playlist (number) to play @@ -514,6 +519,7 @@ struct ClientSettings { GUISettings gui; ///< settings related to the GUI NetworkSettings network; ///< settings related to the network CompanySettings company; ///< default values for per-company settings + SoundSettings sound; ///< sound effect settings MusicSettings music; ///< settings related to music/sound NewsSettings news_display; ///< news display settings. }; diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini index 919e964ca..6d9e7bbea 100644 --- a/src/table/misc_settings.ini +++ b/src/table/misc_settings.ini @@ -43,11 +43,6 @@ def = (1 << DO_SHOW_TOWN_NAMES | 1 << DO_SHOW_STATION_NAMES | 1 << DO_SHOW_ full = ""SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION||FULL_DETAIL|WAYPOINTS|SHOW_COMPETITOR_SIGNS"" [SDTG_BOOL] -name = ""news_ticker_sound"" -var = _news_ticker_sound -def = true - -[SDTG_BOOL] name = ""fullscreen"" var = _fullscreen def = false diff --git a/src/table/settings.ini b/src/table/settings.ini index 517e1fdf6..42be320cc 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -2913,6 +2913,13 @@ def = 100 min = 10 max = 65500 +[SDTC_BOOL] +var = sound.news_ticker +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +def = true +str = STR_CONFIG_SETTING_SOUND_TICKER +strhelp = STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT + [SDTC_VAR] var = music.playlist type = SLE_UINT8 |