Commit 59119545cec0152f69726cf89d33dcccaec76be8 - openttd

+1

-1

.ottdrev less more

0		1.1.4 23435 0 1.1.4
	0	1.1.5 23798 0 1.1.5

+3

-3

build-number.txt less more

0	0	#Created by the Bamboo Continuous Integration Server
1		#Sun Dec 04 20:40:51 CET 2011
2		build.number=8
3		build.timestamp="2011-12-04 20\:40\:51"
	1	#Sat Jan 14 15:04:37 CET 2012
	2	build.number=11
	3	build.timestamp="2012-01-14 15\:04\:37"

+15

-6

changelog.txt less more

	0	1.1.5 (2012-01-14)
	1	------------------------------------------------------------------------
	2	- Fix: Make default timeouts for certain network states lower and configurable [CVE-2012-0049] [FS#4955] (r23764)
	3	- Fix: Check whether a water tile is really empty when overbuilding it with an object [FS#4956] (r23763)
	4	- Fix: Missing locking causing crash in extreme case when being in the MP lobby [FS#4938] (r23752)
	5	- Fix: Clear the backed up orders of a removed station as well, otherwise one could create orders to a station that was never in the original backupped orders. For example a road vehicle trying to go to a buoy [FS#4876] (r23464)
	6	- Fix: Do not assume all industries that cut trees have tile (0,0) and wait until all tiles of an industry are completed before starting to cut trees (r23458)
	7
	8
0	9	1.1.4 (2011-12-05)
1	10	------------------------------------------------------------------------
2	11	- Fix: Savegames made with the Catalan town name generator would trigger a 'savegame corrupt' exception [FS#4866] (r23418)

65	74	1.1.3-RC1 (2011-09-04)
66	75	------------------------------------------------------------------------
67	76	- Add: River graphics for the original base set (r22766)
68		- Fix: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash [FS#4758] (r22882)
	77	- Fix: [NewGRF] DCxx text references via the text stack are not allowed, but caused crash [FS#4758] (r22882)
69	78	- Fix: Harden memory allocation (r22881, r22880, r22875)
70	79	- Fix: Miscalculation of train curve speed limits (r22879)
71	80	- Fix: Validate image dimensions before loading [CVE-2011-3343] [FS#4747] (r22878, r22877, r22874, r22873)

867	876	- Fix: Sorting industries by production was broken for NewGRF industries (r19538)
868	877	- Fix: Vehicle details window did not resize correctly after refitting a road vehicle to a longer variant [FS#3720] (r19533)
869	878	- Fix: Prevent drawing industries disabled at the smallmap as land tiles when they are built on water (r19523)
870		- Fix: Tunnels, bridges and roadstops are build with only one roadtype (r19506)
	879	- Fix: Tunnels, bridges and road stops are build with only one roadtype (r19506)
871	880	- Fix: Remove same_industry_close setting did not do what it said and caused NewGRF trouble (r19499)
872	881	- Fix: Keep number padding intact when cloning vehicle names [FS#3710] (r19498)
873	882	- Fix: [NewGRF] Bytes and words get sign-extended for temporary/persistent storage (r19497)

967	976	- Fix: Not all news data was properly freed when starting a new game [FS#3614] (r19105)
968	977	- Fix: The BeMidi driver was broken [FS#3610] (r19097)
969	978	- Fix: Crash when one of the items in the news_display group in the config file has no value (r19096)
970		- Fix: Crash when a baseset has an empty metadata field (r19095)
	979	- Fix: Crash when a base set has an empty metadata field (r19095)
971	980	- Fix: Possible read/write after free when the client triggered the server to close the connection [FS#3599] (r19072)
972	981	- Fix: Remove Bidi control characters from the reordered text so they are not drawn [FS#3604] (r19067)
973	982	- Fix: [NewGRF] Settings that are part of the 'TTDPatch flags' can cause desyncs if they are changed in network games (r19066)

1653	1662	- Fix: Add an EngineOverrideManager to give the term 'compatible NewGRF' again some sense and to not crash because of trivial changes [FS#2612] (r15645)
1654	1663	- Fix: Closing a network connection twice in the case that sending packets starts failing while disconnecting [FS#2710] (r15644)
1655	1664	- Fix: Game crashes when network pools are empty, so always allocate at least one pool block [FS#2712] (r15641)
1656		- Fix: Do not allow more than 64 road vehicles to reserve a slot at a single road stop. 255 + 1 gives trouble, but 64 is even more than the roadstop would be able to handle within the slot timeout time [FS#2707] (r15635)
	1665	- Fix: Do not allow more than 64 road vehicles to reserve a slot at a single road stop. 255 + 1 gives trouble, but 64 is even more than the road stop would be able to handle within the slot timeout time [FS#2707] (r15635)
1657	1666	- Fix: Kicking/banning a client from the Client list window crashed the server [FS#2705] (r15628)
1658	1667	- Fix: UTF8 string handling could cause buffer overruns [FS#2698] (r15626)
1659	1668	- Fix: When trying to reserve a self-crossing path the failed reservation was sometimes not cleared completely [FS#2701] (r15619)

2188	2197	- Fix: Do entrance-slope-check for every tile of railstations (r11999)
2189	2198	- Fix: Possible remote assert by setting bit 6 of p1 for CMD_REMOVE_ROAD [FS#1692] (r11998)
2190	2199	- Fix: Update train statusbar when stopping from zero speed [FS#1706] (r11996)
2191		- Fix: Resize station/roadstop/dock/airport construction windows if cargo acceptance list is too long (r11993)
	2200	- Fix: Resize station/road stop/dock/airport construction windows if cargo acceptance list is too long (r11993)
2192	2201	- Fix: When building two rail stations close to each other (with control) so they looked like one long track trains would see them as one (r11992)
2193	2202	- Fix: Resize autoreplace window to fit purchase information text if it is too large (r11989)
2194	2203	- Fix: Build system ignored changes to table/control_codes.h which require strgen to be rebuilt (r11986)

2719	2728	- Codechange: Change the ordering of the network list, compatible servers just missing grf files are below fully compatible servers, not on the bottom (r8118)
2720	2729	- Fix: Return proper error value when unthreaded save fails, prevents server sending 0-sized files (r8171)
2721	2730	- Fix: Network client crashes when a server sends a 0-sized savegame [FS#556] (r8167)
2722		- Fix: Several desync fixes (incorrect roadstop update of old games, autoreplace bugs) [FS#551] (r8137, r8147, r8157)
	2731	- Fix: Several desync fixes (incorrect road stop update of old games, autoreplace bugs) [FS#551] (r8137, r8147, r8157)
2723	2732	- Fix: Some disaster-events fixed: combat chopper shoots from right position, submarine once again moves around (r8140, r8158)
2724	2733	- Fix: 'out of sprite memory' warning messages due to incorrect assumption of requested memory for sprites (r8133)
2725	2734	- Fix: Buoys are now built and numbered 1..9 not 9..1 [FS#538] (r8123)

+1

-1

config.lib less more

0		# $Id: config.lib 23435 2011-12-04 19:40:14Z rubidium $
	0	# $Id: config.lib 23798 2012-01-14 14:03:10Z rubidium $
1	1
2	2	# This file is part of OpenTTD.
3	3	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

+2

-2

known-bugs.txt less more

0	0	OpenTTD's known bugs
1		Last updated: 2011-12-05
2		Release version: 1.1.4
	1	Last updated: 2012-01-14
	2	Release version: 1.1.5
3	3	------------------------------------------------------------------------
4	4
5	5

+6

-0

os/debian/changelog less more

	0	openttd (1.1.5) unstable; urgency=low
	1
	2	* New upstream release 1.1.5
	3
	4	-- Matthijs Kooijman <matthijs@stdin.nl> Sat, 14 Jan 2012 00:00:00 +0400
	5
0	6	openttd (1.1.4) unstable; urgency=low
1	7
2	8	* New upstream release 1.1.4

+1

-1

os/os2/installer/make_installer.cmd less more

0	0	@echo off
1	1
2		set OPENTTD_VERSION=1.1.4
	2	set OPENTTD_VERSION=1.1.5
3	3	set OPENSFX_VERSION=0.8.0
4	4	set NOSOUND_VERSION=0.8.0
5	5	set OPENGFX_VERSION=0.7.0

+1

-1

os/rpm/openttd.spec less more

1	1
2	2	%define binname openttd
3	3
4		%define srcver 1.1.4
	4	%define srcver 1.1.5
5	5
6	6	%if %{dedicated}
7	7	Name: %{binname}-dedicated

+2

-2

os/windows/installer/install.nsi less more

0	0	# Version numbers to update
1	1	!define APPV_MAJOR 1
2	2	!define APPV_MINOR 1
3		!define APPV_MAINT 4
4		!define APPV_BUILD 1
	3	!define APPV_MAINT 5
	4	!define APPV_BUILD 0
5	5	!define APPV_EXTRA ""
6	6
7	7	!define APPNAME "OpenTTD" ; Define application name

+2

-2

readme.txt less more

0	0	OpenTTD readme
1		Last updated: 2011-12-05
2		Release version: 1.1.4
	1	Last updated: 2012-01-14
	2	Release version: 1.1.5
3	3	------------------------------------------------------------------------
4	4
5	5

+5

-1

src/ai/api/ai_changelog.hpp less more

0		/* $Id: ai_changelog.hpp 22995 2011-10-04 20:22:46Z rubidium $ */
	0	/* $Id: ai_changelog.hpp 23797 2012-01-13 22:06:30Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

13	13	* bug fixes can be found in the normal changelog. Note that removed API
14	14	* functions may still be available if you return an older API version
15	15	* in GetAPIVersion() in info.nut.
	16	*
	17	* \b 1.1.5
	18	*
	19	* No changes
16	20	*
17	21	* \b 1.1.4
18	22	*

+2

-2

src/disaster_cmd.cpp less more

0		/* $Id: disaster_cmd.cpp 22017 2011-02-07 22:29:47Z rubidium $ */
	0	/* $Id: disaster_cmd.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

375	375	static void DestructIndustry(Industry *i)
376	376	{
377	377	for (TileIndex tile = 0; tile != MapSize(); tile++) {
378		if (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == i->index) {
	378	if (i->TileBelongsToIndustry(tile)) {
379	379	ResetIndustryConstructionStage(tile);
380	380	MarkTileDirtyByTile(tile);
381	381	}

+11

-1

src/industry.h less more

0		/* $Id: industry.h 23053 2011-10-22 21:06:58Z rubidium $ */
	0	/* $Id: industry.h 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

77	77	~Industry();
78	78
79	79	void RecomputeProductionMultipliers();
	80
	81	/**
	82	* Check if a given tile belongs to this industry.
	83	* @param tile The tile to check.
	84	* @return True if the tils is part of this industry.
	85	*/
	86	inline bool TileBelongsToIndustry(TileIndex tile) const
	87	{
	88	return IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == this->index;
	89	}
80	90
81	91	/**
82	92	* Get the industry of the given tile

+8

-4

src/industry_cmd.cpp less more

0		/* $Id: industry_cmd.cpp 23053 2011-10-22 21:06:58Z rubidium $ */
	0	/* $Id: industry_cmd.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

1064	1064	*/
1065	1065	static void ChopLumberMillTrees(Industry *i)
1066	1066	{
	1067	/* We only want to cut trees if all tiles are completed. */
	1068	TILE_AREA_LOOP(tile_cur, i->location) {
	1069	if (i->TileBelongsToIndustry(tile_cur)) {
	1070	if (!IsIndustryCompleted(tile_cur)) return;
	1071	}
	1072	}
	1073
1067	1074	TileIndex tile = i->location.tile;
1068
1069		if (!IsIndustryCompleted(tile)) return; // Can't proceed if not completed.
1070
1071	1075	if (CircularTileSearch(&tile, 40, SearchLumberMillTrees, NULL)) { // 40x40 tiles to search.
1072	1076	i->produced_cargo_waiting[0] = min(0xffff, i->produced_cargo_waiting[0] + 45); // Found a tree, add according value to waiting cargo.
1073	1077	}

+2

-2

src/lang/afrikaans.txt less more

10	10	##gender male
11	11
12	12
13		# $Id: afrikaans.txt 22395 2011-04-30 21:03:14Z rubidium $
	13	# $Id: afrikaans.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2247	2247	STR_ABOUT_OPENTTD :{WHITE}Oor OpenTTD
2248	2248	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Oorspronklike kopiereg {COPYRIGHT} 1995 Chris Sawyer, Alle regte voorbehou
2249	2249	STR_ABOUT_VERSION :{BLACK}OpenTTD uitgawe {REV}
2250		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Die OpenTTD span
	2250	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Die OpenTTD span
2251	2251
2252	2252	# Save/load game/scenario
2253	2253	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spaar Spel

+2

-2

src/lang/arabic_egypt.txt less more

9	9	##grflangid 0x14
10	10
11	11
12		# $Id: arabic_egypt.txt 22936 2011-09-15 18:59:23Z rubidium $
	12	# $Id: arabic_egypt.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2285	2285	STR_ABOUT_OPENTTD :{WHITE}حول النسخة المفتوحة
2286	2286	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}الحقوق الاصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق محفوظة
2287	2287	STR_ABOUT_VERSION :{BLACK}النسخة المفتوحة رقم {REV}
2288		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2011 فريق النسخة المفتوحة
	2288	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2012 فريق النسخة المفتوحة
2289	2289
2290	2290	# Save/load game/scenario
2291	2291	STR_SAVELOAD_SAVE_CAPTION :{WHITE}حفظ اللعبة

+2

-2

src/lang/belarusian.txt less more

11	11	##case m f n p nom gen dat acc abl pre
12	12
13	13
14		# $Id: belarusian.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: belarusian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2623	2623	STR_ABOUT_OPENTTD :{WHITE}Аб OpenTTD
2624	2624	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Арыгінальныя аўтарскія правы {COPYRIGHT} 1995 Chris Sawyer. Усе правы абароненыя
2625	2625	STR_ABOUT_VERSION :{BLACK}OpenTTD вэрсія {REV}
2626		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Каманда распрацоўнікаў OpenTTD
	2626	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Каманда распрацоўнікаў OpenTTD
2627	2627
2628	2628	# Save/load game/scenario
2629	2629	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Захаваць гульню

+2

-2

src/lang/brazilian_portuguese.txt less more

10	10	##gender m f
11	11
12	12
13		# $Id: brazilian_portuguese.txt 23054 2011-10-22 21:15:17Z rubidium $
	13	# $Id: brazilian_portuguese.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2286	2286	STR_ABOUT_OPENTTD :{WHITE}Sobre o OpenTTD...
2287	2287	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
2288	2288	STR_ABOUT_VERSION :{BLACK}OpenTTD versão {REV}
2289		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 A equipe do OpenTTD
	2289	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 A equipe do OpenTTD
2290	2290
2291	2291	# Save/load game/scenario
2292	2292	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Salvar Jogo

+2

-2

src/lang/bulgarian.txt less more

11	11	##case m f n p
12	12
13	13
14		# $Id: bulgarian.txt 22520 2011-05-29 17:55:15Z rubidium $
	14	# $Id: bulgarian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2278	2278	STR_ABOUT_OPENTTD :{WHITE}Относно OpenTTD
2279	2279	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Авторски права {COPYRIGHT} 1995 Крис Сойер (Chris Sawyer), Всички права са запазени
2280	2280	STR_ABOUT_VERSION :{BLACK}OpenTTD версия {REV}
2281		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 The OpenTTD team
	2281	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 The OpenTTD team
2282	2282
2283	2283	# Save/load game/scenario
2284	2284	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Запази играта

+2

-2

src/lang/catalan.txt less more

10	10	##gender Masculin Femenin
11	11
12	12
13		# $Id: catalan.txt 22936 2011-09-15 18:59:23Z rubidium $
	13	# $Id: catalan.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2286	2286	STR_ABOUT_OPENTTD :{WHITE}Quant a OpenTTD
2287	2287	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Tots els drets reservats
2288	2288	STR_ABOUT_VERSION :{BLACK}OpenTTD versió {REV}
2289		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 L'equip d'OpenTTD
	2289	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 L'equip d'OpenTTD
2290	2290
2291	2291	# Save/load game/scenario
2292	2292	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Desa el Joc

+2

-2

src/lang/croatian.txt less more

11	11	##case nom gen dat aku vok lok ins
12	12
13	13
14		# $Id: croatian.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: croatian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2382	2382	STR_ABOUT_OPENTTD :{WHITE}O OpenTTD-u
2383	2383	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Izvorno autorsko pravo {COPYRIGHT} 1995 Chris Sawyer, sva prava pridržana
2384	2384	STR_ABOUT_VERSION :{BLACK}OpenTTD verzija {REV}
2385		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD tim
	2385	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD tim
2386	2386
2387	2387	# Save/load game/scenario
2388	2388	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spremi igru

+2

-2

src/lang/czech.txt less more

11	11	##case nom gen dat acc voc loc ins big small
12	12
13	13
14		# $Id: czech.txt 22936 2011-09-15 18:59:23Z rubidium $
	14	# $Id: czech.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2373	2373	STR_ABOUT_OPENTTD :{WHITE}O OpenTTD
2374	2374	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Původní copyright: {COPYRIGHT} 1995 Chris Sawyer, všechna práva vyhrazena
2375	2375	STR_ABOUT_VERSION :{BLACK}OpenTTD verze {REV}
2376		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Tým OpenTTD
	2376	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Tým OpenTTD
2377	2377
2378	2378	# Save/load game/scenario
2379	2379	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Uložit hru

+2

-2

src/lang/danish.txt less more

9	9	##grflangid 0x2d
10	10
11	11
12		# $Id: danish.txt 23054 2011-10-22 21:15:17Z rubidium $
	12	# $Id: danish.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2285	2285	STR_ABOUT_OPENTTD :{WHITE}Om OpenTTD
2286	2286	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheder reserveret
2287	2287	STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV}
2288		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD teamet
	2288	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD teamet
2289	2289
2290	2290	# Save/load game/scenario
2291	2291	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Gem spil

+2

-2

src/lang/dutch.txt less more

9	9	##grflangid 0x1f
10	10
11	11
12		# $Id: dutch.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: dutch.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2286	2286	STR_ABOUT_OPENTTD :{WHITE}Over OpenTTD
2287	2287	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Originele copyright {COPYRIGHT} 1995 Chris Sawyer, alle rechten voorbehouden
2288	2288	STR_ABOUT_VERSION :{BLACK}OpenTTD versie {REV}
2289		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Het OpenTTD team
	2289	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Het OpenTTD team
2290	2290
2291	2291	# Save/load game/scenario
2292	2292	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spel Opslaan

+4

-2

src/lang/english.txt less more

9	9	##grflangid 0x01
10	10
11	11
12		# $Id: english.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: english.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

1775	1775	STR_NETWORK_ERROR_KICKED :{WHITE}You were kicked out of the game
1776	1776	STR_NETWORK_ERROR_CHEATER :{WHITE}Cheating is not allowed on this server
1777	1777	STR_NETWORK_ERROR_TOO_MANY_COMMANDS :{WHITE}You were sending too many commands to the server
	1778	STR_NETWORK_ERROR_TIMEOUT_PASSWORD :{WHITE}You took too long to enter the password
	1779	STR_NETWORK_ERROR_TIMEOUT_COMPUTER :{WHITE}Your computer took too long to join
1778	1780
1779	1781	############ Leave those lines in this order!!
1780	1782	STR_NETWORK_ERROR_CLIENT_GENERAL :general error

2287	2289	STR_ABOUT_OPENTTD :{WHITE}About OpenTTD
2288	2290	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
2289	2291	STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV}
2290		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 The OpenTTD team
	2292	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 The OpenTTD team
2291	2293
2292	2294	# Save/load game/scenario
2293	2295	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Save Game

+2

-2

src/lang/english_US.txt less more

9	9	##grflangid 0x00
10	10
11	11
12		# $Id: english_US.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: english_US.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2287	2287	STR_ABOUT_OPENTTD :{WHITE}OpenTTD
2288	2288	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
2289	2289	STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV}
2290		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 The OpenTTD team
	2290	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 The OpenTTD team
2291	2291
2292	2292	# Save/load game/scenario
2293	2293	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Save Game

+2

-2

src/lang/esperanto.txt less more

10	10	##case n
11	11
12	12
13		# $Id: esperanto.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: esperanto.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2255	2255	STR_ABOUT_OPENTTD :{WHITE}Pri OpenTTD
2256	2256	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Origina kopirajto {COPYRIGHT} 1995 Chris Sawyer, Ĉiuj rajtoj rezervitaj
2257	2257	STR_ABOUT_VERSION :{BLACK}OpenTTD-versio {REV}
2258		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 La teamo de OpenTTD
	2258	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 La teamo de OpenTTD
2259	2259
2260	2260	# Save/load game/scenario
2261	2261	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Konservu Ludon

+2

-2

src/lang/estonian.txt less more

10	10	##case g in sü
11	11
12	12
13		# $Id: estonian.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: estonian.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2343	2343	STR_ABOUT_OPENTTD :{WHITE}OpenTTD lisainfo
2344	2344	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Algne autorikaitse {COPYRIGHT} 1995 Chris Sawyer, kõik õigused kaitstud
2345	2345	STR_ABOUT_VERSION :{BLACK}OpenTTD osa {REV}
2346		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 OpenTTD meeskond
	2346	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD meeskond
2347	2347
2348	2348	# Save/load game/scenario
2349	2349	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Salvesta mäng

+2

-2

src/lang/finnish.txt less more

9	9	##grflangid 0x35
10	10
11	11
12		# $Id: finnish.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: finnish.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2287	2287	STR_ABOUT_OPENTTD :{WHITE}Tietoja OpenTTD:stä
2288	2288	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Alkuperäiset oikeudet {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pidätetään
2289	2289	STR_ABOUT_VERSION :{BLACK}OpenTTD-versio {REV}
2290		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 The OpenTTD team
	2290	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 The OpenTTD team
2291	2291
2292	2292	# Save/load game/scenario
2293	2293	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Tallenna peli

+2

-2

src/lang/french.txt less more

10	10	##gender m m2 f
11	11
12	12
13		# $Id: french.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: french.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2287	2287	STR_ABOUT_OPENTTD :{WHITE}A propos de OpenTTD
2288	2288	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Tous droits réservés
2289	2289	STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV}
2290		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 L'équipe OpenTTD
	2290	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 L'équipe OpenTTD
2291	2291
2292	2292	# Save/load game/scenario
2293	2293	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Sauvegarder la partie

+2

-2

src/lang/galician.txt less more

10	10	##gender m f n
11	11
12	12
13		# $Id: galician.txt 22257 2011-03-17 21:15:27Z rubidium $
	13	# $Id: galician.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2187	2187	STR_ABOUT_OPENTTD :{WHITE}Acerca de OpenTTD
2188	2188	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright Orixinal {COPYRIGHT} 1995 Chris Sawyer, Tódolos dereitos reservados
2189	2189	STR_ABOUT_VERSION :{BLACK}OpenTTD versión {REV}
2190		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 O Equipo de OpenTTD
	2190	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 O Equipo de OpenTTD
2191	2191
2192	2192	# Save/load game/scenario
2193	2193	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Grabar Partida

+2

-2

src/lang/german.txt less more

10	10	##gender m w n p
11	11
12	12
13		# $Id: german.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: german.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2288	2288	STR_ABOUT_OPENTTD :{WHITE}OpenTTD
2289	2289	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Ursprüngliches Urheberrecht {COPYRIGHT} 1995 Chris Sawyer, Alle Rechte vorbehalten
2290	2290	STR_ABOUT_VERSION :{BLACK}OpenTTD Version {REV}
2291		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD-Team
	2291	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD-Team
2292	2292
2293	2293	# Save/load game/scenario
2294	2294	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spiel speichern

+2

-2

src/lang/greek.txt less more

11	11	##case subs date geniki
12	12
13	13
14		# $Id: greek.txt 22936 2011-09-15 18:59:23Z rubidium $
	14	# $Id: greek.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2377	2377	STR_ABOUT_OPENTTD :{WHITE}Σχετικά με το OpenTTD
2378	2378	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Αρχικά Πνευματικά Δικαιώματα {COPYRIGHT} 1995 Chris Sawyer, Όλα τα δικαιώματα διατηρούνται
2379	2379	STR_ABOUT_VERSION :{BLACK}OpenTTD έκδοση {REV}
2380		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Η ομάδα του OpenTTD
	2380	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Η ομάδα του OpenTTD
2381	2381
2382	2382	# Save/load game/scenario
2383	2383	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Αποθήκευση Παιχνιδιού

+2

-2

src/lang/hebrew.txt less more

11	11	##case singular plural gen
12	12
13	13
14		# $Id: hebrew.txt 22841 2011-08-25 13:41:06Z rubidium $
	14	# $Id: hebrew.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2241	2241	STR_ABOUT_OPENTTD :{WHITE}OpenTTD אודות
2242	2242	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}כל הזכויות שמורות , {COPYRIGHT}1995 כריס סויר - {NBSP}זכויות יוצרים מקוריות
2243	2243	STR_ABOUT_VERSION :{BLACK}{REV} גירסה , OpenTTD
2244		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 The OpenTTD team
	2244	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 The OpenTTD team
2245	2245
2246	2246	# Save/load game/scenario
2247	2247	STR_SAVELOAD_SAVE_CAPTION :{WHITE}שמור משחק

+2

-2

src/lang/hungarian.txt less more

10	10	##case t ba
11	11
12	12
13		# $Id: hungarian.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: hungarian.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2351	2351	STR_ABOUT_OPENTTD :{WHITE}Az OpenTTD-ről
2352	2352	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Eredeti copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva
2353	2353	STR_ABOUT_VERSION :{BLACK}OpenTTD {REV} verzió
2354		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 Az OpenTTD csapat
	2354	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 Az OpenTTD csapat
2355	2355
2356	2356	# Save/load game/scenario
2357	2357	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Játék mentése

+2

-2

src/lang/icelandic.txt less more

10	10	##gender karlkyn kvenkyn hvorugkyn
11	11
12	12
13		# $Id: icelandic.txt 23054 2011-10-22 21:15:17Z rubidium $
	13	# $Id: icelandic.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2251	2251	STR_ABOUT_OPENTTD :{WHITE}Um OpenTTD
2252	2252	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Upphaflegur höfundarréttur {COPYRIGHT} 1995 Chris Sawyer, Öll réttindi áskilin
2253	2253	STR_ABOUT_VERSION :{BLACK}OpenTTD útgáfa {REV}
2254		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 OpenTTD hópurinn
	2254	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD hópurinn
2255	2255
2256	2256	# Save/load game/scenario
2257	2257	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Vista leik

+2

-2

src/lang/indonesian.txt less more

9	9	##grflangid 0x5a
10	10
11	11
12		# $Id: indonesian.txt 22654 2011-07-10 20:35:31Z rubidium $
	12	# $Id: indonesian.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2282	2282	STR_ABOUT_OPENTTD :{WHITE}Tentang OpenTTD
2283	2283	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Hak Cipta asli {COPYRIGHT} 1995 Chris Sawyer, Hak Cipta dilindungi
2284	2284	STR_ABOUT_VERSION :{BLACK}OpenTTD versi {REV}
2285		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Tim OpenTTD
	2285	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Tim OpenTTD
2286	2286
2287	2287	# Save/load game/scenario
2288	2288	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Simpan Permainan

+2

-2

src/lang/irish.txt less more

9	9	##grflangid 0x08
10	10
11	11
12		# $Id: irish.txt 22520 2011-05-29 17:55:15Z rubidium $
	12	# $Id: irish.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2279	2279	STR_ABOUT_OPENTTD :{WHITE}Maidir le OpenTTD
2280	2280	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Cóipcheart bunaidh {COPYRIGHT} 1995 Chris Sawyer, Gach ceart ar cosaint
2281	2281	STR_ABOUT_VERSION :{BLACK}OpenTTD leagan {REV}
2282		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 An fhoireann OpenTTD
	2282	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 An fhoireann OpenTTD
2283	2283
2284	2284	# Save/load game/scenario
2285	2285	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Sábháil an Cluiche

+2

-2

src/lang/italian.txt less more

11	11	##case ms mp fs fp
12	12
13	13
14		# $Id: italian.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: italian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2300	2300	STR_ABOUT_OPENTTD :{WHITE}Informazioni su OpenTTD
2301	2301	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright originale {COPYRIGHT} 1995 Chris Sawyer, Tutti i diritti riservati
2302	2302	STR_ABOUT_VERSION :{BLACK}OpenTTD versione {REV}
2303		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Il team OpenTTD
	2303	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Il team OpenTTD
2304	2304
2305	2305	# Save/load game/scenario
2306	2306	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Salva partita

+2

-2

src/lang/japanese.txt less more

9	9	##grflangid 0x39
10	10
11	11
12		# $Id: japanese.txt 23054 2011-10-22 21:15:17Z rubidium $
	12	# $Id: japanese.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2284	2284	STR_ABOUT_OPENTTD :{WHITE}OpenTTD について
2285	2285	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}オリジナル版権{COPYRIGHT} 1995 Chris Sawyer、不許複製
2286	2286	STR_ABOUT_VERSION :{BLACK}OpenTTD バージョン {REV}
2287		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 The OpenTTD team
	2287	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 The OpenTTD team
2288	2288
2289	2289	# Save/load game/scenario
2290	2290	STR_SAVELOAD_SAVE_CAPTION :{WHITE}ゲームを保存

+2

-2

src/lang/korean.txt less more

10	10	##gender m f
11	11
12	12
13		# $Id: korean.txt 23054 2011-10-22 21:15:17Z rubidium $
	13	# $Id: korean.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2286	2286	STR_ABOUT_OPENTTD :{WHITE}OpenTTD에 대해서
2287	2287	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
2288	2288	STR_ABOUT_VERSION :{BLACK}OpenTTD 버전 {REV}
2289		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD 개발팀
	2289	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD 개발팀
2290	2290
2291	2291	# Save/load game/scenario
2292	2292	STR_SAVELOAD_SAVE_CAPTION :{WHITE}게임 저장

+2

-2

src/lang/latvian.txt less more

11	11	##case kas
12	12
13	13
14		# $Id: latvian.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: latvian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2289	2289	STR_ABOUT_OPENTTD :{WHITE}Par OpenTTD
2290	2290	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Oriģināla autortiesības {COPYRIGHT} 1995 Kriss Sojers. Visas tiesības paturētas
2291	2291	STR_ABOUT_VERSION :{BLACK}OpenTTD versija {REV}
2292		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 OpenTTD grupa
	2292	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD grupa
2293	2293
2294	2294	# Save/load game/scenario
2295	2295	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Saglabāt spēli

+2

-2

src/lang/lithuanian.txt less more

11	11	##case kas ko kam ka kuo kur kreip
12	12
13	13
14		# $Id: lithuanian.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: lithuanian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2356	2356	STR_ABOUT_OPENTTD :{WHITE}Apie OpenTTD
2357	2357	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Pradinės versijos teisės priklauso {COPYRIGHT} 1995 Chris Sawyer, Visos teisės saugomos
2358	2358	STR_ABOUT_VERSION :{BLACK}OpenTTD versija {REV}
2359		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 OpenTTD komanda
	2359	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD komanda
2360	2360
2361	2361	# Save/load game/scenario
2362	2362	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Išsaugoti žaidimą

+2

-2

src/lang/luxembourgish.txt less more

9	9	##grflangid 0x23
10	10
11	11
12		# $Id: luxembourgish.txt 22936 2011-09-15 18:59:23Z rubidium $
	12	# $Id: luxembourgish.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2285	2285	STR_ABOUT_OPENTTD :{WHITE}Iwwert OpenTTD
2286	2286	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original Copyright {COPYRIGHT} 1995 Chris Sawyer, All Rechter virbehalen
2287	2287	STR_ABOUT_VERSION :{BLACK}OpenTTD Versioun {REV}
2288		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 D'OpenTTD team
	2288	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 D'OpenTTD team
2289	2289
2290	2290	# Save/load game/scenario
2291	2291	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spill späicheren

+2

-2

src/lang/malay.txt less more

9	9	##grflangid 0x3c
10	10
11	11
12		# $Id: malay.txt 23054 2011-10-22 21:15:17Z rubidium $
	12	# $Id: malay.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2249	2249	STR_ABOUT_OPENTTD :{WHITE}Tentang OpenTTD
2250	2250	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Hakcipta asal {COPYRIGHT} 1995 Chris Sawyer, Hakcipta terpelihara
2251	2251	STR_ABOUT_VERSION :{BLACK}OpenTTD versi {REV}
2252		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 The OpenTTD team
	2252	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 The OpenTTD team
2253	2253
2254	2254	# Save/load game/scenario
2255	2255	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Simpankan Permainan

+2

-2

src/lang/norwegian_bokmal.txt less more

11	11	##case small
12	12
13	13
14		# $Id: norwegian_bokmal.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: norwegian_bokmal.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2284	2284	STR_ABOUT_OPENTTD :{WHITE}Om OpenTTD
2285	2285	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Opprinnelig opphavsbeskyttet {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheter reservert
2286	2286	STR_ABOUT_VERSION :{BLACK}OpenTTD versjon {REV}. Oversatt til norsk av Thor Morten Skogrand med flere.
2287		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 OpenTTD-teamet
	2287	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD-teamet
2288	2288
2289	2289	# Save/load game/scenario
2290	2290	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Lagre spill

+2

-2

src/lang/norwegian_nynorsk.txt less more

11	11	##case small
12	12
13	13
14		# $Id: norwegian_nynorsk.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: norwegian_nynorsk.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2275	2275	STR_ABOUT_OPENTTD :{WHITE}Om OpenTTD
2276	2276	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Opphaveleg opphavsbeskytta av {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheiter reservert
2277	2277	STR_ABOUT_VERSION :{BLACK}OpenTTD versjon {REV}. Oversett til nynorsk av Thor Morten Skogrand med fleire.
2278		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD-teamet
	2278	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD-teamet
2279	2279
2280	2280	# Save/load game/scenario
2281	2281	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Lagre spel

+2

-2

src/lang/polish.txt less more

11	11	##case d c b n m w
12	12
13	13
14		# $Id: polish.txt 22936 2011-09-15 18:59:23Z rubidium $
	14	# $Id: polish.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2665	2665	STR_ABOUT_OPENTTD :{WHITE}OpenTTD
2666	2666	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Prawa Autorskie {COPYRIGHT} 1995 Chris Sawyer, Wszelkie prawa zastrzeżone
2667	2667	STR_ABOUT_VERSION :{BLACK}OpenTTD wersja {REV}
2668		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 Zespół OpenTTD
	2668	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 Zespół OpenTTD
2669	2669
2670	2670	# Save/load game/scenario
2671	2671	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Zapisz grę

+2

-2

src/lang/portuguese.txt less more

10	10	##gender n m f mp fp
11	11
12	12
13		# $Id: portuguese.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: portuguese.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2287	2287	STR_ABOUT_OPENTTD :{WHITE}Sobre o OpenTTD...
2288	2288	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Direitos de autor originais {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
2289	2289	STR_ABOUT_VERSION :{BLACK}OpenTTD versão {REV}
2290		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 A equipa do OpenTTD
	2290	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 A equipa do OpenTTD
2291	2291
2292	2292	# Save/load game/scenario
2293	2293	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Guardar Jogo

+2

-2

src/lang/romanian.txt less more

9	9	##grflangid 0x28
10	10
11	11
12		# $Id: romanian.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: romanian.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2286	2286	STR_ABOUT_OPENTTD :{WHITE}Despre OpenTTD
2287	2287	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Toate drepturile rezervate
2288	2288	STR_ABOUT_VERSION :{BLACK}OpenTTD versiunea {REV}
2289		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Echipa OpenTTD
	2289	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Echipa OpenTTD
2290	2290
2291	2291	# Save/load game/scenario
2292	2292	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Salvează joc

+2

-2

src/lang/russian.txt less more

11	11	##case m f n p nom gen dat acc abl pre
12	12
13	13
14		# $Id: russian.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: russian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2461	2461	STR_ABOUT_OPENTTD :{WHITE}Об OpenTTD
2462	2462	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Оригинальные авторские права {COPYRIGHT} 1995 Chris Sawyer. Все права защищены.
2463	2463	STR_ABOUT_VERSION :{BLACK}OpenTTD версия {REV}
2464		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Команда разработчиков OpenTTD
	2464	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Команда разработчиков OpenTTD
2465	2465
2466	2466	# Save/load game/scenario
2467	2467	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Сохранить игру

+2

-2

src/lang/serbian.txt less more

11	11	##case nom big gen dat aku vok lok ins
12	12
13	13
14		# $Id: serbian.txt 23258 2011-11-18 21:17:11Z rubidium $
	14	# $Id: serbian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2481	2481	STR_ABOUT_OPENTTD :{WHITE}O OpenTTD-u
2482	2482	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Originalni kopirajt {COPYRIGHT} 1995 Chris Sawyer, Sva prava zadržana
2483	2483	STR_ABOUT_VERSION :{BLACK}OpenTTD verzija {REV}
2484		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD tim
	2484	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD tim
2485	2485
2486	2486	# Save/load game/scenario
2487	2487	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Sačuvaj poziciju

+2

-2

src/lang/simplified_chinese.txt less more

9	9	##grflangid 0x56
10	10
11	11
12		# $Id: simplified_chinese.txt 23054 2011-10-22 21:15:17Z rubidium $
	12	# $Id: simplified_chinese.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2283	2283	STR_ABOUT_OPENTTD :{WHITE}关于 OpenTTD
2284	2284	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}原始版权由 {COPYRIGHT} 1995 Chris Sawyer 所有，保留一切权力。
2285	2285	STR_ABOUT_VERSION :{BLACK}OpenTTD 版本 {REV}
2286		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 OpenTTD 团队
	2286	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD 团队
2287	2287
2288	2288	# Save/load game/scenario
2289	2289	STR_SAVELOAD_SAVE_CAPTION :{WHITE}保存游戏

+2

-2

src/lang/slovak.txt less more

11	11	##case g
12	12
13	13
14		# $Id: slovak.txt 23054 2011-10-22 21:15:17Z rubidium $
	14	# $Id: slovak.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2353	2353	STR_ABOUT_OPENTTD :{WHITE}OpenTTD
2354	2354	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Pôvodný copyright: {COPYRIGHT} 1995 Chris Sawyer, všetky práva vyhradené
2355	2355	STR_ABOUT_VERSION :{BLACK}OpenTTD verzia {REV}
2356		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 team OpenTTD
	2356	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 team OpenTTD
2357	2357
2358	2358	# Save/load game/scenario
2359	2359	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Uložiť hru

+2

-2

src/lang/slovenian.txt less more

10	10	##case r d t
11	11
12	12
13		# $Id: slovenian.txt 22936 2011-09-15 18:59:23Z rubidium $
	13	# $Id: slovenian.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2438	2438	STR_ABOUT_OPENTTD :{WHITE}O OpenTTD
2439	2439	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Prvotne avtorske pravice {COPYRIGHT} 1995 Chris Sawyer, vse pravice pridržane
2440	2440	STR_ABOUT_VERSION :{BLACK}OpenTTD različica {REV}
2441		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 ekipa OpenTTD
	2441	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 ekipa OpenTTD
2442	2442
2443	2443	# Save/load game/scenario
2444	2444	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Shrani igro

+2

-2

src/lang/spanish.txt less more

10	10	##gender m f
11	11
12	12
13		# $Id: spanish.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: spanish.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2288	2288	STR_ABOUT_OPENTTD :{WHITE}Acerca de OpenTTD
2289	2289	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados
2290	2290	STR_ABOUT_VERSION :{BLACK}OpenTTD versión {REV}
2291		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 El equipo OpenTTD
	2291	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 El equipo OpenTTD
2292	2292
2293	2293	# Save/load game/scenario
2294	2294	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Guardar Juego

+2

-2

src/lang/swedish.txt less more

9	9	##grflangid 0x2e
10	10
11	11
12		# $Id: swedish.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: swedish.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2286	2286	STR_ABOUT_OPENTTD :{WHITE}OpenTTD
2287	2287	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Ursprunglig äganderätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter reserverade
2288	2288	STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV}
2289		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD-teamet
	2289	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD-teamet
2290	2290
2291	2291	# Save/load game/scenario
2292	2292	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spara spel

+2

-2

src/lang/traditional_chinese.txt less more

9	9	##grflangid 0x0c
10	10
11	11
12		# $Id: traditional_chinese.txt 23054 2011-10-22 21:15:17Z rubidium $
	12	# $Id: traditional_chinese.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2284	2284	STR_ABOUT_OPENTTD :{WHITE}關於 OpenTTD
2285	2285	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}原著作權為 {COPYRIGHT} 1995 Chris Sawyer，保留所有權利
2286	2286	STR_ABOUT_VERSION :{BLACK}OpenTTD 版本 {REV}
2287		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD 開發小組
	2287	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD 開發小組
2288	2288
2289	2289	# Save/load game/scenario
2290	2290	STR_SAVELOAD_SAVE_CAPTION :{WHITE}儲存遊戲

+2

-2

src/lang/turkish.txt less more

10	10	##case tamlanan
11	11
12	12
13		# $Id: turkish.txt 23258 2011-11-18 21:17:11Z rubidium $
	13	# $Id: turkish.txt 23796 2012-01-13 22:05:04Z rubidium $
14	14
15	15	# This file is part of OpenTTD.
16	16	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2285	2285	STR_ABOUT_OPENTTD :{WHITE}OpenTTD Hakkında
2286	2286	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Telif hakkı {COPYRIGHT} 1995 Chris Sawyer, Her hakkı saklıdır
2287	2287	STR_ABOUT_VERSION :{BLACK}OpenTTD {REV} versiyonu
2288		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 OpenTTD ekibi
	2288	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 OpenTTD ekibi
2289	2289
2290	2290	# Save/load game/scenario
2291	2291	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Oyunu Kaydet

+2

-2

src/lang/ukrainian.txt less more

11	11	##case r d z
12	12
13	13
14		# $Id: ukrainian.txt 22704 2011-07-30 17:55:23Z rubidium $
	14	# $Id: ukrainian.txt 23796 2012-01-13 22:05:04Z rubidium $
15	15
16	16	# This file is part of OpenTTD.
17	17	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2408	2408	STR_ABOUT_OPENTTD :{WHITE}Про OpenTTD
2409	2409	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Авторське право {COPYRIGHT} 1995 Кріс Сойєр, Всі права захищені
2410	2410	STR_ABOUT_VERSION :{BLACK}OpenTTD версія {REV}
2411		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 команда OpenTTD
	2411	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 команда OpenTTD
2412	2412
2413	2413	# Save/load game/scenario
2414	2414	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Зберегти гру

+2

-2

src/lang/unfinished/frisian.txt less more

9	9	##grflangid 0x32
10	10
11	11
12		# $Id: frisian.txt 21965 2011-02-04 18:47:33Z translators $
	12	# $Id: frisian.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

1549	1549	STR_ABOUT_OPENTTD :{WHITE}Oer OpenTTD
1550	1550	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Orizjineel copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
1551	1551	STR_ABOUT_VERSION :{BLACK}OpenTTD-ferzje {REV}
1552		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 It OpenTTD team
	1552	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 It OpenTTD team
1553	1553
1554	1554	# Save/load game/scenario
1555	1555	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Spul Opslaan

+2

-2

src/lang/unfinished/ido.txt less more

9	9	##grflangid 0x06
10	10
11	11
12		# $Id: ido.txt 21965 2011-02-04 18:47:33Z translators $
	12	# $Id: ido.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

738	738
739	739	# About OpenTTD window
740	740	STR_ABOUT_VERSION :{BLACK}OpenTTD versiono {REV}
741		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 La kruo OpenTTD
	741	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 La kruo OpenTTD
742	742
743	743	# Save/load game/scenario
744	744	STR_SAVELOAD_DETAIL_CAPTION :{BLACK}Ludo Detali

+2

-2

src/lang/unfinished/macedonian.txt less more

9	9	##grflangid 0x26
10	10
11	11
12		# $Id: macedonian.txt 21965 2011-02-04 18:47:33Z translators $
	12	# $Id: macedonian.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

932	932	STR_ABOUT_OPENTTD :{WHITE}За OpenTTD
933	933	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Оригинален copyright {COPYRIGHT} 1995 Chris Sawyer, Сите права се задржани
934	934	STR_ABOUT_VERSION :{BLACK}OpenTTD верзија {REV}
935		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 OpenTTD тимот
	935	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 OpenTTD тимот
936	936
937	937	# Save/load game/scenario
938	938	STR_SAVELOAD_LOAD_BUTTON :{BLACK}Оптоварување

+2

-2

src/lang/unfinished/persian.txt less more

9	9	##grflangid 0x62
10	10
11	11
12		# $Id: persian.txt 21965 2011-02-04 18:47:33Z translators $
	12	# $Id: persian.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

1076	1076	STR_ABOUT_OPENTTD :{WHITE}OpenTTD در باره ی
1077	1077	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
1078	1078	STR_ABOUT_VERSION :{BLACK}OpenTTD version {REV}
1079		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 The OpenTTD team
	1079	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 The OpenTTD team
1080	1080
1081	1081	# Save/load game/scenario
1082	1082	STR_SAVELOAD_SAVE_CAPTION :{WHITE}ذخیره ی بازی

+2

-2

src/lang/unfinished/thai.txt less more

9	9	##grflangid 0x42
10	10
11	11
12		# $Id: thai.txt 22257 2011-03-17 21:15:27Z rubidium $
	12	# $Id: thai.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2066	2066	STR_ABOUT_OPENTTD :{WHITE}เกี่ยวกับ OpenTTD
2067	2067	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}ลิขสิทธิ์เดิม {COPYRIGHT} ค.ศ.1995 ของ Chris Sawyer, สงวนลิขสิทธิ์
2068	2068	STR_ABOUT_VERSION :{BLACK}OpenTTD รุ่นที่ {REV}
2069		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}ลิขสิทธิ์ OpenTTD {COPYRIGHT}2002-2011 ของ The OpenTTD team
	2069	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}ลิขสิทธิ์ OpenTTD {COPYRIGHT}2002-2012 ของ The OpenTTD team
2070	2070
2071	2071	# Save/load game/scenario
2072	2072	STR_SAVELOAD_SAVE_CAPTION :{WHITE}บันทึกเกม

+2

-2

src/lang/vietnamese.txt less more

9	9	##grflangid 0x54
10	10
11	11
12		# $Id: vietnamese.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: vietnamese.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2286	2286	STR_ABOUT_OPENTTD :{WHITE}OpenTTD
2287	2287	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Nguyên tác bản quyền {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
2288	2288	STR_ABOUT_VERSION :{BLACK}OpenTTD phiên bản {REV}
2289		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2011 Nhóm OpenTTD
	2289	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT} 2002-2012 Nhóm OpenTTD
2290	2290
2291	2291	# Save/load game/scenario
2292	2292	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Lưu Ván Chơi

+2

-2

src/lang/welsh.txt less more

9	9	##grflangid 0x0f
10	10
11	11
12		# $Id: welsh.txt 23258 2011-11-18 21:17:11Z rubidium $
	12	# $Id: welsh.txt 23796 2012-01-13 22:05:04Z rubidium $
13	13
14	14	# This file is part of OpenTTD.
15	15	# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

2279	2279	STR_ABOUT_OPENTTD :{WHITE}Gwybodaeth am OpenTTD
2280	2280	STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}Hawlfraint Wreiddiol {COPYRIGHT} 1995 Chris Sawyer, Holl cedwir pob hawl
2281	2281	STR_ABOUT_VERSION :{BLACK}fersiwn OpenTTD {REV}
2282		STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2011 Y tîm OpenTTD
	2282	STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2012 Y tîm OpenTTD
2283	2283
2284	2284	# Save/load game/scenario
2285	2285	STR_SAVELOAD_SAVE_CAPTION :{WHITE}Cadw Gêm

+8

-10

src/network/network.cpp less more

0		/* $Id: network.cpp 22935 2011-09-15 18:56:43Z rubidium $ */
	0	/* $Id: network.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

818	818	}
819	819	}
820	820
821		/* We have to do some UDP checking */
822		void NetworkUDPGameLoop()
	821	/**
	822	* We have to do some (simple) background stuff that runs normally,
	823	* even when we are not in multiplayer. For example stuff needed
	824	* for finding servers or downloading content.
	825	*/
	826	void NetworkBackgroundLoop()
823	827	{
824	828	_network_content_client.SendReceive();
825	829	TCPConnecter::CheckCallbacks();
826	830	NetworkHTTPSocketHandler::HTTPReceive();
827	831
828		if (_network_udp_server) {
829		_udp_server_socket->ReceivePackets();
830		_udp_master_socket->ReceivePackets();
831		} else {
832		_udp_client_socket->ReceivePackets();
833		if (_network_udp_broadcast > 0) _network_udp_broadcast--;
834		}
	832	NetworkBackgroundUDPLoop();
835	833	}
836	834
837	835	/* The main loop called from ttd.c

+7

-1

src/network/network_client.cpp less more

0		/* $Id: network_client.cpp 22461 2011-05-15 09:38:54Z rubidium $ */
	0	/* $Id: network_client.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

632	632	case NETWORK_ERROR_TOO_MANY_COMMANDS:
633	633	_switch_mode_errorstr = STR_NETWORK_ERROR_TOO_MANY_COMMANDS;
634	634	break;
	635	case NETWORK_ERROR_TIMEOUT_PASSWORD:
	636	ShowErrorMessage(STR_NETWORK_ERROR_TIMEOUT_PASSWORD, INVALID_STRING_ID, WL_CRITICAL);
	637	break;
	638	case NETWORK_ERROR_TIMEOUT_COMPUTER:
	639	ShowErrorMessage(STR_NETWORK_ERROR_TIMEOUT_COMPUTER, INVALID_STRING_ID, WL_CRITICAL);
	640	break;
635	641	default:
636	642	_switch_mode_errorstr = STR_NETWORK_ERROR_LOSTCONNECTION;
637	643	}

+2

-2

src/network/network_func.h less more

0		/* $Id: network_func.h 22838 2011-08-25 13:24:32Z rubidium $ */
	0	/* $Id: network_func.h 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

39	39	void NetworkReboot();
40	40	void NetworkDisconnect(bool blocking = false, bool close_admins = true);
41	41	void NetworkGameLoop();
42		void NetworkUDPGameLoop();
	42	void NetworkBackgroundLoop();
43	43	void ParseConnectionString(const char company, const char port, char *connection_string);
44	44	void NetworkStartDebugLog(NetworkAddress address);
45	45	void NetworkPopulateCompanyStats(NetworkCompanyStats *stats);

+86

-47

src/network/network_server.cpp less more

0		/* $Id: network_server.cpp 23403 2011-12-03 21:31:44Z rubidium $ */
	0	/* $Id: network_server.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

1716	1716	_settings_client.network.bytes_per_frame_burst);
1717	1717
1718	1718	/* Check if the speed of the client is what we can expect from a client */
1719		if (cs->status == NetworkClientSocket::STATUS_ACTIVE) {
1720		/* 1 lag-point per day */
1721		uint lag = NetworkCalculateLag(cs) / DAY_TICKS;
1722		if (lag > 0) {
1723		if (lag > 3) {
1724		/* Client did still not report in after 4 game-day, drop him
1725		* (that is, the 3 of above, + 1 before any lag is counted) */
1726		IConsolePrintF(CC_ERROR, cs->last_packet + 3 * DAY_TICKS * MILLISECONDS_PER_TICK > _realtime_tick ?
1727		/* A packet was received in the last three game days, so the client is likely lagging behind. */
1728		"Client #%d is dropped because the client's game state is more than 4 game-days behind" :
1729		/* No packet was received in the last three game days; sounds like a lost connection. */
1730		"Client #%d is dropped because the client did not respond for more than 4 game-days",
1731		cs->client_id);
1732		cs->CloseConnection(NETWORK_RECV_STATUS_SERVER_ERROR);
	1719	uint lag = NetworkCalculateLag(cs);
	1720	switch (cs->status) {
	1721	case NetworkClientSocket::STATUS_ACTIVE:
	1722	/* 1 lag-point per day */
	1723	lag /= DAY_TICKS;
	1724	if (lag > 0) {
	1725	if (lag > 3) {
	1726	/* Client did still not report in after 4 game-day, drop him
	1727	* (that is, the 3 of above, + 1 before any lag is counted) */
	1728	IConsolePrintF(CC_ERROR, cs->last_packet + 3 * DAY_TICKS * MILLISECONDS_PER_TICK > _realtime_tick ?
	1729	/* A packet was received in the last three game days, so the client is likely lagging behind. */
	1730	"Client #%d is dropped because the client's game state is more than 4 game-days behind" :
	1731	/* No packet was received in the last three game days; sounds like a lost connection. */
	1732	"Client #%d is dropped because the client did not respond for more than 4 game-days",
	1733	cs->client_id);
	1734	cs->SendError(NETWORK_ERROR_TIMEOUT_COMPUTER);
	1735	continue;
	1736	}
	1737
	1738	/* Report once per time we detect the lag, and only when we
	1739	* received a packet in the last 2000 milliseconds. If we
	1740	* did not receive a packet, then the client is not just
	1741	* slow, but the connection is likely severed. Mentioning
	1742	* frame_freq is not useful in this case. */
	1743	if (cs->lag_test == 0 && cs->last_packet + DAY_TICKS * MILLISECONDS_PER_TICK > _realtime_tick) {
	1744	IConsolePrintF(CC_WARNING,"[%d] Client #%d is slow, try increasing [network.]frame_freq to a higher value!", _frame_counter, cs->client_id);
	1745	cs->lag_test = 1;
	1746	}
	1747	} else {
	1748	cs->lag_test = 0;
	1749	}
	1750	if (cs->last_frame_server - cs->last_token_frame >= 5 * DAY_TICKS) {
	1751	/* This is a bad client! It didn't send the right token back. */
	1752	IConsolePrintF(CC_ERROR, "Client #%d is dropped because it fails to send valid acks", cs->client_id);
	1753	cs->SendError(NETWORK_ERROR_TIMEOUT_COMPUTER);
1733	1754	continue;
1734	1755	}
1735
1736		/* Report once per time we detect the lag, and only when we
1737		* received a packet in the last 2000 milliseconds. If we
1738		* did not receive a packet, then the client is not just
1739		* slow, but the connection is likely severed. Mentioning
1740		* frame_freq is not useful in this case. */
1741		if (cs->lag_test == 0 && cs->last_packet + DAY_TICKS * MILLISECONDS_PER_TICK > _realtime_tick) {
1742		IConsolePrintF(CC_WARNING,"[%d] Client #%d is slow, try increasing [network.]frame_freq to a higher value!", _frame_counter, cs->client_id);
1743		cs->lag_test = 1;
	1756	break;
	1757
	1758	case NetworkClientSocket::STATUS_INACTIVE:
	1759	case NetworkClientSocket::STATUS_NEWGRFS_CHECK:
	1760	case NetworkClientSocket::STATUS_AUTHORIZED:
	1761	/* NewGRF check and authorized states should be handled almost instantly.
	1762	* So give them some lee-way, likewise for the query with inactive. */
	1763	if (lag > 4 * DAY_TICKS) {
	1764	IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks to start the joining process", cs->client_id, 4 * DAY_TICKS);
	1765	cs->SendError(NETWORK_ERROR_TIMEOUT_COMPUTER);
	1766	continue;
1744	1767	}
1745		} else {
1746		cs->lag_test = 0;
1747		}
1748		if (cs->last_frame_server - cs->last_token_frame >= 5 * DAY_TICKS) {
1749		/* This is a bad client! It didn't send the right token back. */
1750		IConsolePrintF(CC_ERROR, "Client #%d is dropped because it fails to send valid acks", cs->client_id);
1751		cs->CloseConnection(NETWORK_RECV_STATUS_SERVER_ERROR);
1752		continue;
1753		}
1754		} else if (cs->status == NetworkClientSocket::STATUS_PRE_ACTIVE) {
1755		uint lag = NetworkCalculateLag(cs);
1756		if (lag > _settings_client.network.max_join_time) {
1757		IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->client_id, _settings_client.network.max_join_time);
1758		cs->CloseConnection(NETWORK_RECV_STATUS_SERVER_ERROR);
1759		continue;
1760		}
1761		} else if (cs->status == NetworkClientSocket::STATUS_INACTIVE) {
1762		uint lag = NetworkCalculateLag(cs);
1763		if (lag > 4 * DAY_TICKS) {
1764		IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks to start the joining process", cs->client_id, 4 * DAY_TICKS);
1765		cs->CloseConnection(NETWORK_RECV_STATUS_SERVER_ERROR);
1766		continue;
1767		}
	1768	break;
	1769
	1770	case NetworkClientSocket::STATUS_MAP:
	1771	/* Downloading the map... this is the amount of time since starting the saving. */
	1772	if (lag > _settings_client.network.max_download_time) {
	1773	IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks for him to download the map", cs->client_id, _settings_client.network.max_download_time);
	1774	cs->SendError(NETWORK_ERROR_TIMEOUT_COMPUTER);
	1775	continue;
	1776	}
	1777	break;
	1778
	1779	case NetworkClientSocket::STATUS_DONE_MAP:
	1780	case NetworkClientSocket::STATUS_PRE_ACTIVE:
	1781	/* The map has been sent, so this is for loading the map and syncing up. */
	1782	if (lag > _settings_client.network.max_join_time) {
	1783	IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->client_id, _settings_client.network.max_join_time);
	1784	cs->SendError(NETWORK_ERROR_TIMEOUT_COMPUTER);
	1785	continue;
	1786	}
	1787	break;
	1788
	1789	case NetworkClientSocket::STATUS_AUTH_GAME:
	1790	case NetworkClientSocket::STATUS_AUTH_COMPANY:
	1791	/* These don't block? */
	1792	if (lag > _settings_client.network.max_password_time) {
	1793	IConsolePrintF(CC_ERROR,"Client #%d is dropped because it took longer than %d to enter the password", cs->client_id, _settings_client.network.max_password_time);
	1794	cs->SendError(NETWORK_ERROR_TIMEOUT_PASSWORD);
	1795	continue;
	1796	}
	1797	break;
	1798
	1799	case NetworkClientSocket::STATUS_MAP_WAIT:
	1800	/* This is an internal state where we do not wait
	1801	* on the client to move to a different state. */
	1802	break;
	1803
	1804	case NetworkClientSocket::STATUS_END:
	1805	/* Bad server/code. */
	1806	NOT_REACHED();
1768	1807	}
1769	1808
1770	1809	if (cs->status >= NetworkClientSocket::STATUS_PRE_ACTIVE) {

+3

-1

src/network/network_type.h less more

0		/* $Id: network_type.h 20963 2010-10-17 17:31:03Z rubidium $ */
	0	/* $Id: network_type.h 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

118	118	NETWORK_ERROR_CHEATER,
119	119	NETWORK_ERROR_FULL,
120	120	NETWORK_ERROR_TOO_MANY_COMMANDS,
	121	NETWORK_ERROR_TIMEOUT_PASSWORD,
	122	NETWORK_ERROR_TIMEOUT_COMPUTER,
121	123	};
122	124
123	125	#endif /* ENABLE_NETWORK */

+17

-1

src/network/network_udp.cpp less more

0		/* $Id: network_udp.cpp 22701 2011-07-30 17:45:37Z rubidium $ */
	0	/* $Id: network_udp.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

636	636	DEBUG(net, 1, "[udp] closed listeners");
637	637	}
638	638
	639	/** Receive the UDP packets. */
	640	void NetworkBackgroundUDPLoop()
	641	{
	642	_network_udp_mutex->BeginCritical();
	643
	644	if (_network_udp_server) {
	645	_udp_server_socket->ReceivePackets();
	646	_udp_master_socket->ReceivePackets();
	647	} else {
	648	_udp_client_socket->ReceivePackets();
	649	if (_network_udp_broadcast > 0) _network_udp_broadcast--;
	650	}
	651
	652	_network_udp_mutex->EndCritical();
	653	}
	654
639	655	#endif /* ENABLE_NETWORK */

+2

-1

src/network/network_udp.h less more

0		/* $Id: network_udp.h 18809 2010-01-15 16:41:15Z rubidium $ */
	0	/* $Id: network_udp.h 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

22	22	void NetworkUDPAdvertise();
23	23	void NetworkUDPRemoveAdvertise(bool blocking);
24	24	void NetworkUDPClose();
	25	void NetworkBackgroundUDPLoop();
25	26
26	27	#endif /* ENABLE_NETWORK */
27	28

+3

-3

src/newgrf_industries.cpp less more

0		/* $Id: newgrf_industries.cpp 22654 2011-07-10 20:35:31Z rubidium $ */
	0	/* $Id: newgrf_industries.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

241	241	/* Get random tile bits at offset param */
242	242	case 0x61:
243	243	tile = GetNearbyTile(parameter, tile, false);
244		return (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile) == industry) ? GetIndustryRandomBits(tile) : 0;
	244	return industry->TileBelongsToIndustry(tile) ? GetIndustryRandomBits(tile) : 0;
245	245
246	246	/* Land info of nearby tiles */
247	247	case 0x62: return GetNearbyIndustryTileInformation(parameter, tile, INVALID_INDUSTRY, false);

249	249	/* Animation stage of nearby tiles */
250	250	case 0x63:
251	251	tile = GetNearbyTile(parameter, tile, false);
252		if (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile) == industry) {
	252	if (industry->TileBelongsToIndustry(tile)) {
253	253	return GetAnimationFrame(tile);
254	254	}
255	255	return 0xFFFFFFFF;

+3

-3

src/newgrf_industrytiles.cpp less more

0		/* $Id: newgrf_industrytiles.cpp 22838 2011-08-25 13:24:32Z rubidium $ */
	0	/* $Id: newgrf_industrytiles.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

330	330	bool ret = true;
331	331	uint32 random = Random();
332	332	TILE_AREA_LOOP(tile, ind->location) {
333		if (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == ind->index) {
	333	if (ind->TileBelongsToIndustry(tile)) {
334	334	if (StartStopIndustryTileAnimation(tile, iat, random)) {
335	335	SB(random, 0, 16, Random());
336	336	} else {

414	414	{
415	415	uint32 reseed_industry = 0;
416	416	TILE_AREA_LOOP(tile, ind->location) {
417		if (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == ind->index) {
	417	if (ind->TileBelongsToIndustry(tile)) {
418	418	DoTriggerIndustryTile(tile, trigger, ind, reseed_industry);
419	419	}
420	420	}

+5

-1

src/object_cmd.cpp less more

0		/* $Id: object_cmd.cpp 23051 2011-10-22 20:45:19Z rubidium $ */
	0	/* $Id: object_cmd.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

33	33	#include "newgrf_object.h"
34	34	#include "date_func.h"
35	35	#include "newgrf_debug.h"
	36	#include "vehicle_func.h"
36	37
37	38	#include "table/strings.h"
38	39	#include "table/object_land.h"

220	221	/* Can't build on water owned by another company. */
221	222	Owner o = GetTileOwner(t);
222	223	if (o != OWNER_NONE && o != OWNER_WATER) cost.AddCost(CheckOwnership(o, t));
	224
	225	/* However, the tile has to be clear of vehicles. */
	226	cost.AddCost(EnsureNoVehicleOnGround(t));
223	227	}
224	228	} else {
225	229	if (!allow_ground) return_cmd_error(STR_ERROR_MUST_BE_BUILT_ON_WATER);

+2

-2

src/openttd.cpp less more

0		/* $Id: openttd.cpp 22886 2011-09-03 18:56:34Z frosch $ */
	0	/* $Id: openttd.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

1267	1267
1268	1268	#ifdef ENABLE_NETWORK
1269	1269	/* Check for UDP stuff */
1270		if (_network_available) NetworkUDPGameLoop();
	1270	if (_network_available) NetworkBackgroundLoop();
1271	1271
1272	1272	if (_networking && !IsGeneratingWorld()) {
1273	1273	/* Multiplayer */

+24

-1

src/order_backup.cpp less more

0		/* $Id: order_backup.cpp 23257 2011-11-18 21:15:09Z rubidium $ */
	0	/* $Id: order_backup.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

16	16	#include "order_backup.h"
17	17	#include "vehicle_base.h"
18	18	#include "window_func.h"
	19	#include "station_map.h"
19	20
20	21	OrderBackupPool _order_backup_pool("BackupOrder");
21	22	INSTANTIATE_POOL_METHODS(OrderBackup)

261	262	{
262	263	_order_backup_pool.CleanPool();
263	264	}
	265
	266	/**
	267	* Removes an order from all vehicles. Triggers when, say, a station is removed.
	268	* @param type The type of the order (OT_GOTO_[STATION\|DEPOT\|WAYPOINT]).
	269	* @param destination The destination. Can be a StationID, DepotID or WaypointID.
	270	*/
	271	/* static */ void OrderBackup::RemoveOrder(OrderType type, DestinationID destination)
	272	{
	273	OrderBackup *ob;
	274	FOR_ALL_ORDER_BACKUPS(ob) {
	275	for (Order *order = ob->orders; order != NULL; order = order->next) {
	276	OrderType ot = order->GetType();
	277	if (ot == OT_GOTO_DEPOT && (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) != 0) continue;
	278	if (ot == OT_IMPLICIT \|\| (IsHangarTile(ob->tile) && ot == OT_GOTO_DEPOT)) ot = OT_GOTO_STATION;
	279	if (ot == type && order->GetDestination() == destination) {
	280	/* Remove the order backup! If a station/depot gets removed, we can't/shouldn't restore those broken orders. */
	281	delete ob;
	282	break;
	283	}
	284	}
	285	}
	286	}

+2

-1

src/order_backup.h less more

0		/* $Id: order_backup.h 21846 2011-01-18 23:09:43Z rubidium $ */
	0	/* $Id: order_backup.h 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

66	66
67	67	static void ClearGroup(GroupID group);
68	68	static void ClearVehicle(const Vehicle *v);
	69	static void RemoveOrder(OrderType type, DestinationID destination);
69	70	};
70	71
71	72	#define FOR_ALL_ORDER_BACKUPS_FROM(var, start) FOR_ALL_ITEMS_FROM(OrderBackup, order_backup_index, var, start)

+4

-1

src/order_cmd.cpp less more

0		/* $Id: order_cmd.cpp 23257 2011-11-18 21:15:09Z rubidium $ */
	0	/* $Id: order_cmd.cpp 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

26	26	#include "station_base.h"
27	27	#include "waypoint_base.h"
28	28	#include "company_base.h"
	29	#include "order_backup.h"
29	30
30	31	#include "table/strings.h"
31	32

1698	1699	}
1699	1700	}
1700	1701	}
	1702
	1703	OrderBackup::RemoveOrder(type, destination);
1701	1704	}
1702	1705
1703	1706	/**

+4

-4

src/os/windows/ottdres.rc.in less more

0	0	//Microsoft Developer Studio generated resource script.
1		// $Id: ottdres.rc.in 23435 2011-12-04 19:40:14Z rubidium $
	1	// $Id: ottdres.rc.in 23798 2012-01-14 14:03:10Z rubidium $
2	2	//
3	3	// This file is part of OpenTTD.
4	4	// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.

78	78	//
79	79
80	80	VS_VERSION_INFO VERSIONINFO
81		FILEVERSION 1,1,4,!!REVISION!!
82		PRODUCTVERSION 1,1,4,!!REVISION!!
	81	FILEVERSION 1,1,5,!!REVISION!!
	82	PRODUCTVERSION 1,1,5,!!REVISION!!
83	83	FILEFLAGSMASK 0x3fL
84	84	#ifdef _DEBUG
85	85	FILEFLAGS 0x1L

99	99	VALUE "FileDescription", "OpenTTD\0"
100	100	VALUE "FileVersion", "!!VERSION!!\0"
101	101	VALUE "InternalName", "openttd\0"
102		VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2011. All Rights Reserved.\0"
	102	VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2012. All Rights Reserved.\0"
103	103	VALUE "LegalTrademarks", "\0"
104	104	VALUE "OriginalFilename", "openttd.exe\0"
105	105	VALUE "PrivateBuild", "\0"

+2

-2

src/rev.cpp.in less more

0		/* $Id: rev.cpp.in 23435 2011-12-04 19:40:14Z rubidium $ */
	0	/* $Id: rev.cpp.in 23798 2012-01-14 14:03:10Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

59	59	* final release will always have a lower version number than the released
60	60	* version, thus making comparisions on specific revisions easy.
61	61	*/
62		const uint32 _openttd_newgrf_version = 1 << 28 \| 1 << 24 \| 4 << 20 \| 1 << 19 \| (!!REVISION!! & ((1 << 19) - 1));
	62	const uint32 _openttd_newgrf_version = 1 << 28 \| 1 << 24 \| 5 << 20 \| 1 << 19 \| (!!REVISION!! & ((1 << 19) - 1));
63	63
64	64	#ifdef __MORPHOS__
65	65	/**

+3

-1

src/settings_type.h less more

0		/* $Id: settings_type.h 22652 2011-07-10 20:25:59Z rubidium $ */
	0	/* $Id: settings_type.h 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

154	154	uint16 bytes_per_frame; ///< how many bytes may, over a long period, be received per frame?
155	155	uint16 bytes_per_frame_burst; ///< how many bytes may, over a short period, be received?
156	156	uint16 max_join_time; ///< maximum amount of time, in game ticks, a client may take to join
	157	uint16 max_download_time; ///< maximum amount of time, in game ticks, a client may take to download the map
	158	uint16 max_password_time; ///< maximum amount of time, in game ticks, a client may take to enter the password
157	159	bool pause_on_join; ///< pause the game when people join
158	160	uint16 server_port; ///< port the server listens on
159	161	uint16 server_admin_port; ///< port the server listens on for the admin network

+3

-1

src/table/settings.h less more

0		/* $Id: settings.h 22598 2011-06-18 18:37:10Z rubidium $ */
	0	/* $Id: settings.h 23795 2012-01-13 21:54:59Z rubidium $ */
1	1
2	2	/*
3	3	* This file is part of OpenTTD.

644	644	SDTC_VAR(network.bytes_per_frame, SLE_UINT16, S, NO, 8, 1, 65535, 0, STR_NULL, NULL),
645	645	SDTC_VAR(network.bytes_per_frame_burst,SLE_UINT16, S, NO, 256, 1, 65535, 0, STR_NULL, NULL),
646	646	SDTC_VAR(network.max_join_time, SLE_UINT16, S, NO, 500, 0, 32000, 0, STR_NULL, NULL),
	647	SDTC_VAR(network.max_download_time, SLE_UINT16, S, NO, 1000, 0, 32000, 0, STR_NULL, NULL),
	648	SDTC_VAR(network.max_password_time, SLE_UINT16, S, NO, 2000, 0, 32000, 0, STR_NULL, NULL),
647	649	SDTC_BOOL(network.pause_on_join, S, NO, true, STR_NULL, NULL),
648	650	SDTC_VAR(network.server_port, SLE_UINT16, S, NO,NETWORK_DEFAULT_PORT,0,65535,0,STR_NULL, NULL),
649	651	SDTC_VAR(network.server_admin_port, SLE_UINT16, S, NO, NETWORK_ADMIN_PORT,0,65535,0,STR_NULL, NULL),