summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-12-13 21:53:54 +0000
committerrubidium <rubidium@openttd.org>2010-12-13 21:53:54 +0000
commit3cb75db0d4d441bc1afb040fa55636934928b8fe (patch)
tree06536d813f7f24a83bf51ba4daf383c8f0e6d315
parente3b391249d2607e5d2af60ada11d3bbaeba0b3a1 (diff)
downloadopenttd-3cb75db0d4d441bc1afb040fa55636934928b8fe.tar.xz
(svn r21506) -Codechange: rename the train/vehicle lost warning strings to be more generic
-rw-r--r--src/lang/english.txt4
-rw-r--r--src/table/settings.h2
-rw-r--r--src/train_cmd.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index a89697660..b50c5bb66 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -814,7 +814,7 @@ STR_NEWS_VEHICLE_IS_GETTING_OLD :{WHITE}{VEHICLE
STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD :{WHITE}{VEHICLE} is getting very old
STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND :{WHITE}{VEHICLE} is getting very old and urgently needs replacing
STR_NEWS_TRAIN_IS_STUCK :{WHITE}{VEHICLE} can't find a path to continue.
-STR_NEWS_TRAIN_IS_LOST :{WHITE}{VEHICLE} is lost.
+STR_NEWS_VEHICLE_IS_LOST :{WHITE}{VEHICLE} is lost.
STR_NEWS_VEHICLE_IS_UNPROFITABLE :{WHITE}{VEHICLE}'s profit last year was {CURRENCY}
STR_NEWS_ORDER_REFIT_FAILED :{WHITE}{VEHICLE} stopped because an ordered refit failed
@@ -1145,7 +1145,7 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Changing
STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Airports never expire: {ORANGE}{STRING1}
-STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Warn if train is lost: {ORANGE}{STRING1}
+STR_CONFIG_SETTING_WARN_LOST_VEHICLE :{LTBLUE}Warn if vehicle is lost: {ORANGE}{STRING1}
STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING1}
STR_CONFIG_SETTING_ORDER_REVIEW_OFF :no
STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT :yes, but exclude stopped vehicles
diff --git a/src/table/settings.h b/src/table/settings.h
index 2cf8c04f1..f525a0c1a 100644
--- a/src/table/settings.h
+++ b/src/table/settings.h
@@ -593,7 +593,7 @@ const SettingDesc _settings[] = {
SDTC_VAR(gui.semaphore_build_before, SLE_INT32, S, NC, 1950, MIN_YEAR, MAX_YEAR, 1, STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE, ResetSignalVariant),
SDTC_BOOL(gui.vehicle_income_warn, S, 0, true, STR_CONFIG_SETTING_WARN_INCOME_LESS, NULL),
SDTC_VAR(gui.order_review_system, SLE_UINT8, S, MS, 2, 0, 2, 0, STR_CONFIG_SETTING_ORDER_REVIEW, NULL),
- SDTC_BOOL(gui.lost_vehicle_warn, S, 0, true, STR_CONFIG_SETTING_WARN_LOST_TRAIN, NULL),
+ SDTC_BOOL(gui.lost_vehicle_warn, S, 0, true, STR_CONFIG_SETTING_WARN_LOST_VEHICLE, NULL),
SDTC_BOOL(gui.always_build_infrastructure, S, 0, false, STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE, RedrawScreen),
SDTC_BOOL(gui.new_nonstop, S, 0, false, STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT, NULL),
SDTC_VAR(gui.stop_location, SLE_UINT8, S, MS, 2, 0, 2, 1, STR_CONFIG_SETTING_STOP_LOCATION, NULL),
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 02820faa7..824745ec6 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2420,7 +2420,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir,
if (_settings_client.gui.lost_vehicle_warn && v->owner == _local_company) {
SetDParam(0, v->index);
AddVehicleNewsItem(
- STR_NEWS_TRAIN_IS_LOST,
+ STR_NEWS_VEHICLE_IS_LOST,
NS_ADVICE,
v->index
);