(svn r13418) [NoAI] -Sync: with trunk r13380:13417. noai
authorrubidium
Sun, 08 Jun 2008 15:32:10 +0000
branchnoai
changeset 10867 5de2923d6e59
parent 10865 c4b3ddd2e9da
child 10869 4fdb11e1b599
(svn r13418) [NoAI] -Sync: with trunk r13380:13417.
src/articulated_vehicles.cpp
src/currency.cpp
src/currency.h
src/driver.cpp
src/engine.cpp
src/engine_type.h
src/fiber_thread.cpp
src/fileio.cpp
src/gamelog.cpp
src/genworld.cpp
src/gfxinit.cpp
src/industry_gui.cpp
src/lang/brazilian_portuguese.txt
src/lang/catalan.txt
src/lang/croatian.txt
src/lang/czech.txt
src/lang/danish.txt
src/lang/dutch.txt
src/lang/estonian.txt
src/lang/finnish.txt
src/lang/french.txt
src/lang/icelandic.txt
src/lang/italian.txt
src/lang/korean.txt
src/lang/portuguese.txt
src/lang/romanian.txt
src/lang/russian.txt
src/lang/spanish.txt
src/lang/swedish.txt
src/lang/turkish.txt
src/lang/ukrainian.txt
src/network/network_server.cpp
src/newgrf.cpp
src/newgrf_engine.cpp
src/news_gui.cpp
src/news_type.h
src/oldloader.cpp
src/openttd.cpp
src/order_gui.cpp
src/os2.cpp
src/roadveh_cmd.cpp
src/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/settings_type.h
src/sound/win32_s.cpp
src/spritecache.cpp
src/stdafx.h
src/strings.cpp
src/table/engines.h
src/thread.h
src/thread_morphos.cpp
src/thread_pthread.cpp
src/thread_win32.cpp
src/town.h
src/town_cmd.cpp
src/town_type.h
src/train_cmd.cpp
src/unix.cpp
src/video/dedicated_v.cpp
src/video/sdl_v.cpp
src/video/win32_v.cpp
src/win32.cpp
--- a/src/articulated_vehicles.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/articulated_vehicles.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -40,11 +40,11 @@
 
 	if (type == VEH_TRAIN) {
 		const RailVehicleInfo *rvi = RailVehInfo(engine);
-		capacity[rvi->cargo_type] = rvi->capacity;
+		capacity[rvi->cargo_type] = GetEngineProperty(engine, 0x14, rvi->capacity);
 		if (rvi->railveh_type == RAILVEH_MULTIHEAD) capacity[rvi->cargo_type] += rvi->capacity;
 	} else if (type == VEH_ROAD) {
 		const RoadVehicleInfo *rvi = RoadVehInfo(engine);
-		capacity[rvi->cargo_type] = rvi->capacity;
+		capacity[rvi->cargo_type] = GetEngineProperty(engine, 0x0F, rvi->capacity);
 	}
 
 	if (!HasBit(EngInfo(engine)->callbackmask, CBM_VEHICLE_ARTIC_ENGINE)) return capacity;
--- a/src/currency.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/currency.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -150,10 +150,10 @@
  **/
 void CheckSwitchToEuro()
 {
-	if (_currency_specs[_settings_client.gui.currency].to_euro != CF_NOEURO &&
-			_currency_specs[_settings_client.gui.currency].to_euro != CF_ISEURO &&
-			_cur_year >= _currency_specs[_settings_client.gui.currency].to_euro) {
-		_settings_client.gui.currency = 2; // this is the index of euro above.
+	if (_currency_specs[_settings_game.locale.currency].to_euro != CF_NOEURO &&
+			_currency_specs[_settings_game.locale.currency].to_euro != CF_ISEURO &&
+			_cur_year >= _currency_specs[_settings_game.locale.currency].to_euro) {
+		_settings_game.locale.currency = 2; // this is the index of euro above.
 		AddNewsItem(STR_EURO_INTRODUCE, NS_ECONOMY, 0, 0);
 	}
 }
--- a/src/currency.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/currency.h	Sun Jun 08 15:32:10 2008 +0000
@@ -39,7 +39,7 @@
 
 // XXX small hack, but makes the rest of the code a bit nicer to read
 #define _custom_currency (_currency_specs[CUSTOM_CURRENCY_ID])
-#define _currency ((const CurrencySpec*)&_currency_specs[_settings_client.gui.currency])
+#define _currency ((const CurrencySpec*)&_currency_specs[_game_mode == GM_MENU ? _settings_newgame.locale.currency : _settings_game.locale.currency])
 
 uint GetMaskOfAllowedCurrencies();
 void CheckSwitchToEuro();
--- a/src/driver.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/driver.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -87,7 +87,7 @@
 				delete newd;
 			}
 		}
-		error("Couldn't find any suitable %s driver", GetDriverTypeName(type));
+		usererror("Couldn't find any suitable %s driver", GetDriverTypeName(type));
 	} else {
 		char *parm;
 		char buffer[256];
@@ -125,7 +125,7 @@
 			const char *err = newd->Start(parms);
 			if (err != NULL) {
 				delete newd;
-				error("Unable to load driver '%s'. The error was: %s", d->name, err);
+				usererror("Unable to load driver '%s'. The error was: %s", d->name, err);
 			}
 
 			DEBUG(driver, 1, "Successfully loaded %s driver '%s'", GetDriverTypeName(type), d->name);
@@ -133,7 +133,7 @@
 			*GetActiveDriver(type) = newd;
 			return newd;
 		}
-		error("No such %s driver: %s\n", GetDriverTypeName(type), buffer);
+		usererror("No such %s driver: %s\n", GetDriverTypeName(type), buffer);
 	}
 }
 
--- a/src/engine.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/engine.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -185,6 +185,13 @@
 	DEBUG(misc, 1, "LoadCustomEngineNames: not done");
 }
 
+/* Determine if an engine type is a wagon (and not a loco) */
+static bool IsWagon(EngineID index)
+{
+	const Engine *e = GetEngine(index);
+	return e->type == VEH_TRAIN && e->u.rail.railveh_type == RAILVEH_WAGON;
+}
+
 static void CalcEngineReliability(Engine *e)
 {
 	uint age = e->age;
@@ -257,10 +264,9 @@
 		e->duration_phase_2 = GB(r, 5, 4) + ei->base_life * 12 - 96;
 		e->duration_phase_3 = GB(r, 9, 7) + 120;
 
-		e->reliability_spd_dec = (ei->unk2&0x7F) << 2;
+		e->reliability_spd_dec = ei->decay_speed << 2;
 
-		/* my invented flag for something that is a wagon */
-		if (ei->unk2 & 0x80) {
+		if (IsWagon(e->index)) {
 			e->age = 0xFFFF;
 		} else {
 			CalcEngineReliability(e);
@@ -374,13 +380,6 @@
 	return CommandCost();
 }
 
-/* Determine if an engine type is a wagon (and not a loco) */
-static bool IsWagon(EngineID index)
-{
-	const Engine *e = GetEngine(index);
-	return e->type == VEH_TRAIN && e->u.rail.railveh_type == RAILVEH_WAGON;
-}
-
 StringID GetEngineCategoryName(EngineID engine);
 
 static void NewVehicleAvailable(Engine *e)
--- a/src/engine_type.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/engine_type.h	Sun Jun 08 15:32:10 2008 +0000
@@ -109,7 +109,7 @@
 	Date base_intro;
 	Year lifelength;
 	Year base_life;
-	byte unk2;         ///< flag for carriage(bit 7) and decay speed(bits0..6)
+	byte decay_speed;
 	byte load_amount;
 	byte climates;
 	uint32 refit_mask;
--- a/src/fiber_thread.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/fiber_thread.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -109,7 +109,7 @@
 	/**
 	 * First function which is called within the fiber.
 	 */
-	static void * CDECL stFiberProc(void *fiber)
+	static void stFiberProc(void *fiber)
 	{
 		Fiber_Thread *cur = (Fiber_Thread *)fiber;
 		/* Now suspend the thread until we get SwitchToFiber() for the first time */
@@ -124,8 +124,6 @@
 			s_main->m_sem->Set();
 			throw;
 		}
-
-		return NULL;
 	}
 };
 
--- a/src/fileio.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/fileio.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -186,7 +186,7 @@
 	FioFreeHandle();
 #endif /* LIMITED_FDS */
 	f = FioFOpenFile(filename);
-	if (f == NULL) error("Cannot open file '%s'", filename);
+	if (f == NULL) usererror("Cannot open file '%s'", filename);
 	uint32 pos = ftell(f);
 
 	FioCloseFile(slot); // if file was opened before, close it
--- a/src/gamelog.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/gamelog.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -502,7 +502,7 @@
  */
 void GamelogGRFCompatible(const GRFIdentifier *newg)
 {
-	assert(_gamelog_action_type == GLAT_LOAD);
+	assert(_gamelog_action_type == GLAT_LOAD || _gamelog_action_type == GLAT_GRF);
 
 	LoggedChange *lc = GamelogChange(GLCT_GRFCOMPAT);
 	if (lc == NULL) return;
--- a/src/genworld.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/genworld.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -85,7 +85,7 @@
 /**
  * The internal, real, generate function.
  */
-static void * CDECL _GenerateWorld(void *arg)
+static void _GenerateWorld(void *arg)
 {
 	try {
 		_generating_world = true;
@@ -156,7 +156,6 @@
 		/* Show all vital windows again, because we have hidden them */
 		if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows();
 		_gw.active   = false;
-		_gw.thread   = NULL;
 		_gw.proc     = NULL;
 		_gw.threaded = false;
 
@@ -170,7 +169,6 @@
 		_generating_world = false;
 		throw;
 	}
-	return NULL;
 }
 
 /**
@@ -200,6 +198,7 @@
 	if (_gw.thread == NULL) return;
 	_gw.quit_thread = true;
 	_gw.thread->Join();
+	delete _gw.thread;
 	_gw.thread   = NULL;
 	_gw.threaded = false;
 }
@@ -234,9 +233,7 @@
 	/* Show all vital windows again, because we have hidden them */
 	if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows();
 
-	ThreadObject *thread = _gw.thread;
 	_gw.active   = false;
-	_gw.thread   = NULL;
 	_gw.proc     = NULL;
 	_gw.abortp   = NULL;
 	_gw.threaded = false;
@@ -244,7 +241,7 @@
 	DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
 	MarkWholeScreenDirty();
 
-	thread->Exit();
+	_gw.thread->Exit();
 }
 
 /**
@@ -288,6 +285,12 @@
 	/* Create toolbars */
 	SetupColorsAndInitialWindow();
 
+	if (_gw.thread != NULL) {
+		_gw.thread->Join();
+		delete _gw.thread;
+		_gw.thread = NULL;
+	}
+
 	if (_network_dedicated ||
 	    (_gw.thread = ThreadObject::New(&_GenerateWorld, NULL)) == NULL) {
 		DEBUG(misc, 1, "Cannot create genworld thread, reverting to single-threaded mode");
--- a/src/gfxinit.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/gfxinit.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -55,7 +55,7 @@
 		load_index++;
 		sprite_id++;
 		if (load_index >= MAX_SPRITES) {
-			error("Too many sprites. Recompile with higher MAX_SPRITES value or remove some custom GRF files.");
+			usererror("Too many sprites. Recompile with higher MAX_SPRITES value or remove some custom GRF files.");
 		}
 	}
 	DEBUG(sprite, 2, "Currently %i sprites are loaded", load_index);
--- a/src/industry_gui.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/industry_gui.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -806,13 +806,13 @@
 	static int CDECL IndustryTypeSorter(const Industry* const *a, const Industry* const *b)
 	{
 		int r = (*a)->type - (*b)->type;
-		return (r = 0) ? IndustryNameSorter(a, b) : r;
+		return (r == 0) ? IndustryNameSorter(a, b) : r;
 	}
 
 	/** Sort industries by production and name */
 	static int CDECL IndustryProductionSorter(const Industry* const *a, const Industry* const *b)
 	{
-		int r;
+		int r = 0;
 
 		if ((*a)->produced_cargo[0] == CT_INVALID) {
 			if ((*b)->produced_cargo[0] != CT_INVALID) return -1;
@@ -823,14 +823,14 @@
 			    ((*b)->last_month_production[0] + (*b)->last_month_production[1]);
 		}
 
-		return (r = 0) ? IndustryNameSorter(a, b) : r;
+		return (r == 0) ? IndustryNameSorter(a, b) : r;
 	}
 
 	/** Sort industries by transported cargo and name */
 	static int CDECL IndustryTransportedCargoSorter(const Industry* const *a, const Industry* const *b)
 	{
 		int r = GetCargoTransportedSortValue(*a) - GetCargoTransportedSortValue(*b);
-		return (r = 0) ? IndustryNameSorter(a, b) : r;
+		return (r == 0) ? IndustryNameSorter(a, b) : r;
 	}
 
 	/** Sort the industries list */
--- a/src/lang/brazilian_portuguese.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/brazilian_portuguese.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -487,6 +487,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Custo para limpar: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
 STR_01A7_OWNER                                                  :{BLACK}Proprietário: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Dono da estrada: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Dono da linha de bonde: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Dono da linha de trem: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridade local: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Nenhum
 STR_01AA_NAME                                                   :{BLACK}Nome
@@ -1055,6 +1058,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Fator de velocidade para aeronaves: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Permitir estações drive-through em ruas locais: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Permitir construção de estações adjacentes: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Ativar múltiplos conjuntos NewGRF de locomotivas: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING}
 
@@ -1365,7 +1369,7 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nome do jogo
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Idioma, versão do servidor, etc.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Clique num jogo da lista para o selecionar
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}O servidor que você entrou última vez:
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}O servidor que você entrou da última vez:
 STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Clique para selecionar o servidor que você jogou da última vez
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Localizar servidor
@@ -1714,6 +1718,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Rodovia arborizada
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Garagem
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Passagem de nível
+STR_TRAMWAY                                                     :Linha de bonde
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Impossível remover estação de ônibus
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Impossível remover parada de caminhões
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Impossível remover estação de bonde...
@@ -2659,13 +2664,13 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_ORDER_GO_TO                                                 :Vá para
-STR_ORDER_GO_NON_STOP_TO                                        :Vá não parando para
+STR_ORDER_GO_NON_STOP_TO                                        :Ir sem parar para
 STR_ORDER_GO_VIA                                                :Vá via
-STR_ORDER_GO_NON_STOP_VIA                                       :Vá não parando via
+STR_ORDER_GO_NON_STOP_VIA                                       :Ir sem parar via
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Carregar se disponível
-STR_ORDER_DROP_FULL_LOAD_ALL                                    :Full load all cargo
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Carregar tudo
 STR_ORDER_DROP_FULL_LOAD_ANY                                    :Carregar completamente qualquer carga
-STR_ORDER_DROP_NO_LOADING                                       :Não carregando
+STR_ORDER_DROP_NO_LOADING                                       :Não carregar
 STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Descarregar se aceito
 STR_ORDER_DROP_UNLOAD                                           :Descarregar tudo
 STR_ORDER_DROP_TRANSFER                                         :Transferir
@@ -3183,6 +3188,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Arquivo(s) GRF faltantes
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Despausar pode travar OpenTTD. Não envie relatórios de erros sobre travas subseqüentes.{}Você realmente quer despausar?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Jogo foi salvo numa versão sem suporte a bondes. Todos os bondes foram removidos.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de câmbio: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
@@ -3413,7 +3420,7 @@
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Alternar transparência para estruturas como faróis e antenas, talvez no futuro para efeitos visuais
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Alternar transparência para catenária. CTRL+click para travar.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Altera transparência para os indicadores de carga
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Definir objetos invisíveis ao invés de transparente
+STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Definir objetivos como invisíveis ao invés de transparentes.
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3547,3 +3554,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Permitir controle de ruído de aeronaves pelas cidades: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Limite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Ruído gerado: {GOLD}{COMMA}
+########
--- a/src/lang/catalan.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/catalan.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -486,6 +486,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost de neteja: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
 STR_01A7_OWNER                                                  :{BLACK}Propietari: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Propietari de la carretera: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Propietari del rail del tramvia: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Propietari del rail: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritat Local: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Ningú
 STR_01AA_NAME                                                   :{BLACK}Nom
@@ -1054,6 +1057,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Factor de velocitat dels avions: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Permet situar parades en carreteres que són propietat del poble: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Permet construir estacions annexes: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Activa diversos paquets de motors NewGRF: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permet sempre aeroports petits: {ORANGE}{STRING}
 
@@ -1713,6 +1717,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Carretera de tres carrils
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Cotxeres
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Pas a nivell
+STR_TRAMWAY                                                     :Rail de Tramvia
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}No es pot treure l'estació d'autobusos...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}No es pot treure l'estació de camions...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}No puc treure l'estació de tramvies de passatgers
@@ -3182,6 +3187,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Falten arxiu(s) GRF
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Treure la pausa pot provocar fallades d'OpenTTD. No informis d'errors a causa de fallades subseqüents.{}Estàs segur de voler treure la pausa?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El joc s'ha desat en una versió sense suport de tramvies. Tots els tramvies s'han eliminat.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalitzada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Canvi de moneda: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
@@ -3546,3 +3553,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Permet a la ciutat controlar el nivell de soroll dels aeroports: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Límit de soroll a la ciutat: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Soroll generat: {GOLD}{COMMA}
+########
--- a/src/lang/croatian.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/croatian.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -19,6 +19,7 @@
 STR_0009                                                        :{WHITE}{CARGO}
 STR_000C_ACCEPTS                                                :{BLACK}Prihvaća: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Prihvaća: {GOLD}
+STR_SUPPLIES                                                    :{BLACK}Zalihe: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :Putnici
 STR_0010_COAL                                                   :Ugljen
@@ -378,6 +379,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Maksimalna brzina
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Vrijednost
+STR_SORT_BY_LENGTH                                              :Dužina
 STR_SORT_BY_FACILITY                                            :Vrsta stanice
 STR_SORT_BY_WAITING                                             :Vrijednost tereta koji čeka
 STR_SORT_BY_RATING_MAX                                          :Ocjena tereta
@@ -1170,6 +1172,7 @@
 STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS                     :bolje ceste
 STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID                         :2x2 mreža
 STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID                         :3x3 mreža
+STR_CONFIG_PATCHES_TOWN_LAYOUT_RANDOM                           :nasumično
 
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Položaj glavne alatne trake: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Lijevo
@@ -1202,6 +1205,16 @@
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Promijeni vrijednost postavke
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Neki ili svi od zadanih servisnih intervala ispod nisu kompatibilni s odabranim postavkama! Valjane vrijednosti su 5-90% ili 30-800 dana.
 
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(Nije preporučivo)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Preporučeno)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF                   :Original {RED}(Nije preporučivo)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(Preporučeno)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF                     :Original {BLUE}(Preporučeno)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Nije preporučivo)
+
 STR_TEMPERATE_LANDSCAPE                                         :Blagi krajolik
 STR_SUB_ARCTIC_LANDSCAPE                                        :Pod-arktički krajolik
 STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropski krajolik
@@ -1336,6 +1349,7 @@
 
 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Ime igrača:
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ovo je ime po kojem će te drugi igrači raspoznavati
+STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Upiši svoje ime
 STR_NETWORK_CONNECTION                                          :{BLACK}Veza:
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Izaberi između internetske igre ili igre preko lokalne mreže (LAN)
 
@@ -2622,6 +2636,8 @@
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Detalji)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Vlak na putu
 
+
+
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Putovanje (bez rasporeda)
 STR_TIMETABLE_TRAVEL_FOR                                        :Putovanje za {STRING}
 STR_TIMETABLE_STAY_FOR                                          :i boravak za {STRING}
@@ -3075,6 +3091,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Nedostaje GRF datoteka(e)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Odpauziranje može uzrokovati rušenje OpenTTD-a. Nemojte slati prijave bugova za posljedična rušenja.{}Želite li stvarno odpauzirati?
 
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Proizvoljna valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Devizni tečaj: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Razdjelnik:
@@ -3427,3 +3444,9 @@
 STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Smanji gustoću signala prilikom izgradnje
 STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Povećaj gustoću signala prilikom izgradnje
 ########
+
+############ on screen keyboard
+########
+
+############ town controlled noise level
+########
--- a/src/lang/czech.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/czech.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -2,7 +2,7 @@
 ##ownname Čeština
 ##isocode cs_CZ
 ##plural 6
-##case nom gen dat acc voc loc ins big
+##case nom gen dat acc voc loc ins big small
 ##gender f m n
 
 #
@@ -544,6 +544,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cena za vyčištění: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
 STR_01A7_OWNER                                                  :{BLACK}Vlastník: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Majitel silnice: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Majitel tratě: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Majitel tratě: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Místní správa: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Nic
 STR_01AA_NAME                                                   :{BLACK}Jméno
@@ -1112,6 +1115,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Činitel rychlosti letadel: {ORANGE}1/{STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Povolit průjezdné zastávky na silnicích vlastněných obcemi: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Povolit stavění přilehlých stanic: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Více grafických setů s vozidly vedle sebe: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Malá letiště se budou moci stále stavět: {ORANGE}{STRING}
 
@@ -1771,6 +1775,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Silnice s alejí
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Garáž
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Železniční přejezd
+STR_TRAMWAY                                                     :Tramvaj
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Nelze odstranit autobusovou zastávku...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Nelze odstranit nakládací rampu...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Nelze zbourat tramvajovou stanici pro cestující...
@@ -2752,6 +2757,7 @@
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Ovlivnit vykládání u vybraného příkazu
 STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
 
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Vložit složitější příkaz
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Jet do nejbližšího depa
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Jet do nejbližšího hangáru
 STR_ORDER_NEAREST_DEPOT                                         :nebližšího
@@ -2765,6 +2771,29 @@
 STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
 STR_GO_TO_HANGAR                                                :{STRING} {STATION} hangár
 
+STR_ORDER_CONDITIONAL                                           :Podmíněné přeskočení příkazu
+STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Vlastnost vozidla, podle které přeskakovat
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Jak porovnat vlastnost vozidla se zadanou hodnotou
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Hodnota, se kterou srovnat vlastnost vozidla
+STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Zadej hodnotu pro srovnávání
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Procento naložení
+STR_ORDER_CONDITIONAL_RELIABILITY                               :Spolehlivost
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Maximální rychlost
+STR_ORDER_CONDITIONAL_AGE                                       :Stáří vozidla (v letech)
+STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Vyžaduje údržbu
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Vždy
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :se rovná
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :se nerovná
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :je menší než
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :je menší nebo rovno
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :je více než
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :je více nebo rovno
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je pravda
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :není pravda
+STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_CONDITIONAL_UNCONDITIONAL                                   :Skočit na příkaz {COMMA}
+STR_CONDITIONAL_NUM                                             :Skočit na příkaz {COMMA}, když {STRING.small} {STRING} {COMMA}
+STR_CONDITIONAL_TRUE_FALSE                                      :Skočit na příkaz {COMMA}, když {STRING.small} {STRING}
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Jet do (mimo jízdní řád)
 STR_TIMETABLE_TRAVEL_FOR                                        :Jet do {STRING}
@@ -3222,6 +3251,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Chybějící grafické soubory
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Spuštění hry může shodit OpenTTD. Nehlaš chybu kvůli pádům způsobeným touto akcí.{}Opravdu chceš rozjet hru?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Hra byla uložena ve verzi bez podpory tramvají. Všechny tramvaje se odstraní.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastní měna
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz měny: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddělovač:
@@ -3586,3 +3617,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :"+ěščřžýáíé=-\qwertyuiopú)asdfghjklů'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~1234567890_+|QWERTYUIOP/(}}ASDFGHJKL:!  ZXCVBNM?:_ .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Umožnit městům ovlivňovat hlukový limit pro letiště: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Hlukový limit ve městě: {ORANGE}{COMMA}{BLACK}  max.: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Vytvářený hluk: {GOLD}{COMMA}
+########
--- a/src/lang/danish.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/danish.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -18,6 +18,7 @@
 STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO} undervejs fra {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepterer: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepterer: {GOLD}
+STR_SUPPLIES                                                    :{BLACK}Forsyninger: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :Passagerer
 STR_0010_COAL                                                   :Kul
@@ -1363,6 +1364,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Spillets navn
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Sprog, server version, osv.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klik på et spil fra listen for at vælge det
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Den senest tilsluttede server:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klik for at vælge den server du spillede på sidst
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Find server
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Søg netværket for en server
@@ -1396,6 +1399,7 @@
 
 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spillets navn:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Navnet vil blive vist til andre spillere i menuen, hvor man vælger netværksspil
+STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Skriv et navn for netværksspillet
 STR_NETWORK_SET_PASSWORD                                        :{BLACK}Sæt kodeord
 STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Beskyt dit spil med et kodeord hvis du ikke vil have fremmede med
 STR_NETWORK_SELECT_MAP                                          :{BLACK}Vælg et kort:
@@ -1452,7 +1456,10 @@
 STR_NETWORK_LANG_SWEDISH                                        :Svensk
 STR_NETWORK_LANG_TURKISH                                        :Tyrkisk
 STR_NETWORK_LANG_UKRAINIAN                                      :Ukrainsk
+STR_NETWORK_LANG_AFRIKAANS                                      :Afrikaans
 STR_NETWORK_LANG_CROATIAN                                       :Kroatisk
+STR_NETWORK_LANG_CATALAN                                        :Catalansk
+STR_NETWORK_LANG_ESTONIAN                                       :Estisk
 STR_NETWORK_LANG_GALICIAN                                       :Galicisk
 STR_NETWORK_LANG_GREEK                                          :Græsk
 STR_NETWORK_LANG_LATVIAN                                        :Lettisk
@@ -1554,6 +1561,7 @@
 STR_NETWORK_CHAT_TO_CLIENT                                      :[Privat] Til {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Alle] :
 STR_NETWORK_CHAT_ALL                                            :[Alle] {STRING}: {GRAY}{STRING}
+STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Skriv tekst i netværks-chat
 STR_NETWORK_NAME_CHANGE                                         :har skiftet navn til
 STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Serveren har lukket ned for dette spil
 STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Serveren genstarter...{}Vent venligst...
@@ -1957,6 +1965,7 @@
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Vælg scenarie (grøn), predefineret spil (blå), eller nyt tilfældigt spil
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generer nyt tilfældigt spil
 STR_LOAD_HEIGHTMAP                                              :{WHITE}Hent højdekort
+STR_SAVE_OSKTITLE                                               :{BLACK}Skriv et navn til det gemte spil
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} i vejen
@@ -2652,14 +2661,40 @@
 STR_ORDER_GO_NON_STOP_TO                                        :Gå uden stop til
 STR_ORDER_GO_VIA                                                :Gå via
 STR_ORDER_GO_NON_STOP_VIA                                       :Gå uden stop via
+STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Åbn hvis tilgængelig
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Fuld last af alt gods
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Fuld last af hvilket som helst gods
+STR_ORDER_DROP_NO_LOADING                                       :Ingen lastning
+STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Los hvis gods accepteres
 STR_ORDER_DROP_UNLOAD                                           :Aflæs alt
 STR_ORDER_DROP_TRANSFER                                         :Overfør
+STR_ORDER_DROP_NO_UNLOADING                                     :Ingen losning
+STR_ORDER_FULL_LOAD                                             :(Fuld last)
+STR_ORDER_FULL_LOAD_ANY                                         :(Fuld last af hvilket som helst gods)
+STR_ORDER_NO_LOAD                                               :(Ingen lastning)
+STR_ORDER_UNLOAD                                                :(Los og medtag gods)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :(Los og vent på fuld last)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Los og vent på fuld last af hvilket som helst gods)
+STR_ORDER_UNLOAD_NO_LOAD                                        :(Los og efterlad tom)
+STR_ORDER_TRANSFER                                              :(Overfør og last gods)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :(Overfør og vent på fuld last)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Overfør og vent på fuld last af hvilket som helst gods)
 STR_ORDER_TRANSFER_NO_LOAD                                      :(Overfør og efterlad tom)
+STR_ORDER_NO_UNLOAD                                             :(Los ikke og last gods)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Los ikke og vent på fuld last)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Los ikke og vent på fuld last af hvilket som helst gods)
+STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Ændr standseregel for den valgte ordre
+STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Ændr lasteregel for den valgte ordre
+STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Ændr losseregel for den valgte ordre
 STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
 
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Indsæt en avanceret ordre
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Gå til nærmeste depot
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Flyv til nærmeste hangar
 STR_ORDER_NEAREST_DEPOT                                         :det nærmeste
 STR_ORDER_NEAREST_HANGAR                                        :den nærmeste hangar
+STR_ORDER_SERVICE_AT                                            :Servicer i
+STR_ORDER_SERVICE_NON_STOP_AT                                   :Gå direkte til service i
 STR_ORDER_TRAIN_DEPOT                                           :Remise
 STR_ORDER_ROAD_DEPOT                                            :Værksted
 STR_ORDER_SHIP_DEPOT                                            :Skibsdok
@@ -2667,6 +2702,12 @@
 STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
 STR_GO_TO_HANGAR                                                :{STRING} {STATION} hangar
 
+STR_ORDER_CONDITIONAL                                           :Betinget ordrespring
+STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Data som ordrespring baseres på
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Hvordan data sammenlignes med den givne værdi
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Værdi data skal sammenlignes med
+STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Skriv værdi der sammenlignes med
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Last-procentdel
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Pålidelighed
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Tophastighed
 STR_ORDER_CONDITIONAL_AGE                                       :Køretøjets alder (år)
@@ -2681,6 +2722,9 @@
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er sand
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er falsk
 STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_CONDITIONAL_UNCONDITIONAL                                   :Spring til ordre {COMMA}
+STR_CONDITIONAL_NUM                                             :Spring til ordre {COMMA} når {STRING} {STRING} {COMMA}
+STR_CONDITIONAL_TRUE_FALSE                                      :Spring til ordre {COMMA} når {STRING} {STRING}
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Rejs (ikke iflg. køreplan)
 STR_TIMETABLE_TRAVEL_FOR                                        :Rejs i {STRING}
@@ -2729,6 +2773,7 @@
 STR_TIMETABLE_VIEW                                              :{BLACK}Køreplan
 STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Skift til køreplan-visning
 STR_ORDER_VIEW                                                  :{BLACK}Ordrer
+STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Skift til ordrevisning
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordrer)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Slut på ordrer - -
 STR_SERVICE                                                     :{BLACK}Service
@@ -3137,6 +3182,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Manglende GRF-fil(er)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}OpenTTD kan gå ned, når spillet sættes i gang igen. Undlad at indsende fejlrapporter for efterfølgende nedbrud.{}Vil du virkelig sætte spillet i gang igen?
 
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Brugerdefineret møntfod
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurs: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Tilskuer:
@@ -3274,6 +3320,7 @@
 STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Verdensgenerering
 STR_RANDOM_SEED                                                 :{BLACK}Tilfældig
 STR_RANDOM_SEED_HELP                                            :{BLACK}Klik for at angive tilfældighed
+STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Skriv startværdi til tilfældige tal
 STR_LAND_GENERATOR                                              :{BLACK}Terrængenerator:
 STR_TREE_PLACER                                                 :{BLACK}Træalgoritme:
 STR_HEIGHTMAP_ROTATION                                          :{BLACK}Højdekortets rotation:
@@ -3366,6 +3413,7 @@
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Skift gennemsigtighed for strukturer som fyrtårne og antenner, og måske i fremtiden for øjeguf
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Slå transparens til/fra for køreledninger. CTRL+klik for at låse.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Slå gennemsigtighed til/fra for laste-indikatorer
+STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Gør objekter usynlige i stedet for gennemsigtige
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3499,3 +3547,6 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+########
--- a/src/lang/dutch.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/dutch.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -486,6 +486,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Sloopkosten: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :(geen)
 STR_01A7_OWNER                                                  :{BLACK}Eigenaar: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Weg eigenaar: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Tramspoor eigenaar: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Spoor eigenaar: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Gemeente: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Geen
 STR_01AA_NAME                                                   :{BLACK}Naam
@@ -1054,6 +1057,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Vliegtuig snelheidsverhouding: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Laat toe dat doorrij wegstops worden geplaatst op door stad beheerde wegen: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Bouwen van aangrenzende stations toestaan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Activeer meerdere NewGRF treinsets: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Altijd kleine vliegvelden toestaan: {ORANGE}{STRING}
 
@@ -1713,6 +1717,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Weg met bomenrij
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Wegvoertuigdepot
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Gelijke weg/spoorweg kruising
+STR_TRAMWAY                                                     :Tramspoor
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Kan busstation niet verwijderen...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Kan vrachtwagenstation niet verwijderen...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Kan passagiers tram station niet verwijderen...
@@ -3182,6 +3187,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Ontbrekende GRF bestand(en)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Pauze uit zetten kan OpenTTD laten vastlopen. Geef geen fout rapporten bij herhaaldelijk vastlopen.{}Weet je zeker dat je pauze wilt uit zetten?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spel was opgeslagen in een versie zonder tram ondersteuning. Alle trams zijn verwijderd.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Aangepaste valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Scheidingsteken:
@@ -3546,3 +3553,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Geluidsniveau controle door steden voor vliegvelden toestaan: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Geluidslimiet in steden: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Geluid gegenereerd: {GOLD}{COMMA}
+########
--- a/src/lang/estonian.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/estonian.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -2,7 +2,7 @@
 ##ownname Eesti keel
 ##isocode et_ET
 ##plural 0
-##case g genitiiv
+##case g in
 
 #
 
@@ -51,138 +51,92 @@
 STR_001C_FRUIT.g                                                :Puuviljade
 STR_001D_DIAMONDS                                               :Teemantid
 STR_001D_DIAMONDS.g                                             :Teemantite
-STR_001D_DIAMONDS.genitiiv                                      :Teemantite
 STR_001E_FOOD                                                   :Toit
 STR_001E_FOOD.g                                                 :Toidu
-STR_001E_FOOD.genitiiv                                          :Toidu
 STR_001F_PAPER                                                  :Paber
 STR_001F_PAPER.g                                                :Paberi
-STR_001F_PAPER.genitiiv                                         :Paberi
 STR_0020_GOLD                                                   :Kuld
 STR_0020_GOLD.g                                                 :Kulla
-STR_0020_GOLD.genitiiv                                          :Kulla
 STR_0021_WATER                                                  :Vesi
 STR_0021_WATER.g                                                :Vee
-STR_0021_WATER.genitiiv                                         :Vee
 STR_0022_WHEAT                                                  :Nisu
 STR_0022_WHEAT.g                                                :Nisu
-STR_0022_WHEAT.genitiiv                                         :Nisu
 STR_0023_RUBBER                                                 :Kumm
 STR_0023_RUBBER.g                                               :Kummi
-STR_0023_RUBBER.genitiiv                                        :Kummi
 STR_0024_SUGAR                                                  :Suhkur
 STR_0024_SUGAR.g                                                :Suhkru
-STR_0024_SUGAR.genitiiv                                         :Suhkru
 STR_0025_TOYS                                                   :Mänguasjad
 STR_0025_TOYS.g                                                 :Mänguasjade
-STR_0025_TOYS.genitiiv                                          :Mänguasjade
 STR_0026_CANDY                                                  :Maiustused
 STR_0026_CANDY.g                                                :Maiustuste
-STR_0026_CANDY.genitiiv                                         :Maiustuste
 STR_0027_COLA                                                   :Koola
 STR_0027_COLA.g                                                 :Koola
-STR_0027_COLA.genitiiv                                          :Koola
 STR_0028_COTTON_CANDY                                           :Suhkruvatt
 STR_0028_COTTON_CANDY.g                                         :Suhkruvati
-STR_0028_COTTON_CANDY.genitiiv                                  :Suhkruvati
 STR_0029_BUBBLES                                                :Mullid
 STR_0029_BUBBLES.g                                              :Mullide
-STR_0029_BUBBLES.genitiiv                                       :Mullide
 STR_002A_TOFFEE                                                 :Iiris
 STR_002A_TOFFEE.g                                               :Iirise
-STR_002A_TOFFEE.genitiiv                                        :Iirise
 STR_002B_BATTERIES                                              :Patareid
 STR_002B_BATTERIES.g                                            :Patareide
-STR_002B_BATTERIES.genitiiv                                     :Patareide
 STR_002C_PLASTIC                                                :Plastmass
 STR_002C_PLASTIC.g                                              :Plastmassi
-STR_002C_PLASTIC.genitiiv                                       :Plastmassi
 STR_002D_FIZZY_DRINKS                                           :Kihisevad joogid
 STR_002D_FIZZY_DRINKS.g                                         :Kihisevate jookide
-STR_002D_FIZZY_DRINKS.genitiiv                                  :Kihisevate jookide
 STR_002E                                                        :
 STR_002F_PASSENGER                                              :Reisija
 STR_002F_PASSENGER.g                                            :Reisijate
-STR_002F_PASSENGER.genitiiv                                     :Reisijate
 STR_0030_COAL                                                   :Kivisüsi
 STR_0030_COAL.g                                                 :Kivisöe
-STR_0030_COAL.genitiiv                                          :Kivisöe
 STR_0031_MAIL                                                   :Post
 STR_0031_MAIL.g                                                 :Posti
 STR_0032_OIL                                                    :Nafta
 STR_0032_OIL.g                                                  :Nafta
-STR_0032_OIL.genitiiv                                           :Nafta
 STR_0033_LIVESTOCK                                              :Kariloom
 STR_0033_LIVESTOCK.g                                            :Kariloomade
-STR_0033_LIVESTOCK.genitiiv                                     :Kariloomade
 STR_0034_GOODS                                                  :Kaubad
 STR_0034_GOODS.g                                                :Kaupade
-STR_0034_GOODS.genitiiv                                         :Kaupade
 STR_0035_GRAIN                                                  :Teravili
 STR_0035_GRAIN.g                                                :Teravilja
-STR_0035_GRAIN.genitiiv                                         :Teravilja
 STR_0036_WOOD                                                   :Puit
 STR_0036_WOOD.g                                                 :Puidu
-STR_0036_WOOD.genitiiv                                          :Puidu
 STR_0037_IRON_ORE                                               :Rauamaak
 STR_0037_IRON_ORE.g                                             :Rauamaagi
-STR_0037_IRON_ORE.genitiiv                                      :Rauamaagi
 STR_0038_STEEL                                                  :Teras
 STR_0038_STEEL.g                                                :Terase
-STR_0038_STEEL.genitiiv                                         :Terase
 STR_0039_VALUABLES                                              :Väärisesemed
 STR_0039_VALUABLES.g                                            :Väärisesemete
-STR_0039_VALUABLES.genitiiv                                     :Väärisesemete
 STR_003A_COPPER_ORE                                             :Vasemaak
 STR_003A_COPPER_ORE.g                                           :Vasemaagi
-STR_003A_COPPER_ORE.genitiiv                                    :Vasemaagi
 STR_003B_MAIZE                                                  :Mais
 STR_003B_MAIZE.g                                                :Maisi
 STR_003C_FRUIT                                                  :Puuviljad
 STR_003C_FRUIT.g                                                :Puuviljade
-STR_003C_FRUIT.genitiiv                                         :Puuviljade
 STR_003D_DIAMOND                                                :Teemant
 STR_003D_DIAMOND.g                                              :Teemantite
-STR_003D_DIAMOND.genitiiv                                       :Teemantite
 STR_003E_FOOD                                                   :Toit
 STR_003E_FOOD.g                                                 :Toidu
-STR_003E_FOOD.genitiiv                                          :Toidu
 STR_003F_PAPER                                                  :Paber
 STR_003F_PAPER.g                                                :Paberi
-STR_003F_PAPER.genitiiv                                         :Paberi
 STR_0040_GOLD                                                   :Kuld
 STR_0040_GOLD.g                                                 :Kulla
-STR_0040_GOLD.genitiiv                                          :Kulla
 STR_0041_WATER                                                  :Vesi
 STR_0041_WATER.g                                                :Vee
-STR_0041_WATER.genitiiv                                         :Vee
 STR_0042_WHEAT                                                  :Nisu
 STR_0042_WHEAT.g                                                :Nisu
-STR_0042_WHEAT.genitiiv                                         :Nisu
 STR_0043_RUBBER                                                 :Kumm
 STR_0043_RUBBER.g                                               :kummi
-STR_0043_RUBBER.genitiiv                                        :Kummi
 STR_0044_SUGAR                                                  :Suhkur
 STR_0044_SUGAR.g                                                :Suhkru
-STR_0044_SUGAR.genitiiv                                         :Suhkru
 STR_0045_TOY                                                    :Mänguasjad
-STR_0045_TOY.genitiiv                                           :Mänguasjade
 STR_0046_CANDY                                                  :Maiustus
-STR_0046_CANDY.genitiiv                                         :Maiustuste
 STR_0047_COLA                                                   :Koola
-STR_0047_COLA.genitiiv                                          :Koola
 STR_0048_COTTON_CANDY                                           :Suhkruvatt
-STR_0048_COTTON_CANDY.genitiiv                                  :Suhkruvati
 STR_0049_BUBBLE                                                 :Mullid
-STR_0049_BUBBLE.genitiiv                                        :Mullide
 STR_004A_TOFFEE                                                 :Iiris
-STR_004A_TOFFEE.genitiiv                                        :Iirise
 STR_004B_BATTERY                                                :Patarei
-STR_004B_BATTERY.genitiiv                                       :Patareide
 STR_004C_PLASTIC                                                :Plastmass
-STR_004C_PLASTIC.genitiiv                                       :Plastmassi
 STR_004D_FIZZY_DRINK                                            :Kihisevad joogid
-STR_004D_FIZZY_DRINK.genitiiv                                   :Kihisevate jookide
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA} reisija{P "" t}
 STR_QUANTITY_COAL                                               :{WEIGHT} kivisütt
@@ -478,6 +432,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Tippkiirus
 STR_SORT_BY_MODEL                                               :Mudel
 STR_SORT_BY_VALUE                                               :Väärtus
+STR_SORT_BY_LENGTH                                              :Pikkus
 STR_SORT_BY_FACILITY                                            :Jaama tüüp
 STR_SORT_BY_WAITING                                             :Ootava kauba väärtus
 STR_SORT_BY_RATING_MAX                                          :Kauba hinnang
@@ -746,39 +701,72 @@
 STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Ehita linn suvalisse kohta
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Tööstuste loomine
 STR_0240_COAL_MINE                                              :{BLACK}Kivisöekaevandus
+STR_0240_COAL_MINE.in                                           :{BLACK}Kivisöekaevanduses
 STR_0241_POWER_STATION                                          :{BLACK}Elektrijaam
+STR_0241_POWER_STATION.in                                       :{BLACK}Elektrijaamas
 STR_0242_SAWMILL                                                :{BLACK}Saeveski
+STR_0242_SAWMILL.in                                             :{BLACK}Saeveskis
 STR_0243_FOREST                                                 :{BLACK}Mets
 STR_0244_OIL_REFINERY                                           :{BLACK}Naftarafineerimistehas
-STR_0245_OIL_RIG                                                :{BLACK}Naftaplatvorm
-STR_0246_FACTORY                                                :{BLACK}Vabrik
+STR_0244_OIL_REFINERY.in                                        :{BLACK}Naftarafineerimistehases
+STR_0245_OIL_RIG                                                :{BLACK}Naftapuurplatvorm
+STR_0245_OIL_RIG.in                                             :{BLACK}Naftapuurplatvormis
+STR_0246_FACTORY                                                :{BLACK}Tehas
+STR_0246_FACTORY.in                                             :{BLACK}Tehases
 STR_0247_STEEL_MILL                                             :{BLACK}Terasetööstus
-STR_0248_FARM                                                   :{BLACK}Talu
+STR_0247_STEEL_MILL.in                                          :{BLACK}Terasetööstuses
+STR_0248_FARM                                                   :{BLACK}Põllumajandusettevõte
+STR_0248_FARM.in                                                :{BLACK}Põllumajandusettevõttes
 STR_0249_IRON_ORE_MINE                                          :{BLACK}Rauamaagikaevandus
+STR_0249_IRON_ORE_MINE.in                                       :{BLACK}Rauamaagikaevanduses
 STR_024A_OIL_WELLS                                              :{BLACK}Naftapuuraugud
+STR_024A_OIL_WELLS.in                                           :{BLACK}Naftapuuraukudes
 STR_024B_BANK                                                   :{BLACK}Pank
+STR_024B_BANK.in                                                :{BLACK}Pangas
 STR_024C_PAPER_MILL                                             :{BLACK}Paberitehas
+STR_024C_PAPER_MILL.in                                          :{BLACK}Paberitehases
 STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}Toidutöötlustehas
+STR_024D_FOOD_PROCESSING_PLANT.in                               :{BLACK}Toidutöötlustehases
 STR_024E_PRINTING_WORKS                                         :{BLACK}Trükikoda
+STR_024E_PRINTING_WORKS.in                                      :{BLACK}Trükikojas
 STR_024F_GOLD_MINE                                              :{BLACK}Kullakaevandus
+STR_024F_GOLD_MINE.in                                           :{BLACK}Kullakaevanduses
 STR_0250_LUMBER_MILL                                            :{BLACK}Saeveski
+STR_0250_LUMBER_MILL.in                                         :{BLACK}Saeveskis
 STR_0251_FRUIT_PLANTATION                                       :{BLACK}Puuviljaistandus
+STR_0251_FRUIT_PLANTATION.in                                    :{BLACK}Puuviljaistanduses
 STR_0252_RUBBER_PLANTATION                                      :{BLACK}Kummipuuistandus
+STR_0252_RUBBER_PLANTATION.in                                   :{BLACK}Kummipuuistanduses
 STR_0253_WATER_SUPPLY                                           :{BLACK}Veepumbad
+STR_0253_WATER_SUPPLY.in                                        :{BLACK}Veepumpades
 STR_0254_WATER_TOWER                                            :{BLACK}Veetorn
+STR_0254_WATER_TOWER.in                                         :{BLACK}Veetornis
 STR_0255_DIAMOND_MINE                                           :{BLACK}Teemantikaevandus
+STR_0255_DIAMOND_MINE.in                                        :{BLACK}Teemantikaevanduses
 STR_0256_COPPER_ORE_MINE                                        :{BLACK}Vasemaagikaevandus
+STR_0256_COPPER_ORE_MINE.in                                     :{BLACK}Vasemaagikaevanduses
 STR_0257_COTTON_CANDY_FOREST                                    :{BLACK}Suhkruvatimets
+STR_0257_COTTON_CANDY_FOREST.in                                 :{BLACK}Suhkruvatimetsas
 STR_0258_CANDY_FACTORY                                          :{BLACK}Maiustuste tehas
+STR_0258_CANDY_FACTORY.in                                       :{BLACK}Maiustuste tehases
 STR_0259_BATTERY_FARM                                           :{BLACK}Patareitalu
+STR_0259_BATTERY_FARM.in                                        :{BLACK}Patareitalus
 STR_025A_COLA_WELLS                                             :{BLACK}Koolapumbad
+STR_025A_COLA_WELLS.in                                          :{BLACK}Koolapumpades
 STR_025B_TOY_SHOP                                               :{BLACK}Mänguasjapood
+STR_025B_TOY_SHOP.in                                            :{BLACK}Mänguasjapoes
 STR_025C_TOY_FACTORY                                            :{BLACK}Mänguasjatehas
+STR_025C_TOY_FACTORY.in                                         :{BLACK}Mänguasjatehases
 STR_025D_PLASTIC_FOUNTAINS                                      :{BLACK}Plastmassiallikad
+STR_025D_PLASTIC_FOUNTAINS.in                                   :{BLACK}Plastmassiallikates
 STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}Kihisevate jookide tehas
+STR_025E_FIZZY_DRINK_FACTORY.in                                 :{BLACK}Kihisevate jookide tehases
 STR_025F_BUBBLE_GENERATOR                                       :{BLACK}Mulligeneraator
+STR_025F_BUBBLE_GENERATOR.in                                    :{BLACK}Mulligeneraatoris
 STR_0260_TOFFEE_QUARRY                                          :{BLACK}Iirisekaevandus
+STR_0260_TOFFEE_QUARRY.in                                       :{BLACK}Iirisekaevanduses
 STR_0261_SUGAR_MINE                                             :{BLACK}Suhkrukaevandus
+STR_0261_SUGAR_MINE.in                                          :{BLACK}Suhkrukaevanduses
 STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Ehita kivisöekaevandus
 STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Ehita elektrijaam
 STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Ehita saeveski
@@ -952,7 +940,7 @@
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Rahasta uute ehitiste konstrueerimist
 
 ############ range for menu starts
-STR_INDUSTRY_DIR                                                :Tööstuste nimistu
+STR_INDUSTRY_DIR                                                :Tööstuste kataloog
 STR_0313_FUND_NEW_INDUSTRY                                      :Uue tööstuse rahastamine
 ############ range ends here
 
@@ -1153,6 +1141,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Lennuki kiiruse tegur: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Luba läbisõidupeatused linnateedel: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Luba jaamu lähestikku ehitada: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Lubatakse mitu NewGRF sõidukikomplekti: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Luba väikesed lennuväljad kuni mängu lõpuni: {ORANGE}{STRING}
 
@@ -1463,6 +1452,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Mängu nimi
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Suhtluskeel, serveri versioon, jne.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Mäng valimiseks vajuta nimekirjas olevale nimele
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server, kus sa viimati mängisid:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klõpsa, et valida server, kus sa viimati mängisid
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Serveri otsimine
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Võrgust serveri otsimine
@@ -1917,6 +1908,7 @@
 STR_INDUSTRY                                                    :{INDUSTRY}
 STR_TOWN                                                        :{TOWN}
 STR_INDUSTRY_FORMAT                                             :{TOWN} {STRING}
+STR_INDUSTRY_FORMAT.in                                          :{TOWN} {STRING.in}
 STR_STATION                                                     :{STATION}
 
 ##id 0x2800
@@ -2129,7 +2121,7 @@
 STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{STRING} juhtkond teatab sulgemisest!
 STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}{STRING} teatab sulgemisest varustusprobleemide tõttu!
 STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Lähiümbruse puude puudumine põhjustab {STRING} sulgemise!
-STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} kasvab toodang!
+STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} toodang kasvas!
 STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}{INDUSTRY} lähedal avati uus kivisöe kiht!{}Toodang kahekordistub!
 STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}{INDUSTRY} lähedal avastati uusi naftareserve!{}Toodang kahekordistub!
 STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT}{INDUSTRY} võttis kasutusele uued põllutöövahendid! Toodang kahekordistub!
@@ -2752,6 +2744,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Rahvas rõõmustab. . .{}{STATION} jaama saabus esimene rong!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (üksikasjad)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Rong on ees
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_ORDER_GO_TO                                                 :Mine
 STR_ORDER_GO_NON_STOP_TO                                        :Mine peatumata
 STR_ORDER_GO_VIA                                                :Mine läbi
@@ -3277,6 +3271,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Puuduolevad GRF failid
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Pausi lõpetamine võib põhjustada OpenTTD krahhi. Ära teavita järgnevatest krahhidest.{}Oled sa tõepoolest veendunud, et sa soovid pausi lõpetada?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Mäng salvestati trammide toetuseta versioonis. Kõik trammid eemaldati.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Isiklik valuuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vahetuskurss: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Vahemärk:
@@ -3641,3 +3637,6 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+########
--- a/src/lang/finnish.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/finnish.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -376,6 +376,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Huippunopeus
 STR_SORT_BY_MODEL                                               :Malli
 STR_SORT_BY_VALUE                                               :Arvo
+STR_SORT_BY_LENGTH                                              :Pituus
 STR_SORT_BY_FACILITY                                            :Asematyyppi
 STR_SORT_BY_WAITING                                             :Odottavan lastin arvo
 STR_SORT_BY_RATING_MAX                                          :Rahtauksen arvosana
@@ -852,6 +853,7 @@
 
 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Rakenna uutta teollisuutta
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...voidaan rakentaa vain kaupunkeihin.
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...voidaan rakentaa vain sademetsäalueisiin.
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...voidaan rakentaa vain aavikkoalueisiin.
@@ -1109,7 +1111,7 @@
 STR_CONFIG_PATCHES_LOADING_INDICATORS_ALL                       :Kaikki yhtiöt
 STR_CONFIG_PATCHES_TIMETABLE_ALLOW                              :{LTBLUE}Aikataulut ajoneuvoille: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS                           :{LTBLUE}Näytä aikataulu tickseissä päivien sijaan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}Raidetyyppi oletuksena: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}Oletusraidetyyppi: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL                       :Tavallinen raide
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL                     :Sähköraide
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL                   :Yksiraiteinen
@@ -1159,6 +1161,7 @@
 STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS                     :parempia teitä
 STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID                         :2x2 ruudukko
 STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID                         :3x3 ruudukko
+STR_CONFIG_PATCHES_TOWN_LAYOUT_RANDOM                           :satunnainen
 
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Päätyökalupalkin sijainti: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :vasen
@@ -1190,6 +1193,7 @@
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Muuta asetusarvo
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Osa allaolevista oletushuoltoväleistä ei ole yhteensopivia valitun asetuksen kanssa! 5-90{NBSP}% ja 30-800 päivää ovat oikein.
 
+
 STR_TEMPERATE_LANDSCAPE                                         :lauhkea maasto
 STR_SUB_ARCTIC_LANDSCAPE                                        :pohjoinen maasto
 STR_SUB_TROPICAL_LANDSCAPE                                      :subtrooppinen maasto
@@ -1680,8 +1684,10 @@
 STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
 STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
 STR_2002                                                        :{TINYFONT}{BLACK}{SIGN}
+STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Rakennus täytyy purkaa ensin.
 STR_2005                                                        :{WHITE}{TOWN}
+STR_CITY                                                        :{WHITE}{TOWN} (City)
 STR_2006_POPULATION                                             :{BLACK}Asukasluku: {ORANGE}{COMMA}{BLACK}  Taloja: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Nimeä kaupunki
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kaupungin nimeä ei voi vaihtaa.
@@ -2599,6 +2605,8 @@
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (yksityiskohdat)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Juna on tiellä.
 
+
+
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Kiertävä (ei aikataulua)
 STR_TIMETABLE_TRAVEL_FOR                                        :Kulje kohteeseen {STRING}
 STR_TIMETABLE_STAY_FOR                                          :ja odota {STRING}
@@ -2733,6 +2741,7 @@
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{ENGINE}
 STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Uusi {STRING} on nyt saatavilla! - {ENGINE}
 
+
 STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Ei voi asettaa aikataulua.
 STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vain asemalla voi odottaa.
 STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Tämä ajoneuvo ei pysähdy tällä asemalla.
@@ -3045,6 +3054,7 @@
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Puuttuvat GRF tiedostot ovat poistettu käytöstä
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Puuttuvat GRF tiedostot tarvitaan pelin lataamiseksi.
 
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Oma valuutta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vaihtokurssi: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Välimerkki:
@@ -3168,6 +3178,9 @@
 STR_PURCHASE_INFO_ALL_BUT                                       :Kaikki paitsi {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Suurin vääntömomentti: {GOLD}{FORCE}
 
+########### For showing numbers in widgets
+
+
 ########### String for New Landscape Generator
 
 STR_GENERATE                                                    :{WHITE}Generoi
@@ -3328,3 +3341,15 @@
 STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Koekaivaus
 STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Rakenna
 STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Valitse tehdas listasta
+
+############ Face formatting
+########
+
+############ signal GUI
+########
+
+############ on screen keyboard
+########
+
+############ town controlled noise level
+########
--- a/src/lang/french.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/french.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -487,6 +487,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coût du balayage: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
 STR_01A7_OWNER                                                  :{BLACK}Propriétaire: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Propriétaire de la route: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Propriétaire du tramway: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Propriétaire des rails: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Municipalité: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Aucun
 STR_01AA_NAME                                                   :{BLACK}Nom
@@ -1055,6 +1058,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Facteur de vitesse des aéroplanes: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Autoriser les arrêts de bus sur les routes des municipalités: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Autoriser la construction de stations adjacentes: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Utiliser plusieurs NewGRF de véhicules: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Toujours permettre les petits aéroports: {ORANGE}{STRING}
 
@@ -1714,6 +1718,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Route avec lignée d'arbustres
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Dépôt de véhicules routiers
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Route/rail Croisement à niveau
+STR_TRAMWAY                                                     :Tramway
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Impossible de supprimer la station de bus...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Impossible de supprimer la station de camions...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Impossible de retirer la station de tramway pour passagers...
@@ -3183,6 +3188,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Fichier(s) GRF manquant(s)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Retirer la pause peut faire planter OpenTTD. Ne créez pas de rapport de bug pour ceux-ci.{}Voulez-vous vraiment retirer la pause?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Partie sauvegardée avec une version sans support des tramways. Tous les tramways ont été supprimés.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Devise personnalisée
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taux de change : {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Séparateur :
@@ -3544,6 +3551,12 @@
 ########
 
 ############ on screen keyboard
-STR_OSK_KEYBOARD_LAYOUT                                         :²&é"'(-è_çà)=azertyuiop^$qsdfghjklmù*wxcvbn,;:!
-STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :²1234567890°+AZERTYUIOP¨£QSDFGHJKLM%µWXCVBN?./§
+STR_OSK_KEYBOARD_LAYOUT                                         :²&é"'(-è_çà)= azertyuiop^$qsdfghjklmù*<wxcvbn,;:!
+STR_OSK_KEYBOARD_LAYOUT_CAPS                                    : 1234567890°+ AZERTYUIOP¨£QSDFGHJKLM%µ>WXCVBN?./§
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Permettre plus d'aéroport par ville, selon les nuisances: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Limite de nuisance pour la ville: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Bruit généré: {GOLD}{COMMA}
+########
--- a/src/lang/icelandic.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/icelandic.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -1,7 +1,7 @@
 ##name Icelandic
 ##ownname Íslenska
 ##isocode is_IS
-##plural 9
+##plural 0
 ##gender karlkyn kvenkyn hvorugkyn
 
 #
@@ -19,6 +19,7 @@
 STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO} frá {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Tekur við: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Tekur við: {GOLD}
+STR_SUPPLIES                                                    :{BLACK}Birgðir: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :Farþegar
 STR_0010_COAL                                                   :Kol
@@ -378,6 +379,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Hámarkshraði
 STR_SORT_BY_MODEL                                               :Týpa
 STR_SORT_BY_VALUE                                               :Virði
+STR_SORT_BY_LENGTH                                              :Lengd
 STR_SORT_BY_FACILITY                                            :Tegund stöðvar
 STR_SORT_BY_WAITING                                             :Verðgildi farms á stöð
 STR_SORT_BY_RATING_MAX                                          :Flutningur farms
@@ -485,6 +487,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kostnaður við hreinsun: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Enginn
 STR_01A7_OWNER                                                  :{BLACK}Eigandi: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Eigandi vegs: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Eigandi spors: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Eigandi lestarteina: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Bæjaryfirvöld: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Enginn
 STR_01AA_NAME                                                   :{BLACK}Nafn
@@ -1053,6 +1058,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Hraðastuðull flugvéla: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Leyfa strætóstöðvar á gangstéttum bæja: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Heimila sambyggingu stöðva: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Virkja mörg NewGRF vélasöfn: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Alltaf leyfa litla flugvelli: {ORANGE}{STRING}
 
@@ -1172,6 +1178,7 @@
 STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS                     :betri vegi
 STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID                         :2x2 net
 STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID                         :3x3 net
+STR_CONFIG_PATCHES_TOWN_LAYOUT_RANDOM                           :slembið
 
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Staðsetning tækjasláar: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Vinstri
@@ -1362,6 +1369,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nafn leiksins
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Tungumál, útgáfa þjóns o.s.frv.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Ýttu á leik á listanum til að velja hann
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Þjónninn sem þú tengdist síðast:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Smelltu til að velja þjóninn sem þú tengdist í síðast
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Finna þjón
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Leita að þjónum á neti
@@ -1709,6 +1718,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Trjáskreyttur vegur
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Bifreiðaskýli
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Vega/lestar gatnamót
+STR_TRAMWAY                                                     :Sporvagn
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Get ekki fjarlægt strætóstoppistöð...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Get ekki flutt vörubílastöð...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Get ekki fjarlægt farþegasporvagnastöð...
@@ -2651,6 +2661,68 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsta lest kemur við á {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Upplýsingar)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Lest fyrir
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
+STR_ORDER_GO_TO                                                 :Fara að
+STR_ORDER_GO_VIA                                                :Fara gegnum
+STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Hlaða ef það er hægt
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Fullhlaða öllum farmi
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Fullhlaða hvaða farmi sem er
+STR_ORDER_DROP_NO_LOADING                                       :Ekki hlaða
+STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Afhlaða ef tekið er við farmi
+STR_ORDER_DROP_UNLOAD                                           :Afhlaða allt
+STR_ORDER_DROP_TRANSFER                                         :Flytja
+STR_ORDER_DROP_NO_UNLOADING                                     :Ekki afhlaða
+STR_ORDER_FULL_LOAD                                             :(Fullhlaða)
+STR_ORDER_FULL_LOAD_ANY                                         :(Fullhlaða hvaða farmi sem er)
+STR_ORDER_NO_LOAD                                               :(Ekki hlaða)
+STR_ORDER_UNLOAD                                                :(Afhlaða og taka farm)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :(Afhlaða og bíða fullhleðslu)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Afhlaða og bíða eftir hvaða fullhleðslu sem er)
+STR_ORDER_UNLOAD_NO_LOAD                                        :(Afhlaða og yfirgefa tóm)
+STR_ORDER_TRANSFER                                              :(Flytja og taka farm)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :(Flytja og bíða fullfermis)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Flytja og bíða hvaða fullfermis sem er)
+STR_ORDER_TRANSFER_NO_LOAD                                      :(Flytja og yfirgefa tóm)
+STR_ORDER_NO_UNLOAD                                             :(Ekki afhlaða en taka farm)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ekki afhlaða en býða fullfermis)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ekki afhlaða og bíða hvaða fullfermis sem er)
+STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Breyta stanshegðun valinna skipana
+STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Breyta fermishegðun valinna skipana
+STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Breyta hegðun affermingar valinna skipanna
+STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Bæta við ítarlegri skipun
+STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Fara í næsta skýli
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Fara í næsta flugskýli
+STR_ORDER_NEAREST_DEPOT                                         :næsta
+STR_ORDER_NEAREST_HANGAR                                        :næsta flugskýli
+STR_ORDER_SERVICE_AT                                            :Skoða í
+STR_ORDER_TRAIN_DEPOT                                           :lestaskýli
+STR_ORDER_ROAD_DEPOT                                            :bifreiðaskýli
+STR_ORDER_SHIP_DEPOT                                            :skipaskýli
+STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
+STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
+STR_GO_TO_HANGAR                                                :{STRING} {STATION} flugskýli
+
+STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Gögn farartækis sem skilyrði byggja á
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Hleðsluhlutfall
+STR_ORDER_CONDITIONAL_RELIABILITY                               :Áreiðanleiki
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Hámarkshraði
+STR_ORDER_CONDITIONAL_AGE                                       :Aldur farartækis (í árum)
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Alltaf
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :er jafnt og
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :er ekki jafnt og
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :er minna en
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :er minna en eða jafnt og
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :er stærra en
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :er stærra en eða jafnt og
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er satt
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er ósatt
+STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_CONDITIONAL_UNCONDITIONAL                                   :Hoppa í skipun {COMMA}
+STR_CONDITIONAL_NUM                                             :Hoppa í skipun {COMMA} þegar {STRING} {STRING} {COMMA}
+STR_CONDITIONAL_TRUE_FALSE                                      :Hoppa í skipun {COMMA} þegar {STRING} {STRING}
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Ferðalag (ekki sett í áætlun)
 STR_TIMETABLE_TRAVEL_FOR                                        :Ferðast í {STRING}
@@ -2708,6 +2780,7 @@
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   Virði: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Fermandi / Affermandi
+STR_LEAVING                                                     :{LTBLUE}Yfirgefur
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Lest þarf að vera stöðvuð í skýli
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Get ekki sent lest í skýli...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Ekki pláss fyrir fleiri skipanir
@@ -3107,6 +3180,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Vantar GRF skrá(r)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}OpenTTD getur hrunið ef leikur er settur af stað. Ekki skrá villufærslur fyrir eftirfarandi hrun.{}Ertu viss um að þú viljir setja leikinn af stað?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Leikurinn var vistaður í útgáfu án sporvagna. Allir sporvagnar hafa verið fjarlægðir.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Sérvalinn gjaldeyrir
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Gengi: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Aðskilnaðarmerki:
@@ -3337,6 +3412,7 @@
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Virkja/afvirkja gegnsæji bygginga á borð við vita og möstur. CTRL+smella til að læsa.
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Virkja/afvirkja gegnsæji raflína. CTRL+smella til að læsa.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Virkja/afvirkja gegnsæji hleðslumæla. CTRL+smella til að læsa.
+STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Gera hluti ósýnilega en ekki gagnsæja
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3468,3 +3544,8 @@
 
 ############ on screen keyboard
 ########
+
+############ town controlled noise level
+STR_NOISE_IN_TOWN                                               :{BLACK}Hávaðamörk í bænum: {ORANGE}{COMMA}{BLACK}  mest: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Hávaði við flugvöll: {GOLD}{COMMA}
+########
--- a/src/lang/italian.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/italian.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -488,6 +488,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Costo di demolizione: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
 STR_01A7_OWNER                                                  :{BLACK}Proprietario: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Proprietario strada: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Proprietario tranvia: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Proprietario ferrovia: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autorità locale: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Nessuno
 STR_01AA_NAME                                                   :{BLACK}Nome
@@ -1056,6 +1059,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Fattore di velocità degli aeromobili: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Consenti fermate passanti sulle strade delle città: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Consenti la costruzione di stazioni adiacenti: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Abilita pacchetti di locomotive NewGRF multipli: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Consenti sempre la costruzione di piccoli aeroporti: {ORANGE}{STRING}
 
@@ -1242,8 +1246,8 @@
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Diretto a {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Diretto a {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Procedi attraverso {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Procedi no-stop attraverso {WAYPOINT}
+STR_GO_TO_WAYPOINT                                              :Passa per {WAYPOINT}
+STR_GO_NON_STOP_TO_WAYPOINT                                     :Passa no-stop per {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :Waypoint di {TOWN}
 STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint di {TOWN} #{COMMA}
@@ -1366,7 +1370,7 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nome della partita
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Lingua, versione del server, etc.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Fare clic su una partita in elenco per selezionarla
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}L'ultimo server utilizzato.
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Ultimo server utilizzato:
 STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Fare clic per selezionare il server su cui si è giocato l'ultima volta
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Trova server
@@ -1715,6 +1719,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Strada alberata
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Deposito automezzi
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Passaggio a livello
+STR_TRAMWAY                                                     :Tranvia
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Impossibile rimuovere la stazione degli autobus...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Impossibile rimuovere l'area di carico per camion...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Impossibile rimuovere la stazione tram passeggeri...
@@ -2660,9 +2665,9 @@
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_ORDER_GO_TO                                                 :Vai a
-STR_ORDER_GO_NON_STOP_TO                                        :Vai non-stop a
-STR_ORDER_GO_VIA                                                :Procedi verso
-STR_ORDER_GO_NON_STOP_VIA                                       :Procedi non-stop verso
+STR_ORDER_GO_NON_STOP_TO                                        :Vai no-stop a
+STR_ORDER_GO_VIA                                                :Passa per
+STR_ORDER_GO_NON_STOP_VIA                                       :Passa no-stop per
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Carica se possibile
 STR_ORDER_DROP_FULL_LOAD_ALL                                    :Attendi pieno carico
 STR_ORDER_DROP_FULL_LOAD_ANY                                    :Attendi qualsiasi carico
@@ -2691,8 +2696,8 @@
 STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
 
 STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Inserisce un ordine avanzato
-STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Vai al deposito più vicino
-STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Vai all'hangar più vicino
+STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Deposito più vicino
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Hangar più vicino
 STR_ORDER_NEAREST_DEPOT                                         :più vicino
 STR_ORDER_NEAREST_HANGAR                                        :più vicino Hangar
 STR_ORDER_SERVICE_AT                                            :Manutenzione al
@@ -2700,11 +2705,11 @@
 STR_ORDER_TRAIN_DEPOT                                           :Deposito ferroviario
 STR_ORDER_ROAD_DEPOT                                            :Deposito automezzi
 STR_ORDER_SHIP_DEPOT                                            :Deposito navale
-STR_GO_TO_DEPOT                                                 :{0:STRING} {2:STRING} di {1:TOWN}
+STR_GO_TO_DEPOT                                                 :{0:STRING}l {2:STRING} di {1:TOWN}
 STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING}l'Hangar di {STATION}
+STR_GO_TO_HANGAR                                                :{STRING}ll'Hangar di {STATION}
 
-STR_ORDER_CONDITIONAL                                           :Salto condizionale a ordine
+STR_ORDER_CONDITIONAL                                           :Salto condizionale
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Dato del veicolo sul quale basare il salto
 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Modalità di confronto del dato del veicolo con il valore inserito
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Valore col quale confrontare il dato del veicolo
@@ -2716,7 +2721,7 @@
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Manutenzione richiesta
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Sempre
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :è uguale a
-STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :è diverso da
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :è diversa da
 STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :è minore di
 STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :è minore o uguale a
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :è maggiore di
@@ -3184,6 +3189,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}File GRF mancanti
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Uscire dalla pausa può causare un crash: nel caso, si prega di non inviare segnalazioni bug al riguardo.{}Uscire dalla pausa?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}La partita è stata salvata in una versione senza il supporto per i tram. Tutte le tranvie sono state rimosse.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Valuta personalizzata
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Cambio: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separatore:
@@ -3548,3 +3555,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :\1234567890'ì qwertyuiopè+asdfghjklòàù<zxcvbnm,.- .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :|!"£$%&/()=?^ QWERTYUIOPé*ASDFGHJKLç°§>ZXCVBNM;:_ .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Consenti controllo rumore aeroporti da parte delle città: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Limite di rumore in città: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Rumore generato: {GOLD}{COMMA}
+########
--- a/src/lang/korean.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/korean.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -19,6 +19,7 @@
 STR_EN_ROUTE_FROM                                               :{YELLOW}({1:STATION}에서 온 {0:SHORTCARGO})
 STR_000C_ACCEPTS                                                :{BLACK}받음: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}받음: {GOLD}
+STR_SUPPLIES                                                    :{BLACK}공급: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :승객
 STR_0010_COAL                                                   :석탄
@@ -200,7 +201,7 @@
 STR_00E7_INDUSTRIES                                             :산업시설
 STR_00E8_ROUTES                                                 :경로
 STR_00E9_VEGETATION                                             :초목
-STR_00EA_OWNERS                                                 :소유자
+STR_00EA_OWNERS                                                 :소유주
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}도로
 STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}철도
 STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}역/공항/항구
@@ -261,7 +262,7 @@
 STR_0124_TREES                                                  :{BLACK}{TINYFONT}나무
 STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}바위
 STR_0126_WATER                                                  :{BLACK}{TINYFONT}물
-STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}소유자 없음
+STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}소유주 없음
 STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}마을
 STR_0129_INDUSTRIES                                             :{BLACK}{TINYFONT}산업 시설
 STR_012A_DESERT                                                 :{BLACK}{TINYFONT}사막
@@ -342,11 +343,11 @@
 
 ############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :경영 수익 그래프
-STR_0155_INCOME_GRAPH                                           :수입 그래프
+STR_0155_INCOME_GRAPH                                           :수익 그래프
 STR_0156_DELIVERED_CARGO_GRAPH                                  :수송 화물량 그래프
 STR_0157_PERFORMANCE_HISTORY_GRAPH                              :성취도 그래프
 STR_0158_COMPANY_VALUE_GRAPH                                    :회사가치 그래프
-STR_0159_CARGO_PAYMENT_RATES                                    :화물 지불량 그래프
+STR_0159_CARGO_PAYMENT_RATES                                    :화물 운송단가 그래프
 STR_015A_COMPANY_LEAGUE_TABLE                                   :회사 성취도 순위
 STR_PERFORMANCE_DETAIL_MENU                                     :상세 성취도
 ############ range for menu ends
@@ -378,6 +379,7 @@
 STR_SORT_BY_MAX_SPEED                                           :최고 속력
 STR_SORT_BY_MODEL                                               :모델
 STR_SORT_BY_VALUE                                               :가격
+STR_SORT_BY_LENGTH                                              :길이
 STR_SORT_BY_FACILITY                                            :역 종류
 STR_SORT_BY_WAITING                                             :대기 화물량
 STR_SORT_BY_RATING_MAX                                          :화물 성취도
@@ -443,7 +445,7 @@
 STR_0182_BUILD_ROADS                                            :{BLACK}도로 건설
 STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}항만 건설
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}공항 건설
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}나무 심기, 팻말 달기 등
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}나무 심기
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}지역 정보
 STR_0187_OPTIONS                                                :{BLACK}옵션
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
@@ -464,7 +466,7 @@
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}맵에 산업시설 표시
 STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}맵에 수송경로 표시
 STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}맵에 초목 표시
-STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}맵에 부지 소유자 표시
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}맵에 부지 소유주 표시
 STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}마을 이름 표시/숨기기
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}올해 수입: {CURRENCY} (작년: {CURRENCY})
 
@@ -484,7 +486,10 @@
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}초기화 가격: {LTBLUE}없음
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}초기화 가격: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :없음
-STR_01A7_OWNER                                                  :{BLACK}소유자: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}소유주: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}도로 소유주: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}전찻길 소유주: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}철도 소유주: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}지역 당국: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :없음
 STR_01AA_NAME                                                   :{BLACK}이름
@@ -801,15 +806,15 @@
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}보조금 표시
 STR_02DD_SUBSIDIES                                              :보조금
 STR_02DE_MAP_OF_WORLD                                           :전체 지도 보기
-STR_EXTRA_VIEW_PORT                                             :추가 보임창
+STR_EXTRA_VIEW_PORT                                             :외부 화면
 STR_SIGN_LIST                                                   :팻말 목록
 STR_02DF_TOWN_DIRECTORY                                         :도시 목록
 STR_TOWN_POPULATION                                             :{BLACK}세계 인구: {COMMA}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}보임창 {COMMA}
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}보임창으로 복사
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}이 지역의 풍경을 이 보임창으로 복사합니다
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}보임창에서 붙여넣기
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}이 지역의 풍경을 이 보임창에 붙여넣습니다
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}외부 화면 {COMMA}
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}외부 화면에 저장
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}현재 장소를 외부 화면에 저장합니다.
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}이 장소로 이동
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}외부 화면에 저장된 장소로 이동합니다.
 
 STR_02E0_CURRENCY_UNITS                                         :{BLACK}화폐 단위
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
@@ -1025,7 +1030,7 @@
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}도시 소유의 도로, 다리 등의 제거를 허용 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}매우 긴 열차 허용 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}사실감있는 열차 가속 사용 : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}열차/선박의 90도 회전을 금지함: {ORANGE}{STRING} {LTBLUE} (requires NPF)
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}열차/선박의 90도 회전을 금지함: {ORANGE}{STRING} {LTBLUE} (NPF 필요)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}바로 옆에 역이 있으면 그 역의 이름으로 건설 (새로운 이름X) : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}향상된 수송 알고리즘 사용 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}점차적으로 차량 싣기 : {ORANGE}{STRING}
@@ -1053,6 +1058,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}비행기 속도 인수: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}마을이 소유중인 도로를 통과하는 버스 정류장 건설 허용: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}정거장 근처에 건물 짓기 허용: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}여러 개의 NewGRF 엔진 세트를 허용: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}소형 공항의 건설을 허용 : {ORANGE}{STRING}
 
@@ -1092,7 +1098,7 @@
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}헬리콥터를 발착장에서 자동으로 점검 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}철도/도로/항만/공항 툴바에 지형 정보 링크 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}스크롤 방향 뒤집기 : {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SMOOTH_SCROLLING                             :{LTBLUE}부드러운 보임창 스크롤: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMOOTH_SCROLLING                             :{LTBLUE}부드러운 화면 스크롤: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}건설도구 사용시 거리측정 툴팁 표시 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}회사 조합원 표시 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :없음
@@ -1121,9 +1127,9 @@
 STR_CONFIG_PATCHES_LOADING_INDICATORS_ALL                       :모든 회사
 STR_CONFIG_PATCHES_TIMETABLE_ALLOW                              :{LTBLUE}차량에 시간표 사용: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS                           :{LTBLUE}시간표를 일(日)이 아닌 틱으로 표시: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}기본값으로 사용할 철도의 종류 (새 게임/불러오기 후): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}자주 쓰는 철도 종류 설정: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL                       :보통 철도
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL                     :전개 철도
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL                     :전기 철도
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL                   :모노레일
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV                     :자기부상
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST                      :처음 사용 가능한 것
@@ -1172,6 +1178,7 @@
 STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS                     :개선된 도로
 STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID                         :2x2 칸
 STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID                         :3x3 칸
+STR_CONFIG_PATCHES_TOWN_LAYOUT_RANDOM                           :무작위
 
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}주메뉴의 위치 : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :왼쪽
@@ -1238,8 +1245,8 @@
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}{WAYPOINT}(으)로 향하는 중
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}{WAYPOINT}, {VELOCITY}(으)로 향하는 중
 
-STR_GO_TO_WAYPOINT                                              :{WAYPOINT}을/를 경유
-STR_GO_NON_STOP_TO_WAYPOINT                                     :{WAYPOINT}을/를 직통 경유
+STR_GO_TO_WAYPOINT                                              :[경유] {WAYPOINT}
+STR_GO_NON_STOP_TO_WAYPOINT                                     :[경유, 직통] {WAYPOINT}
 
 STR_WAYPOINTNAME_CITY                                           :웨이포인트 {TOWN}
 STR_WAYPOINTNAME_CITY_SERIAL                                    :웨이포인트 {TOWN} #{COMMA}
@@ -1271,7 +1278,7 @@
 
 STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}땅을 올리거나 내리기, 나무 심기 등의 지형 툴바를 엽니다.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}지평편집
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}위치좌표값
+STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}땅을 평평하게 고릅니다.
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}무작위 나무
@@ -1362,6 +1369,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}게임 이름
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}언어, 서버 버전 등
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}선택하려면 목록에서 게임을 클릭하세요
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}최근에 접속한 서버:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}최근에 플레이한 서버를 선택하려면 클릭하세요
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}서버 검색
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}서버를 네트워크에서 검색합니다
@@ -1615,7 +1624,7 @@
 ##id 0x1000
 STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}잘못된 방향으로 땅이 기울어졌습니다
 STR_1001_IMPOSSIBLE_TRACK_COMBINATION                           :{WHITE}불가능한 트랙 조합입니다
-STR_1002_EXCAVATION_WOULD_DAMAGE                                :{WHITE}터널에 영향을 주는 지형편집입니다
+STR_1002_EXCAVATION_WOULD_DAMAGE                                :{WHITE}터널 때문에 지형을 편집할 수 없습니다.
 STR_1003_ALREADY_AT_SEA_LEVEL                                   :{WHITE}이미 해수면에 도달했습니다
 STR_1004_TOO_HIGH                                               :{WHITE}너무 높습니다!
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}알맞지 않은 철로입니다.
@@ -1709,6 +1718,7 @@
 STR_1816_TREE_LINED_ROAD                                        :가로수가 있는 도로
 STR_1817_ROAD_VEHICLE_DEPOT                                     :차고
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :철도 건널목
+STR_TRAMWAY                                                     :전찻길
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}버스정류장을 제거할 수 없습니다...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}트럭 터미널을 제거할 수 없습니다...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}승객 전차 정거장을 제거할 수 없습니다...
@@ -1792,7 +1802,7 @@
 STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :중규모 광고 캠페인
 STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :대규모 광고 캠페인
 STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :지역 도로 재공사에 투자
-STR_204A_BUILD_STATUE_OF_COMPANY                                :회사 소유자의 동상 건설
+STR_204A_BUILD_STATUE_OF_COMPANY                                :회사 소유주의 동상 건설
 STR_204B_FUND_NEW_BUILDINGS                                     :새로운 건물에 투자
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :수송 권한 독점권 구입
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :지역 당국에 뇌물 먹이기
@@ -1819,7 +1829,7 @@
 STR_STATION                                                     :{STATION}
 
 ##id 0x2800
-STR_LANDSCAPING                                                 :지형편집
+STR_LANDSCAPING                                                 :지형 편집
 STR_2800_PLANT_TREES                                            :나무 심기
 STR_2801_PLACE_SIGN                                             :팻말 달기
 STR_2802_TREES                                                  :{WHITE}나무
@@ -2185,7 +2195,7 @@
 STR_6821_MEDIUM                                                 :보통
 STR_6822_HIGH                                                   :높음
 STR_6823_NONE                                                   :고장 안남
-STR_6824_REDUCED                                                :재생산
+STR_6824_REDUCED                                                :적음
 STR_6825_NORMAL                                                 :일반
 STR_6826_X1_5                                                   :1.5배 지급
 STR_6827_X2                                                     :2배 지급
@@ -2247,7 +2257,7 @@
 STR_7022_INCOME_GRAPH                                           :{WHITE}수익 그래프
 STR_CURRCOMPACT                                                 :{CURRCOMPACT}
 STR_7024                                                        :{COMMA}
-STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}수행 이익 그래프
+STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}경영 수익 그래프
 STR_7026_BANK_BALANCE                                           :{WHITE}소유금
 STR_7027_LOAN                                                   :{WHITE}대출
 STR_MAX_LOAN                                                    :{WHITE}최대 대출:  {BLACK}{CURRENCY}
@@ -2305,9 +2315,9 @@
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}새로운 운송회사 등장!
 STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY}이/가 {TOWN}에서 공사를 시작했습니다!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}회사를 인수할 수 없습니다...
-STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}화물 운송비 지급량
+STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}화물 운송단가 비율
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}통과시간
-STR_7063_PAYMENT_FOR_DELIVERING                                 :{BLACK}{TINYFONT}10단위(또는 1만리터)의 화물을 20칸의 거리로 운송할 때의 운송비 지급량입니다.
+STR_7063_PAYMENT_FOR_DELIVERING                                 :{BLACK}{TINYFONT}10 단위(1만 리터)의 화물을 20칸 거리만큼 운송할 때의 운송비 지급량
 STR_7064_TOGGLE_GRAPH_FOR_CARGO                                 :{BLACK}이 화물에 대한 그래프 켜기/끄기
 STR_7065                                                        :{BLACK}{TINYFONT}{STRING}
 STR_7066_ENGINEER                                               :엔지니어
@@ -2651,6 +2661,76 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}{STATION}에 처음으로 기차가 도착했습니다!{}사람들이 환호성을 지릅니다!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (상세정보)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}중간에 기차가 있습니다
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
+STR_ORDER_GO_TO                                                 :[운행]
+STR_ORDER_GO_NON_STOP_TO                                        :급행
+STR_ORDER_GO_VIA                                                :경유
+STR_ORDER_GO_NON_STOP_VIA                                       :직통 경유
+STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :적재 옵션
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :모든 화물을 가득 실음
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :종류에 상관 없이 화물을 가득 실음
+STR_ORDER_DROP_NO_LOADING                                       :싣지 않기
+STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :하차 옵션
+STR_ORDER_DROP_UNLOAD                                           :모든 화물 하차
+STR_ORDER_DROP_TRANSFER                                         :환승
+STR_ORDER_DROP_NO_UNLOADING                                     :화물 하차 않음
+STR_ORDER_FULL_LOAD                                             :(가득 실음)
+STR_ORDER_FULL_LOAD_ANY                                         :(종류에 상관 없이 모든 화물 적재)
+STR_ORDER_NO_LOAD                                               :(싣지 않기)
+STR_ORDER_UNLOAD                                                :(화물 하차 후 적재)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :(화물 하차 후 모든 화물을 싣고 출발)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(화물 하차 후 종류에 상관없이 모든 화물 적재)
+STR_ORDER_UNLOAD_NO_LOAD                                        :(화물 하차 후 빈 차로 출발)
+STR_ORDER_TRANSFER                                              :(환승 후 화물 받음)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :(환승 후 모든 화물 적재)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(환승 후 종류에 상관없이 모든 화물 적재)
+STR_ORDER_TRANSFER_NO_LOAD                                      :(환승 후 빈 차로 출발)
+STR_ORDER_NO_UNLOAD                                             :(내리지 않고 화물을 받음)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(내리지 않고 가득 찰 때까지 기다림)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(내리지 않고 특정 화물이 가득 찰 때까지 기다림)
+STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}선택한 목적지에서의 정차 방식을 변경합니다
+STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}선택한 목적지에서의 화물 적재 방식을 변경합니다
+STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}선택한 목적지에서의 화물 하차 방식을 변경합니다
+STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}확장된 이동경로를 입력합니다
+STR_ORDER_GO_TO_NEAREST_DEPOT                                   :가까운 차량기지로
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :가까운 격납고로
+STR_ORDER_NEAREST_DEPOT                                         :가까운
+STR_ORDER_NEAREST_HANGAR                                        :가까운 격납고
+STR_ORDER_SERVICE_AT                                            :[점검]
+STR_ORDER_SERVICE_NON_STOP_AT                                   :[점검, 급행]
+STR_ORDER_TRAIN_DEPOT                                           :차량기지
+STR_ORDER_ROAD_DEPOT                                            :차고
+STR_ORDER_SHIP_DEPOT                                            :정박소
+STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
+STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
+STR_GO_TO_HANGAR                                                :{STRING} {STATION} 격납고
+
+STR_ORDER_CONDITIONAL                                           :조건부 경로 건너뛰기
+STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}경로를 건너뛰기 위한 차량값
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}차량 데이터와 주어진 값을 비교하는 방법
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}차량 데이터에 대해 비교하기 위한 값
+STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}비교할 값을 입력하세요
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :적재율
+STR_ORDER_CONDITIONAL_RELIABILITY                               :신뢰도
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :최고 속력
+STR_ORDER_CONDITIONAL_AGE                                       :연식 (년)
+STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :점검 필요성
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :항상
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :=
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :≠
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :<
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :≤
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :>
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :≥
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :이 있을 때
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :이 없을 때
+STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_CONDITIONAL_UNCONDITIONAL                                   :{COMMA}(으)로 건너뛰기
+STR_CONDITIONAL_NUM                                             :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING} {COMMA} 일때)
+STR_CONDITIONAL_TRUE_FALSE                                      :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING})
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :여행 (시간표 없음)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING}로 여행
@@ -2708,6 +2788,7 @@
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   가격: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}싣는중 / 내리는중
+STR_LEAVING                                                     :{LTBLUE}떠남
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}차량기지 안에서 정지해있어야 합니다!
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}기차를 기지로 보낼 수 없습니다...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}더이상 경로를 지정할 공간이 없습니다
@@ -3021,7 +3102,7 @@
 
 STR_BRIBE_FAILED                                                :{WHITE}당신의 뇌물 수수 행위가
 STR_BRIBE_FAILED_2                                              :{WHITE}지역 당국에 의해 발각되었습니다!
-STR_BUILD_DATE                                                  :{BLACK}생산: {LTBLUE}{DATE_LONG}
+STR_BUILD_DATE                                                  :{BLACK}건설날짜: {LTBLUE}{DATE_LONG}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}상세 성취도
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}자세히
@@ -3105,7 +3186,9 @@
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}사라진 GRF 파일은 사용불가능합니다
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}사라진 GRF 파일이 게임 로드에 사용될 수 있습니다
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}GRF 파일 손실
-STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}일시정지는 OpenTTD를 망가뜨릴 수 있습니다. 차후에 나오는 버그를 위해 버그 리포트를 파일로 만들지 마십시오.{}일시정지하시겠습니까?
+STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}일시정지를 해제하면 오류가 발생할 수도 있습니다. 차후에 나오는 오류를 위해 버그 리포트를 보관하지 마십시오.{}일시정지를 해제하시겠습니까?
+
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}전차를 지원하지 않는 버전으로 게임이 저장되었습니다. 모든 전차는 제거되었습니다.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}사용자 화폐 단위
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}환율: {ORANGE}{CURRENCY} = {COMMA}파운드
@@ -3318,7 +3401,7 @@
 
 ############ Date formatting
 STR_DATE_TINY                                                   :{2:NUM}.{1:STRING}.{0:STRING}
-STR_DATE_SHORT                                                  :{1:NUM}년 {0:STRING}월
+STR_DATE_SHORT                                                  :{1:NUM}년 {0:STRING}
 STR_DATE_LONG                                                   :{2:NUM}년 {1:STRING}월 {0:STRING}일
 
 ########
@@ -3337,6 +3420,7 @@
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}등대와 안테나와 같은 구조물 투명 전환
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}케이블 보이기/숨기기. 고정하려면 CTRL+클릭하세요.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}적재 정도 투명 전환
+STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}투명이 아니라 아예 안보이게 할 항목을 선택하세요
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3470,3 +3554,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}도시가 공항에서 나오는 소음을 제한하도록 함: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}도시 소음 제한: {ORANGE}{COMMA}{BLACK}  최고: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}소음 원인: {GOLD}{COMMA}
+########
--- a/src/lang/portuguese.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/portuguese.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -2638,6 +2638,15 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro comboio chega a {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Detalhes)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Comboio no caminho
+STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+
+STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
+STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
+
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Sempre
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :é igual a
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :é diferente de
+STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viagem (sem programação)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
@@ -3092,6 +3101,7 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Ficheiro(s) GRF em falta
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Sair da pausa pode causar problemas ao OpenTTD. Não envie informações sobre este tipo de problemas.{}Deseja realmente sair da pausa?
 
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de troca: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
@@ -3448,3 +3458,9 @@
 STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Diminuir densidade de sinais
 STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Aumentar densidade de sinais
 ########
+
+############ on screen keyboard
+########
+
+############ town controlled noise level
+########
--- a/src/lang/romanian.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/romanian.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -15,11 +15,12 @@
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Necesită teren plat
 STR_0008_WAITING                                                :{BLACK}În aşteptare: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
+STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO} pe drum de la {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Acceptă: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Acceptă: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :călători
-STR_0010_COAL                                                   :cărbuni
+STR_0010_COAL                                                   :cărbune
 STR_0011_MAIL                                                   :colete poştale
 STR_0012_OIL                                                    :petrol
 STR_0013_LIVESTOCK                                              :animale
@@ -51,7 +52,7 @@
 STR_002D_FIZZY_DRINKS                                           :sucuri
 STR_002E                                                        :
 STR_002F_PASSENGER                                              :călător
-STR_0030_COAL                                                   :cărbuni
+STR_0030_COAL                                                   :cărbune
 STR_0031_MAIL                                                   :colete poştale
 STR_0032_OIL                                                    :petrol
 STR_0033_LIVESTOCK                                              :animale
@@ -83,7 +84,7 @@
 STR_004D_FIZZY_DRINK                                            :suc
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA} cãlãtor{P "" i}
-STR_QUANTITY_COAL                                               :{WEIGHT} de cãrbune
+STR_QUANTITY_COAL                                               :{WEIGHT} de cărbune
 STR_QUANTITY_MAIL                                               :{COMMA} sac{P "" i} cu colete postale
 STR_QUANTITY_OIL                                                :{VOLUME} de petrol
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} animal{P "" e}
@@ -125,7 +126,7 @@
 STR_ABBREV_IRON_ORE                                             :{TINYFONT}FE
 STR_ABBREV_STEEL                                                :{TINYFONT}OT
 STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
-STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CU
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CP
 STR_ABBREV_MAIZE                                                :{TINYFONT}PR
 STR_ABBREV_FRUIT                                                :{TINYFONT}FR
 STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
@@ -134,7 +135,7 @@
 STR_ABBREV_GOLD                                                 :{TINYFONT}AU
 STR_ABBREV_WATER                                                :{TINYFONT}AP
 STR_ABBREV_WHEAT                                                :{TINYFONT}GR
-STR_ABBREV_RUBBER                                               :{TINYFONT}CU
+STR_ABBREV_RUBBER                                               :{TINYFONT}CC
 STR_ABBREV_SUGAR                                                :{TINYFONT}ZH
 STR_ABBREV_TOYS                                                 :{TINYFONT}JC
 STR_ABBREV_SWEETS                                               :{TINYFONT}BB
@@ -146,7 +147,7 @@
 STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}SC
 STR_ABBREV_NONE                                                 :{TINYFONT}NU
-STR_ABBREV_ALL                                                  :{TINYFONT}TOATE
+STR_ABBREV_ALL                                                  :{TINYFONT}TOT
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Harta - {STRING}
@@ -154,8 +155,8 @@
 STR_00B2_MESSAGE                                                :{YELLOW}Mesaj
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mesaj de la {STRING}
 STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Atentie!
-STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Nu pot face asta....
-STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nu pot curăţa terenul....
+STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Nu se poate face asta....
+STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nu se poate curăţa terenul....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, toate drepturile rezervate
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versiunea {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2008 Echipa OpenTTD
@@ -200,9 +201,9 @@
 STR_00E9_VEGETATION                                             :Vegetatie
 STR_00EA_OWNERS                                                 :Proprietari
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Drumuri
-STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Cãi ferate
-STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Statii/Aeroporturi/Porturi
-STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Clãdiri/Industrii
+STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Căi ferate
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Staţii/Aeroporturi/Porturi
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Clădiri/Industrii
 STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Vehicule
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100m
 STR_00F1_200M                                                   :{BLACK}{TINYFONT}200m
@@ -214,59 +215,59 @@
 STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Nave
 STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Aeronave
 STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Rute de transport
-STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Minã de cãrbune
-STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Termocentralã
-STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Pãdure
-STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Exploatatie forestierã
-STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Rafinãrie
-STR_00FF_FARM                                                   :{BLACK}{TINYFONT}Fermã
-STR_0100_FACTORY                                                :{BLACK}{TINYFONT}Fabricã de conserve
+STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Mină de cărbune
+STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Termocentrală
+STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Pădure
+STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Fabrică de cherestea
+STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Rafinărie
+STR_00FF_FARM                                                   :{BLACK}{TINYFONT}Fermă
+STR_0100_FACTORY                                                :{BLACK}{TINYFONT}Fabrică de conserve
 STR_0101_PRINTING_WORKS                                         :{BLACK}{TINYFONT}Tipografie
 STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}Sonde de petrol
-STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}Minã de fier
-STR_0104_STEEL_MILL                                             :{BLACK}{TINYFONT}Otelãrie
-STR_0105_BANK                                                   :{BLACK}{TINYFONT}Bancã
-STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Fabricã de hârtie
-STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Minã de aur
+STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}Mină de fier
+STR_0104_STEEL_MILL                                             :{BLACK}{TINYFONT}Oţelărie
+STR_0105_BANK                                                   :{BLACK}{TINYFONT}Bancă
+STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Fabrică de hârtie
+STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Mină de aur
 STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Combinat alimentar
-STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Minã de diamante
-STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Minã de cupru
-STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Livadã
-STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Plantatie de cauciuc
-STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Rezervor de apã
-STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Turn de apã
-STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Fabricã de cherestea
-STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Pãdure de vatã de zahãr
-STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Fabricã de bomboane
-STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}Fermã de baterii
+STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Mină de diamante
+STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Mină de cupru
+STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Livadă
+STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Plantaţie de cauciuc
+STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Rezervor de apă
+STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Turn de apă
+STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Fabrică de cherestea
+STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Pădure de vată de zahăr
+STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Fabrică de bomboane
+STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}Fermă de baterii
 STR_0113_COLA_WELLS                                             :{BLACK}{TINYFONT}Fântâni de cola
-STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}Magazin de jucãrii
-STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}Fabricã de jucãrii
+STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}Magazin de jucării
+STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}Fabrică de jucării
 STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}Fântâni de plastic
-STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}Fabricã de sucuri
-STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}Generator de balonase
-STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Carierã de caramel
-STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}Minã de zahãr
-STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Garã
-STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Loc încãrcare camioane
-STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Statie de autobuz
+STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}Fabrică de sucuri
+STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}Generator de balonaşe
+STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Carieră de caramel
+STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}Mină de zahăr
+STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Gară
+STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Loc încărcare camioane
+STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Staţie de autobuz
 STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Aeroport/Heliport
 STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Port
 STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Teren pietros
-STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Pajiste
+STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Pajişte
 STR_0122_BARE_LAND                                              :{BLACK}{TINYFONT}Teren viran
 STR_0123_FIELDS                                                 :{BLACK}{TINYFONT}Teren agricol
 STR_0124_TREES                                                  :{BLACK}{TINYFONT}Copaci
 STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Pietre
-STR_0126_WATER                                                  :{BLACK}{TINYFONT}Apã
-STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Fãrã proprietar
-STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Orase
+STR_0126_WATER                                                  :{BLACK}{TINYFONT}Apă
+STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Fără proprietar
+STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Oraşe
 STR_0129_INDUSTRIES                                             :{BLACK}{TINYFONT}Industrii
-STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Desert
-STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Zãpadã
+STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Deşert
+STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Zăpadă
 STR_012C_MESSAGE                                                :{WHITE}Mesaj
 STR_012D                                                        :{WHITE}{STRING}
-STR_012E_CANCEL                                                 :{BLACK}Anuleazã
+STR_012E_CANCEL                                                 :{BLACK}Anulează
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Redenumeste
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Prea multe nume definite
@@ -282,9 +283,9 @@
 STR_OSNAME_SUNOS                                                :SunOS
 
 STR_013B_OWNED_BY                                               :{WHITE}...apartine companiei {STRING}
-STR_013C_CARGO                                                  :{BLACK}Încãrcãturã
+STR_013C_CARGO                                                  :{BLACK}Încărcătură
 STR_013D_INFORMATION                                            :{BLACK}Informatii
-STR_013E_CAPACITIES                                             :{BLACK}Capacitãti
+STR_013E_CAPACITIES                                             :{BLACK}Capacităţi
 STR_TOTAL_CARGO                                                 :{BLACK}Încãrcãturi
 STR_013F_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{CARGO}
 STR_CAPACITY_MULT                                               :{BLACK}Capacitate: {LTBLUE}{CARGO} (x{NUM})
@@ -292,7 +293,7 @@
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Joc nou
-STR_0141_LOAD_GAME                                              :{BLACK}Încarcã joc
+STR_0141_LOAD_GAME                                              :{BLACK}Încarcă joc
 STR_SINGLE_PLAYER                                               :{BLACK}Un singur jucãtor
 STR_MULTIPLAYER                                                 :{BLACK}Multiplayer
 STR_SCENARIO_EDITOR                                             :{BLACK}Editor harta
@@ -322,8 +323,8 @@
 STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t
 STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg
 
-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} tone imperiale{P "" s}
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} tone{P "" s}
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} ton{P ă e}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} ton{P ă e}
 STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg
 
 STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}gal
@@ -341,23 +342,23 @@
 ############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Profitul operational
 STR_0155_INCOME_GRAPH                                           :Venituri
-STR_0156_DELIVERED_CARGO_GRAPH                                  :Numãr încãrcãturi livrate
+STR_0156_DELIVERED_CARGO_GRAPH                                  :Număr încărcături livrate
 STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Evolutia performantei
 STR_0158_COMPANY_VALUE_GRAPH                                    :Valoarea companiei
-STR_0159_CARGO_PAYMENT_RATES                                    :Valorile plãtilor pe încãrcãturi
+STR_0159_CARGO_PAYMENT_RATES                                    :Valorile plăţilor pe încărcături
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Clasamentul companiilor
 STR_PERFORMANCE_DETAIL_MENU                                     :Rating de performantã detaliat
 ############ range for menu ends
 
 STR_015B_OPENTTD                                                :{WHITE}Despre OpenTTD
-STR_015C_SAVE_GAME                                              :Salveazã jocul (F3)
-STR_015D_LOAD_GAME                                              :Încarcã joc
+STR_015C_SAVE_GAME                                              :Salvează jocul (F3)
+STR_015D_LOAD_GAME                                              :Încarcă joc
 STR_015E_QUIT_GAME                                              :Iesire în meniul principal
 STR_015F_QUIT                                                   :Iesire din joc
-STR_ABANDON_GAME_QUERY                                          :{YELLOW}Esti sigur cã vrei sã renunti la acest joc?
+STR_ABANDON_GAME_QUERY                                          :{YELLOW}Eşti sigur că vrei să renunţi la acest joc?
 STR_0161_QUIT_GAME                                              :{WHITE}Iesire din joc
 STR_SORT_ORDER_TIP                                              :{BLACK}Alegeti ordinea de sortare ascendenta/descendenta
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Alegeti criteriul de sortare
+STR_SORT_CRITERIA_TIP                                           :{BLACK}Alege criteriul de sortare
 STR_SORT_BY                                                     :{BLACK}Ordoneaza dupa
 
 STR_SORT_BY_POPULATION                                          :{BLACK}Populatia
@@ -371,11 +372,12 @@
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :Profit anul trecut
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profit anul acesta
 STR_SORT_BY_AGE                                                 :Vechime
-STR_SORT_BY_RELIABILITY                                         :Eficienta
+STR_SORT_BY_RELIABILITY                                         :Eficienţă
 STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Capacitatea totala in functie de incarcatura
 STR_SORT_BY_MAX_SPEED                                           :Viteza maxima
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Valoare
+STR_SORT_BY_LENGTH                                              :Lungime
 STR_SORT_BY_FACILITY                                            :Tipul de statie
 STR_SORT_BY_WAITING                                             :In asteptarea valorii  încãrcãturii
 STR_SORT_BY_RATING_MAX                                          :Evaluare încãrcãturã
@@ -386,8 +388,8 @@
 STR_ENGINE_SORT_RUNNING_COST                                    :Cost exploatare
 STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Cost exploatare/putere
 STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacitate incarcatura
-STR_NO_WAITING_CARGO                                            :{BLACK}Nu este în asteptare nici un fel de încãrcãturã
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alege toate facilitãtile
+STR_NO_WAITING_CARGO                                            :{BLACK}Nu este nici un fel de încărcătură în aşteptare
+STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alege toate facilităţile
 STR_SELECT_ALL_TYPES                                            :{BLACK}Alege toate tipurile de încãrcãturi (inclusiv încãrcãturile care nu sunt în asteptare)
 STR_AVAILABLE_TRAINS                                            :{BLACK}Trenuri disponibile
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehicule disponibile
@@ -421,49 +423,49 @@
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
-STR_0171_PAUSE_GAME                                             :{BLACK}Pauzã joc (F1)
+STR_0171_PAUSE_GAME                                             :{BLACK}Pauză joc (F1)
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Salvare/abandon/iesire joc
-STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afiseazã lista cu statiile companiei
-STR_0174_DISPLAY_MAP                                            :{BLACK}Afiseazã harta (F4)
-STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Afiseazã harta, lista cu orase
-STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Afiseazã lista cu orasele de pe hartã (F5)
-STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Afiseazã informatiile financiare ale companiei
-STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Afiseazã datele generale despre companie
-STR_0179_DISPLAY_GRAPHS                                         :{BLACK}Afiseazã graficele
-STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Afiseazã clasamentul companiilor
-STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afiseazã lista cu trenurile companiei
-STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afiseazã lista cu autovehiculele companiei
-STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afiseazã lista cu navele companiei
-STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afiseazã lista cu aeronavele companiei
-STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Mãreste imaginea
-STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Micsoreazã imaginea
-STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Construieste cãi ferate
+STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afişează lista cu staţiile companiei
+STR_0174_DISPLAY_MAP                                            :{BLACK}Afişează harta (F4)
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Afişează harta, lista cu oraşe
+STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Afişează lista cu oraşele de pe hartă (F5)
+STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Afişează informaţii financiare ale companiei
+STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Afişează date generale despre companie
+STR_0179_DISPLAY_GRAPHS                                         :{BLACK}Afişează grafice
+STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Afişează clasamentul companiilor
+STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afişează lista cu trenurile companiei
+STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afişează lista cu autovehiculele companiei
+STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afişează lista cu navele companiei
+STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Afişează lista cu aeronavele companiei
+STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Măreşte imaginea
+STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Micşorează imaginea
+STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Construieşte căi ferate
 STR_0182_BUILD_ROADS                                            :{BLACK}Construieste drumuri
 STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Construieste porturi
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}Construieste aeroporturi
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Planteazã arbori, plaseazã semne, etc.
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Plantează arbori, plasează semne, etc.
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Informatii despre teren
 STR_0187_OPTIONS                                                :{BLACK}Optiuni
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
 STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
-STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Nu pot schimba intervalul de întreţinere...
+STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Nu se poate schimba intervalul de întreţinere...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Închide fereastra
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Titlul ferestrei - trage de aici pentru a muta fereastra
 STR_STICKY_BUTTON                                               :{BLACK}Mark this window as undeletable for the 'Close All Windows' key
 STR_RESIZE_BUTTON                                               :{BLACK}Apasa si trage pentru redimensionarea ferestrei
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Click aici pentru a ajunge la directorul predefinit pentru salvari
-STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Demoleazã clãdiri, strãzi, etc. pe un pãtrat de teren
+STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Demolează clădiri, străzi, etc. pe un pătrăţel de teren
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Scade altitudinea unui vârf de teren
-STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Mãreste altitudinea unui vârf de teren
-STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Bara de defilare - defileazã în listã sus/jos
+STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Măreşte altitudinea unui punct de teren
+STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Bara de defilare - defilează în listă sus/jos
 STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}Bara de defilare - stanga/dreapta
-STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}Aratã relieful pe hartã
-STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Aratã vehiculele pe hartã
-STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Aratã industriile pe hartã
-STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Aratã rutele de transport pe hartã
-STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Aratã vegetatia pe hartã
-STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Aratã proprietãtile pe hartã
-STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Activeazã/Dezactivează afişarea numelor oraşelor pe hartă
+STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}Arată relieful pe hartă
+STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Arată vehiculele pe hartă
+STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Arată industriile pe hartă
+STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Arată rutele de transport pe hartă
+STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Arată vegetaţia pe hartă
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Arată proprietarii de teren pe hartă
+STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Afişează/Ascunde numele oraşelor pe hartă
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profit anul acesta: {CURRENCY} (anul trecut: {CURRENCY})
 
 ############ range for service numbers starts
@@ -479,11 +481,14 @@
 STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} este foarte vechi
 STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} este foarte vechi si trebuie înlocuit urgent
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informatii teren
-STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Costul demolãrii: {LTBLUE}nu este cazul
-STR_01A5_COST_TO_CLEAR                                          :{BLACK}Costul demolãrii: {LTBLUE}{CURRENCY}
+STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Costul demolării: {LTBLUE}nu este cazul
+STR_01A5_COST_TO_CLEAR                                          :{BLACK}Costul demolării: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :nu este cazul
 STR_01A7_OWNER                                                  :{BLACK}Proprietar: {LTBLUE}{STRING}
-STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritatea localã: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Proprietar al drumului: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Proprietar al şinei de tramvai: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Proprietar al căii ferate: {LTBLUE}{STRING}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritatea locală: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :nici una
 STR_01AA_NAME                                                   :{BLACK}Nume
 STR_01AB                                                        :{BLACK}{TINYFONT}{VEHICLE}
@@ -524,13 +529,13 @@
 
 STR_01CB                                                        :{TINYFONT}{COMMA}
 
-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Încãrcãturi acceptate: {LTBLUE}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Încărcături acceptate: {LTBLUE}
 
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Tonomatul cu jazz
-STR_01D3_SOUND_MUSIC                                            :Sunet/muzicã
-STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Afiseazã fereastra pentru configurarea sunetului/muzicii
-STR_01D5_ALL                                                    :{TINYFONT}Toate
+STR_01D3_SOUND_MUSIC                                            :Sunet/muzică
+STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Afişează fereastra pentru configurarea sunetului/muzicii
+STR_01D5_ALL                                                    :{TINYFONT}Tot
 STR_01D6_OLD_STYLE                                              :{TINYFONT}Oldies
 STR_01D7_NEW_STYLE                                              :{TINYFONT}Moderne
 STR_01D8_EZY_STREET                                             :{TINYFONT}Ezy Street
@@ -539,8 +544,8 @@
 STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Volumul muzicii
 STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Volumul efectelor sonore
 STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}MIN  '  '  '  '  '  '  MAX
-STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Sãri la piesa precedentã din selectie
-STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Sãri la piesa urmãtoare din selectie
+STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Sări la piesa precedentă din selecţie
+STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Sări la piesa următoare din selecţie
 STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Opreste muzica
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Porneste muzica
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Foloseste aceste indicatoare pentru a regla volumul muzicii si al efectelor sonore
@@ -550,24 +555,24 @@
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Piesa nr: {SETX 88}Titlul
-STR_01E9_SHUFFLE                                                :{TINYFONT}Amestecã
+STR_01E9_SHUFFLE                                                :{TINYFONT}Aleator
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Programare piese muzicale
 STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
 STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA} "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Lista melodiilor
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
-STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Sterge
-STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Salveazã
+STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Şterge
+STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Salvează
 STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Programul current al pieselor muzicale
-STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Selecteazã programul 'toate melodiile'
-STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Selecteazã programul 'oldies'
-STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Selecteazã programul 'modern'
-STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Selecteazã programul personal 1
-STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Selecteazã programul personal 2
-STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Sterge programul curent (doar pentru cele personale)
+STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Selectează programul 'toate melodiile'
+STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Selectează programul 'oldies'
+STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Selectează programul 'modern'
+STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Selectează programul personal 1
+STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Selectează programul personal 2
+STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Şterge programul curent (doar pentru cele personale)
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Salveaza setarile pentru muzica
-STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Click pe o melodie pentru a o adãuga in programul personal curent
+STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Clic pe o melodie pentru a o adăuga în programul personal curent
 STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Apasa pe pista audio pentru a o elimina din programul actual (doar Custom1 sau Custom2)
 STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Comutator pentru amestecarea melodiilor (da/nu)
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Afiseaza fereastra pentru selectia melodiilor
@@ -575,7 +580,7 @@
 STR_01FE_DIFFICULTY                                             :{BLACK}Nivel dificultate ({STRING})
 STR_01FF                                                        :{TINYFONT}{BLACK}{DATE_LONG}
 STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Ultimul mesaj/ultima stire
-STR_0201_MESSAGE_SETTINGS                                       :Setãri mesaje
+STR_0201_MESSAGE_SETTINGS                                       :Setări mesaje
 STR_MESSAGE_HISTORY_MENU                                        :Lista ultimelor mesaje
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Afiseaza ultimul mesaj (ultima stire) si optiunile pentru mesaje
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Optiuni mesaje
@@ -585,23 +590,23 @@
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidente/dezastre
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informatii despre companie
 STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Deschidere / inchidere industrii
-STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Schimbãri economice
+STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Schimbări economice
 STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER                           :{YELLOW}Schimbări de producţie la industrii partenere cu jucătorul
 STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Schimbări de producţie la industrii partenere cu concurenţa
-STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Alte schimbari in productia industriala
+STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Alte schimbări în producţia industrială
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Sfaturi/informatii despre vehiculele tale
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Vehicule noi
-STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Schimbãri ale acceptãrii mãrfurilor
+STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Schimbări ale acceptării mărfurilor
 STR_020E_SUBSIDIES                                              :{YELLOW}Subventii
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Informatii generale
 STR_MESSAGES_ALL                                                :{YELLOW}Setare pentru tipurile de mesaje (da/nu/rezumat)
 STR_MESSAGE_SOUND                                               :{YELLOW}Sunet pentru mesajele-stiri
-STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prea departe de destinatia precedentã
+STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...prea departe de destinaţia precedentă
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Primele companii care au atins {NUM}{}(Nivelul {STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Clasamentul companiilor in {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Om de afaceri
-STR_0214_ENTREPRENEUR                                           :Întreprinzãtor
+STR_0214_ENTREPRENEUR                                           :Întreprinzător
 STR_0215_INDUSTRIALIST                                          :Industrias
 STR_0216_CAPITALIST                                             :Capitalist
 STR_0217_MAGNATE                                                :Magnat
@@ -614,13 +619,13 @@
 STR_021F                                                        :{BLUE}{COMMA}
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de scenarii
-STR_0223_LAND_GENERATION                                        :{WHITE}Generator suprafatã uscat
+STR_0223_LAND_GENERATION                                        :{WHITE}Generator suprafaţă uscat
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Mãreste aria de editare a terenului
-STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Micsoreazã aria de editare a terenului
-STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genereazã teren aleator
-STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reseteazã peisajul
+STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Măreşte aria de editare a terenului
+STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Micşorează aria de editare a terenului
+STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generează teren aleator
+STR_022B_RESET_LANDSCAPE                                        :{BLACK}Resetează peisajul
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Resetare peisaj
 STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Elimina de pe harta toate proprietatile detinute de jucatori
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Esti sigur ca vrei sa elimini toate proprietatile detinute de jucatori?
@@ -631,13 +636,13 @@
 STR_0233_TOWN_GENERATION                                        :{WHITE}Generare oras
 STR_0234_NEW_TOWN                                               :{BLACK}Oras nou
 STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Construieste un oras nou
-STR_0236_CAN_T_BUILD_TOWN_HERE                                  :{WHITE}Nu pot construi un oras aici...
-STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...prea aproape de marginea hãrtii
+STR_0236_CAN_T_BUILD_TOWN_HERE                                  :{WHITE}Nu se poate construi un oraş aici...
+STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...prea aproape de marginea hărţii
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...prea aproape de alt oras
 STR_0239_SITE_UNSUITABLE                                        :{WHITE}...locaţie nepotrivită
 STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...prea multe oraşe
 STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nu pot construi nici un oras
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nu mai este loc pe hartã
+STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nu mai este loc pe hartă
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Măreşte dimensiunile oraşului
 STR_023C_EXPAND                                                 :{BLACK}Extinde
 STR_023D_RANDOM_TOWN                                            :{BLACK}Oraş aleator
@@ -645,7 +650,7 @@
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Generare industrii
 STR_0240_COAL_MINE                                              :{BLACK}Mină de cărbune
 STR_0241_POWER_STATION                                          :{BLACK}Termocentrală
-STR_0242_SAWMILL                                                :{BLACK}Exploataţie forestieră
+STR_0242_SAWMILL                                                :{BLACK}Fabrică de cherestea
 STR_0243_FOREST                                                 :{BLACK}Pădure
 STR_0244_OIL_REFINERY                                           :{BLACK}Rafinărie
 STR_0245_OIL_RIG                                                :{BLACK}Platformă petrolieră
@@ -679,7 +684,7 @@
 STR_0261_SUGAR_MINE                                             :{BLACK}Mină de zahăr
 STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Construieşte mină de cupru
 STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Construieşte termocentrală
-STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Înfiinţează exploataţie forestieră
+STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Înfiinţează fabrică de cherestea
 STR_0265_PLANT_FOREST                                           :{BLACK}Plantează pădure
 STR_0266_CONSTRUCT_OIL_REFINERY                                 :{BLACK}Construieşte rafinărie
 STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY                             :{BLACK}Construieşte platformă petrolieră (doar în apropierea marginilor hărţii)
@@ -712,7 +717,7 @@
 STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Construieşte generator de balonaşe
 STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Construieşte carieră de caramel
 STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Construieşte mină de zahăr
-STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Nu pot construi {STRING} aici...
+STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Nu se poate construi {STRING} aici...
 STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...mai întâi trebuie creat un oraş
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...un singur obiectiv de acest tip este permis într-un oraş
 STR_0288_PLANT_TREES                                            :{BLACK}Plantează arbori
@@ -724,6 +729,7 @@
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plasează transmiţător
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Defineşte suprafaţa de deşert.{}Apasă şi menţine apăsat CTRL pentru a o şterge
 STR_CREATE_LAKE                                                 :{BLACK}Defineste zona apei.{}Creeaza un canal, mai putin cand CTRL este apasat la nivelul marii, cand va inunda, in loc, imprejurimile
+STR_CREATE_RIVER                                                :{BLACK}Amplasează râuri.
 STR_0290_DELETE                                                 :{BLACK}Şterge
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Şterge acest oraş
 STR_0292_SAVE_SCENARIO                                          :Salvează scenariul
@@ -798,15 +804,15 @@
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Afişează subvenţiile (F6)
 STR_02DD_SUBSIDIES                                              :Subvenţii (F6)
 STR_02DE_MAP_OF_WORLD                                           :Harta lumii (F4)
-STR_EXTRA_VIEW_PORT                                             :Extra ecran
+STR_EXTRA_VIEW_PORT                                             :Ecran suplimentar
 STR_SIGN_LIST                                                   :Lista de semne
 STR_02DF_TOWN_DIRECTORY                                         :Lista oraşelor
 STR_TOWN_POPULATION                                             :{BLACK}Populatia totala: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Ecran{COMMA}
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiaza pe ecranul principal
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copiaza locatia ecranului principal in acest ecran
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiază în fereastră
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copiază locaţia ecranului principal în acest ecran
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Importa din ecran
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Importa locatia acestui ecran in ecranul principal
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Importă locaţia acestui ecran în ecranul principal
 
 STR_02E0_CURRENCY_UNITS                                         :{BLACK}Unitate monetară
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
@@ -929,7 +935,7 @@
 
 STR_OPTIONS_LANG                                                :{BLACK}Limba
 STR_OPTIONS_LANG_CBO                                            :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_LANG_TIP                                            :{BLACK}Alege limba în care doresti afisatã interfata
+STR_OPTIONS_LANG_TIP                                            :{BLACK}Alege limba în care doreşti afişată interfaţa
 
 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Ecran intreg
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Bifeaza aceasta casuta pentru a juca in modul
@@ -937,13 +943,13 @@
 
 STR_OPTIONS_RES                                                 :{BLACK}Rezolutia ecranului
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_RES_TIP                                             :{BLACK}Alege rezolutia doritã pentru joc
+STR_OPTIONS_RES_TIP                                             :{BLACK}Alege rezoluţia dorită pentru joc
 
 STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Formatul capturii de ecran
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Alege tipul fisierului în care se salveazã captura de ecran (screenshot)
+STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Alege tipul fişierului în care se salvează captura de ecran (screenshot)
 
-STR_AUTOSAVE_1_MONTH                                            :În fiecare lunã
+STR_AUTOSAVE_1_MONTH                                            :În fiecare lună
 STR_AUTOSAVE_FAILED                                             :{WHITE}Auto-salvarea a esuat
 
 STR_MONTH_JAN                                                   :ianuarie
@@ -961,73 +967,73 @@
 
 STR_HEADING_FOR_STATION                                         :{LTBLUE}Spre {STATION}
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Spre {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Fãrã rutã
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Fãrã rutã, {VELOCITY}
+STR_NO_ORDERS                                                   :{LTBLUE}Fără comenzi
+STR_NO_ORDERS_VEL                                               :{LTBLUE}Fără comenzi, {VELOCITY}
 
-STR_PASSENGERS                                                  :cãlãtori
+STR_PASSENGERS                                                  :călători
 STR_BAGS                                                        :saci
 STR_TONS                                                        :tone
 STR_LITERS                                                      :litri
-STR_ITEMS                                                       :bucãti
+STR_ITEMS                                                       :bucăţi
 STR_CRATES                                                      :pachete
 STR_RES_OTHER                                                   :altele
 STR_NOTHING                                                     :
 
 STR_SMALL_RIGHT_ARROW                                           :{TINYFONT}{RIGHTARROW}
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nu pot construi lista de comenzi comune...
+STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nu se poate trece la comenzi sincronizate...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nu pot copia lista de comenzi...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Sfârsitul comenzilor comune - -
+STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Sfârşitul comenzilor sincronizate - -
 
 STR_TRAIN_IS_LOST                                               :{WHITE}Trenul {COMMA} s-a rãtãcit.
 STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Profitul trenului {COMMA} a fost anul trecut de {CURRENCY}
-STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Uniunea Monetarã Europeanã!{}{}Euro este introdus în tarã ca monedã unicã de folosintã în tranzactiile zilnice!
+STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Uniunea Monetară Europeană!{}{}Euro este introdus în ţară ca monedă unică de folosinţă în tranzacţiile zilnice!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Trenul {COMMA} are prea putine comenzi în listã
-STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trenul {COMMA} nu are comenzi
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trenul {COMMA} are o comandă nulă
 STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trenul {COMMA} are comenzi repetate
 STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trenul {COMMA} are o statie inexistentã în comenzi
 STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Autovehiculul {COMMA} are prea putine comenzi în listã
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Autovehiculul {COMMA} nu are comenzi
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Autovehiculul {COMMA} are o comandă nulă
 STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Autovehiculul {COMMA} are comenzi duplicat
 STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Autovehiculul {COMMA} are o statie inexistentã în comenzi
 STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Nava {COMMA} are prea putine comenzi în listã
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Nava {COMMA} nu are comenzi
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Nava {COMMA} are o comandă nulă
 STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Nava {COMMA} are comenzi repetate
 STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Nava {COMMA} are o statie inexistentã în comenzi
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aeronava {COMMA} are prea putine comenzi în listã
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aeronava {COMMA} nu are comenzi
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aeronava {COMMA} are prea puţine comenzi în listă
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aeronava {COMMA} are o comandă nulă
 STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aeronava {COMMA} are comenzi repetate
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aeronava {COMMA} are o statie inexistentã în comenzi
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aeronava {COMMA} are o staţie inexistentă în comenzi
 # end of order system
 
 STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Înnoirea trenului {COMMA} a esuat (fonduri limitate)
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Înnoirea autovehiculului {COMMA} a esuat (fonduri limitate)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Înnoirea navei {COMMA} a esuat (fonduri limitate)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Înnoirea aeronavei {COMMA} a esuat (fonduri limitate)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Înnoirea automată a aeronavei {COMMA} a eşuat (fonduri limitate)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Trenul {COMMA} este prea lung dupa inlocuire
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configurare patch
-STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configureazã patch-urile OpenTTD
+STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configurează patch-urile OpenTTD
 STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Configurare patch
 
 STR_CONFIG_PATCHES_OFF                                          :inactiv
 STR_CONFIG_PATCHES_ON                                           :activ
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Afiseazã viteza vehiculelor in bara de jos: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permite construirea pe coastã si in pantã: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Afişează viteza vehiculelor în bara de stare: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Permite construirea pe coastă şi în pantă: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSLOPE                                    :{LTBLUE}Permite terra-formarea sub cladiri, sine, etc. (auto-pante): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permite arii de cuprindere mai realistice: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permite demolarea unui nr. mai mare constructii: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permite constructia de trenuri foarte lungi: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permite acceleratie realisticã pentru trenuri: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permite acceleraţie realistică pentru trenuri: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Interzice trenurilor si navelor sa faca intoarceri de 90 de grade: {ORANGE}{STRING} {LTBLUE} (necesita NPF)
-STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Uneste gãrile alãturate: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Uneşte gările alăturate: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Foloseste algoritm incarcare imbunatatit: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Incarca vehiculele gradual: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflatia: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livreazã marfa doar in statiile unde aceasta este ceruta: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livrează marfa doar în staţiile unde aceasta este cerută: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permite constructia de poduri foarte lungi: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permite ordine de tipul "mergi la depou": {ORANGE}{STRING}
 STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Metoda manuala de constructie industrii primare: {ORANGE}{STRING}
@@ -1035,20 +1041,22 @@
 STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :ca alte industrii
 STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :de prospectie
 STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Permite mai multe industrii similare in acelasi oras: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrii identice pot fi construite aproape una de cealaltã: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Afiseazã intotdeauna data in format lung in bara de stare: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Industrii identice pot fi construite în apropiere una de cealaltă: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Afişează întotdeauna data în format lung în bara de stare: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Afişează semafoarele pe partea de circulaţie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Afiseazã finantele la sfârsitul fiecãrui an: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Utilizeazã o metodã gen TTDPatch pentru 'non stop': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Autovehiculele formeazã o coadã (cu efecte cuantice): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Mutã imaginea când mouse-ul este la marginea ecranului: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permite mituirea autoritãtilor locale: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Afişează finanţele la sfârşitul fiecărui an: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}Utilizează o metodă gen TTDPatch pentru 'non stop': {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Autovehiculele pot forma cozi (cu efecte cuantice): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Mută imaginea când mouse-ul este la marginea ecranului: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permite mituirea autorităţilor locale: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE                              :{LTBLUE}Permite cumpararea de drepturi exclusive de transport: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY                             :{LTBLUE}Permite transfer de bani catre alte companii: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Statii neuniforme: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Multiplicator greutate pt marfar pt simularea trenurilor grele: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Factor de viteză pentru avioane: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Permite semafoare in intersectiile drumurilor din proprietatea orasului: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Permite construirea de statii adiacente: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Permite mai multe seturi NewGRF simultan: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permite întotdeauna aeroporturi mici: {ORANGE}{STRING}
 
@@ -1058,10 +1066,10 @@
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :da, dar exclude vehiculele oprite
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :pentru toate vehiculele
 STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avertizare in cazul in care un tren are profit negativ: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehiculele nu expirã niciodatã: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Înnoire automatã pentru vehiculele învechite
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Înnoire automatã cu {ORANGE}{STRING}{LTBLUE} luni pânã la/dupã atingerea vechimii max.
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Fonduri minime pentru înnoire automatã: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vehiculele nu expiră niciodată: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Înnoire automată pentru vehiculele învechite
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Înnoire automată cu {ORANGE}{STRING}{LTBLUE} luni înainte de/după atingerea vechimii max.
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Fonduri minime pentru înnoire automată: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Durata mesajelor de eroare: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Afiseaza populatia unui oras langa nume: {ORANGE}{STRING}
 
@@ -1069,7 +1077,7 @@
 STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Original
 STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGeneza
 STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Distanta maxima de la margine pt Rafinariile de petrol {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitudinea de înzãpezire: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altitudinea de înzăpezire: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Duritatea terenului (Doar pt TerraGeneza) : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Foarte fin
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Fin
@@ -1084,12 +1092,12 @@
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :In sensul acelor de ceasornic
 STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Nivelul inaltimii atins de o harta plana: {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Mãrimea maximã a statiilor: {ORANGE}{STRING} {RED}(valorile mari încetinesc jocul!)
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Distanţarea maximă a staţiilor: {ORANGE}{STRING} {RED}Atenţie: Valorile mari încetinesc jocul!
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service automat pentru elicoptere la helipaduri: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Conecteaza bara de instrumente pentru peisaj cu cea de constructii feroviare/auto/aeriane: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Cand faci scroll cu mouse-ul muta ecranul in directia opusã: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Scroll cu mouse-ul dreapta mută ecranul în direcţia opusă: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_SCROLLING                             :{LTBLUE}Derulare usoara ecran: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Arata o bara de unelte de masuratori la folosirea uneltelor de constructie: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Arată o indicaţie de distanţă la folosirea uneltelor de construcţie: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Arata uniformele companiilor: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Niciunul
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Propria companie
@@ -1127,15 +1135,15 @@
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED                  :Cea mai folosita
 
 STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Arata uneltele de constructie cand nu sunt disponibile vehiculele potrivite: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nr. max. de trenuri per jucãtor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nr. max. de autovehicule pentru un jucãtor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nr. max. de aeronave pentru un jucãtor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nr. max. de nave per jucãtor: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nr. max. de trenuri pentru un jucător: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nr. max. de autovehicule pentru un jucător: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nr. max. de aeronave pentru un jucător: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nr. max. de nave pentru un jucător: {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Dezactiveazã trenurile pentru jucãtorii PC: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Dezactiveazã autovehiculele pentru jucãtorii PC: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Dezactiveazã aeronavele pentru jucãtorii PC: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Dezactiveazã navele pentru jucãtorii PC: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Dezactivează trenurile pentru jucătorii controlaţi de PC: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Dezactivează autovehiculele pentru jucătorii controlaţi de PC: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Dezactivează aeronavele pentru jucătorii controlaţi de PC: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Dezactivează navele pentru jucătorii controlaţi de PC: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Foloseste noul AI (versiune alfa): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Permite AI în multiplayer (experimental): {ORANGE}{STRING}
@@ -1149,7 +1157,7 @@
 STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Intervalul de service presetat pentru nave: {ORANGE}{STRING} zile
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervalul de service presetat pentru nave: {ORANGE}dezactivat
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Deactivare service cand defectiunile sunt anulate: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Activeazã limite de vitezã pt. vagoane: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Activează limite de viteză pentru vagoane: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Dezactiveaza sinele electrice: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Stirile în culori apar în anul: {ORANGE}{STRING}
@@ -1162,12 +1170,13 @@
 STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}Activare GUI pentru semnale: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_TOWN_LAYOUT_INVALID                          :{WHITE}Apectul de oras "fara alte drumuri" nu este valid in editorul de scenarii
-STR_CONFIG_PATCHES_TOWN_LAYOUT                                  :{LTBLUE}Alege aspect drum-de-oras: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOWN_LAYOUT                                  :{LTBLUE}Alege amplasarea drumurilor în oraş: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOWN_LAYOUT_NO_ROADS                         :fara alte drumuri
 STR_CONFIG_PATCHES_TOWN_LAYOUT_DEFAULT                          :implicit
 STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS                     :drumuri mai bune
 STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID                         :grila 2x2
 STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID                         :grila 3x3
+STR_CONFIG_PATCHES_TOWN_LAYOUT_RANDOM                           :aleator
 
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozitia listei cu instrumente: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :stânga
@@ -1186,7 +1195,7 @@
 STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER                         :{LTBLUE}Multiplicator initial dimensiune oras: {ORANGE}{STRING}
 STR_CONFIG_MODIFIED_ROAD_REBUILD                                :{LTBLUE}Elimina elementele de drum absurde pe durata constructiei drumului
 
-STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interfatã
+STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interfaţă
 STR_CONFIG_PATCHES_CONSTRUCTION                                 :{BLACK}Construcţie
 STR_CONFIG_PATCHES_VEHICLES                                     :{BLACK}Vehicule
 STR_CONFIG_PATCHES_STATIONS                                     :{BLACK}Statii
@@ -1197,25 +1206,38 @@
 STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 
-STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Schimbã valoarea setãrii
+STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Schimbă valoarea setării
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Unele sau toate din intervalurile de service alese sunt incompatibile cu setarea aleasa! Valorile valide sunt cuprinse intre 5-90% si 30-800 zile
 
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Algoritm de rutare pentru trenuri: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(Nerecomandat)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Recomandat)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH                       :{LTBLUE}Algoritm de rutare pentru vehicule rutiere: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF                   :Original {RED}(Nerecomandat)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(Recomandat)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Algoritm de rutare pentru nave: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF                     :Original {BLUE}(Recomandat)
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
+STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Nerecomandat)
+
 STR_TEMPERATE_LANDSCAPE                                         :peisajul temperat
 STR_SUB_ARCTIC_LANDSCAPE                                        :peisajul sub-arctic
 STR_SUB_TROPICAL_LANDSCAPE                                      :peisajul sub-tropical
 STR_TOYLAND_LANDSCAPE                                           :peisajul 'tara jucãriilor'
 
 STR_CHEATS                                                      :{WHITE}Cheat-uri
-STR_CHEATS_TIP                                                  :{BLACK}Checkbox-urile aratã un cheat folosit anterior
-STR_CHEATS_WARNING                                              :{BLACK}Atentie! Esti pe cale sã-ti trãdezi colegii de joc! Nu uita cã aceastã rusine va rãmâne înregistratã pentru totdeauna!
-STR_CHEAT_MONEY                                                 :{LTBLUE}Mãreste fondurile cu {CURRENCY}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Joacã în locul jucãtorului: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Buldozer magic (demoleazã industrii si lucruri amovibile): {ORANGE}{STRING}
+STR_CHEATS_TIP                                                  :{BLACK}Bifa vă indică dacă aţi folosit anterior acest cheat
+STR_CHEATS_WARNING                                              :{BLACK}Atenţie! Eşti pe cale să-ţi trădezi colegii de joc! Nu uita că această ruşine va rămâne înregistrată pentru totdeauna!
+STR_CHEAT_MONEY                                                 :{LTBLUE}Măreşte fondurile cu {CURRENCY}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Joacă în locul jucătorului: {ORANGE}{COMMA}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Buldozer magic (demolează industrii şi lucruri amovibile): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunelele se pot intersecta: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construieste în modul pauzã: {ORANGE}{STRING}
-STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Avioanele cu reactie nu se vor prãbusi (frecvent) pe aeroporturile mici: {ORANGE} {STRING}
-STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Schimbã peisajul: {ORANGE} {STRING}
-STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Schimbã data: {ORANGE} {DATE_SHORT}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construieşte în modul pauză: {ORANGE}{STRING}
+STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Avioanele cu reacţie nu se vor prăbuşi (frecvent) pe aeroporturile mici: {ORANGE} {STRING}
+STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Schimbă peisajul: {ORANGE} {STRING}
+STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Schimbă data: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activeaza accesul la valorile de productie: {ORANGE}{STRING}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Merge spre {WAYPOINT}
@@ -1226,7 +1248,7 @@
 
 STR_WAYPOINTNAME_CITY                                           :Halta {TOWN}
 STR_WAYPOINTNAME_CITY_SERIAL                                    :Halta {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Haltã de miscare
+STR_LANDINFO_WAYPOINT                                           :Haltă de mişcare
 
 STR_WAYPOINT                                                    :{WHITE}Punct de tranzit
 STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Alege tipul de punct de tranzit
@@ -1234,18 +1256,18 @@
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
 STR_WAYPOINT_RAW                                                :{WAYPOINT}
-STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editeazã numele haltei
+STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editează numele haltei
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nu pot schimba numele haltei...
-STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}Converteste linia în haltã de miscare (waypoint)
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Nu pot plasa o haltã aici...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nu pot sterge halta de aici...
+STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}Converteşte linia în haltă de mişcare (waypoint)
+STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Nu se poate plasa o haltă aici...
+STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nu se poate desfiinţa halta de aici...
 
-STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Construieste cale feratã în modul automat
+STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Construieşte cale ferată în modul automat
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...în acest scenariu nu existã nici un oras
+STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...în acest scenariu nu există nici un oraş
 
-STR_GENERATE_RANDOM_LANDSCAPE                                   :{WHITE}Esti sigur cã vrei sã creezi un peisaj aleator?
+STR_GENERATE_RANDOM_LANDSCAPE                                   :{WHITE}Eşti sigur că vrei să creezi un peisaj aleator?
 STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mai multe orase aleatoare
 STR_RANDOM_TOWNS_TIP                                            :{BLACK}Umple harta cu orase generate aleator
 STR_MANY_RANDOM_INDUSTRIES                                      :Multe industrii aleatoare
@@ -1254,7 +1276,7 @@
 
 STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}Afiseaza instrumentele pentru modelarea terenului, plantarea copacilor, etc.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Modificare peisaj
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Niveleazã terenul
+STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivelează terenul
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbori din specii aleatoare
@@ -1264,9 +1286,9 @@
 STR_BUILD_CANALS_TIP                                            :{BLACK}Construieste canale.
 STR_LANDINFO_CANAL                                              :Canal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Nu pot construi o ecluzã aici...
-STR_BUILD_LOCKS_TIP                                             :{BLACK}Construieste ecluzã
-STR_LANDINFO_LOCK                                               :Ecluzã
+STR_CANT_BUILD_LOCKS                                            :{WHITE}Nu se poate construi o ecluză aici...
+STR_BUILD_LOCKS_TIP                                             :{BLACK}Construieşte ecluză
+STR_LANDINFO_LOCK                                               :Ecluză
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}... baliza in uz!
 
@@ -1274,51 +1296,51 @@
 
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nu pot demola o parte din statie...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Nu pot converti linia aici...
-STR_CONVERT_RAIL_TIP                                            :{BLACK}Converteste tipul de cale feratã
+STR_CONVERT_RAIL_TIP                                            :{BLACK}Converteşte tipul de cale ferată
 
 STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Trage locomotiva aici pentru a vinde întregul tren
 
 STR_DRAG_DROP                                                   :{BLACK}Drag & Drop
 STR_STATION_DRAG_DROP                                           :{BLACK}Construieste o statie prin drag & drop
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Alege o clasã de statii pentru afisare
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Alege tipul de statie pentru constructie
-
-STR_FAST_FORWARD                                                :{BLACK}Mãreste viteza de trecere a timpului (TAB)
-STR_MESSAGE_HISTORY                                             :{WHITE}Cronologia mesajelor
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}O listã a celor mai recente mesaje
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Dezactiveazã toate
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activeazã toate
+STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Alege o clasă de staţii pentru afişare
+STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Alege tipul de staţie pentru construcţie
 
-STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Construieste minã de cãrbune
-STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Planteazã pãdure
-STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Construieste platformã petrolierã
-STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Înfiinteazã fermã
-STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Construieste minã de cupru
-STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Foreazã dupã petrol
-STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Construieste minã de aur
-STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Construieste minã de diamante
-STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Construieste minã de fier
-STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Planteazã livadã
-STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Înfiinteazã plantatie de cauciuc
-STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Construieste rezervor de apã
-STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Planteazã pãdure de vatã de zahãr
-STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Planteazã pãdure de baterii
-STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}Foreazã dupã cola
+STR_FAST_FORWARD                                                :{BLACK}Măreşte viteza de trecere a timpului (TAB)
+STR_MESSAGE_HISTORY                                             :{WHITE}Cronologia mesajelor
+STR_MESSAGE_HISTORY_TIP                                         :{BLACK}O listă a celor mai recente mesaje
+STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Dezactivează toate
+STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activează toate
+
+STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Construieşte mină de cărbune
+STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Plantează pădure
+STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Construieşte platformă petrolieră
+STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Înfiinţează fermă
+STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Construieşte mină de cupru
+STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Forează după petrol
+STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Construieşte mină de aur
+STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Construieşte mină de diamante
+STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Construieşte mină de fier
+STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Plantează livadă
+STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Înfiinţează plantaţie de cauciuc
+STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Construieşte rezervor de apă
+STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Plantează pădure de vată de zahăr
+STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Înfiinţează fermă de baterii
+STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}Forează după cola
 STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP                             :{BLACK}Construieste fântâni de plastic
 STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}Construieste generator de balonase
-STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}Construieste carierã de caramel
-STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construieste minã de zahãr
+STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}Construieşte carieră de caramel
+STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construieşte mină de zahăr
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrii
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prea aproape de altã industrie
+STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prea aproape de altă industrie
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Schimba tipul încãrcãturii cãratã de acest tren
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Modificã încãrcãturã
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de marfã transportat de tren
+STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de marfă transportat de tren
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Modificã trenul pentru a transporta marfa aleasã
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nu pot modifica trenul...
 STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Intervaluri de service in procente: {ORANGE}{STRING}
@@ -1332,8 +1354,9 @@
 
 STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multiplayer
 
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Numele jucãtorului:
+STR_NETWORK_PLAYER_NAME                                         :{BLACK}Numele jucătorului:
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Acesta este numele prin care te vor identifica ceilalţi
+STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Introduceţi-vă numele dvs.
 STR_NETWORK_CONNECTION                                          :{BLACK}Conexiune:
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Alege între un joc pe internet şi unul în reţea (LAN)
 
@@ -1343,7 +1366,9 @@
 STR_NETWORK_GAME_NAME                                           :{BLACK}Nume
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Numele jocului
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Limba, versiunea serverului, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Click pe un joc din listã pentru a-l selecta
+STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Clic pe un joc din listă pentru a-l selecta
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server-ul la care v-aţi conectat data trecută:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Clic pentru a alege serverul de data trecută
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Caută server
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Caută un server în reţea
@@ -1353,7 +1378,7 @@
 
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clienţi
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clienti online / Nr. max. clienti
+STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clienţi online / Nr. max. clienţi{}Companii online / Nr. max. companii
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JOC
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clienţi:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
@@ -1377,10 +1402,11 @@
 
 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nume joc:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Numele jocului va fi afisat celorlalti în meniul de selectare al jocurilor multiplayer
+STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Introduceţi un nume pentru joc
 STR_NETWORK_SET_PASSWORD                                        :{BLACK}Pune parola
 STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protejeazã-ti jocul cu o parolã dacã nu vrei sã intre jucãtori neautorizati
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Alege o hartã:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Ce hartã doresti sa joci?
+STR_NETWORK_SELECT_MAP                                          :{BLACK}Alege o hartă:
+STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Ce hartă doreşti să joci?
 STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
 STR_NETWORK_LAN                                                 :LAN
 STR_NETWORK_INTERNET                                            :Internet
@@ -1388,13 +1414,13 @@
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (fă reclamă)
 STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client{P "" i}
 STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Numar maxim de clienti
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Alege un numar maxim de clienti. Nu trebuie ocupate toate locurile.
+STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Alege un număr maxim de clienţi. Nu trebuie ocupate toate locurile.
 STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P ie ii}
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maximum companii:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limiteazã serverle la un anumit numãr companii
+STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limitează serverul la un anumit număr de companii
 STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectator{P "" i}
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maxim spectatori:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limiteazã serverul la un anumit numãr de spectatori
+STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limitează serverul la un anumit număr de spectatori
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Limba vorbită:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Ceilalţi jucători vor şti în ce limbă se discută pe server.
 STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1433,16 +1459,21 @@
 STR_NETWORK_LANG_SWEDISH                                        :Suedeza
 STR_NETWORK_LANG_TURKISH                                        :Turca
 STR_NETWORK_LANG_UKRAINIAN                                      :Ucrainiana
+STR_NETWORK_LANG_CROATIAN                                       :Croată
+STR_NETWORK_LANG_CATALAN                                        :Catalană
+STR_NETWORK_LANG_ESTONIAN                                       :Estonă
+STR_NETWORK_LANG_GREEK                                          :Greacă
+STR_NETWORK_LANG_LATVIAN                                        :Letonă
 ############ End of leave-in-this-order
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Chatul jocului multiplayer
 
 STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}In pregatire pentru joc:   {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista companiilor din jocul curent. Poti colabora cu o companie sau sa infiintezi una
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Companie nouã
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Fondeazã o nouã companie
+STR_NETWORK_NEW_COMPANY                                         :{BLACK}Companie nouă
+STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Fondează o companie nouă
 STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Modul spectator
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Vizioneazã un joc din pozitia unui spectator
+STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Vizionează jocul din poziţia de spectator
 STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Alătură-te companiei
 STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Ajută la conducerea acestei companii
 STR_NETWORK_REFRESH                                             :{BLACK}Actualizeaza serverul
@@ -1531,7 +1562,7 @@
 STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] pentru {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {GRAY}{STRING}
-STR_NETWORK_NAME_CHANGE                                         :si-a schimbat numele in
+STR_NETWORK_NAME_CHANGE                                         :şi-a schimbat numele în
 STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE}Serverul a inchis conexiunea
 STR_NETWORK_SERVER_REBOOT                                       :{WHITE}Serverul este repornit...{}Va rugam asteptati...
 
@@ -1571,12 +1602,12 @@
 STR_0801_COST                                                   :{RED}Cheltuieli: {CURRENCY}
 STR_0802_INCOME                                                 :{TINYFONT}{GREEN}Venituri: {CURRENCY}
 STR_0803_INCOME                                                 :{GREEN}Venituri: {CURRENCY}
-STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Transferã: {CURRENCY}
-STR_FEEDER                                                      :{YELLOW}Transferã: {CURRENCY}
+STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Transferă: {CURRENCY}
+STR_FEEDER                                                      :{YELLOW}Transferă: {CURRENCY}
 STR_0805_ESTIMATED_COST                                         :{WHITE}Cost estimat: {CURRENCY}
 STR_0807_ESTIMATED_INCOME                                       :{WHITE}Venit estimat: {CURRENCY}
-STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Nu pot înălţa terenul...
-STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Nu pot coborî terenul...
+STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Nu se poate înălţa terenul...
+STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Nu se poate coborî terenul...
 STR_080A_ROCKS                                                  :Stânci
 STR_080B_ROUGH_LAND                                             :Teren pietros
 STR_080C_BARE_LAND                                              :Teren viran
@@ -1594,17 +1625,18 @@
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Cale ferată nepotrivită
 STR_1007_ALREADY_BUILT                                          :{WHITE}...deja construit
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Mai întâi trebuie înlăturată calea ferată
+STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Drum cu sens unic sau blocat
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Construcţii feroviare
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Construcţie Cale Ferată Electrificată
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Construcţii monoşină
 STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Construcţii maglev
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Alege podul de cale ferată
-STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Nu pot construi un depou feroviar aici...
-STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Nu pot construi o gară aici...
-STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Nu pot plasa semafoare aici...
-STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Nu pot construi cale ferată aici...
-STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Nu pot înlătura calea ferată...
-STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Nu pot înlătura semafoarele de aici...
+STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Nu se poate construi depou feroviar aici...
+STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Nu se poate construi o gară aici...
+STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Nu se pot plasa semafoare aici...
+STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Nu se poate construi cale ferată aici...
+STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Nu se poate înlătura calea ferată...
+STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Nu se pot înlătura semafoarele de aici...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Orientarea depoului feroviar
 STR_1015_RAILROAD_CONSTRUCTION                                  :Construcţii feroviare
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Construcţie cale ferată electrificată
@@ -1643,16 +1675,16 @@
 STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}Construcţie Tramvai
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Alege pod rutier
 STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... drumurile cu sens unic nu pot avea bifurcatii
-STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nu pot construi şosea aici...
+STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nu se poate construi şosea aici...
 STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}Nu pot construi şină de tramvai aici...
-STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nu pot înlătura şoseaua...
+STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nu se poate înlătura şoseaua...
 STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}Nu pot înlătura şina de tramvai de aici...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientarea autobazei
 STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}Orientarea Depoului de Tramvaie
-STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nu pot construi autobază aici...
+STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nu se poate construi autobază aici...
 STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}Nu pot construi depou de tramvaie aici...
-STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nu pot construi staţie de autobuz...
-STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nu pot construi platformă pentru camioane...
+STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nu se poate construi staţie de autobuz...
+STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nu se poate construi platformă pentru camioane...
 STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}Nu pot construi staţie de tramvai aici...
 STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}Nu pot construi staţie de tramvai aici...
 STR_180A_ROAD_CONSTRUCTION                                      :Construcţii rutiere
@@ -1673,7 +1705,7 @@
 STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Construieşte tunel pentru tramvaie
 STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Activare/Dezactivare sensuri unice
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Comutator pentru construcţie/înlăturare şosele
-STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Comuta constructie/stergere pentru constructia de linii de tramvaie
+STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Comută construcţie/eliminare pentru şine de tramvai
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Alege orientarea autobazei
 STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Alege orientarea depoului de tramvaie
 STR_1814_ROAD                                                   :Şosea
@@ -1681,6 +1713,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Stradă cu copaci pe margine
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Autobază
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Trecere la nivel cu calea ferată
+STR_TRAMWAY                                                     :Şină de tramvai
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Nu pot elimina statia de autobus...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Nu pot elimina statia de camioane...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Nu pot înlătura staţia de tramvai...
@@ -1696,9 +1729,10 @@
 STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Mai întâi trebuie demolată clădirea
 STR_2005                                                        :{WHITE}{TOWN}
+STR_CITY                                                        :{WHITE}{TOWN} (Oraş)
 STR_2006_POPULATION                                             :{BLACK}Populaţia: {ORANGE}{COMMA}{BLACK}  Locuinţe: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Redenumire oraş
-STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Nu pot redenumi oraşul...
+STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Nu se poate redenumi oraşul...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}Autorităţile locale din {TOWN} refuză să permită această acţiune
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Numele oraşelor - clic pe un nume pentru a centra imaginea pe oraşul respectiv
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Mută imaginea pe locaţia oraşului
@@ -1766,7 +1800,7 @@
 STR_204A_BUILD_STATUE_OF_COMPANY                                :Ridică un monument dedicat preşedintelui companiei
 STR_204B_FUND_NEW_BUILDINGS                                     :Finanţează construcţia de noi clădiri
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Cumpără drepturi exclusive de transport
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Mituieste autoritatea localã
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Mituieşte autoritatea locală
 STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniţiază o campanie publicitară mică pentru a atrage mai mulţi călători şi mai multe mărfuri spre compania ta.{}  Cost: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Iniţiază o campanie publicitară medie pentru a atrage mai mulţi călători şi mai multe mărfuri spre compania ta.{}  Cost: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniţiază o mare campanie publicitară pentru a atrage mai mulţi călători şi mai multe mărfuri spre compania ta.{}  Cost: {CURRENCY}
@@ -1796,13 +1830,13 @@
 STR_2802_TREES                                                  :{WHITE}Arbori
 STR_2803_TREE_ALREADY_HERE                                      :{WHITE}...sunt deja plantaţi arbori
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...locaţie nepotrivită
-STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Nu pot planta arbori aici...
+STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Nu se pot planta arbori aici...
 STR_2806                                                        :{WHITE}{SIGN}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...prea multe semne
-STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Nu pot plasa un semn aici...
+STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Nu se poate plasa un semn aici...
 STR_280A_SIGN                                                   :Semn
 STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Editează textul semnului
-STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Nu pot schimba numele semnului...
+STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Nu se poate schimba numele semnului...
 STR_280D_SELECT_TREE_TYPE_TO_PLANT                              :{BLACK}Alege specia de arbori de plantat
 STR_280E_TREES                                                  :Arbori
 STR_280F_RAINFOREST                                             :Pădure tropicală
@@ -1827,7 +1861,7 @@
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Mai întâi trebuie demolat aeroportul
 
 STR_3030_RENAME_STATION_LOADING                                 :Redenumeşte staţia
-STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Nu pot redenumi staţia...
+STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Nu se poate redenumi staţia...
 STR_3032_RATINGS                                                :{BLACK}Evaluări
 STR_3033_ACCEPTS                                                :{BLACK}Acceptă
 STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Evaluarea serviciilor de transport local:
@@ -1868,7 +1902,7 @@
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Alege orientarea staţiei de autobuz
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Alege orientarea platformei pentru camioane
 STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION                   :{BLACK}Alege orientarea staţiei de tramvai
-STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Alege orientarea staţiei de tramvai
+STR_SELECT_CARGO_TRAM_STATION_ORIENTATION                       :{BLACK}Alege orientarea platformei de tramvai
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrează imaginea pe locaţia staţiei
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Afişează evaluările staţiei
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Schimbă numele staţiei
@@ -1900,12 +1934,12 @@
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientarea şantierului naval
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...trebuie construit pe apă
-STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Nu pot construi un şantier naval aici...
+STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Nu se poate construi şantier naval aici...
 STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Alege orientarea şantierului naval
 STR_3804_WATER                                                  :Apă
 STR_3805_COAST_OR_RIVERBANK                                     :Mal/Coastă
 STR_3806_SHIP_DEPOT                                             :Şantier naval
-STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Nu pot construi pe apă
+STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Nu se poate construi pe apă
 STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Trebuie sa demolezi canalul inainte
 
 ##id 0x4000
@@ -1915,7 +1949,7 @@
 STR_4003_DELETE                                                 :{BLACK}Şterge
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabyte{P "" s} liberi
-STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nu pot citi acest disc
+STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Discul nu a putut fi citit
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Salvarea jocului eşuată{}{STRING}
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Ştergerea jocului eşuată
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}Încărcarea jocului eşuată{}{STRING}
@@ -1932,13 +1966,14 @@
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Alege un scenariu (verde), un joc predefinit (albastru) sau o hartă aleatoare
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generează o hartă aleatoare
 STR_LOAD_HEIGHTMAP                                              :{WHITE}Încarcă harta înălţimilor
+STR_SAVE_OSKTITLE                                               :{BLACK}Introduceţi un nume pentru salvare
 
 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} în cale
 STR_4801                                                        :{WHITE}{INDUSTRY}
 STR_4802_COAL_MINE                                              :Mină de cărbune
 STR_4803_POWER_STATION                                          :Termocentrală
-STR_4804_SAWMILL                                                :Exploataţie forestieră
+STR_4804_SAWMILL                                                :Fabrică de cherestea
 STR_4805_FOREST                                                 :Pădure
 STR_4806_OIL_REFINERY                                           :Rafinărie
 STR_4807_OIL_RIG                                                :Platformă petrolieră
@@ -2029,8 +2064,8 @@
 STR_5013_CONCRETE                                               :Beton
 STR_5014_TUBULAR_STEEL                                          :Tubular (oţel)
 STR_BRIDGE_TUBULAR_SILICON                                      :Tubular (silicon)
-STR_5015_CAN_T_BUILD_BRIDGE_HERE                                :{WHITE}Nu pot construi pod aici...
-STR_5016_CAN_T_BUILD_TUNNEL_HERE                                :{WHITE}Nu pot construi tunel aici...
+STR_5015_CAN_T_BUILD_BRIDGE_HERE                                :{WHITE}Nu se poate construi pod aici...
+STR_5016_CAN_T_BUILD_TUNNEL_HERE                                :{WHITE}Nu se poate construi tunel aici...
 STR_5017_RAILROAD_TUNNEL                                        :Tunel feroviar
 STR_5018_ROAD_TUNNEL                                            :Tunel rutier
 STR_501B_STEEL_SUSPENSION_RAIL_BRIDGE                           :Pod feroviar suspendat din oţel
@@ -2108,7 +2143,7 @@
 
 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Nivel de dificultate
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Salveazã
+STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Salvează
 
 ############ range for difficulty levels starts
 STR_6801_EASY                                                   :{BLACK}Uşor
@@ -2192,8 +2227,8 @@
 STR_7009_PRESIDENT_NAME                                         :{BLACK}Numele preşedintelui
 STR_700A_COMPANY_NAME                                           :Noul nume al companiei
 STR_700B_PRESIDENT_S_NAME                                       :Noul nume al preşedintelui
-STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nu pot schimba numele companiei...
-STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Nu pot schimba numele preşedintelui...
+STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nu se poate schimba numele companiei...
+STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Nu se poate schimba numele preşedintelui...
 STR_700E_FINANCES                                               :{WHITE}Situaţia financiară a companiei {COMPANY} {BLACK}{COMPANYNUM}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Cheltuieli/Venituri
 STR_7010                                                        :{WHITE}{NUM}
@@ -2229,7 +2264,7 @@
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...nu ai nici un credit de plătit
 STR_702E_REQUIRED                                               :{WHITE}...ai nevoie de {CURRENCY}
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Nu poţi plăti creditul...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nu poti dona din banii împrumutati de bancã...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nu poţi dona din banii împrumutaţi de la bancă...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Alege o nouă poză a preşedintelui
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Schimbă culoarea care îţi reprezintă compania
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Schimbă numele preşedintelui
@@ -2242,7 +2277,7 @@
 STR_7039_VEHICLES                                               :{GOLD}Vehicule:
 STR_TRAINS                                                      :{WHITE}{COMMA} tren{P "" uri}
 STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} autovehicul{P "" e}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeronav{P ã e}
+STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeronav{P ă e}
 STR_SHIPS                                                       :{WHITE}{COMMA} nav{P ã e}
 STR_7042_NONE                                                   :{WHITE}Nici unul
 STR_7043_FACE_SELECTION                                         :{WHITE}Alegerea pozei
@@ -2274,7 +2309,7 @@
 STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}Compania {COMPANY} a fost închisă şi toate activele au fost valorificate de creditori!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}A apărut o nouă companie!
 STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} şi-a stabilit sediul lângă {TOWN}!
-STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nu pot cumpăra compania...
+STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nu se poate cumpăra compania...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Preţurile transportului de călători şi mărfuri
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Zile în tranzit
 STR_7063_PAYMENT_FOR_DELIVERING                                 :{BLACK}{TINYFONT}Plata pentru livrarea a 10 unităţi (sau 10.000 de litri) de marfă pe o distanţă de 20 de pătrăţele
@@ -2292,7 +2327,7 @@
 STR_706F_BUILD_HQ                                               :{BLACK}Construieşte sediu
 STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Construieşte sau arată sediul companiei
 STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Muta sediul companiei (costa 1% din valoarea companiei)
-STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Nu pot construi sediul...
+STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Nu se poate construi sediul...
 STR_7072_VIEW_HQ                                                :{BLACK}Vezi sediul
 STR_RELOCATE_HQ                                                 :{BLACK}Muta sediu
 STR_COMPANY_PASSWORD                                            :{BLACK}Parola
@@ -2311,8 +2346,8 @@
 STR_7078_SELL_25_SHARE_IN_COMPANY                               :{BLACK}Vinde 25% din acţiunile companiei
 STR_7079_BUY_25_SHARE_IN_THIS_COMPANY                           :{BLACK}Cumpără 25% din acţiunile acestei companii
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vinde 25% din acţiunile acestei companii
-STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nu pot cumpăra 25% din acţiunile acestei companii...
-STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nu pot vinde 25% din acţiunile acestei companii...
+STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Nu se pot cumpăra 25% din acţiunile acestei companii...
+STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Nu se pot vinde 25% din acţiunile acestei companii...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% deţinute de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} a fost preluată de {COMPANY}!
 STR_PROTECTED                                                   :{WHITE}Această companie încă nu vinde acţiuni...
@@ -2328,6 +2363,8 @@
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Vagon de călători (Aburi)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Vagon de călători (Diesel)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Vagon de călători (Electric)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Vagon pentru Pasageri (Monoşină)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Vagon pentru Pasageri (Pernă Magnetică)
 STR_LIVERY_FREIGHT_WAGON                                        :Vagon de marfa
 STR_LIVERY_BUS                                                  :Autobus
 STR_LIVERY_TRUCK                                                :Camion
@@ -2344,8 +2381,8 @@
 STR_LIVERY_ROADVEH_TIP                                          :{BLACK}Arata schemele de culori pentru autovehiculele rutiere
 STR_LIVERY_SHIP_TIP                                             :{BLACK}Arata schemele de culori pentru vase
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Arata schemele de culori pentru avioane
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Alege culoarea primara pentru schema selectata
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Alege culoarea secundara pentru schema selectata
+STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Alege culoarea primară pentru schema selectată
+STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Alege culoarea secundară pentru schema selectată
 STR_LIVERY_PANEL_TIP                                            :{BLACK}Alege o schema de culori pentru modificare sau mai multe scheme, folosind CTRL+click. Apasa pe casuta pentru a comuta schema
 
 ##id 0x8000
@@ -2619,11 +2656,72 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetăţenii sărbătoresc {}sosirea primului tren la {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Detalii)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Tren în drum
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
+STR_ORDER_GO_TO                                                 :Du-te la
+STR_ORDER_GO_NON_STOP_TO                                        :Du-te fără oprire la
+STR_ORDER_GO_VIA                                                :Du-te prin
+STR_ORDER_GO_NON_STOP_VIA                                       :Du-te fără oprire prin
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Încarcă toate produsele
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Încarcă orice produs
+STR_ORDER_DROP_NO_LOADING                                       :Nu încărca
+STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Descarcă dacă este cerere
+STR_ORDER_DROP_UNLOAD                                           :Descarcă tot
+STR_ORDER_DROP_TRANSFER                                         :Transferă
+STR_ORDER_DROP_NO_UNLOADING                                     :Nu descărca
+STR_ORDER_FULL_LOAD                                             :(Încărcare maximă)
+STR_ORDER_FULL_LOAD_ANY                                         :(Încărcare orice produs)
+STR_ORDER_NO_LOAD                                               :(Fără încărcare)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :(Descarcă şi aşteaptă încărcare maximă)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Descarcă şi aşteaptă orice încărcătură)
+STR_ORDER_UNLOAD_NO_LOAD                                        :(Descarcă şi pleacă)
+STR_ORDER_TRANSFER                                              :(Transferă - preia încărcătura)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :(Transferă şi aşteaptă încărcare maximă)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Transferă şi aşteaptă orice încărcătură)
+STR_ORDER_TRANSFER_NO_LOAD                                      :(Transferă - pleacă descărcat)
+STR_ORDER_NO_UNLOAD                                             :(Nu descărca şi preia încărcătura)
+STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Nu descărca şi aşteaptă încărcare maximă)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Nu descărca şi aşteaptă orice încărcătură)
+STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Schimbă comportamentul de oprire pentru ordinul selectat
+STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Schimbă comportamentul de încărcare pentru ordinul selectat
+STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Schimbă comportamentul de descărcare pentru ordinul selectat
+STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Adaugă o comandă avansată
+STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Du-te la cel mai apropiat depou
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Du-te la cel mai apropiat hangar
+STR_ORDER_NEAREST_DEPOT                                         :cel mai apropiat
+STR_ORDER_NEAREST_HANGAR                                        :cel mai apropiat Hangar
+STR_ORDER_SERVICE_AT                                            :Service la
+STR_ORDER_TRAIN_DEPOT                                           :Depou de Trenuri
+STR_ORDER_ROAD_DEPOT                                            :Autobază
+STR_ORDER_SHIP_DEPOT                                            :Şantier Naval
+STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
+STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
+STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Valoarea cu care se compară
+STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduceţi valoarea de comparat
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Procentaj încărcare
+STR_ORDER_CONDITIONAL_RELIABILITY                               :Eficienţă
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Viteză maximă
+STR_ORDER_CONDITIONAL_AGE                                       :Vechime vehicol (ani)
+STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Necesită service
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Întotdeauna
+STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :este egal cu
+STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :nu este egal cu
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :este mai mic decât
+STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :mai mic sau egal cu
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :este mai mare decât
+STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :mai mare sau egal cu
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :este adevărat
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :este fals
+STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Calatorie (fara orar)
 STR_TIMETABLE_TRAVEL_FOR                                        :Calatorii pentru {STRING}
 STR_TIMETABLE_STAY_FOR                                          :si opriri pentru {STRING}
-STR_TIMETABLE_DAYS                                              :{COMMA} zi{P "" s}
+STR_TIMETABLE_DAYS                                              :{COMMA} zi{P "" le}
 STR_TIMETABLE_TICKS                                             :{COMMA} programare{P "" s}
 
 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Merge la Depoul {TOWN}
@@ -2648,17 +2746,17 @@
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Noi Vehicule Electrice pe Sine
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Noi vehicule monoşină
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Noi vehicule maglev
-STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Vehicule pe sine
+STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Vehicule pe şine
 
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Cumpără vehicul
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Cloneazã vehiculul
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Acest buton va crea o copie a autovehiculului. Control+click pentru comenzi comune
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Acest buton va crea o copie a autovehiculului. Apasã acest buton, apoi fã click pe un autovehicul de pe hartã. Control+click pentru a-i da ordine comune
-STR_CLONE_TRAIN                                                 :{BLACK}Cloneazã trenul
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Acest buton va crea o copie a întregului tren. Control+click pentru comenzi comune
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Acest buton va crea o copie a întregului tren. Apasã acest buton, apoi fã click pe un tren de pe hartã. Control+click pentru a-i da ordine comune
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonare vehicul
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Acest buton va crea o copie a autovehiculului. Control+clic pentru comenzi sincronizate
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Acest buton va crea o copie a autovehiculului. Apasă acest buton, apoi fă clic pe un autovehicul din joc. Control+clic pentru a crea comenzi sincronizate
+STR_CLONE_TRAIN                                                 :{BLACK}Clonare tren
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Acest buton va crea o copie a întregului tren. Control+clic pentru comenzi sincronizate
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Acest buton va crea o copie a întregului tren. Apasă acest buton, apoi fă clic pe un tren din joc. Control+clic pentru a crea comenzi sincronizate
 STR_8820_RENAME                                                 :{BLACK}Redenumeşte
-STR_8823_SKIP                                                   :{BLACK}Sãri peste
+STR_8823_SKIP                                                   :{BLACK}Treci la următoarea
 STR_8824_DELETE                                                 :{BLACK}Şterge
 STR_8826_GO_TO                                                  :{BLACK}Mergi la
 STR_REFIT                                                       :{BLACK}Rearanjeaza
@@ -2666,30 +2764,31 @@
 STR_REFIT_ORDER                                                 :(Rearanjeaza in {STRING})
 STR_TIMETABLE_VIEW                                              :{BLACK}Orar
 STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Comuta in modul de vizualizare orar
+STR_ORDER_VIEW                                                  :{BLACK}Comenzi
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Comenzi)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Sfârşitul comenzilor - -
 STR_SERVICE                                                     :{BLACK}Service
-STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nu pot construi vehiculul...
+STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nu se poate construi vehiculul...
 STR_882C_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Cumpărat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   Valoare: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Încărcare / Descărcare
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trenul trebuie oprit intr-un depou
-STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nu pot trimite trenul la depou...
+STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nu se poate trimite trenul la depou...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Nu mai este loc pentru comenzi
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Prea multe comenzi
-STR_8833_CAN_T_INSERT_NEW_ORDER                                 :{WHITE}Nu pot adăuga o comandă nouă...
-STR_8834_CAN_T_DELETE_THIS_ORDER                                :{WHITE}Nu pot şterge această comandă...
-STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Nu pot modifica această comandă...
+STR_8833_CAN_T_INSERT_NEW_ORDER                                 :{WHITE}Nu se poate adăuga o comandă nouă...
+STR_8834_CAN_T_DELETE_THIS_ORDER                                :{WHITE}Nu se poate şterge această comandă...
+STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Nu se poate modifica această comandă...
 STR_CAN_T_MOVE_THIS_ORDER                                       :{WHITE}Nu pot muta acest ordin...
 STR_CAN_T_SKIP_ORDER                                            :{WHITE}Nu pot renunta la comanda actuala...
 STR_CAN_T_SKIP_TO_ORDER                                         :{WHITE}Nu pot sări la ordinul selectat...
-STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Nu pot muta vehiculul...
+STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Nu se poate muta vehiculul...
 STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}Al doilea vagon+motor va avea mereu aceeasi destinatie ca si primul
 STR_8838_N_A                                                    :N/A{SKIP}
-STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nu pot vinde vehiculul...
-STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nu pot găsi un drum spre un depou local
-STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Nu pot opri-porni trenul...
+STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nu se poate vinde vehiculul...
+STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nu se poate găsi un drum spre un depou apropiat
+STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Nu se poate opri/porni trenul...
 STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Intervalul pentru întreţinere: {LTBLUE}{COMMA}zile{BLACK}   Ultima întreţinere: {LTBLUE}{DATE_LONG}
 STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Intervalul de service: {LTBLUE}{COMMA}%{BLACK}   Ultimul service: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trenuri - apasă aici pentru informaţii despre trenuri
@@ -2697,29 +2796,29 @@
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trenuri - clic pe tren pentru informaţii, mută vehiculele pentru adăugare-scoatere din tren
 STR_8840_BUILD_NEW_TRAIN_VEHICLE                                :{BLACK}Construieşte un nou vehicul feroviar
 STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE                             :{BLACK}Mută un vehicul aici pentru a-l vinde
-STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Centreazã imaginea pe locatia depoului
+STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Centrează imaginea pe locaţia depoului
 STR_8843_TRAIN_VEHICLE_SELECTION                                :{BLACK}Lista de selectie a componentelor trenului - clic pe vehicule pt. informatii
-STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Cumpãrã vehiculul selectat
+STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Cumpără vehiculul selectat
 STR_8845_RENAME_TRAIN_VEHICLE_TYPE                              :{BLACK}Redenumeste modelul vehiculului
-STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Comanda curentã a trenului - apasã aici pentru a porni/opri trenul
-STR_8847_SHOW_TRAIN_S_ORDERS                                    :{BLACK}Afiseazã comenzile trenului
-STR_8848_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Centreazã imaginea pe locatia curentã a trenului
+STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Comanda curentă a trenului - clic aici pentru a opri/porni trenul
+STR_8847_SHOW_TRAIN_S_ORDERS                                    :{BLACK}Afişează comenzile trenului
+STR_8848_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Centrează imaginea pe locaţia curentă a trenului
 STR_8849_SEND_TRAIN_TO_DEPOT                                    :{BLACK}Trimite trenul într-un depou
-STR_884A_FORCE_TRAIN_TO_PROCEED                                 :{BLACK}Forteazã trenul sã ignore semnalulizarea de oprire
-STR_884B_REVERSE_DIRECTION_OF_TRAIN                             :{BLACK}Schimbã sensul de circulatie al trenului
-STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Afiseazã detaliile trenului
-STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Mãreste intervalul de service
-STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Micsoreazã intervalul de service
-STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Afiseazã detalii despre încãrcãtura transportatã
-STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Afiseazã detalii despre componentele trenului
-STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Afiseazã capacitãtile componentelor trenului
+STR_884A_FORCE_TRAIN_TO_PROCEED                                 :{BLACK}Forţează trenul să ignore semnalizarea de oprire
+STR_884B_REVERSE_DIRECTION_OF_TRAIN                             :{BLACK}Schimbă sensul de circulaţie al trenului
+STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Afişează detaliile trenului
+STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Măreşte intervalul de service
+STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Micşorează intervalul de service
+STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Afişează detalii despre încărcătura transportată
+STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Afişează detalii despre componentele trenului
+STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Afişează capacităţile fiecărei componente
 STR_SHOW_TOTAL_CARGO                                            :{BLACK}Afiseazã capacitãtile totale ale trenului, diferentiate pe tip de încãrcãturã
-STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista de comenzi - clic pe comandã pentru a o selecta
+STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Lista de comenzi - clic pe o comandă pentru a o selecta. Ctrl+clic poziţionează ecranul pe staţie
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Renunta la comanta acruala si preia-o pe urmatoarea. CTRL + click face salt la comanda selectata
-STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Sterge comanda selectatã
-STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Introdu o comandã înaintea celei selectate sau adaugã o comandã la sfârsitul listei
+STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Şterge comanda selectată
+STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Adaugă o comandă înaintea celei selectate, sau la sfârşitul listei
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Orar - click on an order to highlight it.
-STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Modifica durata de timp alocata pentru comanda selectata
+STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Modifică durata de timp alocată pentru comanda selectată
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Elimina durata de timp pentru comanda selectata
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reinitializeaza contorul de intarziere, astfel ca vehiculul sa ajunga la timp
 STR_SERVICE_HINT                                                :{BLACK}Sari peste aceastã comandã dacã nu este necesar un service
@@ -2729,18 +2828,18 @@
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Greutate: {LTBLUE}{WEIGHT_S}  {BLACK}Putere: {LTBLUE}{POWER}{BLACK} Vitezã max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Greutate: {LTBLUE}{WEIGHT_S} {BLACK}Putere: {LTBLUE}{POWER}{BLACK} Viteza max.: {LTBLUE}{VELOCITY} {BLACK}E.T. max.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
+STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficienţă: {LTBLUE}{COMMA}%  {BLACK}Defecţiuni de la ultimul service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Oprit
-STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nu pot permite trenului sã treacã în caz de pericol...
+STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nu se poate permite trenului să treacă în caz de pericol...
 STR_8863_CRASHED                                                :{RED}Accident!
 
 STR_8865_NAME_TRAIN                                             :{WHITE}Numele trenului
-STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nu pot redenumi trenul...
+STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nu se poate denumi trenul...
 STR_8867_NAME_TRAIN                                             :{BLACK}Numele trenului
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident feroviar!{}{COMMA} victime în urma unei coliziuni
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nu pot schimba sensul de mers al trenului...
+STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nu se poate schimba sensul de mers al trenului...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Redenumeste modelul vehiculului feroviar
-STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nu pot redenumi modelul acestui vehicul...
+STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nu se poate redenumi modelul de vehicul...
 STR_CLEAR_TIME                                                  :{BLACK}Curata timp
 STR_RESET_LATENESS                                              :{BLACK}Reinitializeaza contorul de intarziere
 
@@ -2750,19 +2849,19 @@
 STR_TRAIN_NO_POWER                                              :{RED}Fara curent
 STR_TRAIN_START_NO_CATENARY                                     :Aceasta sina nu este electrificata, deci trenul nu poate porni
 
-STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Un nou {STRING} este acum disponibil!
+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Un nou tip de {STRING} este acum disponibil!
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{ENGINE}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Un nou {STRING} este acum disponibil!  -  {ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Un nou tip de {STRING} este acum disponibil!  -  {ENGINE}
 
 STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Vehiculul distrus nu poate fi vandut...
 STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nu putem repara vehiculele distruse...
 
 STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Nu pot programa vehiculul...
 STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vehiculele pot astepta numai in statii.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Acest vehicul nu opreste in aceasta statie.
+STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Acest vehicul nu are oprire în această staţie.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Modifica timpul
 STR_TIMETABLE_STATUS_ON_TIME                                    :Acest vehicul se incadreaza in timp
-STR_TIMETABLE_STATUS_LATE                                       :Momentan, acest vehicul este in intarziere {STRING}
+STR_TIMETABLE_STATUS_LATE                                       :Vehiculul are întârziere de {STRING}
 STR_TIMETABLE_STATUS_EARLY                                      :Momentan, acest vehicul si-a devansat programul {STRING}
 STR_TIMETABLE_TOTAL_TIME                                        :Acest orar va lua {STRING} pentru finalizare
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :Acest orar va lua cel putin {STRING} pentru finalizare (nu in intregime programat)
@@ -2776,220 +2875,220 @@
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Autobaza {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Autovehicule noi
 STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Autovehicule noi
-STR_9007_BUILD_VEHICLE                                          :{BLACK}Cumpãrã vehicul
-STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nu pot cumpãra autovehicul...
+STR_9007_BUILD_VEHICLE                                          :{BLACK}Cumpără vehicul
+STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nu pot cumpăra autovehicul...
 STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalii)
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
-STR_900E_MAX_SPEED                                              :{BLACK}Vitezã max.: {LTBLUE}{VELOCITY}
+STR_900E_MAX_SPEED                                              :{BLACK}Viteză max.: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
-STR_9011_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Cumpãrat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficienţă: {LTBLUE}{COMMA}%  {BLACK}Defecţiuni de la ultimul service: {LTBLUE}{COMMA}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Cumpărat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{CARGO}
-STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...trebuie oprit intr-o autobazã
-STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nu pot vinde autovehiculul...
-STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nu pot opri/porni autovehiculul...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Autovehiculul {COMMA} e parcat la autobazã
+STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...trebuie oprit într-o autobază
+STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Nu se poate vinde autovehiculul...
+STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Nu se poate opri/porni autovehiculul...
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Autovehiculul {COMMA} staţionează la autobază
 STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Merge la Autobaza {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Merge la Autobaza {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Service la Autobaza {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Service la Autobaza {TOWN}, {VELOCITY}
-STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nu pot trimite autovehiculul la autobazã...
-STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nu pot gãsi un drum spre o autobazã localã
+STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nu pot trimite autovehiculul la autobază...
+STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nu pot găsi o autobază apropiată
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Autovehicule - clic pe vehicul pentru informatii
 STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Cumpãrã un nou autovehicul (ai nevoie de o autobazã)
-STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Comanda curentã a autovehiculului - clic aici pentru a opri/porni autovehiculul
-STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Afiseazã comenzile autovehiculului
-STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Centreazã imaginea pe locatia curentã a autovehiculului
-STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Trimite autovehiculul la o autobazã
-STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Forteazã vehiculul sã întoarcã
-STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Afiseazã detaliile autovehiculului
+STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Comanda curentă a autovehiculului - clic aici pentru a opri/porni autovehiculul
+STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Afişează comenzile autovehiculului
+STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Centrează imaginea pe locaţia curentă a autovehiculului
+STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Trimite autovehiculul la autobază. Ctrl+clic pentru service
+STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Forţează vehiculul să întoarcă
+STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Afişează detaliile autovehiculului
 STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Autovehicule - clic pe vehicul pentru informatii
-STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Cumpãrã un autovehicul
-STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Mutã un autovehicul aici pentru a-l vinde
-STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centreazã imaginea pe locatia acestei autobaze
-STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista selectie vehicule rutiere - apasa pe vehicul pentru informatii
-STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Cumpãrã autovehiculul selectat
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Pret: {CURRENCY}{}Vitezã: {VELOCITY}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {CARGO}
+STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Cumpără un autovehicul nou
+STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Mută un autovehicul aici pentru a-l vinde
+STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centrează imaginea pe locaţia acestei autobaze
+STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Listă selecţie vehicule rutiere - apasă pe vehicul pentru informaţii
+STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Cumpără autovehiculul selectat
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Preţ: {CURRENCY}{}Viteză: {VELOCITY}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {CARGO}
 STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacitate: {LTBLUE}
 STR_BARE_CARGO                                                  :{CARGO}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Numele autovehiculului
-STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Nu pot redenumi autovehiculul...
+STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Nu se poate denumi autovehiculul...
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Numele autovehiculului
-STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului autobuz la {STATION}!
-STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}sosirea primului camion la {STATION}!
+STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetăţenii sărbătoresc{}Sosirea primului autobuz la {STATION}!
+STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetăţenii sărbătoresc{}Sosirea primului camion la {STATION}!
 STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru călători la {STATION}!
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Cetăţenii sărbătoresc . . .{}sosirea primului primul tramvai pentru marfă la {STATION}!
-STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident rutier!{}Soferul decedat in urma coliziunii cu un tren
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident rutier!{}{COMMA} victime in urma coliziunii cu un tren
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nu pot schimba întoarce autvehiculul...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Nu pot întoarce vehiculele alcãtuite din mai multe unitãti
-STR_9034_RENAME                                                 :{BLACK}Redenumeste
-STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Redenumeste modelul de autovehicul
-STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Redenumeste modelul autovehiculului
-STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nu pot redenumi modelul acestui autovehicul...
+STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident rutier!{}Şoferul decedat în urma coliziunii cu un tren
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident rutier!{}{COMMA} victime în urma coliziunii cu un tren
+STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nu pot întoarce autovehiculul...
+STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Nu se pot întoarce vehiculele alcătuite din mai multe unităţi
+STR_9034_RENAME                                                 :{BLACK}Redenumeşte
+STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Redenumeşte modelul de autovehicul
+STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Redenumeşte modelul de autovehicul
+STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nu pot redenumi modelul de autovehicul...
 
 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Adapteaza autovehiculul pentru o incarcatura diferita
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Adaptare autovehicul
 STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Adapteaza autovehiculul pentru transportul incarcaturii evidentiate
 STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nu pot adapta autovehiculul...
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de marfa pentru transport cu autovehiculul
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de marfă pe care o transportă autovehiculul
 
 ##id 0x9800
-STR_9800_DOCK_CONSTRUCTION                                      :Construcţii navale
+STR_9800_DOCK_CONSTRUCTION                                      :Construcţie port
 STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}Construcţie port
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Nu pot construi port aici...
-STR_9803_SHIP_DEPOT                                             :{WHITE}Santierul Naval {TOWN}
+STR_9803_SHIP_DEPOT                                             :{WHITE}Şantierul Naval {TOWN}
 STR_9804_NEW_SHIPS                                              :{BLACK}Nave noi
-STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA}Nave
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Nav{P ă e}
 STR_9808_NEW_SHIPS                                              :{WHITE}Nave noi
-STR_9809_BUILD_SHIP                                             :{BLACK}Construieste navã
-STR_CLONE_SHIP                                                  :{BLACK}Cloneaz? nava
-STR_CLONE_SHIP_INFO                                             :{BLACK}Acest buton va crea o copie a navei. Control+click pentru comenzi comune
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Acest buton va crea o copie a navei. Apasã acest buton, apoi fã click pe o nav? de pe hartã. Control+click pentru a-i da ordine comune
-STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Nava trebuie sã fie stationatã într-un santier
+STR_9809_BUILD_SHIP                                             :{BLACK}Construieşte navă
+STR_CLONE_SHIP                                                  :{BLACK}Clonare navă
+STR_CLONE_SHIP_INFO                                             :{BLACK}Acest buton va crea o copie a navei. Control+clic pentru comenzi sincronizate
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Acest buton va crea o copie a navei. Apasă acest buton, apoi fă clic pe o navă din joc. Control+clic pentru a crea comenzi sincronizate
+STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Nava trebuie să fie staţionată într-un şantier
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Nu pot vinde nava...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Nu pot construi nava...
-STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Navã în cale
+STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Navă în cale
 STR_980F                                                        :{WHITE}{VEHICLE}
 STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalii)
-STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vârsta: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vechime: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
 STR_9813_MAX_SPEED                                              :{BLACK}Viteza max.: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficienţă: {LTBLUE}{COMMA}%  {BLACK}Defecţiuni de la ultimul service: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Construit: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{CARGO}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Nu pot opri/porni nava...
-STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nu pot trimite nava în santier...
-STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nu pot gãsi un santier apropiat
+STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Nu pot trimite nava în şantier...
+STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nu pot găsi un şantier apropiat
 STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Merge la Santierul {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Merge la Santierul {TOWN}, {VELOCITY}
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service la Santierul Naval {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service la Santierul Naval {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Nava {COMMA} este stationatã în santier
-STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construieste port
-STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Constructie santier naval (pentru construirea si repararea navelor)
-STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Nave - clic pe o navã pentru informatii
-STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Construieste o nouã navã
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Nava {COMMA} este staţionată în şantier
+STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construieşte port
+STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construcţie şantier naval (pentru construirea şi repararea navelor)
+STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Nave - clic pe o navă pentru informaţii
+STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Construieşte o navă nouă
 STR_9821_DRAG_SHIP_TO_HERE_TO_SELL                              :{BLACK}Trage nava aici pentru a o vinde
-STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centreazã imaginea pe locatia santierului
-STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Nave - click pe navã pentru informatii
-STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Construieste nave noi (necesitã cel putin un santier naval)
-STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Lista de selectie a navelor - click pe o navã pentru informatii
-STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Construieste nava selectatã
-STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Comanda curentã a navei - clic aici pentru a porni/opri nava
-STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Afiseazã comenzile navei
-STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centreazã imaginea pe locatia curentã a navei
-STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Trimite nava într-un santier
-STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afiseazã detaliile navei
-STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {CARGO}{}Cost de rulare: {CURRENCY}/an
-STR_982F_NAME_SHIP                                              :{BLACK}Alege un nume pentru aceastã navã
+STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrează imaginea pe locaţia şantierului
+STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Nave - click pe navă pentru informaţii
+STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Construieşte nave noi (necesită cel puţin un şantier naval)
+STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Listă de selecţie a navelor - click pe o navă pentru informaţii
+STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Construieşte nava selectată
+STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Comanda curentă a navei - clic aici pentru a opri/porni nava
+STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Afişează comenzile navei
+STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrează imaginea pe locaţia curentă a navei
+STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Trimite nava în şantier. Ctrl+clic pentru întreţinere
+STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afişează detaliile navei
+STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Preţ: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {CARGO}{}Cost de rulare: {CURRENCY}/an
+STR_982F_NAME_SHIP                                              :{BLACK}Denumeşte această navă
 
-STR_9831_NAME_SHIP                                              :{WHITE}Alege un nume pentru aceastã navã
-STR_9832_CAN_T_NAME_SHIP                                        :{WHITE}Nu pot redenumi nava...
-STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc{}Sosirea primei nave la {STATION}!
-STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Plaseazã o balizã ce poate fi utilizatã pentru directionare
-STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Nu pot plasa o balizã aici...
-STR_9836_RENAME                                                 :{BLACK}Redenumeste
-STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Redenumeste modelul navei
-STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Redenumeste modelul navei
-STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nu pot schimba numele modelului acestei nave...
-STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Schimbã tipul de marfã transportat
-STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Schimb marfã)
-STR_983C_REFIT_SHIP                                             :{BLACK}Schimbã marfa transportatã
-STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de încãrcãturã ce va fi transportat de navã
-STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Schimbã tipul de încãrcãturã al acestei nave
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege tipul încãrcãturii:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{CARGO}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
-STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nu pot schimba tipul navei...
-STR_9842_REFITTABLE                                             :(suportã alte mãrfuri)
+STR_9831_NAME_SHIP                                              :{WHITE}Denumeşte această navă
+STR_9832_CAN_T_NAME_SHIP                                        :{WHITE}Nu pot denumi nava...
+STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetăţenii sărbătoresc{}Sosirea primei nave la {STATION}!
+STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Amplasează o baliză ce poate fi utilizată pentru direcţionare
+STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Nu se poate amplasa baliză aici...
+STR_9836_RENAME                                                 :{BLACK}Redenumeşte
+STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Redenumeşte modelul de navă
+STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Redenumeşte modelul de navă
+STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nu se poate redenumi modelul de navă...
+STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Schimbă tipul de marfă transportat de navă
+STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Schimbă marfa)
+STR_983C_REFIT_SHIP                                             :{BLACK}Schimbă marfa transportată de navă
+STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de încărcătură ce va fi transportat de navă
+STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Schimbă tipul de încărcătură al navei cu cel selectat
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege tipul încărcăturii:
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{CARGO}{}{BLACK}Costul transformării: {GOLD}{CURRENCY}
+STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nu se poate schimba tipul navei...
+STR_9842_REFITTABLE                                             :(suportă alte mărfuri)
 
 ##id 0xA000
-STR_A000_AIRPORTS                                               :{WHITE}Airoporturi
-STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Nu pot construi un aeroport aici...
+STR_A000_AIRPORTS                                               :{WHITE}Aeroporturi
+STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Nu se poate construi un aeroport aici...
 STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION} Hangar
-STR_A003_NEW_AIRCRAFT                                           :{BLACK}Aeronavã nouã
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonare aeronavã
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Acest buton va crea o copie a aeronavei. Control+click pentru comenzi comune
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Acest buton va crea o copie a aeronavei. Apasã acest buton, apoi fã click pe o aeronav? de pe hartã. Control+click pentru a-i da ordine comune
-STR_A005_NEW_AIRCRAFT                                           :{WHITE}Aeronavã nouã
-STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Cumpãrã aeronavã
-STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nu pot cumpãra aeronava...
+STR_A003_NEW_AIRCRAFT                                           :{BLACK}Aeronavă nouă
+STR_CLONE_AIRCRAFT                                              :{BLACK}Clonare aeronavă
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Acest buton va crea o copie a aeronavei. Control+clic pentru comenzi sincronizate
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Acest buton va crea o copie a aeronavei. Apasă acest buton, apoi fă clic pe o aeronavă din joc. Control+clic pentru a crea comenzi sincronizate
+STR_A005_NEW_AIRCRAFT                                           :{WHITE}Aeronavă nouă
+STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Cumpără aeronavă
+STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Nu se poate cumpăra aeronava...
 STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronave
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Comenzi)
 STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalii)
-STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârstã: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
-STR_A00E_MAX_SPEED                                              :{BLACK}Vitezã max.: {LTBLUE}{VELOCITY}
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vârstă: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
+STR_A00E_MAX_SPEED                                              :{BLACK}Viteză max.: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit anul acesta: {LTBLUE}{CURRENCY}  (anul trecut: {CURRENCY})
-STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficientã: {LTBLUE}{COMMA}%  {BLACK}Defectiuni de la ultimul service: {LTBLUE}{COMMA}
-STR_A011_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Cumpãrat în: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
-STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nu pot trimite nava într+un hangar...
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Eficienţă: {LTBLUE}{COMMA}%  {BLACK}Defecţiuni de la ultimul service: {LTBLUE}{COMMA}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Cumpărat în: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
+STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Nu se poate trimite aeronava la hangar...
 STR_HEADING_FOR_HANGAR                                          :{ORANGE}Merge la Hangarul {STATION}
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Merge la Hangarul {STATION}, {VELOCITY}
 STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service la Hangarul {STATION}
 STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service la Hangarul {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronava {COMMA} se aflã în hangar
-STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronavã în cale
-STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nu pot opri/porni aeronava...
-STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronavã se aflã în zbor
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Aeronava {COMMA} staţionează în hangar
+STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronavă în cale
+STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Nu se poate opri/porni aeronava...
+STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronava se află în zbor
 STR_A019_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{CARGO}, {CARGO}
 STR_A01A_CAPACITY                                               :{BLACK}Capacitate: {LTBLUE}{CARGO}
-STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aeronava trebuie sã se afle într-un hangar
-STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nu pot vinde aeronava...
-STR_A01D_AIRPORT_CONSTRUCTION                                   :Construcţie aeroport
-STR_A01E_BUILD_AIRPORT                                          :{BLACK}Constr. aeroport
-STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Aeronavã - clic pe aeronavã pentru informatii
-STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES                            :{BLACK}Cumpãrã o nouã aeronavã (necesitã un aeroport)
-STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Aeronavã - clic pe aeronavã pentru informatii
-STR_A022_BUILD_NEW_AIRCRAFT                                     :{BLACK}Cumpãrã o aeronavã
+STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aeronava trebuie să staţioneze într-un hangar
+STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nu se poate vinde aeronava...
+STR_A01D_AIRPORT_CONSTRUCTION                                   :Construire aeroport
+STR_A01E_BUILD_AIRPORT                                          :{BLACK}Construieşte aeroport
+STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Aeronavă - clic pe aeronavă pentru informaţii
+STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES                            :{BLACK}Cumpără o nouă aeronavă (necesită un aeroport cu hangar)
+STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Aeronavă - clic pe aeronavă pentru informaţii
+STR_A022_BUILD_NEW_AIRCRAFT                                     :{BLACK}Cumpără o aeronavă
 STR_A023_DRAG_AIRCRAFT_TO_HERE_TO                               :{BLACK}Trage aeronava aici pentru a o vinde
-STR_A024_CENTER_MAIN_VIEW_ON_HANGAR                             :{BLACK}Centreazã imaginea pe locatia hangarului
-STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Lista de selectie a aeronavelor - clic pe o aeronavã pentru informatii
-STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Cumpãrã aeronava selectatã
-STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Comanda curentã a aeronavei - click aici pentru a porni/opri aeronava
-STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Afiseazã comenzile aeronavei
-STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centreazã imaginea pe locatia curentã a aeronavei
-STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Trimite aeronava într-un hangar
-STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afiseazã detaliile aeronavei
-STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pret: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {COMMA} cãlãtori, {COMMA} saci de postã{}Cost de rulare: {CURRENCY}/an
+STR_A024_CENTER_MAIN_VIEW_ON_HANGAR                             :{BLACK}Centrează imaginea pe locaţia hangarului
+STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Lista de selecţie a aeronavelor - clic pe o aeronavă pentru informaţii
+STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Cumpără aeronava selectată
+STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Comanda curentă a aeronavei - clic aici pentru a opri/porni aeronava
+STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Afişează comenzile aeronavei
+STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrează imaginea pe locaţia curentă a aeronavei
+STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Trimite aeronava la hangar. Ctrl+clic pentru întreţinere
+STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afişează detaliile aeronavei
+STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Preţ: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {COMMA} călători, {COMMA} saci de poştă{}Cost de rulare: {CURRENCY}/an
 
-STR_A030_NAME_AIRCRAFT                                          :{WHITE}Redenumeste aeronava
-STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Nu pot redenumi aeronava...
-STR_A032_NAME_AIRCRAFT                                          :{BLACK}Redenumeste aeronava
-STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetãtenii sãrbãtoresc {}sosirea primei aeronave la {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident aviatic!{}{COMMA} victime în urma prãbusirii de la {STATION}
+STR_A030_NAME_AIRCRAFT                                          :{WHITE}Denumeşte aeronava
+STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Nu pot denumi aeronava...
+STR_A032_NAME_AIRCRAFT                                          :{BLACK}Denumeşte aeronava
+STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Cetăţenii sărbătoresc {}Sosirea primei aeronave la {STATION}!
+STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident aviatic!{}{COMMA} victime în urma prăbuşirii de la {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident aerian!{}Aeronava in pana de combustibil, {COMMA} victime in urma dezastrulu!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Redenumire
-STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Redenumeste modelul aeronavei
-STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Redenumeste modelul aeronavei
-STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nu pot schimba numele aceste aeronave...
-STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Schimbã tipul de încãrcãturã transportat
-STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Schimbã încãrcãtura)
-STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Schimbã tipul de încãrcãturã transportat
-STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege marfa care doresti sã fie transportatã
-STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Schimbã tipul de încãrcãturã al acestei aeronave
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege marfa de transportat:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING}{}{BLACK}Costul transformãrii: {GOLD}{CURRENCY}
-STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nu pot schimba tipul de încãrcãturã...
+STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Redenumeşte modelul de aeronavă
+STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Redenumeşte modelul de aeronavă
+STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nu se poate redenumi modelul de aeronavă...
+STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Schimbă tipul de marfă transportat de aeronavă
+STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Schimbă marfa)
+STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Schimbă marfa transportată de aeronavă
+STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de încărcătură ce va fi transportat de aeronavă
+STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Schimbă tipul de încărcătură al aeronavei cu cel selectat
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege tipul încărcăturii:
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING}{}{BLACK}Costul transformării: {GOLD}{CURRENCY}
+STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nu se poate schimba tipul aeronavei...
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Orar)
 
 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}Accident de zepelin la{STATION}!
 STR_B001_ROAD_VEHICLE_DESTROYED                                 :{BLACK}{BIGFONT}Autovehicul distrus în urma coliziunii cu un OZN!
-STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT}Explozie la o rafinãrie de lângã {TOWN}!
-STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabricã de conserve distrusã în conditii misterioase lângã {TOWN}!
-STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Un OZN a aterizat lângã {TOWN}!
-STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Prãbusirea unei mine de cupru lângã {TOWN} provoacã daune majore!
+STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT}Explozie la o rafinărie de lângă {TOWN}!
+STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Fabrică de conserve distrusă în condiţii misterioase lângă {TOWN}!
+STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Un OZN a aterizat lângă {TOWN}!
+STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Prăbuşirea unei mine de cărbune lângă {TOWN} provoacă daune majore!
 STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inundatii!{}Se estimeaza cel putin {COMMA}  victime!
 
 STR_BRIBE_FAILED                                                :{WHITE}Încercarea ta de mituire
-STR_BRIBE_FAILED_2                                              :{WHITE}a fost descoperitã de un procuror local
+STR_BRIBE_FAILED_2                                              :{WHITE}a fost descoperită de un procuror local
 STR_BUILD_DATE                                                  :{BLACK}Data constructiei: {LTBLUE}{DATE_LONG}
 
-STR_PERFORMANCE_DETAIL                                          :{WHITE}Ratingul de performantã detaliat
+STR_PERFORMANCE_DETAIL                                          :{WHITE}Rating de performanţă detaliat
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalii
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
@@ -3002,7 +3101,7 @@
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Venit minim:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Venit maxim:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Livrãri:
-STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Mãrfuri:
+STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Mărfuri:
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Cont curent:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Credite:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
@@ -3020,7 +3119,7 @@
 
 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Setari NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Setari Newgrf
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplica schimbarile
+STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplică schimbările
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Seteaza parametri
 STR_NEWGRF_TIP                                                  :{BLACK}Lista tuturor setarilor Newgrf pe care le-ai instalat. Click pentru a schimba setarile.
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Nu exista fisiere newgrf instalate! Citeste manualul pentru instructiunile de instalare a fisierelor grafice noi.
@@ -3073,6 +3172,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Fisier(e) GRF lipsa
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Reluarea jocului poate bloca OpenTTD. Nu raportati raporturi cu probleme pentru blocari succesive.{}Sigur doresti sa reiei jocul?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Jocul a fost salvat într-o versiune fără suport pentru tramvaie. Toate tramvaiele au fost eliminate.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Monedă proprie
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Curs de schimb: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
@@ -3099,7 +3200,7 @@
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Afiseaza toate aeronavele care opresc in aceasta statie
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Afiseaza toate navele care opresc in aceasta statie
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Comenzi comune ale {COMMA} Vehicul{P "" s}
+STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Comenzi sincronizate pentru {COMMA} vehicul{P "" e}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Arata toate vehiculele care se incadreaza in acest program
 
 ### depot strings
@@ -3131,11 +3232,11 @@
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Oprire inlocuire vehicule
 STR_NOT_REPLACING                                               :{BLACK}Neinlocuire
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nici un vehicul selectat
-STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Alege tipul de motor pentru inlocuire
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Alege noul tip de motor pe care doresti sa-l folosesti in locul motorului selectat in stanga
+STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Alege tipul de motor pentru înlocuire
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Alege noul tip de motor pe care doreşti să-l foloseşti în locul motorului selectat în stânga
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Apasa aici pentru oprirea inlocuirii motorului selectat in stanga
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Apasa aici pentru a incepe inlocuirea motorului selectat in stanga cu cel selectat in dreapta
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Alege un tip de cale ferata pentru care sa inlocuiesti motoarele
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Alege un tip de cale ferată pentru care să înlocuieşti motoarele
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Arata care va fi  inlocuitorul motorului selectat in stanga
 STR_REPLACE_HELP                                                :{BLACK}Aceasta functie iti permite sa selectezi un model de vehicul si sa-l inlocuiesti cu altul. Schimbarea se va efectua automat la intrarea vehiculului intr-un depou.
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Retragere vagoane: {ORANGE}{SKIP}{STRING}
@@ -3145,7 +3246,7 @@
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehiculul nu este disponibil
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehiculul nu este disponibil
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Vasul nu este disponibil
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aeronava nu este disponibila
+STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aeronava nu este disponibilă
 
 STR_ENGINES                                                     :Motoare
 STR_WAGONS                                                      :Vagoane
@@ -3185,7 +3286,7 @@
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cost de rulare: {GOLD}{CURRENCY}/an
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitate: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}An aparitie: {GOLD}{NUM}{BLACK} Durata de viata: {GOLD}{COMMA} years
-STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Eficienta max.: {GOLD}{COMMA}%
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Eficienţă max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Greutate: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Viteza: {GOLD}{VELOCITY}
@@ -3196,6 +3297,12 @@
 STR_PURCHASE_INFO_ALL_BUT                                       :Toate, cu exceptia {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Efort tractor max.: {GOLD}{FORCE}
 
+########### For showing numbers in widgets
+
+STR_NUM_1                                                       :{BLACK}{SKIP}{NUM}
+STR_NUM_2                                                       :{BLACK}{SKIP}{SKIP}{NUM}
+STR_NUM_3                                                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
+
 ########### String for New Landscape Generator
 
 STR_GENERATE                                                    :{WHITE}Genereaza
@@ -3204,6 +3311,7 @@
 STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generare lume
 STR_RANDOM_SEED                                                 :{BLACK}Parametru aleator:
 STR_RANDOM_SEED_HELP                                            :{BLACK}Click pt introducerea unui parametru aleator
+STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Introduceţi o valoare de pornire pentru numerele aleatoare
 STR_LAND_GENERATOR                                              :{BLACK}Generator de teren:
 STR_TREE_PLACER                                                 :{BLACK}Algoritm arbore:
 STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotatie harta inaltimi:
@@ -3334,7 +3442,7 @@
 
 STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupuri - Da click pe un grup pentru lista completa a vehiculelor acestuia
 STR_GROUP_CREATE_TIP                                            :{BLACK}Da click pentru a creea un grup
-STR_GROUP_DELETE_TIP                                            :{BLACK}Sterge grupul selectat
+STR_GROUP_DELETE_TIP                                            :{BLACK}Şterge grupul selectat
 STR_GROUP_RENAME_TIP                                            :{BLACK}Redenumeste grupul selectat
 STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Click aici pentru a proteja acest grup de la inlocuirile automate globale
 
@@ -3356,7 +3464,7 @@
 STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finanteaza
 STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospecteaza
 STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construieste
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Alege industria potrivita din acesta lista
+STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Alege industria potrivită din acestă listă
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Avansat
@@ -3375,9 +3483,9 @@
 STR_FACE_SAVE_TIP                                               :{BLACK}Salveaza fata preferata
 STR_FACE_SAVE_DONE                                              :{WHITE}Aceasta fata va fi salvata ca fata preferata în fisierul de configurare al OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}European
-STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Alege fete europene
+STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Alege feţe europene
 STR_FACE_AFRICAN                                                :{BLACK}African
-STR_FACE_SELECT_AFRICAN                                         :{BLACK}Alege fete africane
+STR_FACE_SELECT_AFRICAN                                         :{BLACK}Alege feţe africane
 STR_FACE_YES                                                    :Da
 STR_FACE_NO                                                     :Nu
 STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Permite mustata sau cercei
@@ -3422,3 +3530,10 @@
 STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Scade densitatea semnalului de tractare
 STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Mareste densitatea semnalului de tractare
 ########
+
+############ on screen keyboard
+########
+
+############ town controlled noise level
+STR_STATION_NOISE                                               :{BLACK}Zgomot generat: {GOLD}{COMMA}
+########
--- a/src/lang/russian.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/russian.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -380,6 +380,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Максимальная скорость
 STR_SORT_BY_MODEL                                               :Модель
 STR_SORT_BY_VALUE                                               :Стоимость
+STR_SORT_BY_LENGTH                                              :Длина
 STR_SORT_BY_FACILITY                                            :Тип станции
 STR_SORT_BY_WAITING                                             :Кол-во товара на станции
 STR_SORT_BY_RATING_MAX                                          :Рейтинг грузов
@@ -487,6 +488,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Чтобы очистить, надо: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :нет данных
 STR_01A7_OWNER                                                  :{BLACK}Владелец: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Владелец дороги: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Владелец трамвая: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Владелец ЖД пути: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Администрация: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Нет
 STR_01AA_NAME                                                   :{BLACK}Имя
@@ -1055,6 +1059,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Коэффициент скорости авиатранспорта: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Позволять строить остановки на городских дорогах: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Разрешить строительство смежных станций: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Включить поддержку нескольких NewGRF сетов: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Малые аэропорты всегда доступны: {ORANGE}{STRING}
 
@@ -1457,7 +1462,7 @@
 STR_NETWORK_LANG_SWEDISH                                        :Шведский
 STR_NETWORK_LANG_TURKISH                                        :Турецкий
 STR_NETWORK_LANG_UKRAINIAN                                      :Украинский
-STR_NETWORK_LANG_AFRIKAANS                                      :Африканский
+STR_NETWORK_LANG_AFRIKAANS                                      :Африкаанс
 STR_NETWORK_LANG_CROATIAN                                       :Хорватский
 STR_NETWORK_LANG_CATALAN                                        :Каталанский
 STR_NETWORK_LANG_ESTONIAN                                       :Эстонский
@@ -1714,6 +1719,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Шоссе
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Гараж
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Железнодорожный переезд
+STR_TRAMWAY                                                     :Трамвай
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Невозможно удалить автобусную остановку...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Невозможно удалить грузовой терминал...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Не могу удалить пассажирскую трамвайную станцию...
@@ -2667,6 +2673,8 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Жители празднуют!{}Первый поезд прибыл на станцию {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Детали)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Поезд мешает
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_ORDER_GO_TO                                                 :Идти на
 STR_ORDER_GO_NON_STOP_TO                                        :Идти без остановки на
 STR_ORDER_GO_VIA                                                :Идти через
@@ -3192,6 +3200,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Пропущенные GRF файлы
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Снятие с паузы может привести к ошибке OpenTTD.{}Вы хотите запустить игру?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Игра была сохранена в игре без поддержки трамваев. Все трамваи были отключены.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Своя валюта
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Обменный курс: {ORANGE}{CURRENCY} = £{COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Разделитель:
@@ -3556,3 +3566,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Разрешить городам контролировать уровень шума для аэропортов: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Уровень шума в городе: {ORANGE}{COMMA}{BLACK}  макс: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Производимый шум: {GOLD}{COMMA}
+########
--- a/src/lang/spanish.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/spanish.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -379,6 +379,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Velocidad máxima
 STR_SORT_BY_MODEL                                               :Modelo
 STR_SORT_BY_VALUE                                               :Valor
+STR_SORT_BY_LENGTH                                              :Longitud
 STR_SORT_BY_FACILITY                                            :Tipo de estación
 STR_SORT_BY_WAITING                                             :Esperando valor de la carga
 STR_SORT_BY_RATING_MAX                                          :Clasificación de la carga
@@ -486,6 +487,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Coste de desbroce: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/D
 STR_01A7_OWNER                                                  :{BLACK}Propietario: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Propietario de la carretera: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Propietario del tranvía: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Propietario de la vía del tren: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoridad local: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Ninguna
 STR_01AA_NAME                                                   :{BLACK}Nombre
@@ -1054,6 +1058,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Factor velocidad avión: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Permite conducir en paradas sobre carreteras de ciudades: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Permitir construcción en estaciones contiguas : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Activar motor  de multiples NewGRF: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir siempre aeropuertos pequeños: {ORANGE}{STRING}
 
@@ -1364,6 +1369,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nombre del juego
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Idioma, versión del servidor, etc.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Pulse en un juego de la lista para seleccionarlo
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}El servidor al que has estado conectado la última vez:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Pulsa para seleccionar el servidor al que has jugado la última vez
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Buscar servidor
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Buscar en la red servidores
@@ -1711,6 +1718,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Carretera arbolada
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Depósito de carretera
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Paso a nivel
+STR_TRAMWAY                                                     :Tranvía
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}No se puede quitar la estación de bus...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}No se puede quitar la estación de camiones...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}No se puede quitar estación de tranvía de pasajeros...
@@ -3180,6 +3188,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Fichero(s) GRF que faltan
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Quitar la pausa puede hacer que se cierre OpenTTD. No notifique este error.{}¿Desea realmente quitar la pausa?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El juego ha sido grabado en una versión sin soporte de tranvía. Todos los tranvías serán eliminados.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador:
@@ -3544,3 +3554,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Permitir a la ciudad controlar el nivel de ruidos de los aeropuertos: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Nivel de ruido en ciudad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Ruido generado: {GOLD}{COMMA}
+########
--- a/src/lang/swedish.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/swedish.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -378,6 +378,7 @@
 STR_SORT_BY_MAX_SPEED                                           :Maximal hastighet
 STR_SORT_BY_MODEL                                               :Modell
 STR_SORT_BY_VALUE                                               :Värde
+STR_SORT_BY_LENGTH                                              :Längd
 STR_SORT_BY_FACILITY                                            :Stationstyp
 STR_SORT_BY_WAITING                                             :Väntande last-värde
 STR_SORT_BY_RATING_MAX                                          :Lasts-värdering
@@ -485,6 +486,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kostnad att röja: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :Otillgänglig
 STR_01A7_OWNER                                                  :{BLACK}Ägare: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Vägens ägare: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Spårvägens ägare: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Järnvägens ägare: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokala myndigheter: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Ingen
 STR_01AA_NAME                                                   :{BLACK}Namn
@@ -1053,6 +1057,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Hastighetsfaktor för flygplan: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Tillåt genomfarts-stop på stadsägda vägar: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Tillåt byggande av närliggande stationer: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Tillåt flera NewGRF-set: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Tillåt alltid små flygplatser: {ORANGE}{STRING}
 
@@ -1363,6 +1368,8 @@
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Namn på nätverksspelet
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Språk, serverversion, mm
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klicka på ett spel från listan för att välja det
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Servern du senast anslöt till:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Välj servern du senast spelade på
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Leta server
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Leta på nätverket efter en server
@@ -1710,6 +1717,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Väg med träd
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Bussgarage
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Väg-/Järnvägskorsning
+STR_TRAMWAY                                                     :Spårväg
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Kan inte ta bort busstation...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Kan inte ta bort lastbilsstation...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Kan inte ta bort passagerar-spårvagnsstation...
@@ -2779,6 +2787,7 @@
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   Värde: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Lastar / lastar av
+STR_LEAVING                                                     :{LTBLUE}Lämnar
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Tåget måste stoppas inne i depån
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan inte skicka tåg till depå...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Ingen mer plats för order
@@ -3178,6 +3187,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Saknad(e) GRF-fil(er)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Avpausning kan krascha OpenTTD. Skicka ej igen bugg-rapport för möjlig krasch.{}Är du säker att du vill avpausa?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spelet sparades i en version som ej stöder spårvagn. Alla spårvagnar har tagits bort
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Egen valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Avskiljare:
@@ -3542,3 +3553,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Tillåt stadskontrollerade bullernivåer för flygplatser: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Bullernivågräns i stad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Genererat buller: {GOLD}{COMMA}
+########
--- a/src/lang/turkish.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/turkish.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -1380,7 +1380,7 @@
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Sunucu adresi:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Başlama tarihi:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Şimdiki tarih:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Şifre korumalı!
+STR_NETWORK_PASSWORD                                            :{SILVER}Parola korumalı!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SUNUCU KAPALI
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SUNUCU DOLU
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}SÜRÜM UYUŞMAZLIĞI
@@ -2649,6 +2649,44 @@
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kutlama Yapıldı . . .{} {STATION} istasyonuna ilk kez tren geldi!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (Detaylar)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Yolda tren var
+STR_ORDER_GO_VIA                                                :Üzerinden git
+STR_ORDER_GO_NON_STOP_VIA                                       :Durmadan üzerinden git
+STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Mümkünse yükle
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Tüm kargoyu yükle
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Her kargoyu yükle
+STR_ORDER_DROP_NO_LOADING                                       :Yükleme yapma
+STR_ORDER_DROP_UNLOAD_IF_ACCEPTED                               :Kabul edilirse yükle
+STR_ORDER_DROP_UNLOAD                                           :Tümünü boşalt
+STR_ORDER_DROP_TRANSFER                                         :Aktar
+STR_ORDER_DROP_NO_UNLOADING                                     :Boşaltma yapma
+STR_ORDER_FULL_LOAD                                             :(Tam yükle)
+STR_ORDER_FULL_LOAD_ANY                                         :(Her kargoyu tam yükle)
+STR_ORDER_NO_LOAD                                               :(Yükleme yapma)
+STR_ORDER_UNLOAD                                                :(Kargoyu boşalt ve al)
+STR_ORDER_UNLOAD_FULL_LOAD                                      :(Boşalt ve tam yüklemeyi bekle)
+STR_ORDER_UNLOAD_NO_LOAD                                        :(Boşalt ve boş kal)
+STR_ORDER_TRANSFER                                              :(Aktar ve kargoyu al)
+STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+
+STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Gelişmiş talimat ekle
+STR_ORDER_GO_TO_NEAREST_DEPOT                                   :En yakın gara git
+STR_ORDER_GO_TO_NEAREST_HANGAR                                  :En yakın hangara git
+STR_ORDER_NEAREST_DEPOT                                         :en yakın
+STR_ORDER_NEAREST_HANGAR                                        :en yakın Hangar
+STR_ORDER_TRAIN_DEPOT                                           :Tren Garı
+STR_ORDER_ROAD_DEPOT                                            :Araba Garajı
+STR_ORDER_SHIP_DEPOT                                            :Tershane
+STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
+STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
+STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+
+STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Yükleme yüzdesi
+STR_ORDER_CONDITIONAL_RELIABILITY                               :Güvenilirlik
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Azami hız
+STR_ORDER_CONDITIONAL_AGE                                       :Araç yaşı (yıl)
+STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Bakım gerektirir
+STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Her zaman
+STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Gezi (zamanlı değil)
 STR_TIMETABLE_TRAVEL_FOR                                        :{STRING} için gezi
@@ -2696,6 +2734,7 @@
 STR_REFIT_ORDER                                                 :(Moifiye ile > {STRING})
 STR_TIMETABLE_VIEW                                              :{BLACK}Zaman çizelgesi
 STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Zaman tablosu görünümüne geç
+STR_ORDER_VIEW                                                  :{BLACK}Talimatlar
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Talimatlar)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Talimatların Sonu - -
 STR_SERVICE                                                     :{BLACK}Bakım
@@ -3102,6 +3141,7 @@
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Oyunu yüklemek için gerekli olan GRF dosyaları eksik
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Eksik GRF dosyası
 
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Özel Para Birimi
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Çarpan: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Ayraç:
@@ -3385,10 +3425,12 @@
 #### Improved sign GUI
 STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Sonraki tabelaya git
 STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Önceki tabelaya git
+STR_SIGN_OSKTITLE                                               :{BLACK}Tabela için bir isim girin
 
 ########
 
 STR_FUND_NEW_INDUSTRY                                           :{BLACK}Parayla Yap
+STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Tetkik arama
 STR_BUILD_NEW_INDUSTRY                                          :{BLACK}İnşa et
 STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Bu listeden uygun fabrikayı seçin
 
@@ -3450,3 +3492,6 @@
 
 ############ on screen keyboard
 ########
+
+############ town controlled noise level
+########
--- a/src/lang/ukrainian.txt	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/lang/ukrainian.txt	Sun Jun 08 15:32:10 2008 +0000
@@ -503,6 +503,7 @@
 STR_SORT_BY_MAX_SPEED                                           :за швидкістю
 STR_SORT_BY_MODEL                                               :Модель
 STR_SORT_BY_VALUE                                               :за ціною
+STR_SORT_BY_LENGTH                                              :Довжина
 STR_SORT_BY_FACILITY                                            :Вид станцій
 STR_SORT_BY_WAITING                                             :за ціною вантажу
 STR_SORT_BY_RATING_MAX                                          :Рейтинг вантажів
@@ -610,6 +611,9 @@
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Вартість очистки: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :немає
 STR_01A7_OWNER                                                  :{BLACK}Власник: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Власник дороги: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Власник трамвайної дороги: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Власник залізниці: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Місцева влада: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :немає
 STR_01AA_NAME                                                   :{BLACK}Назва
@@ -1178,6 +1182,7 @@
 STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Фактор швидкості літаків: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Дозволити безпересадкові зупинки на муніципальних дорогах: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Дозволити будувати суміжні станції: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DYNAMIC_ENGINES                              :{LTBLUE}Дозволити декілька NewGRF наборів транспорту: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Будувати малі аеропорти можна завжди: {ORANGE}{STRING}
 
@@ -1837,6 +1842,7 @@
 STR_1816_TREE_LINED_ROAD                                        :Дорога з насадженнями
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Автомобільне депо
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Залізничний переїзд
+STR_TRAMWAY                                                     :Трамвайна дорога
 STR_CAN_T_REMOVE_BUS_STATION                                    :{WHITE}Не можна знести автобусну станцію...
 STR_CAN_T_REMOVE_TRUCK_STATION                                  :{WHITE}Не можна знести вантажну станцію...
 STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                         :{WHITE}Не можна знести пасажирську трамвайну станцію...
@@ -3343,6 +3349,8 @@
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Відсутній GRF файл(и)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Зняття з паузи може привести до аварійної відмови OpenTTD. Не рапортуйте про наступні відмови.{}Ви дійсно хочете зняти з паузи?
 
+STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Гра була записана у версії без підтримки трамваїв. Усі трамваї були видалені.
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Вибір грошової одиниці
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Валютний курс: {ORANGE}{CURRENCY} = Ј {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Роздільник:
@@ -3707,3 +3715,9 @@
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\йцукенгшщзхїфівапролджє  ячсмитьбю. .
 STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|ЙЦУКЕНГШЩЗХЇФІВАПРОЛДЖЄ  ЯЧСМИТЬБЮ, .
 ########
+
+############ town controlled noise level
+STR_CONFIG_PATCHES_NOISE_LEVEL                                  :{LTBLUE}Дозволити залежний від міста рівень шуму для аеропортів: {ORANGE}{STRING}
+STR_NOISE_IN_TOWN                                               :{BLACK}Ліміт шуму в місті: {ORANGE}{COMMA}{BLACK}  макс: {ORANGE}{COMMA}
+STR_STATION_NOISE                                               :{BLACK}Генерований шум: {GOLD}{COMMA}
+########
--- a/src/network/network_server.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/network/network_server.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -323,12 +323,12 @@
 		Packet *p;
 
 		// Make a dump of the current game
-		if (SaveOrLoad(filename, SL_SAVE, AUTOSAVE_DIR) != SL_OK) error("network savedump failed");
+		if (SaveOrLoad(filename, SL_SAVE, AUTOSAVE_DIR) != SL_OK) usererror("network savedump failed");
 
 		file_pointer = FioFOpenFile(filename, "rb", AUTOSAVE_DIR);
 		fseek(file_pointer, 0, SEEK_END);
 
-		if (ftell(file_pointer) == 0) error("network savedump failed - zero sized savegame?");
+		if (ftell(file_pointer) == 0) usererror("network savedump failed - zero sized savegame?");
 
 		// Now send the _frame_counter and how many packets are coming
 		p = NetworkSend_Init(PACKET_SERVER_MAP);
@@ -355,7 +355,7 @@
 			p->Send_uint8(MAP_PACKET_NORMAL);
 			res = (int)fread(p->buffer + p->size, 1, SEND_MTU - p->size, file_pointer);
 
-			if (ferror(file_pointer)) error("Error reading temporary network savegame!");
+			if (ferror(file_pointer)) usererror("Error reading temporary network savegame!");
 
 			p->size += res;
 			cs->Send_Packet(p);
@@ -611,6 +611,12 @@
 
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)
 {
+	if (cs->status != STATUS_INACTIVE) {
+		/* Illegal call, return error and ignore the packet */
+		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
+		return;
+	}
+
 	NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
 
 	/* We now want a password from the client else we do not allow him in! */
@@ -627,6 +633,12 @@
 
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
 {
+	if (cs->status != STATUS_INACTIVE) {
+		/* Illegal call, return error and ignore the packet */
+		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
+		return;
+	}
+
 	char name[NETWORK_CLIENT_NAME_LENGTH];
 	char unique_id[NETWORK_UNIQUE_ID_LENGTH];
 	NetworkClientInfo *ci;
@@ -1011,6 +1023,12 @@
 
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_ACK)
 {
+	if (cs->status < STATUS_AUTH) {
+		/* Illegal call, return error and ignore the packet */
+		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_AUTHORIZED);
+		return;
+	}
+
 	uint32 frame = p->Recv_uint32();
 
 	/* The client is trying to catch up with the server */
@@ -1139,6 +1157,12 @@
 
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_CHAT)
 {
+	if (cs->status < STATUS_AUTH) {
+		/* Illegal call, return error and ignore the packet */
+		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_AUTHORIZED);
+		return;
+	}
+
 	NetworkAction action = (NetworkAction)p->Recv_uint8();
 	DestType desttype = (DestType)p->Recv_uint8();
 	int dest = p->Recv_uint16();
@@ -1151,6 +1175,12 @@
 
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_SET_PASSWORD)
 {
+	if (cs->status != STATUS_ACTIVE) {
+		/* Illegal call, return error and ignore the packet */
+		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
+		return;
+	}
+
 	char password[NETWORK_PASSWORD_LENGTH];
 	const NetworkClientInfo *ci;
 
@@ -1164,6 +1194,12 @@
 
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_SET_NAME)
 {
+	if (cs->status != STATUS_ACTIVE) {
+		/* Illegal call, return error and ignore the packet */
+		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
+		return;
+	}
+
 	char client_name[NETWORK_CLIENT_NAME_LENGTH];
 	NetworkClientInfo *ci;
 
--- a/src/newgrf.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/newgrf.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -417,18 +417,6 @@
 
 typedef bool (*VCI_Handler)(uint engine, int numinfo, int prop, byte **buf, int len);
 
-static void dewagonize(int condition, Engine *e)
-{
-	if (condition != 0) {
-		e->info.unk2 &= ~0x80;
-		if (e->u.rail.railveh_type == RAILVEH_WAGON)
-			e->u.rail.railveh_type = RAILVEH_SINGLEHEAD;
-	} else {
-		e->info.unk2 |= 0x80;
-		e->u.rail.railveh_type = RAILVEH_WAGON;
-	}
-}
-
 static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **bufp, int len)
 {
 	byte *buf = *bufp;
@@ -468,7 +456,15 @@
 
 			case 0x0B: // Power
 				rvi->power = grf_load_word(&buf);
-				dewagonize(rvi->power, e);
+
+				/* Set engine / wagon state based on power */
+				if (rvi->power != 0) {
+					if (rvi->railveh_type == RAILVEH_WAGON) {
+						rvi->railveh_type = RAILVEH_SINGLEHEAD;
+					}
+				} else {
+					rvi->railveh_type = RAILVEH_WAGON;
+				}
 				break;
 
 			case 0x0D: // Running cost factor
@@ -2300,7 +2296,7 @@
 							break;
 
 						case 0x02: // Decay speed
-							SB(ei->unk2, 0, 7, grf_load_byte(&buf) & 0x7F);
+							ei->decay_speed = grf_load_byte(&buf);
 							break;
 
 						case 0x03: // Vehicle life
@@ -5787,7 +5783,7 @@
 	 * processed once at initialization.  */
 	if (stage != GLS_FILESCAN && stage != GLS_SAFETYSCAN && stage != GLS_LABELSCAN) {
 		_cur_grffile = GetFileByFilename(filename);
-		if (_cur_grffile == NULL) error("File '%s' lost in cache.\n", filename);
+		if (_cur_grffile == NULL) usererror("File '%s' lost in cache.\n", filename);
 		if (stage == GLS_RESERVE && config->status != GCS_INITIALISED) return;
 		if (stage == GLS_ACTIVATION && !HasBit(config->flags, GCF_RESERVED)) return;
 		_cur_grffile->is_ottdfile = config->IsOpenTTDBaseGRF();
@@ -5993,7 +5989,7 @@
 			if (stage > GLS_INIT && HasBit(c->flags, GCF_INIT_ONLY)) continue;
 
 			/* @todo usererror() */
-			if (!FioCheckFileExists(c->filename)) error("NewGRF file is missing '%s'", c->filename);
+			if (!FioCheckFileExists(c->filename)) usererror("NewGRF file is missing '%s'", c->filename);
 
 			if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
 			LoadNewGRFFile(c, slot++, stage);
--- a/src/newgrf_engine.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/newgrf_engine.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -880,7 +880,7 @@
 	NewVehicleResolver(&object, engine, v);
 
 	group = Resolve(GetVehicleSpriteGroup(engine, v), &object);
-	if (group == NULL || group->type != SGT_RESULT) return 0;
+	if (group == NULL || group->type != SGT_RESULT || group->g.result.num_sprites == 0) return 0;
 
 	return group->g.result.sprite + (direction % group->g.result.num_sprites);
 }
@@ -903,7 +903,7 @@
 	const SpriteGroup *group = GetWagonOverrideSpriteSet(engine, CT_DEFAULT, engine);
 	group = Resolve(group, &object);
 
-	if (group == NULL || group->type != SGT_RESULT) return 0;
+	if (group == NULL || group->type != SGT_RESULT || group->g.result.num_sprites == 0) return 0;
 
 	if (v == NULL) return group->g.result.sprite;
 
--- a/src/news_gui.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/news_gui.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -128,17 +128,17 @@
 	{ NT_ARRIVAL_OTHER,   NM_THIN,     NF_VIEWPORT|NF_VEHICLE, NULL                    }, ///< NS_ARRIVAL_OTHER
 	{ NT_ACCIDENT,        NM_THIN,     NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_ACCIDENT_TILE
 	{ NT_ACCIDENT,        NM_THIN,     NF_VIEWPORT|NF_VEHICLE, NULL                    }, ///< NS_ACCIDENT_VEHICLE
-	{ NT_COMPANY_INFO,    NM_CALLBACK, NF_NONE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_TROUBLE
-	{ NT_COMPANY_INFO,    NM_CALLBACK, NF_NONE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_MERGER
-	{ NT_COMPANY_INFO,    NM_CALLBACK, NF_NONE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_BANKRUPT
-	{ NT_COMPANY_INFO,    NM_CALLBACK, NF_TILE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_NEW
+	{ NT_COMPANY_INFO,    NM_NORMAL,   NF_NONE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_TROUBLE
+	{ NT_COMPANY_INFO,    NM_NORMAL,   NF_NONE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_MERGER
+	{ NT_COMPANY_INFO,    NM_NORMAL,   NF_NONE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_BANKRUPT
+	{ NT_COMPANY_INFO,    NM_NORMAL,   NF_TILE,                DrawNewsBankrupcy       }, ///< NS_COMPANY_NEW
 	{ NT_OPENCLOSE,       NM_THIN,     NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_OPENCLOSE
 	{ NT_ECONOMY,         NM_NORMAL,   NF_NONE,                NULL                    }, ///< NS_ECONOMY
 	{ NT_INDUSTRY_PLAYER, NM_THIN,     NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_INDUSTRY_PLAYER
 	{ NT_INDUSTRY_OTHER,  NM_THIN,     NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_INDUSTRY_OTHER
 	{ NT_INDUSTRY_NOBODY, NM_THIN,     NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_INDUSTRY_NOBODY
 	{ NT_ADVICE,          NM_SMALL,    NF_VIEWPORT|NF_VEHICLE, NULL                    }, ///< NS_ADVICE
-	{ NT_NEW_VEHICLES,    NM_CALLBACK, NF_NONE,                DrawNewsNewVehicleAvail }, ///< NS_NEW_VEHICLES
+	{ NT_NEW_VEHICLES,    NM_NORMAL,   NF_NONE,                DrawNewsNewVehicleAvail }, ///< NS_NEW_VEHICLES
 	{ NT_ACCEPTANCE,      NM_SMALL,    NF_VIEWPORT|NF_TILE,    NULL                    }, ///< NS_ACCEPTANCE
 	{ NT_SUBSIDIES,       NM_NORMAL,   NF_TILE|NF_TILE2,       NULL                    }, ///< NS_SUBSIDIES
 	{ NT_GENERAL,         NM_NORMAL,   NF_TILE,                NULL                    }, ///< NS_GENERAL
@@ -208,6 +208,11 @@
 			case NM_THIN: {
 				this->DrawNewsBorder();
 
+				if (_news_subtype_data[this->ni->subtype].callback != NULL) {
+					(_news_subtype_data[this->ni->subtype].callback)(this, ni);
+					break;
+				}
+
 				DrawString(2, 1, STR_00C6, TC_FROMSTRING);
 
 				SetDParam(0, this->ni->date);
@@ -237,11 +242,6 @@
 				break;
 			}
 
-			case NM_CALLBACK:
-				this->DrawNewsBorder();
-				(_news_subtype_data[this->ni->subtype].callback)(this, ni);
-				break;
-
 			default:
 				this->DrawWidgets();
 				if (!(this->ni->flags & NF_VIEWPORT)) {
@@ -371,7 +371,6 @@
 	Window *w;
 	switch (_news_subtype_data[ni->subtype].display_mode) {
 		case NM_NORMAL:
-		case NM_CALLBACK:
 			_news_type13_desc.top = top;
 			w = new NewsWindow(&_news_type13_desc, ni);
 			if (ni->flags & NF_VIEWPORT) {
--- a/src/news_type.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/news_type.h	Sun Jun 08 15:32:10 2008 +0000
@@ -62,7 +62,6 @@
 	NM_SMALL    = 0, ///< Show only a small popup informing us about vehicle age for example
 	NM_NORMAL   = 1, ///< Show a simple news message (height 170 pixels)
 	NM_THIN     = 2, ///< Show a simple news message (height 130 pixels)
-	NM_CALLBACK = 3, ///< Do some special processing before displaying news message. Which callback to call is in NewsCallback
 };
 
 /**
--- a/src/oldloader.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/oldloader.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -1424,8 +1424,8 @@
 
 	OCL_VAR ( OC_FILE_U8 | OC_VAR_U16,    1, &_station_tick_ctr ),
 
-	OCL_VAR (  OC_UINT8,    1, &_settings_client.gui.currency ),
-	OCL_VAR (  OC_UINT8,    1, &_settings_client.gui.units ),
+	OCL_VAR (  OC_UINT8,    1, &_settings_game.locale.currency ),
+	OCL_VAR (  OC_UINT8,    1, &_settings_game.locale.units ),
 	OCL_VAR ( OC_FILE_U8 | OC_VAR_U32,    1, &_cur_player_tick_index ),
 
 	OCL_NULL( 2 ),               ///< Date stuff, calculated automatically
--- a/src/openttd.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/openttd.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -100,11 +100,31 @@
 
 extern void SetDifficultyLevel(int mode, DifficultySettings *gm_opt);
 extern Player* DoStartupNewPlayer(bool is_ai);
-extern void ShowOSErrorBox(const char *buf);
+extern void ShowOSErrorBox(const char *buf, bool system);
 extern void InitializeRailGUI();
 
 /**
- * Error handling for fatal errors.
+ * Error handling for fatal user errors.
+ * @param s the string to print.
+ * @note Does NEVER return.
+ */
+void CDECL usererror(const char *s, ...)
+{
+	va_list va;
+	char buf[512];
+
+	va_start(va, s);
+	vsnprintf(buf, lengthof(buf), s, va);
+	va_end(va);
+
+	ShowOSErrorBox(buf, false);
+	if (_video_driver != NULL) _video_driver->Stop();
+
+	exit(1);
+}
+
+/**
+ * Error handling for fatal non-user errors.
  * @param s the string to print.
  * @note Does NEVER return.
  */
@@ -117,7 +137,7 @@
 	vsnprintf(buf, lengthof(buf), s, va);
 	va_end(va);
 
-	ShowOSErrorBox(buf);
+	ShowOSErrorBox(buf, true);
 	if (_video_driver != NULL) _video_driver->Stop();
 
 	assert(0);
@@ -534,30 +554,30 @@
 	DEBUG(misc, 1, "Loading blitter...");
 	if (BlitterFactoryBase::SelectBlitter(_ini_blitter) == NULL)
 		StrEmpty(_ini_blitter) ?
-			error("Failed to autoprobe blitter") :
-			error("Failed to select requested blitter '%s'; does it exist?", _ini_blitter);
+			usererror("Failed to autoprobe blitter") :
+			usererror("Failed to select requested blitter '%s'; does it exist?", _ini_blitter);
 
 	DEBUG(driver, 1, "Loading drivers...");
 
 	_sound_driver = (SoundDriver*)SoundDriverFactoryBase::SelectDriver(_ini_sounddriver, Driver::DT_SOUND);
 	if (_sound_driver == NULL) {
 		StrEmpty(_ini_sounddriver) ?
-			error("Failed to autoprobe sound driver") :
-			error("Failed to select requested sound driver '%s'", _ini_sounddriver);
+			usererror("Failed to autoprobe sound driver") :
+			usererror("Failed to select requested sound driver '%s'", _ini_sounddriver);
 	}
 
 	_music_driver = (MusicDriver*)MusicDriverFactoryBase::SelectDriver(_ini_musicdriver, Driver::DT_MUSIC);
 	if (_music_driver == NULL) {
 		StrEmpty(_ini_musicdriver) ?
-			error("Failed to autoprobe music driver") :
-			error("Failed to select requested music driver '%s'", _ini_musicdriver);
+			usererror("Failed to autoprobe music driver") :
+			usererror("Failed to select requested music driver '%s'", _ini_musicdriver);
 	}
 
 	_video_driver = (VideoDriver*)VideoDriverFactoryBase::SelectDriver(_ini_videodriver, Driver::DT_VIDEO);
 	if (_video_driver == NULL) {
 		StrEmpty(_ini_videodriver) ?
-			error("Failed to autoprobe video driver") :
-			error("Failed to select requested video driver '%s'", _ini_videodriver);
+			usererror("Failed to autoprobe video driver") :
+			usererror("Failed to select requested video driver '%s'", _ini_videodriver);
 	}
 
 	_savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING;
@@ -1189,7 +1209,7 @@
 /* since savegame version 4.2 the currencies are arranged differently */
 static void UpdateCurrencies()
 {
-	_settings_client.gui.currency = convert_currency[_settings_client.gui.currency];
+	_settings_game.locale.currency = convert_currency[_settings_game.locale.currency];
 }
 
 /* Up to revision 1413 the invisible tiles at the southern border have not been
--- a/src/order_gui.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/order_gui.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -566,6 +566,7 @@
 	{
 		/* Don't skip when there's nothing to skip */
 		if (_ctrl_pressed && w->vehicle->cur_order_index == w->OrderGetSel()) return;
+		if (w->vehicle->num_orders == 0) return;
 
 		DoCommandP(w->vehicle->tile, w->vehicle->index, _ctrl_pressed ? w->OrderGetSel() : ((w->vehicle->cur_order_index + 1) % w->vehicle->num_orders),
 				NULL, CMD_SKIP_TO_ORDER | CMD_MSG(_ctrl_pressed ? STR_CAN_T_SKIP_TO_ORDER : STR_CAN_T_SKIP_ORDER));
--- a/src/os2.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/os2.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -145,7 +145,7 @@
 	WinTerminate(hab);
 }
 
-void ShowOSErrorBox(const char *buf)
+void ShowOSErrorBox(const char *buf, bool system)
 {
 	HAB hab;
 	HMQ hmq;
--- a/src/roadveh_cmd.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/roadveh_cmd.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -1471,7 +1471,7 @@
 		}
 
 		if (dir == INVALID_TRACKDIR) {
-			if (!IsRoadVehFront(v)) error("!Disconnecting road vehicle.");
+			if (!IsRoadVehFront(v)) error("Disconnecting road vehicle.");
 			v->cur_speed = 0;
 			return false;
 		}
--- a/src/saveload.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/saveload.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -95,6 +95,7 @@
 
 typedef void (*AsyncSaveFinishProc)();
 static AsyncSaveFinishProc _async_save_finish = NULL;
+static ThreadObject *_save_thread;
 
 /**
  * Called by save thread to tell we finished saving.
@@ -117,6 +118,12 @@
 	_async_save_finish();
 
 	_async_save_finish = NULL;
+
+	if (_save_thread != NULL) {
+		_save_thread->Join();
+		delete _save_thread;
+		_save_thread = NULL;
+	}
 }
 
 /**
@@ -1545,8 +1552,6 @@
 	SaveFileDone();
 }
 
-static ThreadObject *_save_thread;
-
 /** We have written the whole game into memory, _Savegame_pool, now find
  * and appropiate compressor and start writing to file.
  */
@@ -1607,10 +1612,9 @@
 	}
 }
 
-static void * CDECL SaveFileToDiskThread(void *arg)
+static void SaveFileToDiskThread(void *arg)
 {
 	SaveFileToDisk(true);
-	return NULL;
 }
 
 void WaitTillSaved()
@@ -1618,6 +1622,7 @@
 	if (_save_thread == NULL) return;
 
 	_save_thread->Join();
+	delete _save_thread;
 	_save_thread = NULL;
 }
 
--- a/src/settings.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/settings.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -1546,8 +1546,8 @@
 	 SDTG_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, SLE_UINT16,                    C, 0, _old_diff_custom, 18, 0, 0, 0, 0, NULL, STR_NULL, NULL, 4, 96),
 
 	      SDT_VAR(GameSettings, difficulty.diff_level,    SLE_UINT8,                     0, 0, 0, 0,  3, 0, STR_NULL, NULL),
-	   SDTC_OMANY(              gui.currency,             SLE_UINT8,                     N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRR|custom", STR_NULL, NULL),
-	   SDTC_OMANY(              gui.units,                SLE_UINT8,                     N, 0, 1, 2, "imperial|metric|si", STR_NULL, NULL),
+	    SDT_OMANY(GameSettings, locale.currency,          SLE_UINT8,                     N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRR|custom", STR_NULL, NULL, NULL),
+	    SDT_OMANY(GameSettings, locale.units,             SLE_UINT8,                     N, 0, 1, 2, "imperial|metric|si", STR_NULL, NULL, NULL),
 	/* There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI. */
 	    SDT_OMANY(GameSettings, game_creation.town_name,  SLE_UINT8,                     0, 0, 0, 255, "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian|catalan", STR_NULL, NULL, NULL),
 	    SDT_OMANY(GameSettings, game_creation.landscape,  SLE_UINT8,                     0, 0, 0, 3, "temperate|arctic|tropic|toyland", STR_NULL, NULL, ConvertLandscape),
@@ -1738,8 +1738,8 @@
 	     SDT_VAR(GameSettings, game_creation.map_x,                           SLE_UINT8,                     S, 0,     8,                     6,      11, 0, STR_CONFIG_PATCHES_MAP_X,                 NULL),
 	     SDT_VAR(GameSettings, game_creation.map_y,                           SLE_UINT8,                     S, 0,     8,                     6,      11, 0, STR_CONFIG_PATCHES_MAP_Y,                 NULL),
 
-SDTC_CONDOMANY(              gui.currency,                                  SLE_UINT8, 97, SL_MAX_VERSION, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRR|custom", STR_NULL, NULL),
-SDTC_CONDOMANY(              gui.units,                                     SLE_UINT8, 97, SL_MAX_VERSION, N, 0, 1, 2, "imperial|metric|si", STR_NULL, NULL),
+ SDT_CONDOMANY(GameSettings, locale.currency,                               SLE_UINT8, 97, SL_MAX_VERSION, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRR|custom", STR_NULL, NULL, NULL),
+ SDT_CONDOMANY(GameSettings, locale.units,                                  SLE_UINT8, 97, SL_MAX_VERSION, N, 0, 1, 2, "imperial|metric|si", STR_NULL, NULL, NULL),
 
 	/***************************************************************************/
 	/* Unsaved patch variables. */
--- a/src/settings_gui.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/settings_gui.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -162,8 +162,8 @@
 		this->SetWidgetDisabledState(GAMEOPT_VEHICLENAME_SAVE, !(_vehicle_design_names & 1));
 		if (!this->IsWidgetDisabled(GAMEOPT_VEHICLENAME_SAVE)) str = STR_02BF_CUSTOM;
 		SetDParam(0, str);
-		SetDParam(1, _currency_specs[_settings_client.gui.currency].name);
-		SetDParam(2, STR_UNITS_IMPERIAL + _settings_client.gui.units);
+		SetDParam(1, _currency_specs[this->opt->locale.currency].name);
+		SetDParam(2, STR_UNITS_IMPERIAL + this->opt->locale.units);
 		SetDParam(3, STR_02E9_DRIVE_ON_LEFT + this->opt->vehicle.road_side);
 		SetDParam(4, TownName(this->opt->game_creation.town_name));
 		SetDParam(5, _autosave_dropdown[_settings_client.gui.autosave]);
@@ -181,11 +181,11 @@
 	{
 		switch (widget) {
 			case GAMEOPT_CURRENCY_BTN: // Setup currencies dropdown
-				ShowDropDownMenu(this, BuildCurrencyDropdown(), _settings_client.gui.currency, GAMEOPT_CURRENCY_BTN, _game_mode == GM_MENU ? 0 : ~GetMaskOfAllowedCurrencies(), 0);
+				ShowDropDownMenu(this, BuildCurrencyDropdown(), this->opt->locale.currency, GAMEOPT_CURRENCY_BTN, _game_mode == GM_MENU ? 0 : ~GetMaskOfAllowedCurrencies(), 0);
 				break;
 
 			case GAMEOPT_DISTANCE_BTN: // Setup distance unit dropdown
-				ShowDropDownMenu(this, _units_dropdown, _settings_client.gui.units, GAMEOPT_DISTANCE_BTN, 0, 0);
+				ShowDropDownMenu(this, _units_dropdown, this->opt->locale.units, GAMEOPT_DISTANCE_BTN, 0, 0);
 				break;
 
 			case GAMEOPT_ROADSIDE_BTN: { // Setup road-side dropdown
@@ -265,12 +265,12 @@
 
 			case GAMEOPT_CURRENCY_BTN: /* Currency */
 				if (index == CUSTOM_CURRENCY_ID) ShowCustCurrency();
-				_settings_client.gui.currency = index;
+				this->opt->locale.currency = index;
 				MarkWholeScreenDirty();
 				break;
 
 			case GAMEOPT_DISTANCE_BTN: // Measuring units
-				_settings_client.gui.units = index;
+				this->opt->locale.units = index;
 				MarkWholeScreenDirty();
 				break;
 
--- a/src/settings_type.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/settings_type.h	Sun Jun 08 15:32:10 2008 +0000
@@ -78,9 +78,13 @@
 	bool   autorenew;                        ///< should autorenew be enabled for new companies?
 	int16  autorenew_months;                 ///< how many months from EOL of vehicles should autorenew trigger for new companies?
 	int32  autorenew_money;                  ///< how much money before autorenewing for new companies?
+	byte   news_message_timeout;             ///< how much longer than the news message "age" should we keep the message in the history
+};
+
+/** Settings related to currency/unit systems. */
+struct LocaleSettings {
 	byte   currency;                         ///< currency we currently use
 	byte   units;                            ///< unit system we show everything
-	byte   news_message_timeout;             ///< how much longer than the news message "age" should we keep the message in the history
 };
 
 /** All settings related to the network. */
@@ -310,6 +314,7 @@
 	VehicleSettings      vehicle;            ///< options for vehicles
 	EconomySettings      economy;            ///< settings to change the economy
 	StationSettings      station;            ///< settings related to station management
+	LocaleSettings       locale;             ///< settings related to used currency/unit system in the current game
 };
 
 /** All settings that are only important for the local client. */
--- a/src/sound/win32_s.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/sound/win32_s.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -24,7 +24,7 @@
 	hdr->lpData = MallocT<char>(_bufsize * 4);
 	if (hdr->lpData == NULL ||
 			waveOutPrepareHeader(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR)
-		error("waveOutPrepareHeader failed");
+		usererror("waveOutPrepareHeader failed");
 }
 
 static void FillHeaders()
@@ -35,7 +35,7 @@
 		if (!(hdr->dwFlags & WHDR_INQUEUE)) {
 			MxMixSamples(hdr->lpData, hdr->dwBufferLength / 4);
 			if (waveOutWrite(_waveout, hdr, sizeof(WAVEHDR)) != MMSYSERR_NOERROR)
-				error("waveOutWrite failed");
+				usererror("waveOutWrite failed");
 		}
 	}
 }
--- a/src/spritecache.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/spritecache.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -169,7 +169,7 @@
 			static byte warning_level = 0;
 			DEBUG(sprite, warning_level, "Tried to load non sprite #%d as a real sprite. Probable cause: NewGRF interference", id);
 			warning_level = 6;
-			if (id == SPR_IMG_QUERY) error("Uhm, would you be so kind not to load a NewGRF that makes the 'query' sprite a non- sprite?");
+			if (id == SPR_IMG_QUERY) usererror("Uhm, would you be so kind not to load a NewGRF that makes the 'query' sprite a non- sprite?");
 			return (void*)GetSprite(SPR_IMG_QUERY);
 		}
 
@@ -246,7 +246,7 @@
 	if (!ReadSpriteHeaderSkipData()) return false;
 
 	if (load_index >= MAX_SPRITES) {
-		error("Tried to load too many sprites (#%d; max %d)", load_index, MAX_SPRITES);
+		usererror("Tried to load too many sprites (#%d; max %d)", load_index, MAX_SPRITES);
 	}
 
 	sc = AllocateSpriteCache(load_index);
--- a/src/stdafx.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/stdafx.h	Sun Jun 08 15:32:10 2008 +0000
@@ -317,6 +317,7 @@
 	#define CloseConnection OTTD_CloseConnection
 #endif /* __APPLE__ */
 
+void NORETURN CDECL usererror(const char *str, ...);
 void NORETURN CDECL error(const char *str, ...);
 #define NOT_REACHED() error("NOT_REACHED triggered at line %i of %s", __LINE__, __FILE__)
 
--- a/src/strings.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/strings.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -178,7 +178,7 @@
 
 	if (index >= _langtab_num[tab]) {
 		error(
-			"!String 0x%X is invalid. "
+			"String 0x%X is invalid. "
 			"Probably because an old version of the .lng file.\n", string
 		);
 	}
@@ -546,7 +546,7 @@
  */
 uint ConvertSpeedToDisplaySpeed(uint speed)
 {
- return (speed * units[_settings_client.gui.units].s_m) >> units[_settings_client.gui.units].s_s;
+ return (speed * units[_settings_game.locale.units].s_m) >> units[_settings_game.locale.units].s_s;
 }
 
 /**
@@ -556,7 +556,7 @@
  */
 uint ConvertDisplaySpeedToSpeed(uint speed)
 {
-	return ((speed << units[_settings_client.gui.units].s_s) + units[_settings_client.gui.units].s_m / 2) / units[_settings_client.gui.units].s_m;
+	return ((speed << units[_settings_game.locale.units].s_s) + units[_settings_game.locale.units].s_m / 2) / units[_settings_game.locale.units].s_m;
 }
 
 static char* FormatString(char* buff, const char* str, const int64* argv, uint casei, const char* last)
@@ -602,9 +602,9 @@
 
 			case SCC_VELOCITY: {// {VELOCITY}
 				int64 args[1];
-				assert(_settings_client.gui.units < lengthof(units));
+				assert(_settings_game.locale.units < lengthof(units));
 				args[0] = ConvertSpeedToDisplaySpeed(GetInt32(&argv));
-				buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].velocity), args, modifier >> 24, last);
+				buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].velocity), args, modifier >> 24, last);
 				modifier = 0;
 				break;
 			}
@@ -625,18 +625,18 @@
 				switch (cargo_str) {
 					case STR_TONS: {
 						int64 args[1];
-						assert(_settings_client.gui.units < lengthof(units));
-						args[0] = GetInt32(&argv) * units[_settings_client.gui.units].w_m >> units[_settings_client.gui.units].w_s;
-						buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].l_weight), args, modifier >> 24, last);
+						assert(_settings_game.locale.units < lengthof(units));
+						args[0] = GetInt32(&argv) * units[_settings_game.locale.units].w_m >> units[_settings_game.locale.units].w_s;
+						buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].l_weight), args, modifier >> 24, last);
 						modifier = 0;
 						break;
 					}
 
 					case STR_LITERS: {
 						int64 args[1];
-						assert(_settings_client.gui.units < lengthof(units));
-						args[0] = GetInt32(&argv) * units[_settings_client.gui.units].v_m >> units[_settings_client.gui.units].v_s;
-						buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].l_volume), args, modifier >> 24, last);
+						assert(_settings_game.locale.units < lengthof(units));
+						args[0] = GetInt32(&argv) * units[_settings_game.locale.units].v_m >> units[_settings_game.locale.units].v_s;
+						buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].l_volume), args, modifier >> 24, last);
 						modifier = 0;
 						break;
 					}
@@ -718,9 +718,9 @@
 
 			case SCC_VOLUME: { // {VOLUME}
 				int64 args[1];
-				assert(_settings_client.gui.units < lengthof(units));
-				args[0] = GetInt32(&argv) * units[_settings_client.gui.units].v_m >> units[_settings_client.gui.units].v_s;
-				buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].l_volume), args, modifier >> 24, last);
+				assert(_settings_game.locale.units < lengthof(units));
+				args[0] = GetInt32(&argv) * units[_settings_game.locale.units].v_m >> units[_settings_game.locale.units].v_s;
+				buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].l_volume), args, modifier >> 24, last);
 				modifier = 0;
 				break;
 			}
@@ -763,45 +763,45 @@
 
 			case SCC_POWER: { // {POWER}
 				int64 args[1];
-				assert(_settings_client.gui.units < lengthof(units));
-				args[0] = GetInt32(&argv) * units[_settings_client.gui.units].p_m >> units[_settings_client.gui.units].p_s;
-				buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].power), args, modifier >> 24, last);
+				assert(_settings_game.locale.units < lengthof(units));
+				args[0] = GetInt32(&argv) * units[_settings_game.locale.units].p_m >> units[_settings_game.locale.units].p_s;
+				buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].power), args, modifier >> 24, last);
 				modifier = 0;
 				break;
 			}
 
 			case SCC_VOLUME_SHORT: { // {VOLUME_S}
 				int64 args[1];
-				assert(_settings_client.gui.units < lengthof(units));
-				args[0] = GetInt32(&argv) * units[_settings_client.gui.units].v_m >> units[_settings_client.gui.units].v_s;
-				buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].s_volume), args, modifier >> 24, last);
+				assert(_settings_game.locale.units < lengthof(units));
+				args[0] = GetInt32(&argv) * units[_settings_game.locale.units].v_m >> units[_settings_game.locale.units].v_s;
+				buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].s_volume), args, modifier >> 24, last);
 				modifier = 0;
 				break;
 			}
 
 			case SCC_WEIGHT: { // {WEIGHT}
 				int64 args[1];
-				assert(_settings_client.gui.units < lengthof(units));
-				args[0] = GetInt32(&argv) * units[_settings_client.gui.units].w_m >> units[_settings_client.gui.units].w_s;
-				buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].l_weight), args, modifier >> 24, last);
+				assert(_settings_game.locale.units < lengthof(units));
+				args[0] = GetInt32(&argv) * units[_settings_game.locale.units].w_m >> units[_settings_game.locale.units].w_s;
+				buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].l_weight), args, modifier >> 24, last);
 				modifier = 0;
 				break;
 			}
 
 			case SCC_WEIGHT_SHORT: { // {WEIGHT_S}
 				int64 args[1];
-				assert(_settings_client.gui.units < lengthof(units));
-				args[0] = GetInt32(&argv) * units[_settings_client.gui.units].w_m >> units[_settings_client.gui.units].w_s;
-				buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].s_weight), args, modifier >> 24, last);
+				assert(_settings_game.locale.units < lengthof(units));
+				args[0] = GetInt32(&argv) * units[_settings_game.locale.units].w_m >> units[_settings_game.locale.units].w_s;
+				buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].s_weight), args, modifier >> 24, last);
 				modifier = 0;
 				break;
 			}
 
 			case SCC_FORCE: { // {FORCE}
 				int64 args[1];
-				assert(_settings_client.gui.units < lengthof(units));
-				args[0] = GetInt32(&argv) * units[_settings_client.gui.units].f_m >> units[_settings_client.gui.units].f_s;
-				buff = FormatString(buff, GetStringPtr(units[_settings_client.gui.units].force), args, modifier >> 24, last);
+				assert(_settings_game.locale.units < lengthof(units));
+				args[0] = GetInt32(&argv) * units[_settings_game.locale.units].f_m >> units[_settings_game.locale.units].f_s;
+				buff = FormatString(buff, GetStringPtr(units[_settings_game.locale.units].force), args, modifier >> 24, last);
 				modifier = 0;
 				break;
 			}
@@ -1427,7 +1427,7 @@
 		FioAppendDirectory(path, lengthof(path), sp, LANG_DIR);
 		language_count += GetLanguageList(files, language_count, lengthof(files), path);
 	}
-	if (language_count == 0) error("No available language packs (invalid versions?)");
+	if (language_count == 0) usererror("No available language packs (invalid versions?)");
 
 	/* Acquire the locale of the current system */
 	const char *lang = GetCurrentLocale("LC_MESSAGES");
@@ -1463,7 +1463,7 @@
 		dl->num++;
 	}
 
-	if (dl->num == 0) error("Invalid version of language packs");
+	if (dl->num == 0) usererror("Invalid version of language packs");
 
 	/* We haven't found the language in the config nor the one in the locale.
 	 * Now we set it to one of the fallback languages */
@@ -1471,7 +1471,7 @@
 		chosen_language = (language_fallback != -1) ? language_fallback : en_GB_fallback;
 	}
 
-	if (!ReadLanguagePack(chosen_language)) error("Can't read language pack '%s'", dl->ent[chosen_language].file);
+	if (!ReadLanguagePack(chosen_language)) usererror("Can't read language pack '%s'", dl->ent[chosen_language].file);
 }
 
 /**
--- a/src/table/engines.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/table/engines.h	Sun Jun 08 15:32:10 2008 +0000
@@ -18,7 +18,7 @@
 /** Writes the properties of a train or road vehicle into the EngineInfo struct.
  * @see EngineInfo
  * @param a Introduction date
- * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param b decay speed
  * @param c life length
  * @param d base life
  * @param e Bitmask of the climates
@@ -29,18 +29,18 @@
 
 /** Writes the properties of a train carriage into the EngineInfo struct.
  * @param a Introduction date
- * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param b decay speed
  * @param c life length
  * @param d base life
  * @param e Bitmask of the climates
  * @see MK
  * @note the 5 between d and e is the load amount
  */
-#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b | 0x80, 5, e, 0, 8, 0, 0, 0, STR_EMPTY }
+#define MW(a, b, c, d, e) { DAYS_TILL_ORIGINAL_BASE_YEAR + a, c, d, b, 5, e, 0, 8, 0, 0, 0, STR_EMPTY }
 
 /** Writes the properties of a ship into the EngineInfo struct.
  * @param a Introduction date
- * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param b decay speed
  * @param c life length
  * @param d base life
  * @param e Bitmask of the climates
@@ -51,7 +51,7 @@
 
 /** Writes the properties of an aeroplane into the EngineInfo struct.
  * @param a Introduction date
- * @param b unk2, flag for carriage(bit 7) and decay speed(bits0..6)
+ * @param b decay speed
  * @param c life length
  * @param d base life
  * @param e Bitmask of the climates
--- a/src/thread.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/thread.h	Sun Jun 08 15:32:10 2008 +0000
@@ -5,7 +5,7 @@
 #ifndef THREAD_H
 #define THREAD_H
 
-typedef void * (CDECL *OTTDThreadFunc)(void *);
+typedef void (*OTTDThreadFunc)(void *);
 
 /**
  * A Thread Object which works on all our supported OSes.
@@ -37,7 +37,7 @@
 	/**
 	 * Join this thread.
 	 */
-	virtual void *Join() = 0;
+	virtual void Join() = 0;
 
 	/**
 	 * Check if this thread is the current active thread.
@@ -64,7 +64,7 @@
 	 * Convert the current thread to a new ThreadObject.
 	 * @return A new ThreadObject with the current thread attached to it.
 	 */
-	static ThreadObject* AttachCurrent();
+	static ThreadObject *AttachCurrent();
 
 	/**
 	 * Find the Id of the current running thread.
--- a/src/thread_morphos.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/thread_morphos.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -34,7 +34,6 @@
 	struct Message msg;  ///< standard exec.library message (MUST be the first thing in the message struct!)
 	OTTDThreadFunc func; ///< function the thread will execute
 	void *arg;           ///< functions arguments for the thread function
-	void *ret;           ///< return value of the thread function
 };
 
 
@@ -79,7 +78,6 @@
 		/* Things we'll pass down to the child by utilizing NP_StartupMsg */
 		m_msg.func = proc;
 		m_msg.arg  = param;
-		m_msg.ret  = NULL;
 
 		m_replyport = CreateMsgPort();
 
@@ -161,10 +159,9 @@
 		return true;
 	}
 
-	/* virtual */ void *Join()
+	/* virtual */ void Join()
 	{
 		struct OTTDThreadStartupMessage *reply;
-		void *ret;
 
 		/* You cannot join yourself */
 		assert(!IsCurrent());
@@ -173,13 +170,9 @@
 		KPutStr("[OpenTTD] Wait for child to quit...\n");
 		WaitPort(m_replyport);
 
-		reply = (struct OTTDThreadStartupMessage *)GetMsg(m_replyport);
-		ret   = reply->ret;
-
+		GetMsg(m_replyport);
 		DeleteMsgPort(m_replyport);
 		m_thr = 0;
-
-		return ret;
 	}
 
 	/* virtual */ bool IsCurrent()
@@ -209,7 +202,7 @@
 
 		if (NewGetTaskAttrs(NULL, &msg, sizeof(struct OTTDThreadStartupMessage *), TASKINFOTYPE_STARTUPMSG, TAG_DONE) && msg != NULL) {
 			try {
-				msg->ret = msg->func(msg->arg);
+				msg->func(msg->arg);
 			} catch(...) {
 				KPutStr("[Child] Returned to main()\n");
 			}
@@ -256,7 +249,7 @@
 
 	/* virtual */ void Set()
 	{
-		// Check if semaphore count is really important there.
+		/* Check if semaphore count is really important there. */
 		ReleaseSemaphore(&m_sem);
 	}
 
--- a/src/thread_pthread.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/thread_pthread.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -95,16 +95,13 @@
 		throw 0;
 	}
 
-	/* virtual */ void *Join()
+	/* virtual */ void Join()
 	{
 		/* You cannot join yourself */
 		assert(!IsCurrent());
 
-		void *ret;
-		pthread_join(m_thr, &ret);
+		pthread_join(m_thr, NULL);
 		m_thr = 0;
-
-		return ret;
 	}
 
 	/* virtual */ bool IsCurrent()
@@ -124,14 +121,15 @@
 	 */
 	static void *stThreadProc(void *thr)
 	{
-		return ((ThreadObject_pthread *)thr)->ThreadProc();
+		((ThreadObject_pthread *)thr)->ThreadProc();
+		pthread_exit(NULL);
 	}
 
 	/**
 	 * A new thread is created, and this function is called. Call the custom
 	 *  function of the creator of the thread.
 	 */
-	void *ThreadProc()
+	void ThreadProc()
 	{
 		/* The new thread stops here so the calling thread can complete pthread_create() call */
 		sem_wait(&m_sem_start);
@@ -144,8 +142,6 @@
 
 		/* Notify threads waiting for our completion */
 		sem_post(&m_sem_stop);
-
-		pthread_exit(NULL);
 	}
 };
 
--- a/src/thread_win32.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/thread_win32.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -20,7 +20,6 @@
 	OTTDThreadFunc m_proc;
 	void     *m_param;
 	bool     m_attached;
-	void     *ret;
 
 public:
 	/**
@@ -91,14 +90,12 @@
 		throw 0;
 	}
 
-	/* virtual */ void *Join()
+	/* virtual */ void Join()
 	{
 		/* You cannot join yourself */
 		assert(!IsCurrent());
 
 		WaitForSingleObject(m_h_thr, INFINITE);
-
-		return this->ret;
 	}
 
 	/* virtual */ bool IsCurrent()
@@ -119,21 +116,20 @@
 	 */
 	static uint CALLBACK stThreadProc(void *thr)
 	{
-		return ((ThreadObject_Win32 *)thr)->ThreadProc();
+		((ThreadObject_Win32 *)thr)->ThreadProc();
+		return 0;
 	}
 
 	/**
 	 * A new thread is created, and this function is called. Call the custom
 	 *  function of the creator of the thread.
 	 */
-	uint ThreadProc()
+	void ThreadProc()
 	{
 		try {
-			this->ret = m_proc(m_param);
+			m_proc(m_param);
 		} catch (...) {
 		}
-
-		return 0;
 	}
 };
 
--- a/src/town.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/town.h	Sun Jun 08 15:32:10 2008 +0000
@@ -16,6 +16,7 @@
 #include "settings_type.h"
 #include "strings_type.h"
 #include "viewport_type.h"
+#include "economy_type.h"
 
 enum {
 	HOUSE_NO_CLASS   = 0,
@@ -242,6 +243,13 @@
 	/* grf file related properties*/
 	uint8 local_id;                    ///< id defined by the grf file for this house
 	const struct GRFFile *grffile;     ///< grf file that introduced this house
+
+	/**
+	 * Get the cost for removing this house
+	 * @return the cost (inflation corrected etc)
+	 */
+	Money GetRemovalCost() const;
+
 };
 
 extern HouseSpec _house_specs[HOUSE_MAX];
--- a/src/town_cmd.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/town_cmd.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -127,6 +127,11 @@
 	}
 }
 
+Money HouseSpec::GetRemovalCost() const
+{
+	return (_price.remove_house * this->removal_cost) >> 8;
+}
+
 // Local
 static int _grow_town_result;
 
@@ -517,7 +522,7 @@
 	const HouseSpec *hs = GetHouseSpecs(GetHouseType(tile));
 
 	CommandCost cost(EXPENSES_CONSTRUCTION);
-	cost.AddCost(_price.remove_house * hs->removal_cost >> 8);
+	cost.AddCost(hs->GetRemovalCost());
 
 	int rating = hs->remove_rating_decrease;
 	_cleared_town_rating += rating;
@@ -1598,7 +1603,7 @@
 	if (num == 0 && CreateRandomTown(10000, TSM_RANDOM, 0) == NULL) {
 		if (GetNumTowns() == 0) {
 			/* XXX - can we handle that more gracefully? */
-			if (_game_mode != GM_EDITOR) error("Could not generate any town");
+			if (_game_mode != GM_EDITOR) usererror("Could not generate any town");
 
 			return false;
 		}
--- a/src/town_type.h	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/town_type.h	Sun Jun 08 15:32:10 2008 +0000
@@ -51,9 +51,6 @@
 	RATING_TUNNEL_BRIDGE_DOWN_STEP = -250,
 	RATING_TUNNEL_BRIDGE_MINIMUM   = 0,
 
-	RATING_INDUSTRY_DOWN_STEP = -1500,
-	RATING_INDUSTRY_MINIMUM   = RATING_MINIMUM,
-
 	RATING_ROAD_DOWN_STEP_INNER = -50, ///< removing a roadpiece in the middle
 	RATING_ROAD_DOWN_STEP_EDGE  = -18, ///< removing a roadpiece at the edge
 	RATING_ROAD_MINIMUM   = -100,
--- a/src/train_cmd.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/train_cmd.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -3116,7 +3116,7 @@
 
 invalid_rail:
 	/* We've reached end of line?? */
-	if (prev != NULL) error("!Disconnecting train");
+	if (prev != NULL) error("Disconnecting train");
 
 reverse_train_direction:
 	v->load_unload_time_rem = 0;
--- a/src/unix.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/unix.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -214,7 +214,7 @@
 	fprintf(stderr, "%s\n", str);
 }
 
-void ShowOSErrorBox(const char *buf)
+void ShowOSErrorBox(const char *buf, bool system)
 {
 #if defined(__APPLE__)
 	/* this creates an NSAlertPanel with the contents of 'buf'
--- a/src/video/dedicated_v.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/video/dedicated_v.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -107,10 +107,10 @@
 	/* Create event to signal when console input is ready */
 	_hInputReady = CreateEvent(NULL, false, false, NULL);
 	_hWaitForInputHandling = CreateEvent(NULL, false, false, NULL);
-	if (_hInputReady == NULL || _hWaitForInputHandling == NULL) error("Cannot create console event!");
+	if (_hInputReady == NULL || _hWaitForInputHandling == NULL) usererror("Cannot create console event!");
 
 	_hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)CheckForConsoleInput, NULL, 0, &dwThreadId);
-	if (_hThread == NULL) error("Cannot create console thread!");
+	if (_hThread == NULL) usererror("Cannot create console thread!");
 
 	DEBUG(driver, 2, "Windows console thread started");
 }
--- a/src/video/sdl_v.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/video/sdl_v.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -118,7 +118,7 @@
 	modes = SDL_CALL SDL_ListModes(NULL, SDL_SWSURFACE + (_fullscreen ? SDL_FULLSCREEN : 0));
 
 	if (modes == NULL)
-		error("sdl: no modes available");
+		usererror("sdl: no modes available");
 
 	_all_modes = (modes == (void*)-1);
 
@@ -198,7 +198,7 @@
 
 	DEBUG(driver, 1, "SDL: using mode %dx%dx%d", w, h, bpp);
 
-	if (bpp == 0) error("Can't use a blitter that blits 0 bpp for normal visuals");
+	if (bpp == 0) usererror("Can't use a blitter that blits 0 bpp for normal visuals");
 
 	/* Give the application an icon */
 	icon = SDL_CALL SDL_LoadBMP(ICON_DIR PATHSEP "openttd.32.bmp");
--- a/src/video/win32_v.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/video/win32_v.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -59,7 +59,7 @@
 
 	}
 	_wnd.gdi_palette = CreatePalette(pal);
-	if (_wnd.gdi_palette == NULL) error("CreatePalette failed!\n");
+	if (_wnd.gdi_palette == NULL) usererror("CreatePalette failed!\n");
 }
 
 static void UpdatePalette(HDC dc, uint start, uint count)
@@ -292,7 +292,7 @@
 			_sntprintf(Windowtitle, sizeof(Windowtitle), _T("OpenTTD %s"), MB_TO_WIDE(_openttd_revision));
 
 			_wnd.main_wnd = CreateWindow(_T("OTTD"), Windowtitle, style, x, y, w, h, 0, 0, GetModuleHandle(NULL), 0);
-			if (_wnd.main_wnd == NULL) error("CreateWindow failed");
+			if (_wnd.main_wnd == NULL) usererror("CreateWindow failed");
 			ShowWindow(_wnd.main_wnd, showstyle);
 		}
 	}
@@ -671,7 +671,7 @@
 		};
 
 		registered = true;
-		if (!RegisterClass(&wnd)) error("RegisterClass failed");
+		if (!RegisterClass(&wnd)) usererror("RegisterClass failed");
 	}
 }
 
@@ -684,7 +684,7 @@
 	w = max(w, 64);
 	h = max(h, 64);
 
-	if (bpp == 0) error("Can't use a blitter that blits 0 bpp for normal visuals");
+	if (bpp == 0) usererror("Can't use a blitter that blits 0 bpp for normal visuals");
 
 	if (w == _screen.width && h == _screen.height)
 		return false;
@@ -707,7 +707,7 @@
 
 	dc = GetDC(0);
 	_wnd.dib_sect = CreateDIBSection(dc, bi, DIB_RGB_COLORS, (VOID**)&_wnd.buffer_bits, NULL, 0);
-	if (_wnd.dib_sect == NULL) error("CreateDIBSection failed");
+	if (_wnd.dib_sect == NULL) usererror("CreateDIBSection failed");
 	ReleaseDC(0, dc);
 
 	return true;
--- a/src/win32.cpp	Sun Jun 08 14:00:40 2008 +0000
+++ b/src/win32.cpp	Sun Jun 08 15:32:10 2008 +0000
@@ -92,14 +92,14 @@
 }
 #endif
 
-void ShowOSErrorBox(const char *buf)
+void ShowOSErrorBox(const char *buf, bool system)
 {
 	MyShowCursor(true);
 	MessageBox(GetActiveWindow(), MB_TO_WIDE(buf), _T("Error!"), MB_ICONSTOP);
 
 /* if exception tracker is enabled, we crash here to let the exception handler handle it. */
 #if defined(WIN32_EXCEPTION_TRACKER) && !defined(_DEBUG)
-	if (*buf == '!') {
+	if (system) {
 		_exception_string = buf;
 		*(byte*)0 = 0;
 	}
@@ -961,7 +961,7 @@
 
 #if !defined(WINCE)
 	/* Check if a win9x user started the win32 version */
-	if (HasBit(GetVersion(), 31)) error("This version of OpenTTD doesn't run on windows 95/98/ME.\nPlease download the win9x binary and try again.");
+	if (HasBit(GetVersion(), 31)) usererror("This version of OpenTTD doesn't run on windows 95/98/ME.\nPlease download the win9x binary and try again.");
 #endif
 
 	/* For UNICODE we need to convert the commandline to char* _AND_