pelya 0d868d80bd Merge branch 'master' into 1.5 ...

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/station_gui.cpp
	src/table/settings.ini
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/widget.cpp
	src/widgets/settings_widget.h

2015-03-29 21:48:14 +03:00

..

unfinished

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

afrikaans.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

arabic_egypt.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

basque.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

belarusian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

brazilian_portuguese.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

bulgarian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

catalan.txt

(svn r27180) -Update from WebTranslator v3.0:

2015-03-10 17:47:16 +00:00

croatian.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

czech.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

danish.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

dutch.txt

(svn r27177) -Update from WebTranslator v3.0:

2015-03-02 17:46:37 +00:00

english_AU.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

english_US.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

english.txt

Merge branch 'master' into 1.5

2015-03-29 21:48:14 +03:00

esperanto.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

estonian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

faroese.txt

(svn r27103) -Update: copyright date

2015-01-01 20:51:18 +00:00

finnish.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

french.txt

(svn r27181) -Update from WebTranslator v3.0:

2015-03-11 17:46:24 +00:00

gaelic.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

galician.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

german.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

greek.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

hebrew.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

hungarian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

icelandic.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

indonesian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

irish.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

italian.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

japanese.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

korean.txt

(svn r27189) -Update from WebTranslator v3.0:

2015-03-16 17:45:22 +00:00

latin.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

latvian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

lithuanian.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

luxembourgish.txt

(svn r27182) -Update from WebTranslator v3.0:

2015-03-13 17:45:21 +00:00

malay.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

norwegian_bokmal.txt

(svn r27180) -Update from WebTranslator v3.0:

2015-03-10 17:47:16 +00:00

norwegian_nynorsk.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

polish.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

portuguese.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

romanian.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

russian.txt

(svn r27177) -Update from WebTranslator v3.0:

2015-03-02 17:46:37 +00:00

serbian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

simplified_chinese.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

slovak.txt

(svn r27179) -Update from WebTranslator v3.0:

2015-03-09 18:15:33 +00:00

slovenian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

spanish.txt

(svn r27180) -Update from WebTranslator v3.0:

2015-03-10 17:47:16 +00:00

swedish.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

tamil.txt

(svn r27177) -Update from WebTranslator v3.0:

2015-03-02 17:46:37 +00:00

thai.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

traditional_chinese.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

turkish.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

ukrainian.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

vietnamese.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00

welsh.txt

(svn r27184) -Cleanup: remove some removed strings

2015-03-13 20:53:29 +00:00