From 7bbfbcddb72f3ce1a6470ce79ea41eecd3b139a7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 29 May 2011 20:08:21 +0000 Subject: [PATCH] (svn r22524) [1.1] -Backport from trunk: - Language updates - Documentation updates --- known-bugs.txt | 22 +++++++++++ readme.txt | 61 ++++++++++++++++++++++++------- src/lang/brazilian_portuguese.txt | 2 +- src/lang/croatian.txt | 2 +- src/lang/dutch.txt | 2 +- src/lang/english_US.txt | 2 +- src/lang/finnish.txt | 2 +- src/lang/french.txt | 2 +- src/lang/german.txt | 2 +- src/lang/italian.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/slovenian.txt | 2 +- src/lang/spanish.txt | 2 +- src/lang/vietnamese.txt | 2 +- 14 files changed, 81 insertions(+), 26 deletions(-) diff --git a/known-bugs.txt b/known-bugs.txt index a30601cc5c..2588f004a1 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -301,3 +301,25 @@ Can't run OpenTTD with the -d option from a MSYS console [FS#4587] debugging output. Compiling OpenTTD with the --enable-console configure option prevents this issue and allows the -d option to use the MSYS console for its output. + +Unreadable characters for non-latin locales [FS#4607] + OpenTTD does not ship a non-latin font in its graphics files. As a + result OpenTTD needs to acquire the font from somewhere else. What + OpenTTD does is ask the operating system, or a system library, for + the best font for a given language if the currently loaded font + does not provide all characters of the chosen translation. This + means that OpenTTD has no influence over the quality of the chosen + font; it just does the best it can do. + + If the text is unreadable there are several steps that you can take + to improve this. The first step is finding a good font and configure + this in the configuration file. See section 9.0 of readme.txt for + more information. You can also increase the font size to make the + characters bigger and possible better readable. + + If the problem is with the clarity of the font you might want to + enable anti-aliasing by setting the small_aa/medium_aa/large_aa + settings to "true". However, anti-aliasing only works when a 32 bits + blitter has been selected, e.g. blitter = "32bpp-anim", as with the + 8 bits blitter there are not enough colours to properly perform the + anti-aliasing. diff --git a/readme.txt b/readme.txt index 1f77e74d27..8a1baa2c5f 100644 --- a/readme.txt +++ b/readme.txt @@ -249,9 +249,12 @@ wait for an error message to pop up. The error message will tell you 4.2) OpenTTD directories ---- ------------------- -The required 3rd party files listed in the section 4.1 "(Required) 3rd party files" -as well as other non-compulsory extensions (NewGRFs, AI, heightmaps, scenarios) can be -placed in a few different locations: +OpenTTD uses its own directory to store its required 3rd party base set files (see section +4.1 "Required 3rd party files") and non-compulsory extension and configuration files. See +below for their proper place within this OpenTTD main data directory. + +The main OpenTTD directories can be found in various locations, depending on your operating +system: 1. The current working directory (from where you started OpenTTD) For non-Windows operating systems OpenTTD will not scan for files in this directory if it is your personal directory, i.e. "~/", or when it is the @@ -273,7 +276,26 @@ placed in a few different locations: 5. The installation directory (Linux only) Linux: /usr/share/games/openttd 6. The application bundle (Mac OSX only) - It includes the OpenTTD files (grf+lng) and it will work as long as they aren't touched + It includes the OpenTTD files (grf+lng) and it will work as long as they aren't + touched + +Different types of data or extensions go into different subdirectories of the chosen main +OpenTTD directory: + Config File: (no subdirectory) + Screenshots: (no subdirectory) + Base Graphics: data (or a subdirectory thereof) + Sound Sets: data (or a subdirectory thereof) + NewGRFs: data (or a subdirectory thereof) + 32bpp Sets: data (or a subdirectory thereof) + Music Sets: gm (or a subdirectory thereof) + AIs: ai (or a subdirectory thereof) + AI Libraries: ai/libraries (or a subdirectory thereof) + Savegames: save + Automatic Savegames: save/autosave + Scenarios: scenario + +The (automatically created) directory content_download is for OpenTTD's internal use and +no files should be added to it or its subdirectories manually. Notes: - Linux in the previous list means .deb, but most paths should be similar for others. @@ -357,7 +379,7 @@ OpenTTD in debug mode. The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like .INI format. It's mostly undocumented. Almost all settings can be changed ingame by using the 'Advanced Settings' window. -When you can not find openttd.cfg you should look in the directories as +When you cannot find openttd.cfg you should look in the directories as described in section 4.2. If you do not have an openttd.cfg OpenTTD will create one after closing. @@ -419,7 +441,8 @@ DOS: ---- --------------------------- The following libraries are used by OpenTTD for: - libSDL/liballegro: hardware access (video, sound, mouse) - - zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads, heightmaps + - zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads, + heightmaps - liblzo2: (de)compressing of old (pre 0.3.0) savegames - liblzma: (de)compressing of savegames (1.1.0 and later) - libpng: making screenshots and loading heightmaps @@ -455,7 +478,8 @@ The following compilers are known not to compile OpenTTD: - GNU Compiler Collection (GCC) 3.2 and earlier. These old versions fail due to OpenTTD's template usage. - Intel C++ Compiler (ICC) 11.1 and earlier. - Version 10.0 and earlier fail a configure check and fail with recent system headers. + Version 10.0 and earlier fail a configure check and fail with recent system + headers. Version 10.1 fails to compile station_gui.cpp. Version 11.1 fails with internal error when compiling network.cpp. - Clang/LLVM 2.8 and earlier. @@ -542,16 +566,25 @@ Under Windows 98 and lower it is impossible to use a dedicated server; it will fail to start. Perhaps this is for the better because those OSes are not known for their stability. -With the added support for font-based text selecting a non-latin language will -result in garbage (lots of '?') shown on screen. Please open your configuration -file and add a desired font for small/medium/-and large_font. This can be a font -name like "Tahoma" or a path to a font. +With the added support for font-based text selecting a non-latin language can +result in lots of question marks ('?') being shown on screen. Please open your +configuration file (openttd.cfg - see Section 4.2 for where to find it) +and add a suitable font for the small, medium and / or large font, e.g.: + small_font = "Tahoma" + medium_font = "Tahoma" + large_font = "Tahoma" +You should use a font name like "Tahoma" or a path to the desired font. Any NewGRF file used in a game is stored inside the savegame and will refuse to load if you don't have that NewGRF file available. A list of missing files -will be output to the console at the moment, so use the '-d' flag (on windows) -to see this list. You just have to find the files (http://grfcrawler.tt-forums.net/) -put them in the data/ folder and you're set to go. +can be viewed in the NewGRF window accessible from the file load dialogue window. + +You can try to obtain the missing files from that NewGRF dialogue or - if they +are not available online - you can search manually through our forum's graphics +development section (http://www.tt-forums.net/viewforum.php?f=66) or GrfCrawler +(http://grfcrawler.tt-forums.net/). Put the NewGRF files in OpenTTD's data folder +(see section 4.2 "OpenTTD directories") and rescan the list of available NewGRFs. +Once you have all missing files, you are set to go. X.X) Credits diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 3ded10fdc7..a69c603089 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3248,7 +3248,7 @@ STR_ORDER_STOP_ORDER :(Parar) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automatico) +STR_ORDER_IMPLICIT :(Implícito) STR_ORDER_FULL_LOAD :(Carregar completamente) STR_ORDER_FULL_LOAD_ANY :(Carregar completamente qualquer carga) diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 97d85fe26a..87b4a9ff2b 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3345,7 +3345,7 @@ STR_ORDER_STOP_ORDER :(Stani) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automatsko) +STR_ORDER_IMPLICIT :(Implicitno) STR_ORDER_FULL_LOAD :(Puni ukrcaj) STR_ORDER_FULL_LOAD_ANY :(Puni ukrcaj bilo kojeg tereta) diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 2bc73ade8e..3f05c3f161 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3249,7 +3249,7 @@ STR_ORDER_STOP_ORDER :(Stop) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automatisch) +STR_ORDER_IMPLICIT :(Impliciet) STR_ORDER_FULL_LOAD :(Volledig laden) STR_ORDER_FULL_LOAD_ANY :(Één soort vracht volledig laden) diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index a8c748cd7b..269d640ef9 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3249,7 +3249,7 @@ STR_ORDER_STOP_ORDER :(Stop) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automatic) +STR_ORDER_IMPLICIT :(Implicit) STR_ORDER_FULL_LOAD :(Full load) STR_ORDER_FULL_LOAD_ANY :(Full load any cargo) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 9ce7fcc82c..eb31f6a9bf 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3249,7 +3249,7 @@ STR_ORDER_STOP_ORDER :(Pysähdy) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automaattinen) +STR_ORDER_IMPLICIT :(Ehdoton) STR_ORDER_FULL_LOAD :(Täysi lastaus) STR_ORDER_FULL_LOAD_ANY :(Lastaa täyteen mitä tahansa rahtia) diff --git a/src/lang/french.txt b/src/lang/french.txt index 1b0685676c..44d2c6dee2 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3250,7 +3250,7 @@ STR_ORDER_STOP_ORDER :(Arrêt) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automatique) +STR_ORDER_IMPLICIT :(Implicite) STR_ORDER_FULL_LOAD :(Charger complètement) STR_ORDER_FULL_LOAD_ANY :(Charger complètement par un seul type) diff --git a/src/lang/german.txt b/src/lang/german.txt index 1127ba4291..53722da400 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3250,7 +3250,7 @@ STR_ORDER_STOP_ORDER :(Stopp) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automatisch) +STR_ORDER_IMPLICIT :(Implizit) STR_ORDER_FULL_LOAD :(Voll beladen) STR_ORDER_FULL_LOAD_ANY :(Mit einer Fracht voll beladen) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index cbd0960881..5b5ba896cd 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3263,7 +3263,7 @@ STR_ORDER_STOP_ORDER :(Ferma) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automatico) +STR_ORDER_IMPLICIT :(Implicito) STR_ORDER_FULL_LOAD :(Attendi pieno carico) STR_ORDER_FULL_LOAD_ANY :(Attendi carico) diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 11c2d519f4..b90af85620 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3247,7 +3247,7 @@ STR_ORDER_STOP_ORDER :(Parar) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automático) +STR_ORDER_IMPLICIT :{G=f}(Implícita) STR_ORDER_FULL_LOAD :(Encher) STR_ORDER_FULL_LOAD_ANY :(Encher de qq. carga) diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 848c2037e7..7364d80d42 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -3399,7 +3399,7 @@ STR_ORDER_STOP_ORDER :(Stop) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Avtomatično) +STR_ORDER_IMPLICIT :(Implicitno) STR_ORDER_FULL_LOAD :(Napolni) STR_ORDER_FULL_LOAD_ANY :(Napolni kakršenkoli tovor) diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 5c7a3ea3e1..323c960325 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3250,7 +3250,7 @@ STR_ORDER_STOP_ORDER :(Detenerse) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Automática) +STR_ORDER_IMPLICIT :(Implícita) STR_ORDER_FULL_LOAD :(Carga completa) STR_ORDER_FULL_LOAD_ANY :(Carga completa cualquier carga) diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 562cb7604f..9ec956e34e 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3247,7 +3247,7 @@ STR_ORDER_STOP_ORDER :(Dừng) STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING} -STR_ORDER_IMPLICIT :(Tự động) +STR_ORDER_IMPLICIT :(Chạy ngầm) STR_ORDER_FULL_LOAD :(Bốc đầy hàng) STR_ORDER_FULL_LOAD_ANY :(Bốc đủ bất kỳ hàng nào)