summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordominik <dominik@openttd.org>2004-09-16 10:41:56 +0000
committerdominik <dominik@openttd.org>2004-09-16 10:41:56 +0000
commit21b905e963737caf9d593aa2640848fb96096bcc (patch)
tree71a43516618ba7d345065fc27d9225f5d6b89abd
parent19533f89929808dcfd2618ebea71e3b7f8c3c280 (diff)
downloadopenttd-21b905e963737caf9d593aa2640848fb96096bcc.tar.xz
(svn r271) another town name confusion fix
-rw-r--r--lang/english.txt2
-rw-r--r--settings.c2
-rw-r--r--ttd.h8
3 files changed, 6 insertions, 6 deletions
diff --git a/lang/english.txt b/lang/english.txt
index 8d41fb096..b98f7aa45 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -852,11 +852,11 @@ STR_TOWNNAME_SWEDISH :Swedish
STR_TOWNNAME_DUTCH :Dutch
STR_TOWNNAME_FINNISH :Finnish
STR_TOWNNAME_POLISH :Polish
-STR_TOWNNAME_CZECH :Czech
STR_TOWNNAME_SLOVAKISH :Slovakish
STR_TOWNNAME_HUNGARIAN :Hungarian
STR_TOWNNAME_AUSTRIAN :Austrian
STR_TOWNNAME_ROMANIAN :Romanian
+STR_TOWNNAME_CZECH :Czech
############ end of townname region
STR_CURR_POUNDS :Pounds ({POUNDSIGN})
diff --git a/settings.c b/settings.c
index 7e33dfae6..9171a6875 100644
--- a/settings.c
+++ b/settings.c
@@ -782,7 +782,7 @@ static const SettingDesc gameopt_settings[] = {
{"diff_custom", SDT_INTLIST | SDT_UINT32 | (sizeof(GameDifficulty)/4) << 16, NULL, (void*)offsetof(GameOptions, diff), NULL},
{"currency", SDT_UINT8 | SDT_ONEOFMANY, (void*)21, (void*)offsetof(GameOptions, currency), "GBP|USD|FF|DM|YEN|PT|FT|ZL|ATS|BEF|DKK|FIM|GRD|CHF|NLG|ITL|SEK|RUR|CZK|ISK|NOK|EUR|ROL" },
{"distances", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, kilometers), "imperial|metric" },
- {"town_names", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, town_name), "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|czech|slovakish|hungarian|romanian" },
+ {"town_names", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, town_name), "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|hungarian|romanian|czech" },
{"landscape", SDT_UINT8 | SDT_ONEOFMANY, (void*)0, (void*)offsetof(GameOptions, landscape), "normal|hilly|desert|candy" },
{"autosave", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, autosave), "off|monthly|quarterly|half year|yearly" },
{"road_side", SDT_UINT8 | SDT_ONEOFMANY, (void*)1, (void*)offsetof(GameOptions, road_side), "left|right" },
diff --git a/ttd.h b/ttd.h
index 8ebd77965..570197210 100644
--- a/ttd.h
+++ b/ttd.h
@@ -479,12 +479,12 @@ enum SpecialStrings {
SPECSTR_TOWNNAME_DUTCH,
SPECSTR_TOWNNAME_FINNISH,
SPECSTR_TOWNNAME_POLISH,
- SPECSTR_TOWNNAME_CZECH,
SPECSTR_TOWNNAME_SLOVAKISH,
SPECSTR_TOWNNAME_HUNGARIAN,
- SPECSTR_TOWNNAME_AUSTRIAN,
- SPECSTR_TOWNNAME_ROMANIAN,
- SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_ROMANIAN,
+ SPECSTR_TOWNNAME_AUSTRIAN,
+ SPECSTR_TOWNNAME_ROMANIAN,
+ SPECSTR_TOWNNAME_CZECH,
+ SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_CZECH,
// special strings for player names on the form "TownName transport".
SPECSTR_PLAYERNAME_START = 0x70EA,