Only in trunk.old: lang diff -urp -x '.*' r22610/src/command.cpp trunk.old/src/command.cpp --- r22610/src/command.cpp 2011-06-30 17:52:24.043318814 -0400 +++ trunk.old/src/command.cpp 2011-07-01 08:31:46.383295307 -0400 @@ -27,8 +27,9 @@ #include "signal_func.h" #include "core/backup_type.hpp" #include "object_base.h" - #include "table/strings.h" +#include "tilehighlight_func.h" +#include "window_type.h" CommandProc CmdBuildRailroadTrack; CommandProc CmdRemoveRailroadTrack; @@ -505,7 +506,10 @@ bool DoCommandP(TileIndex tile, uint32 p bool estimate_only = _shift_pressed && IsLocalCompany() && !IsGeneratingWorld() && !(cmd & CMD_NETWORK_COMMAND) && - (cmd & CMD_ID_MASK) != CMD_PAUSE; + (cmd & CMD_ID_MASK) != CMD_PAUSE && + _thd.window_class != WC_VEHICLE_ORDERS && + _cursor.sprite != ANIMCURSOR_PICKSTATION; + /* We're only sending the command, so don't do * fancy things for 'success'. */ Only in trunk.old/src/lang: add_entry.pl diff -urp -x '.*' r22610/src/lang/afrikaans.txt trunk.old/src/lang/afrikaans.txt --- r22610/src/lang/afrikaans.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/afrikaans.txt 2011-07-01 08:39:31.153295100 -0400 @@ -1333,6 +1333,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Verander stel waarde +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/arabic_egypt.txt trunk.old/src/lang/arabic_egypt.txt --- r22610/src/lang/arabic_egypt.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/arabic_egypt.txt 2011-07-01 08:39:31.113295100 -0400 @@ -1350,6 +1350,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}عدل قيمة التغيير +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/belarusian.txt trunk.old/src/lang/belarusian.txt --- r22610/src/lang/belarusian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/belarusian.txt 2011-07-01 08:39:31.103295100 -0400 @@ -1673,6 +1673,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Зьмяніць значэньне +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/brazilian_portuguese.txt trunk.old/src/lang/brazilian_portuguese.txt --- r22610/src/lang/brazilian_portuguese.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/brazilian_portuguese.txt 2011-07-01 08:39:31.213295099 -0400 @@ -1357,6 +1357,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Alterar valor +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/bulgarian.txt trunk.old/src/lang/bulgarian.txt --- r22610/src/lang/bulgarian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/bulgarian.txt 2011-07-01 08:39:31.093295100 -0400 @@ -1347,6 +1347,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Промяна стойноста на настройка +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/catalan.txt trunk.old/src/lang/catalan.txt --- r22610/src/lang/catalan.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/catalan.txt 2011-07-01 08:39:31.133295100 -0400 @@ -1357,6 +1357,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Canvia el valor de l'ajustament +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/croatian.txt trunk.old/src/lang/croatian.txt --- r22610/src/lang/croatian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/croatian.txt 2011-07-01 08:39:31.163295100 -0400 @@ -1452,6 +1452,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Promijeni vrijednost postavke +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/czech.txt trunk.old/src/lang/czech.txt --- r22610/src/lang/czech.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/czech.txt 2011-07-01 08:39:31.113295100 -0400 @@ -1437,6 +1437,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Změnit hodnotu nastavení +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/danish.txt trunk.old/src/lang/danish.txt --- r22610/src/lang/danish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/danish.txt 2011-07-01 08:39:31.163295100 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Skift indstillingsværdi +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/dutch.txt trunk.old/src/lang/dutch.txt --- r22610/src/lang/dutch.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/dutch.txt 2011-07-01 08:39:31.123295100 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Verander waarde +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/english.txt trunk.old/src/lang/english.txt --- r22610/src/lang/english.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/english.txt 2011-07-01 08:39:31.093295100 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Change setting value +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/english_US.txt trunk.old/src/lang/english_US.txt --- r22610/src/lang/english_US.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/english_US.txt 2011-07-01 08:39:31.123295100 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Change setting value +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/esperanto.txt trunk.old/src/lang/esperanto.txt --- r22610/src/lang/esperanto.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/esperanto.txt 2011-07-01 08:39:31.223295099 -0400 @@ -1349,6 +1349,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Ŝanĝu agord-valoron +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/estonian.txt trunk.old/src/lang/estonian.txt --- r22610/src/lang/estonian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/estonian.txt 2011-07-01 08:39:31.193295100 -0400 @@ -1412,6 +1412,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Muuda seadete väärtusi +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/finnish.txt trunk.old/src/lang/finnish.txt --- r22610/src/lang/finnish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/finnish.txt 2011-07-01 08:39:31.233295099 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Muuta asetusarvo +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/french.txt trunk.old/src/lang/french.txt --- r22610/src/lang/french.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/french.txt 2011-07-01 08:39:31.213295099 -0400 @@ -1357,6 +1357,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Changer valeur du paramètre +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/galician.txt trunk.old/src/lang/galician.txt --- r22610/src/lang/galician.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/galician.txt 2011-07-01 08:39:31.193295100 -0400 @@ -1286,6 +1286,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Cambia-lo valor +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/german.txt trunk.old/src/lang/german.txt --- r22610/src/lang/german.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/german.txt 2011-07-01 08:39:31.163295100 -0400 @@ -1357,6 +1357,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Wert der Einstellung ändern +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/greek.txt trunk.old/src/lang/greek.txt --- r22610/src/lang/greek.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/greek.txt 2011-07-01 08:39:31.113295100 -0400 @@ -1442,6 +1442,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Αλλαγή τιμής ρύθμισης +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/hebrew.txt trunk.old/src/lang/hebrew.txt --- r22610/src/lang/hebrew.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/hebrew.txt 2011-07-01 08:39:31.233295099 -0400 @@ -1332,6 +1332,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}שנה ערך +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/hungarian.txt trunk.old/src/lang/hungarian.txt --- r22610/src/lang/hungarian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/hungarian.txt 2011-07-01 08:39:31.193295100 -0400 @@ -1420,6 +1420,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Válassz beállítási értéket +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/icelandic.txt trunk.old/src/lang/icelandic.txt --- r22610/src/lang/icelandic.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/icelandic.txt 2011-07-01 08:39:31.153295100 -0400 @@ -1326,6 +1326,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Breyta gildi stillingar +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/indonesian.txt trunk.old/src/lang/indonesian.txt --- r22610/src/lang/indonesian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/indonesian.txt 2011-07-01 08:39:31.233295099 -0400 @@ -1351,6 +1351,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Ganti nilai tetapan +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/irish.txt trunk.old/src/lang/irish.txt --- r22610/src/lang/irish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/irish.txt 2011-07-01 08:39:31.133295100 -0400 @@ -1348,6 +1348,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Athraigh luach an tsocraithe +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/italian.txt trunk.old/src/lang/italian.txt --- r22610/src/lang/italian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/italian.txt 2011-07-01 08:39:31.223295099 -0400 @@ -1380,6 +1380,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Cambia impostazione +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/japanese.txt trunk.old/src/lang/japanese.txt --- r22610/src/lang/japanese.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/japanese.txt 2011-07-01 08:39:31.213295099 -0400 @@ -1350,6 +1350,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}設定を変更します +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/korean.txt trunk.old/src/lang/korean.txt --- r22610/src/lang/korean.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/korean.txt 2011-07-01 08:39:31.093295100 -0400 @@ -1357,6 +1357,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}설정값 변경 +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/latvian.txt trunk.old/src/lang/latvian.txt --- r22610/src/lang/latvian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/latvian.txt 2011-07-01 08:39:31.203295099 -0400 @@ -1301,6 +1301,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Mainīt iestatījuma vērtību +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/lithuanian.txt trunk.old/src/lang/lithuanian.txt --- r22610/src/lang/lithuanian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/lithuanian.txt 2011-07-01 08:39:31.173295100 -0400 @@ -1423,6 +1423,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Keisti reikšmes +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/luxembourgish.txt trunk.old/src/lang/luxembourgish.txt --- r22610/src/lang/luxembourgish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/luxembourgish.txt 2011-07-01 08:39:31.143295100 -0400 @@ -1355,6 +1355,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Astellung änneren +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/malay.txt trunk.old/src/lang/malay.txt --- r22610/src/lang/malay.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/malay.txt 2011-07-01 08:39:31.183295100 -0400 @@ -1312,6 +1312,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Tukar nilai tetapan +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/norwegian_bokmal.txt trunk.old/src/lang/norwegian_bokmal.txt --- r22610/src/lang/norwegian_bokmal.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/norwegian_bokmal.txt 2011-07-01 08:39:31.123295100 -0400 @@ -1354,6 +1354,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Endre verdi +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/norwegian_nynorsk.txt trunk.old/src/lang/norwegian_nynorsk.txt --- r22610/src/lang/norwegian_nynorsk.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/norwegian_nynorsk.txt 2011-07-01 08:39:31.173295100 -0400 @@ -1354,6 +1354,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Byt innstillingsverdi +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/polish.txt trunk.old/src/lang/polish.txt --- r22610/src/lang/polish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/polish.txt 2011-07-01 08:39:31.163295100 -0400 @@ -1736,6 +1736,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Zmiana wartości +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/portuguese.txt trunk.old/src/lang/portuguese.txt --- r22610/src/lang/portuguese.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/portuguese.txt 2011-07-01 08:39:31.203295099 -0400 @@ -1357,6 +1357,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Alterar valor +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/romanian.txt trunk.old/src/lang/romanian.txt --- r22610/src/lang/romanian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/romanian.txt 2011-07-01 08:39:31.103295100 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Schimbă valoarea setării +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/russian.txt trunk.old/src/lang/russian.txt --- r22610/src/lang/russian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/russian.txt 2011-07-01 08:39:31.183295100 -0400 @@ -1512,6 +1512,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Изменить значение +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/serbian.txt trunk.old/src/lang/serbian.txt --- r22610/src/lang/serbian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/serbian.txt 2011-07-01 08:39:31.093295100 -0400 @@ -1551,6 +1551,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Promena vrednosti +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/simplified_chinese.txt trunk.old/src/lang/simplified_chinese.txt --- r22610/src/lang/simplified_chinese.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/simplified_chinese.txt 2011-07-01 08:39:31.143295100 -0400 @@ -1355,6 +1355,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}改变设置值 +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/slovak.txt trunk.old/src/lang/slovak.txt --- r22610/src/lang/slovak.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/slovak.txt 2011-07-01 08:39:31.123295100 -0400 @@ -1417,6 +1417,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Zmeniť hodnotu nastavenia +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/slovenian.txt trunk.old/src/lang/slovenian.txt --- r22610/src/lang/slovenian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/slovenian.txt 2011-07-01 08:39:31.143295100 -0400 @@ -1508,6 +1508,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Spremeni vrednost +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/spanish.txt trunk.old/src/lang/spanish.txt --- r22610/src/lang/spanish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/spanish.txt 2011-07-01 08:39:31.173295100 -0400 @@ -1357,6 +1357,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Cambiar valor de la opción +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/swedish.txt trunk.old/src/lang/swedish.txt --- r22610/src/lang/swedish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/swedish.txt 2011-07-01 08:39:31.133295100 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Ändra inställningsvärde +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/traditional_chinese.txt trunk.old/src/lang/traditional_chinese.txt --- r22610/src/lang/traditional_chinese.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/traditional_chinese.txt 2011-07-01 08:39:31.223295099 -0400 @@ -1350,6 +1350,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}修改設定值 +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/turkish.txt trunk.old/src/lang/turkish.txt --- r22610/src/lang/turkish.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/turkish.txt 2011-07-01 08:39:31.183295100 -0400 @@ -1344,6 +1344,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Ayar değerini değiştir +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/ukrainian.txt trunk.old/src/lang/ukrainian.txt --- r22610/src/lang/ukrainian.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/ukrainian.txt 2011-07-01 08:39:31.213295099 -0400 @@ -1481,6 +1481,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Змініть значення +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/vietnamese.txt trunk.old/src/lang/vietnamese.txt --- r22610/src/lang/vietnamese.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/vietnamese.txt 2011-07-01 08:39:31.203295099 -0400 @@ -1356,6 +1356,22 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Thay đổi giá trị +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/lang/welsh.txt trunk.old/src/lang/welsh.txt --- r22610/src/lang/welsh.txt 2011-06-30 17:52:09.000000000 -0400 +++ trunk.old/src/lang/welsh.txt 2011-07-01 08:39:31.153295100 -0400 @@ -1258,6 +1258,22 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS STR_CONFIG_SETTING_QUERY_CAPTION :{WHITE}Newid gwerth gosodiad +STR_CONFIG_SETTING_VEHICLES_CTRL :{ORANGE}Controls & Orders +STR_CONFIG_SETTING_ORDER_SHORTCUTS :{ORANGE}Order's Shortcuts +STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP :{LTBLUE}Allow ctrl+left-click vehicles to start or stop them: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER :{LTBLUE}"Transfer" orders are "No Loading" by default: {ORANGE}{STRING} +STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD :{LTBLUE}"Unload all" orders are "No Loading" by default: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK :{LTBLUE}ctrl+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK :{LTBLUE}shift+left-click: {ORANGE}{STRING} +STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK :{LTBLUE}ctrl+shift+left-click: {ORANGE}{STRING} + +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE :do nothing +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_FULL_LOAD_ANY :Full load any cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_TRANSFER_CARGO :Transfer cargo +STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_UNLOAD_ALL :Force unload of all cargo + + # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} diff -urp -x '.*' r22610/src/order_gui.cpp trunk.old/src/order_gui.cpp --- r22610/src/order_gui.cpp 2011-06-30 17:52:24.083318814 -0400 +++ trunk.old/src/order_gui.cpp 2011-06-30 22:33:38.673311296 -0400 @@ -28,6 +28,7 @@ #include "waypoint_base.h" #include "core/geometry_func.hpp" #include "hotkeys.h" +#include "order_type.h" #include "table/strings.h" @@ -156,6 +157,43 @@ static const StringID _order_conditional INVALID_STRING_ID, }; +struct OrdersFromSettings +{ + enum OrderUnloadFlags unload; + enum OrderLoadFlags load; +}; + +typedef enum { + GOFS_NONE = 0, + GOFS_FULL, + GOFS_XFER, + GOFS_UNLOAD +} GetOrderFromSettingsTypes; + +/* fetch and compute orders set from settings */ + +static void GetOrdersFromSettings(uint8 setting, struct OrdersFromSettings *rv) +{ + rv->load = (enum OrderLoadFlags)-1; + rv->unload = (enum OrderUnloadFlags)-1; + + if (setting == GOFS_NONE); + else if (setting == GOFS_FULL) + rv->load = OLF_FULL_LOAD_ANY; + else if (setting == GOFS_XFER) { + rv->unload = OUFB_TRANSFER; + if (_settings_client.gui.auto_noload_on_transfer) + rv->load = OLFB_NO_LOAD; + } + else if (setting == GOFS_UNLOAD) { + rv->unload = OUFB_UNLOAD; + if (_settings_client.gui.auto_noload_on_unloadall) + rv->load = OLFB_NO_LOAD; + } + else { /* uh ho! */ } +} + + extern uint ConvertSpeedToDisplaySpeed(uint speed); extern uint ConvertDisplaySpeedToSpeed(uint speed); @@ -394,8 +432,26 @@ static Order GetOrderCmdFromTile(const V (facil = FACIL_BUS_STOP, v->type == VEH_ROAD && RoadVehicle::From(v)->IsBus()) || (facil = FACIL_TRUCK_STOP, 1); if (st->facilities & facil) { + uint8 os = 0xff; order.MakeGoToStation(st_index); - if (_ctrl_pressed) order.SetLoadType(OLF_FULL_LOAD_ANY); + if (_ctrl_pressed) { + if (_shift_pressed) + os = _settings_client.gui.goto_shortcuts_ctrlshift_lclick; + else + os = _settings_client.gui.goto_shortcuts_ctrl_lclick; + } + else if (_shift_pressed) + os = _settings_client.gui.goto_shortcuts_shift_lclick; + + if (os != 0xff) { + struct OrdersFromSettings ofs; + GetOrdersFromSettings( os, &ofs); + if (ofs.load != (enum OrderLoadFlags)-1) + order.SetLoadType(ofs.load); + if (ofs.unload != (enum OrderUnloadFlags)-1) + order.SetUnloadType(ofs.unload); + } + if (_settings_client.gui.new_nonstop && v->IsGroundVehicle()) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); order.SetStopLocation(v->type == VEH_TRAIN ? (OrderStopLocation)(_settings_client.gui.stop_location) : OSL_PLATFORM_FAR_END); return order; @@ -631,9 +687,14 @@ private: } DoCommandP(this->vehicle->tile, this->vehicle->index + (sel_ord << 20), MOF_UNLOAD | (unload_type << 4), CMD_MODIFY_ORDER | CMD_MSG(STR_ERROR_CAN_T_MODIFY_THIS_ORDER)); + + bool set_no_load = false; + if (unload_type == OUFB_TRANSFER) + set_no_load = _settings_client.gui.auto_noload_on_transfer; + else if (unload_type == OUFB_UNLOAD) + set_no_load = _settings_client.gui.auto_noload_on_unloadall; - /* Transfer orders with leave empty as default */ - if (unload_type == OUFB_TRANSFER) { + if (set_no_load) { DoCommandP(this->vehicle->tile, this->vehicle->index + (sel_ord << 20), MOF_LOAD | (OLFB_NO_LOAD << 4), CMD_MODIFY_ORDER); this->SetWidgetDirty(ORDER_WIDGET_FULL_LOAD); } diff -urp -x '.*' r22610/src/settings.cpp trunk.old/src/settings.cpp --- r22610/src/settings.cpp 2011-06-30 17:52:23.953318814 -0400 +++ trunk.old/src/settings.cpp 2011-06-30 18:05:06.073318474 -0400 @@ -2080,3 +2080,4 @@ static bool IsSignedVarMemType(VarType v } return false; } + diff -urp -x '.*' r22610/src/settings_gui.cpp trunk.old/src/settings_gui.cpp --- r22610/src/settings_gui.cpp 2011-06-30 17:52:23.963318814 -0400 +++ trunk.old/src/settings_gui.cpp 2011-06-30 07:32:35.885995993 -0400 @@ -1541,12 +1541,33 @@ static SettingEntry _settings_vehicles_t /** Trains sub-page */ static SettingsPage _settings_vehicles_trains_page = {_settings_vehicles_trains, lengthof(_settings_vehicles_trains)}; + + +static SettingEntry _settings_order_shortcuts[] = { + SettingEntry("gui.goto_shortcuts_ctrl_lclick"), + SettingEntry("gui.goto_shortcuts_shift_lclick"), + SettingEntry("gui.goto_shortcuts_ctrlshift_lclick"), +}; +/** Order Shorcuts page */ +static SettingsPage _settings_order_shortcuts_page = {_settings_order_shortcuts, lengthof(_settings_order_shortcuts)}; + +static SettingEntry _settings_vehicles_controls[] = { + SettingEntry(&_settings_order_shortcuts_page, STR_CONFIG_SETTING_ORDER_SHORTCUTS), + SettingEntry("gui.enable_ctrl_click_start_stop"), + SettingEntry("gui.new_nonstop"), + SettingEntry("gui.auto_noload_on_transfer"), + SettingEntry("gui.auto_noload_on_unloadall") +}; +/** Vehicle control page */ +static SettingsPage _settings_vehicles_controls_page = {_settings_vehicles_controls,lengthof(_settings_vehicles_controls)}; + static SettingEntry _settings_vehicles[] = { SettingEntry(&_settings_vehicles_routing_page, STR_CONFIG_SETTING_VEHICLES_ROUTING), SettingEntry(&_settings_vehicles_autorenew_page, STR_CONFIG_SETTING_VEHICLES_AUTORENEW), SettingEntry(&_settings_vehicles_servicing_page, STR_CONFIG_SETTING_VEHICLES_SERVICING), SettingEntry(&_settings_vehicles_trains_page, STR_CONFIG_SETTING_VEHICLES_TRAINS), - SettingEntry("gui.new_nonstop"), + SettingEntry(&_settings_vehicles_controls_page, STR_CONFIG_SETTING_VEHICLES_CTRL), + SettingEntry("gui.order_review_system"), SettingEntry("gui.vehicle_income_warn"), SettingEntry("gui.lost_vehicle_warn"), diff -urp -x '.*' r22610/src/settings_type.h trunk.old/src/settings_type.h --- r22610/src/settings_type.h 2011-06-30 17:52:24.063318814 -0400 +++ trunk.old/src/settings_type.h 2011-06-28 21:38:18.555996004 -0400 @@ -61,6 +61,12 @@ struct GUISettings { bool show_finances; ///< show finances at end of year bool sg_new_nonstop; ///< ttdpatch compatible nonstop handling read from pre v93 savegames bool new_nonstop; ///< ttdpatch compatible nonstop handling + bool enable_ctrl_click_start_stop; ///< allow ctrl+click to start or stop vehicles + uint8 goto_shortcuts_ctrl_lclick; ///< goto action shortcut CTRL+LEFT-CLICK + uint8 goto_shortcuts_shift_lclick; ///< goto action shortcut SHIFT+LEFT-CLICK + uint8 goto_shortcuts_ctrlshift_lclick; ///< goto action shortcut CTRL+SHIFT+LEFT-CLICK + bool auto_noload_on_transfer; ///< automatically set no-loading when ordering to transfer all cargo + bool auto_noload_on_unloadall; ///< automatically set no-loading when ordering to unload all cargo uint8 stop_location; ///< what is the default stop location of trains? bool autoscroll; ///< scroll when moving mouse to the edge byte errmsg_duration; ///< duration of error message diff -urp -x '.*' r22610/src/table/settings.ini trunk.old/src/table/settings.ini --- r22610/src/table/settings.ini 2011-06-30 17:52:12.803318819 -0400 +++ trunk.old/src/table/settings.ini 2011-06-30 18:05:42.493318458 -0400 @@ -568,6 +568,60 @@ interval = 1 str = STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS proc = RoadVehSlopeSteepnessChanged +[SDTC_BOOL] +var = gui.enable_ctrl_click_start_stop +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +def = true +str = STR_CONFIG_SETTING_CTRL_ENABLE_CTRLCLICK_STARTSTOP + +[SDTC_VAR] +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +var = gui.goto_shortcuts_ctrl_lclick +type = SLE_UINT8 +guiflags = SGF_MULTISTRING +def = 1 +min = 0 +max = 3 +interval = 1 +str = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLLCLICK +strval = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE + +[SDTC_VAR] +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +var = gui.goto_shortcuts_shift_lclick +type = SLE_UINT8 +guiflags = SGF_MULTISTRING +def = 0 +min = 0 +max = 3 +interval = 1 +str = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_SHIFTLCLICK +strval = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE + +[SDTC_VAR] +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +var = gui.goto_shortcuts_ctrlshift_lclick +type = SLE_UINT8 +guiflags = SGF_MULTISTRING +def = 0 +min = 0 +max = 3 +interval = 1 +str = STR_CONFIG_SETTING_CTRL_GOTOSHORTCUT_CTRLSHIFTLCLICK +strval = STR_CONFIG_SETTING_CTRL_GOTOSHORTOPTS_NONE + +[SDTC_BOOL] +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +var = gui.auto_noload_on_transfer +def = false +str = STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_TRANSFER + +[SDTC_BOOL] +flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC +var = gui.auto_noload_on_unloadall +def = false +str = STR_CONFIG_SETTING_AUTOSET_NOLOAD_ON_UNLOAD + [SDT_BOOL] base = GameSettings var = pf.forbid_90_deg diff -urp -x '.*' r22610/src/viewport.cpp trunk.old/src/viewport.cpp --- r22610/src/viewport.cpp 2011-06-30 17:52:24.133318814 -0400 +++ trunk.old/src/viewport.cpp 2011-06-30 08:06:58.035996010 -0400 @@ -1904,7 +1904,8 @@ bool HandleViewportClicked(const ViewPor if (IsCompanyBuildableVehicleType(v)) { v = v->First(); if (_ctrl_pressed && v->owner == _local_company) { - StartStopVehicle(v, true); + if (_settings_client.gui.enable_ctrl_click_start_stop ) + StartStopVehicle(v, true); } else { ShowVehicleViewWindow(v); }