From e35a0b1c4437905648f3ea8e08924c8f6a658afe Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 24 Nov 2004 22:52:57 +0000 Subject: [PATCH] (svn r803) Switch to ISO 8859-15 It has proper support for the euro sign and includes letters which are needed by the Latvian translation (and perhaps others), though the letter sprites are missing. --- lang/american.txt | 2 +- lang/catalan.txt | 2 +- lang/czech.txt | 2 +- lang/danish.txt | 2 +- lang/dutch.txt | 2 +- lang/english.txt | 2 +- lang/finnish.txt | 2 +- lang/french.txt | 2 +- lang/galician.txt | 2 +- lang/german.txt | 2 +- lang/hungarian.txt | 2 +- lang/icelandic.txt | 2 +- lang/italian.txt | 2 +- lang/latvian.txt | 2 +- lang/norwegian.txt | 2 +- lang/polish.txt | 2 +- lang/portuguese.txt | 2 +- lang/romanian.txt | 2 +- lang/slovak.txt | 2 +- lang/spanish.txt | 2 +- lang/swedish.txt | 2 +- readme.txt | 2 +- spritecache.c | 4 ++-- strings.c | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lang/american.txt b/lang/american.txt index 3f7c39913c..bacfe8b3d4 100644 --- a/lang/american.txt +++ b/lang/american.txt @@ -883,7 +883,7 @@ STR_CURR_CZK :Czech Koruna (CZK) STR_CURR_ISK :Icelandic Krona (ISK) STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_ROL :Romanian Leu (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Language STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/catalan.txt b/lang/catalan.txt index c7538b9454..d4195b6a46 100644 --- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -883,7 +883,7 @@ STR_CURR_CZK :Corones Txeques (CZK) STR_CURR_ISK :Corones Islandeses (ISK) STR_CURR_NOK :Corones Noruegues (NOK) STR_CURR_ROL :Leu Romančs (Lei) -STR_CURR_EUR :Euros (€) +STR_CURR_EUR :Euros (¤) STR_OPTIONS_LANG :{BLACK}Idioma STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/czech.txt b/lang/czech.txt index b2b3b4fcbd..b2858ebd24 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Ceske koruny (CZK) STR_CURR_ISK :Islandské koruny (ISK) STR_CURR_NOK :Norské koruny (NOK) STR_CURR_ROL :Rumunský Lei (ROL) -STR_CURR_EUR :Eura (€) +STR_CURR_EUR :Eura (¤) STR_OPTIONS_LANG :{BLACK}Jazyk STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/danish.txt b/lang/danish.txt index 06995cfd29..9cb8eb3950 100644 --- a/lang/danish.txt +++ b/lang/danish.txt @@ -881,7 +881,7 @@ STR_CURR_CZK :Tjekkiske Koruna (CZK) STR_CURR_ISK :Islandske Kroner (ISK) STR_CURR_NOK :Norske Kroner (NOK) STR_CURR_ROL :Rumćnske Lei -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Sprog STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/dutch.txt b/lang/dutch.txt index ad367517e9..c1b7db7049 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Tsjechise Koruna (CZK) STR_CURR_ISK :IJslandse Kronen (ISK) STR_CURR_NOK :Noorweegse Kronen (NOK) STR_CURR_ROL :Roemeense Leu (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Taal STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/english.txt b/lang/english.txt index 9d04d968c6..5f66cd1b13 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Czech Koruna (CZK) STR_CURR_ISK :Icelandic Krona (ISK) STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_ROL :Romanian Leu (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Language STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/finnish.txt b/lang/finnish.txt index a066ccb3e4..a9bafa2b56 100644 --- a/lang/finnish.txt +++ b/lang/finnish.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Tsekin kruunu (CZK) STR_CURR_ISK :Islannin kruunu (ISK) STR_CURR_NOK :Norjan kruunu (NOK) STR_CURR_ROL :Romanian leu (lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Kieli STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/french.txt b/lang/french.txt index 55e5514d64..11469f8c40 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Couronnes Tch STR_CURR_ISK :Couronnes Islandaises (ISK) STR_CURR_NOK :Cour. Norvégiennes (NOK) STR_CURR_ROL :Leu Roumain (Lei) -STR_CURR_EUR :Euros (EUR) +STR_CURR_EUR :Euros (¤) STR_OPTIONS_LANG :{BLACK}Langue STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/galician.txt b/lang/galician.txt index 473b8d1d0b..b16d91dcd9 100644 --- a/lang/galician.txt +++ b/lang/galician.txt @@ -875,7 +875,7 @@ STR_CURR_CZK :Corona Checa (CZK) STR_CURR_ISK :Corona Islandesa (ISK) STR_CURR_NOK :Corona Noruguesa (NOK) STR_CURR_ROL :Leu Rumano (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Idioma STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/german.txt b/lang/german.txt index 3cb2f05bbd..2b3a6b048c 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Tschechische Koruna (CZK) STR_CURR_ISK :Isländische Krona (ISK) STR_CURR_NOK :Norwegische Kronen (NOK) STR_CURR_ROL :Rumänische Lei (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Sprache STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/hungarian.txt b/lang/hungarian.txt index 42d623a871..031e61ec7c 100644 --- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Cseh Korona (CZK) STR_CURR_ISK :Izlandi Korona (ISK) STR_CURR_NOK :Norvég Korona (NOK) STR_CURR_ROL :Román Lej (Lej) -STR_CURR_EUR :Euró (€) +STR_CURR_EUR :Euró (¤) STR_OPTIONS_LANG :{BLACK}Nyelv STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/icelandic.txt b/lang/icelandic.txt index 8458f42f08..64078efb50 100644 --- a/lang/icelandic.txt +++ b/lang/icelandic.txt @@ -868,7 +868,7 @@ STR_CURR_CZK :T STR_CURR_ISK :Íslensk Króna (ISK) STR_CURR_NOK :Norsk króna (NOK) STR_CURR_ROL :Rúmensk leu (Lei) -STR_CURR_EUR :Evra (€) +STR_CURR_EUR :Evra (¤) STR_OPTIONS_LANG :{BLACK}Tungumál STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/italian.txt b/lang/italian.txt index 6577c4e3c5..373cdc5567 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -881,7 +881,7 @@ STR_CURR_CZK :Corona Ceca (CZK) STR_CURR_ISK :Corona Islandese (ISK) STR_CURR_NOK :Corona Norvegese (NOK) STR_CURR_ROL :Leu rumeno (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Lingua STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/latvian.txt b/lang/latvian.txt index 224c3f5b71..9d65129c30 100644 --- a/lang/latvian.txt +++ b/lang/latvian.txt @@ -1,2 +1,2 @@ ##name Latvian -##ownname Latviešu valoda +##ownname Latvie¨u valoda diff --git a/lang/norwegian.txt b/lang/norwegian.txt index 8d39d5eea1..83b4cf7288 100644 --- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Tsjekkisk Koruna (CZK) STR_CURR_ISK :Islandsk Krona (ISK) STR_CURR_NOK :Norsk Krone (NOK) STR_CURR_ROL :Rumensk Leu (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Sprĺk STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/polish.txt b/lang/polish.txt index d731ac622b..9b761e7318 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Korony czeskie (CZK) STR_CURR_ISK :Korony islandzckie (ISK) STR_CURR_NOK :Korony norweskie (NOK) STR_CURR_ROL :Lewy rumunskie (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Jezyk STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/portuguese.txt b/lang/portuguese.txt index 9f6d233781..0c4f7bd851 100644 --- a/lang/portuguese.txt +++ b/lang/portuguese.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Coroa Checa (CZK) STR_CURR_ISK :Coroa Islandesa (ISK) STR_CURR_NOK :Coroa Norueguesa (NOK) STR_CURR_ROL :Lei Romeno (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Idioma STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/romanian.txt b/lang/romanian.txt index 547033a82f..65044bc6ee 100644 --- a/lang/romanian.txt +++ b/lang/romanian.txt @@ -883,7 +883,7 @@ STR_CURR_CZK :Coroan STR_CURR_ISK :Coroană islandeză (ISK) STR_CURR_NOK :Coroană norvegiană (NOK) STR_CURR_ROL :Leul Greu Romanesc (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Limba STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/slovak.txt b/lang/slovak.txt index 9fe2db713f..a48214e417 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -883,7 +883,7 @@ STR_CURR_CZK :Ceske Koruny (CZK) STR_CURR_ISK :Islandske Koruny (ISK) STR_CURR_NOK :Norske Koruny (NOK) STR_CURR_ROL :Rumunske Lei -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Jazyk STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/spanish.txt b/lang/spanish.txt index 4ba19e57bb..0df3205cc8 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -885,7 +885,7 @@ STR_CURR_CZK :Corona Checa (CZK) STR_CURR_ISK :Corona de Islandia (ISK) STR_CURR_NOK :Corona Noruega(NOK) STR_CURR_ROL :Leu Rumano (Lei) -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Idioma STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/lang/swedish.txt b/lang/swedish.txt index 9fa52fee90..475669e3b1 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -883,7 +883,7 @@ STR_CURR_CZK :Tjeckiska kronor (CZK) STR_CURR_ISK :Isländska kronor (ISK) STR_CURR_NOK :Norska kronor (NOK) STR_CURR_ROL :Rumänsk Leu -STR_CURR_EUR :Euro (€) +STR_CURR_EUR :Euro (¤) STR_OPTIONS_LANG :{BLACK}Sprĺk STR_OPTIONS_LANG_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING} diff --git a/readme.txt b/readme.txt index 5ee90cc653..719c56880a 100644 --- a/readme.txt +++ b/readme.txt @@ -169,7 +169,7 @@ Here are some translation guidelines which you should follow closely. * Please contact the development team before begining the translation process! This avoids double work, as someone else may have already started translating to the same language. - * Translators must use the charater set "Windows latin-1", also known as ISO 8859-1. + * Translators must use the charater set ISO 8859-15. Otherwise, some characters will not display correctly in the game. 8.2) Translation: diff --git a/spritecache.c b/spritecache.c index e885f835a3..bcf96b5ce2 100644 --- a/spritecache.c +++ b/spritecache.c @@ -751,8 +751,8 @@ static const char * const _cached_filenames[4] = { #define OPENTTD_SPRITES_COUNT 70 static const uint16 _openttd_grf_indexes[] = { SPR_OPENTTD_BASE+0, SPR_OPENTTD_BASE+7, // icons etc - 98,98, // euro symbol medium size - 546,546, // euro symbol large size + 134, 134, // euro symbol medium size + 582, 582, // euro symbol large size SPR_OPENTTD_BASE+10, SPR_OPENTTD_BASE+57, // more icons 648, 648, // nordic char: ć 616, 616, // nordic char: Ć diff --git a/strings.c b/strings.c index 855dae390d..5b8b0d005a 100644 --- a/strings.c +++ b/strings.c @@ -73,7 +73,7 @@ static const CurrencySpec _currency_specs[] = { { 50, ',', 0, "", " Kc" }, { 130, '.', 0, "", " kr" }, { 11, '.', 0, "", " kr" }, - { 2, ',', CF_ISEURO, "€", "" }, + { 2, ',', CF_ISEURO, "¤", "" }, { 6, '.', 0, "", " Lei" }, };