cpp/openttd-patchpack/source Changeset - r9648:996b8efd5c66

Changeset - r9648:996b8efd5c66

Parent rev.

Child rev.

[Not reviewed]

master

0 51 0

rubidium - 16 years ago 2008-07-17 13:47:04
rubidium@openttd.org

(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
-Codechange: remove all BindCString and related functions and replace it by RAW_STRING which prints the C-string raw pointer that is on the 'print stack'.

51 files changed with 123 insertions and 174 deletions:

src/genworld_gui.cpp

src/lang/afrikaans.txt

src/lang/brazilian_portuguese.txt

src/lang/bulgarian.txt

src/lang/catalan.txt

src/lang/croatian.txt

src/lang/czech.txt

src/lang/danish.txt

src/lang/dutch.txt

src/lang/english.txt

src/lang/english_US.txt

src/lang/esperanto.txt

src/lang/estonian.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/galician.txt

src/lang/german.txt

src/lang/hungarian.txt

src/lang/icelandic.txt

src/lang/italian.txt

src/lang/japanese.txt

src/lang/korean.txt

src/lang/lithuanian.txt

src/lang/norwegian_bokmal.txt

src/lang/norwegian_nynorsk.txt

src/lang/piglatin.txt

src/lang/polish.txt

src/lang/portuguese.txt

src/lang/romanian.txt

src/lang/russian.txt

src/lang/simplified_chinese.txt

src/lang/slovak.txt

src/lang/slovenian.txt

src/lang/spanish.txt

src/lang/swedish.txt

src/lang/traditional_chinese.txt

src/lang/turkish.txt

src/lang/ukrainian.txt

src/misc_gui.cpp

src/network/network_gui.cpp

src/newgrf_gui.cpp

src/openttd.cpp

src/roadveh_gui.cpp

src/settings_gui.cpp

src/station_gui.cpp

src/strgen/strgen.cpp

src/strings.cpp

src/strings_func.h

src/strings_type.h

src/table/control_codes.h

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -329,13 +329,13 @@ struct GenerateLandscapeWindow : public @@
+			}
 			GetString(buffer, STR_HEIGHTMAP_SIZE, lastof(buffer));
 			DrawStringRightAligned(326, 91, STR_HEIGHTMAP_SIZE, TC_BLACK);
 			DrawString( 12,  91, STR_HEIGHTMAP_NAME, TC_BLACK);
 			SetDParamStr(0, this->name);
-			DrawStringTruncated(114,  91, STR_ORANGE, TC_BLACK, 326 - 114 - GetStringBoundingBox(buffer).width - 5);
+			DrawStringTruncated(114,  91, STR_JUST_RAW_STRING, TC_ORANGE, 326 - 114 - GetStringBoundingBox(buffer).width - 5);
+		}
+	}
 	virtual void OnClick(Point pt, int widget)
+	{
 		switch (widget) {

src/lang/afrikaans.txt

➞

Show inline comments

@@ @@ -1347,13 +1347,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Invoeg die adres van die gasheer
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliente
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliente oplyn / Kliente maks{}Maatskappye oplyn / Maatskappye maks
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPEL INFORMASIE
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Kliente:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Taal:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Blokkiestel:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Werfkaart groote:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verskaffer hersiening:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Verskaffer adres:  {WHITE}{STRING} : {NUM}

src/lang/brazilian_portuguese.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Coloque o endereço IP do servidor
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes ligados / max. clientes{}Empresas ligados / max, empresas
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DO JOGO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}IP do servidor:  {WHITE}{STRING} : {NUM}

src/lang/bulgarian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Въведете адреса на хоста
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Играчи
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Онлайн играчи / макс. брой играчи{}Онлайн компании / макс. компании
 STR_NETWORK_GAME_INFO                                           :{SILVER}ИНФО ЗА ИГРАТА
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Играчи:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Език:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Терен:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Големина на картата:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Версия на сървъра:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Адрес на сървъра:  {WHITE}{STRING} : {NUM}

src/lang/catalan.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Entra l'adreça IP del servidor
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en línia / clients màxim
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓ DEL JOC
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Grup de cel·les:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamany del mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versió del servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adreça del servidor:  {WHITE}{STRING} : {NUM}

src/lang/croatian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Unesi adresu domaćina
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klijenti
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klijenata online / klijenata maks{}Tvrtki online / tvrki maks.
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O IGRI
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klijenti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jezik:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Set pločica:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Veličina karte:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzija poslužitelja:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa poslužitelja:  {WHITE}{STRING} : {NUM}

src/lang/czech.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Vlož IP adresu serveru
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Hráčů
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Hráčů online / maximálně
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HŘE
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klientů:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Prostředí:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikost mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verze hry na serveru:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serveru:  {WHITE}{STRING} : {NUM}

src/lang/danish.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv adressen på en server
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter online / maks. klienter{}Selskaber online / maks. selskaber
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPIL INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Klima:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUM}

src/lang/dutch.txt

➞

Show inline comments

@@ @@ -1381,13 +1381,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}IP adres van de server invoeren
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Spelers
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Spelers online / spelers maximaal
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPEL INFORMATIE
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Spelers:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Taal:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Klimaat:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgrootte:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server versie:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adres:  {WHITE}{STRING} : {NUM}

src/lang/english.txt

➞

Show inline comments

@@ @@ -859,19 +859,20 @@ STR_0312_FUND_CONSTRUCTION_OF_NEW @@
 STR_INDUSTRY_DIR                                                :Industry Directory
 STR_0313_FUND_NEW_INDUSTRY                                      :Fund new industry
 ############ range ends here
 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Fund new industry
 STR_JUST_STRING                                                 :{STRING}
 STR_JUST_RAW_STRING                                             :{RAW_STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...can only be built in towns
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...can only be built in rainforest areas
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...can only be built in desert areas
 STR_0319_PAUSED                                                 :{YELLOW}* *  PAUSED  *  *
-STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot successfully saved as '{STRING}'
+STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot successfully saved as '{RAW_STRING}'
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Screenshot failed!
 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Purchase land for future use
 STR_032F_AUTOSAVE                                               :{RED}AUTOSAVE
 STR_SAVING_GAME                                                 :{RED}*  *  SAVING GAME  *  *
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Saving still in progress,{}please wait until it is finished!
@@ @@ -1293,13 +1294,13 @@ STR_LANDINFO_LOCK @@
 STR_CANT_PLACE_RIVERS                                           :{WHITE}Can't place rivers here...
 STR_LANDINFO_RIVER                                              :River
 STR_BUOY_IS_IN_USE                                              :{WHITE}...buoy is in use!
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUM}x{NUM}x{NUM} ({RAW_STRING})
 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Can't remove part of station...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Can't convert railtype here...
 STR_CONVERT_RAIL_TIP                                            :{BLACK}Convert/Upgrade the type of rail
 STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Drag train engine here to sell the whole train
@@ @@ -1381,19 +1382,18 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Enter the address of the host
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max{}Companies online / companies max
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Language:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{RAW_STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{RAW_STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Password protected!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER FULL
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSION MISMATCH
@@ @@ -1471,35 +1471,35 @@ STR_NETWORK_LANG_GALICIAN @@
 STR_NETWORK_LANG_GREEK                                          :Greek
 STR_NETWORK_LANG_LATVIAN                                        :Latvian
 ############ End of leave-in-this-order
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multiplayer game lobby
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparing to join:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparing to join:   {ORANGE}{RAW_STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}A list of all companies currently in this game. You can either join one or start a new one if there is a free company slot
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}New company
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Create a new company
 STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Spectate game
 STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Watch the game as a spectator
 STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Join company
 STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Help manage this company
 STR_NETWORK_REFRESH                                             :{BLACK}Refresh server
 STR_NETWORK_REFRESH_TIP                                         :{BLACK}Refresh the server info
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}COMPANY INFO
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name:  {WHITE}{STRING}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name:  {WHITE}{RAW_STRING}
 STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Company value:  {WHITE}{CURRENCY}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance:  {WHITE}{CURRENCY}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income:  {WHITE}{CURRENCY}
 STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
 STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Players:  {WHITE}{STRING}
+STR_NETWORK_PLAYERS                                             :{SILVER}Players:  {WHITE}{RAW_STRING}
 STR_NETWORK_CONNECTING                                          :{WHITE}Connecting...
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connecting..
 STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Authorising..
@@ @@ -1556,21 +1556,21 @@ STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH @@
 STR_NETWORK_ERR_CLIENT_KICKED                                   :kicked by server
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :was trying to use a cheat
 STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server full
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :has joined the game
 STR_NETWORK_GIVE_MONEY                                          :gave your company some money ({CURRENCY})
-STR_NETWORK_GAVE_MONEY_AWAY                                     :you gave {STRING} some money ({CURRENCY})
+STR_NETWORK_GAVE_MONEY_AWAY                                     :you gave {RAW_STRING} some money ({CURRENCY})
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] To {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {RAW_STRING}: {GRAY}{RAW_STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] To {RAW_STRING}: {GRAY}{RAW_STRING}
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Private] :
 STR_NETWORK_CHAT_CLIENT                                         :[Private] {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] To {STRING}: {GRAY}{STRING}
 STR_NETWORK_CHAT_CLIENT                                         :[Private] {RAW_STRING}: {GRAY}{RAW_STRING}
 STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] To {RAW_STRING}: {GRAY}{RAW_STRING}
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
-STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {GRAY}{STRING}
+STR_NETWORK_CHAT_ALL                                            :[All] {RAW_STRING}: {GRAY}{RAW_STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Enter text for network chat
 STR_NETWORK_NAME_CHANGE                                         :has changed his/her name to
 STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} The server closed the session
 STR_NETWORK_SERVER_REBOOT                                       :{WHITE} The server is restarting...{}Please wait...
 STR_NETWORK_SERVER                                              :Server
@@ @@ -1955,17 +1955,17 @@ STR_4000_SAVE_GAME @@
 STR_4001_LOAD_GAME                                              :{WHITE}Load Game
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabyte{P "" s} free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
-STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed{}{STRING}
+STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed{}{RAW_STRING}
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Unable to delete file
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}Game Load Failed{}{STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Internal error: {STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Broken savegame - {STRING}
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}Game Load Failed{}{RAW_STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Internal error: {RAW_STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Broken savegame - {RAW_STRING}
 STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Savegame is made with newer version
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :File not readable
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :File not writeable
 STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}List of drives, directories and saved-game files
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Currently selected name for saved-game
 STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Delete the currently selected saved-game
@@ @@ -3147,42 +3147,42 @@ STR_PERFORMANCE_DETAIL_TOTAL_TIP @@
 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF Settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF settings
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Apply changes
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Set parameters
 STR_NEWGRF_TIP                                                  :{BLACK}A list of all the Newgrf sets that you have installed. Click a set to change the settings
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}There are currently no newgrf files installed! Please refer to the manual for instructions on installing new graphics
 STR_NEWGRF_FILENAME                                             :{BLACK}Filename: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_FILENAME                                             :{BLACK}Filename: {SILVER}{RAW_STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{RAW_STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{RAW_STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}You are about to make changes to a running game; this can crash OpenTTD.{}Are you absolutely sure about this?
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Warning: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Error: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatal: {SILVER}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{STRING} will not work with the TTDPatch version reported by OpenTTD.
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{STRING} is for the {STRING} version of TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{STRING} is designed to be used with {STRING}
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Invalid parameter for {STRING}: parameter {STRING} ({NUM})
 STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{STRING} must be loaded before {STRING}.
 STR_NEWGRF_ERROR_LOAD_AFTER                                     :{STRING} must be loaded after {STRING}.
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{STRING} requires OpenTTD version {STRING} or better.
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{RAW_STRING}
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Warning: {SILVER}{RAW_STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Error: {SILVER}{RAW_STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatal: {SILVER}{RAW_STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{RAW_STRING} will not work with the TTDPatch version reported by OpenTTD.
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{RAW_STRING} is for the {RAW_STRING} version of TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{RAW_STRING} is designed to be used with {RAW_STRING}
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Invalid parameter for {RAW_STRING}: parameter {RAW_STRING} ({NUM})
 STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{RAW_STRING} must be loaded before {RAW_STRING}.
 STR_NEWGRF_ERROR_LOAD_AFTER                                     :{RAW_STRING} must be loaded after {RAW_STRING}.
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{RAW_STRING} requires OpenTTD version {RAW_STRING} or better.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :the GRF file it was designed to translate
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Too many NewGRFs are loaded.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {STRING} as static NewGRF with {STRING} could cause desyncs.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {RAW_STRING} as static NewGRF with {RAW_STRING} could cause desyncs.
 STR_NEWGRF_ADD                                                  :{BLACK}Add
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Add a NewGRF file to the list
 STR_NEWGRF_REMOVE                                               :{BLACK}Remove
 STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Remove the selected NewGRF file from the list
 STR_NEWGRF_MOVEUP                                               :{BLACK}Move Up
 STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Move the selected NewGRF file up the list
 STR_NEWGRF_MOVEDOWN                                             :{BLACK}Move Down
 STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Move the selected NewGRF file down the list
 STR_NEWGRF_FILE_TIP                                             :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameters: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER                                            :{BLACK}Parameters: {SILVER}{STRING1}
 STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Enter NewGRF parameters
 STR_NEWGRF_NO_INFO                                              :{BLACK}No information available
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Available NewGRF files
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Add to selection
 STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Add the selected NewGRF file to your configuration
@@ @@ -3409,13 +3409,13 @@ STR_HELIPORTS @@
 STR_MEASURE_LENGTH                                              :{BLACK}Length: {NUM}
 STR_MEASURE_AREA                                                :{BLACK}Area: {NUM} x {NUM}
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Length: {NUM}{}Height difference: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Height difference: {NUM} m
 ############ Date formatting
-STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_TINY                                                   :{RAW_STRING}-{RAW_STRING}-{NUM}
 STR_DATE_SHORT                                                  :{STRING} {NUM}
 STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
 ########
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}

src/lang/english_US.txt

➞

Show inline comments

@@ @@ -1351,13 +1351,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Enter the IP address of the server
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Language:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{STRING} : {NUM}

src/lang/esperanto.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Enigu la adreson de la gastiganto
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientoj
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientoj surrete / maksimume{}Kompanioj surrete / maksimume
 STR_NETWORK_GAME_INFO                                           :{SILVER}LUDINFORMOJ
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klientoj:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Lingvo:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tegolaro:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Mapgrandeco:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Servila versio:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Servila adreso:  {WHITE}{STRING} : {NUM}

src/lang/estonian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Sisesta serveri aadress
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliendid
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliente sees / enim kliente{}Ettevõtteid sees / enim ettevõtteid
 STR_NETWORK_GAME_INFO                                           :{SILVER}MÄNGU ANDMED
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Kliendid:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Keel:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Ruudustik:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaardi suurus:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serveri versioon:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveri aadress:  {WHITE}{STRING} : {NUM}

src/lang/finnish.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Syötä palvelimen IP-osoite
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Pelaajia
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Pelaajia pelissä/enintään.
 STR_NETWORK_GAME_INFO                                           :{SILVER}PELITIEDOT
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Pelaajat:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Kieli:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Ruudusto:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartan koko:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Palvelimen versio:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Palvelimen osoite:  {WHITE}{STRING} : {NUM}

src/lang/french.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Saisir l'adresse IP du serveur
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en ligne / clients max
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFOS SUR LE SERVEUR
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Langue:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Terrain:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Taille de la carte :  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Version du serveur :  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresse du serveur :  {WHITE}{STRING} : {NUM}

src/lang/galician.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Introduce a dirección IP do servidor
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes conectador / clients máximos
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓN DA PARTIDA
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Set de Terreo:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión do servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección do servidor:  {WHITE}{STRING} : {NUM}

src/lang/german.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}IP Adresse des Servers eingeben
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Teilnehmer
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Teilnehmer anwesend / max.
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPIEL-INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Teilnehmer:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Sprache:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Landschaft:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Spielfeldgröße:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUM}

src/lang/hungarian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Írd be a szerver IP címét
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliens
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliens online / kliens max
 STR_NETWORK_GAME_INFO                                           :{SILVER}JÁTÉK INFÓ
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Játékos:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Nyelv:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tájtípus:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}A pálya nagysága:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Szerver verzió:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}A szerver címe:  {WHITE}{STRING} : {NUM}

src/lang/icelandic.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Sláðu inn IP tölu þjónsins
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Notendur
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Tengdir notendur / hámarksfjöldi notenda
 STR_NETWORK_GAME_INFO                                           :{SILVER}UPPLÝSINGAR UM LEIK
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Notendur:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Tungumál:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Landslag:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Stærð:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Útgáfa þjóns:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Veffang þjóns:  {WHITE}{STRING} : {NUM}

src/lang/italian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Digitare l'indirizzo del server
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Client
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Client online / client max{}Compagnie online / compagnie max
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAZIONI PARTITA
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Client:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Lingua:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Paesaggio:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Dimensione mappa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versione server:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Indirizzo del server:  {WHITE}{STRING} : {NUM}

src/lang/japanese.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}ホストアドレスを入力します
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}クライアント
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}オンラインのクライアント人数／最高クライアント人数{}オンラインの会社数／最高会社数
 STR_NETWORK_GAME_INFO                                           :{SILVER}ゲーム情報
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}クライアント：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}国語：　 {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}タイルセット：{WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}地図のサイズ：{WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}サーババージョン：{WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}サーバアドレス：{WHITE}{STRING}：{NUM}

src/lang/korean.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}호스트(IP) 주소 입력
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}클라이언트
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}클라이언트 온라인 / 최대 접속자수{}회사 온라인 / 최대 회사수
 STR_NETWORK_GAME_INFO                                           :{SILVER}게임 정보
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}클라이언트:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}언어:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}기후:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}맵 크기:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}서버 버전:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}서버 주소:  {WHITE}{STRING} : {NUM}

src/lang/lithuanian.txt

➞

Show inline comments

@@ @@ -1321,13 +1321,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Ivesk adresa (IP)
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Zaidejai
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Zaidzia / maksimaliai zaideju
 STR_NETWORK_GAME_INFO                                           :{SILVER}Zaidimo informacija
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Zaidejai:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Kalba:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Pavadinimas:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Zemelapio dydis:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverio versija:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serverio adresas:  {WHITE}{STRING} : {NUM}

src/lang/norwegian_bokmal.txt

➞

Show inline comments

@@ @@ -1353,13 +1353,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv inn IP-adressen til serveren
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter på nett / maks. antall klienter{}Firmaer på nett / maks. antall firmaer
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPILLOVERSIKT
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Språk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Brikkesett:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstørrelse:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tjenerversjon:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server addresse:  {WHITE}{STRING} : {NUM}

src/lang/norwegian_nynorsk.txt

➞

Show inline comments

@@ @@ -1352,13 +1352,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv inn IP-adressa til tenaren
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientar
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientar på nett / maks. antal klientar{}Firma på nett / maks. antal firma
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPELOVERSIKT
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klientar:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Språk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Brikkesett:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstorleik:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tenarversjon:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adressa til tenaren:  {WHITE}{STRING} : {NUM}

src/lang/piglatin.txt

➞

Show inline comments

@@ @@ -1342,13 +1342,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Enterway ethay addressway ofway ethay osthay
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Ientsclay
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Ientsclay onlineway / ientsclay axmay{}Ompaniescay onlineway / ompaniescay axmay
 STR_NETWORK_GAME_INFO                                           :{SILVER}EGAMay INFOWAY
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Ientsclay:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Anguagelay:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Ilesettay:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Apmay izesay:  {WHITE}{COMMA}xay{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Erversay ersionvay:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Erversay addressway:  {WHITE}{STRING} : {NUM}

src/lang/polish.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Wpisz adres IP serwera
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientów
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientów podłączonych / maks.{}Firm podłączonych / maks.
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O GRZE
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klienci:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Język:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Krajobraz:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Rozmiar mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Wersja serwera:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adres serwera:  {WHITE}{STRING} : {NUM}

src/lang/portuguese.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Introduza o endereço IP do servidor
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes ligados / max. clientes
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DE JOGO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Conjunto de blocos:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor:  {WHITE}{STRING} : {NUM}

src/lang/romanian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Introdu IP-ul serverului
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clienţi
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clienţi online / Nr. max. clienţi{}Companii online / Nr. max. companii
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JOC
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clienţi:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Limba:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Marimea hartii:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versiune server:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serverului:  {WHITE}{STRING} : {NUM}

src/lang/russian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Введите адрес сервера
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Клиенты
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Клиентов сейчас/макс. {}Компаний сейчас/макс.
 STR_NETWORK_GAME_INFO                                           :{SILVER}ИНФОРМАЦИЯ ОБ ИГРЕ
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Клиенты:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Язык:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Климат:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Размер карты:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Версия сервера:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Адрес сервера:  {WHITE}{STRING} : {NUM}

src/lang/simplified_chinese.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}输入服务器地址
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}客户端
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}在线客户端 / 最多 - 在线公司 / 最多
 STR_NETWORK_GAME_INFO                                           :{SILVER}游戏信息
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}客 户 端：   {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}语　　言：   {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}场景类型：   {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}地图类型：   {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}服务器版本： {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}服务器地址： {WHITE}{STRING} : {NUM}

src/lang/slovak.txt

➞

Show inline comments

@@ @@ -1435,13 +1435,12 @@ STR_NETWORK_ADD_SERVER_TIP @@
 STR_NETWORK_ENTER_IP                                            :{BLACK}Zadajte IP adresu serveru
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienti
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienti online / klienti max
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HRE
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klienti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Prostredie:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Velkost mapy:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzia servera:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa servera:  {WHITE}{STRING} : {NUM}

src/lang/slovenian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Vnesi naslov gostitelja
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Gosti
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Gosti na zvezi / največ gostov{}Podjetja na zvezi / največ podjetij
 STR_NETWORK_GAME_INFO                                           :{SILVER}IGRA - INFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Gosti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Jezik:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Nabor ploščic:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikost ozemlja:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Različica strežnika:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Naslov strežnika:  {WHITE}{STRING} : {NUM}

src/lang/spanish.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Introduce la dirección IP del servidor
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes online / máx clientes{}Compañías online / máximo compañías
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JUEGO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Escenario:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño Mapa:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión servidor:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección servidor:  {WHITE}{STRING} : {NUM}

src/lang/swedish.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}IP-adressen till servern
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter online / Klienter max
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPELINFO
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Språk:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Klimat:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstorlek:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adress:  {WHITE}{STRING} : {NUM}

src/lang/traditional_chinese.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}輸入主機位址
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}客戶端
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}線上客戶端 / 客戶端上限{}線上公司 / 公司上限
 STR_NETWORK_GAME_INFO                                           :{SILVER}遊戲資訊
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}客戶端：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}語言：{WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}網格組：{WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}地圖大小：{WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}伺服器版本：{WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}伺服器位址：{WHITE}{STRING} : {NUM}

src/lang/turkish.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Sunucunun ip'sini ve portunu girin
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Oyuncular
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Bağlı oyuncular / en fazla oyuncu
 STR_NETWORK_GAME_INFO                                           :{SILVER}OYUN BİLGİSİ
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}İstemciler:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Dil:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Set:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Harita boyutu:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Sunucu sürümü:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Sunucu adresi:  {WHITE}{STRING} : {NUM}

src/lang/ukrainian.txt

➞

Show inline comments

 STR_NETWORK_ENTER_IP                                            :{BLACK}Введіть адресу сервера
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Клієнти
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Клієнти в мережі/макс.клієнтів{}Компанії в мережі/макс.компаній
 STR_NETWORK_GAME_INFO                                           :{SILVER}Інформація про гру
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Клієнт:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Мова:  {WHITE}{STRING}
 STR_NETWORK_TILESET                                             :{SILVER}Шаблон:  {WHITE}{STRING}
 STR_NETWORK_MAP_SIZE                                            :{SILVER}Розмір карти:  {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Версія серверу:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Адреса серверу:  {WHITE}{STRING} : {NUM}

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -93,13 +93,16 @@ public: @@
 			DoDrawStringCentered(140, y, this->landinfo_data[i], i == 0 ? TC_LIGHT_BLUE : TC_FROMSTRING);
 			y += i == 0 ? 16 : 12;
+		}
 		y += 6;
 		if (!StrEmpty(this->landinfo_data[LAND_INFO_MULTICENTER_LINE])) DrawStringMultiCenter(140, y, BindCString(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]), this->width - 4);
 		if (!StrEmpty(this->landinfo_data[LAND_INFO_MULTICENTER_LINE])) {
 			SetDParamStr(0, this->landinfo_data[LAND_INFO_MULTICENTER_LINE]);
 			DrawStringMultiCenter(140, y, STR_JUST_RAW_STRING, this->width - 4);
+		}
+	}
 	LandInfoWindow(TileIndex tile) : Window(&_land_info_desc) {
 		Player *p = GetPlayer(IsValidPlayer(_local_player) ? _local_player : PLAYER_FIRST);
 		Town *t = ClosestTownFromTile(tile, _settings_game.economy.dist_local_authority);
@@ @@ -154,17 +157,18 @@ public: @@
 			str = STR_01A5_COST_TO_CLEAR;
+		}
 		GetString(this->landinfo_data[line_nr], str, lastof(this->landinfo_data[line_nr]));
 		line_nr++;
 		/* Location */
 		snprintf(_userstring, lengthof(_userstring), "0x%.4X", tile);
 		char tmp[16];
 		snprintf(tmp, lengthof(tmp), "0x%.4X", tile);
 		SetDParam(0, TileX(tile));
 		SetDParam(1, TileY(tile));
 		SetDParam(2, TileHeight(tile));
-		SetDParam(3, STR_SPEC_USERSTRING);
+		SetDParamStr(3, tmp);
 		GetString(this->landinfo_data[line_nr], STR_LANDINFO_COORDS, lastof(this->landinfo_data[line_nr]));
 		line_nr++;
 		/* Local authority */
 		SetDParam(0, STR_01A9_NONE);
 		if (t != NULL && t->IsValid()) {
@@ @@ -649,16 +653,17 @@ void GuiShowTooltipsWithArgs(StringID st @@
 static int DrawStationCoverageText(const AcceptedCargo cargo,
 	int str_x, int str_y, StationCoverageType sct, bool supplies)
+{
 	bool first = true;
 	char *b = InlineString(_userstring, supplies ? STR_SUPPLIES : STR_000D_ACCEPTS);
 	char string[512];
 	char *b = InlineString(string, supplies ? STR_SUPPLIES : STR_000D_ACCEPTS);
 	for (CargoID i = 0; i < NUM_CARGO; i++) {
-		if (b >= lastof(_userstring) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode()
+		if (b >= lastof(string) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode()
 		switch (sct) {
 			case SCT_PASSENGERS_ONLY: if (!IsCargoInClass(i, CC_PASSENGERS)) continue; break;
 			case SCT_NON_PASSENGERS_ONLY: if (IsCargoInClass(i, CC_PASSENGERS)) continue; break;
 			case SCT_ALL: break;
 			default: NOT_REACHED();
+		}
@@ @@ -677,15 +682,16 @@ static int DrawStationCoverageText(const @@
 	/* If first is still true then no cargo is accepted */
 	if (first) b = InlineString(b, STR_00D0_NOTHING);
 	*b = '\0';
 	/* Make sure we detect any buffer overflow */
-	assert(b < endof(_userstring));
+	assert(b < endof(string));
 	return DrawStringMultiLine(str_x, str_y, STR_SPEC_USERSTRING, 144);
 	SetDParamStr(0, string);
 	return DrawStringMultiLine(str_x, str_y, STR_JUST_RAW_STRING, 144);
+}
 /**
  * Calculates and draws the accepted or supplied cargo around the selected tile(s)
  * @param sx x position where the string is to be drawn
  * @param sy y position where the string is to be drawn

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -213,13 +213,13 @@ protected: @@
 	void DrawServerLine(const NetworkGameList *cur_item, uint y, bool highlight)
+	{
 		/* show highlighted item with a different colour */
 		if (highlight) GfxFillRect(this->widget[NGWW_NAME].left + 1, y - 2, this->widget[NGWW_INFO].right - 1, y + 9, 10);
 		SetDParamStr(0, cur_item->info.server_name);
-		DrawStringTruncated(this->widget[NGWW_NAME].left + 5, y, STR_02BD, TC_BLACK, this->widget[NGWW_NAME].right - this->widget[NGWW_NAME].left - 5);
+		DrawStringTruncated(this->widget[NGWW_NAME].left + 5, y, STR_JUST_RAW_STRING, TC_BLACK, this->widget[NGWW_NAME].right - this->widget[NGWW_NAME].left - 5);
 		SetDParam(0, cur_item->info.clients_on);
 		SetDParam(1, cur_item->info.clients_max);
 		SetDParam(2, cur_item->info.companies_on);
 		SetDParam(3, cur_item->info.companies_max);
 		DrawStringCentered(this->widget[NGWW_CLIENTS].left + 39, y, STR_NETWORK_GENERAL_ONLINE, TC_GOLD);
@@ @@ -322,27 +322,27 @@ public: @@
 		/* Draw the right menu */
 		GfxFillRect(this->widget[NGWW_DETAILS].left + 1, 43, this->widget[NGWW_DETAILS].right - 1, 92, 157);
 		if (sel == NULL) {
 			DrawStringCentered(this->widget[NGWW_DETAILS].left + 115, 58, STR_NETWORK_GAME_INFO, TC_FROMSTRING);
 		} else if (!sel->online) {
 			SetDParamStr(0, sel->info.server_name);
-			DrawStringCentered(this->widget[NGWW_DETAILS].left + 115, 68, STR_ORANGE, TC_FROMSTRING); // game name
+			DrawStringCentered(this->widget[NGWW_DETAILS].left + 115, 68, STR_JUST_RAW_STRING, TC_ORANGE); // game name
 			DrawStringCentered(this->widget[NGWW_DETAILS].left + 115, 132, STR_NETWORK_SERVER_OFFLINE, TC_FROMSTRING); // server offline
 		} else { // show game info
 			uint16 y = 100;
 			const uint16 x = this->widget[NGWW_DETAILS].left + 5;
 			DrawStringCentered(this->widget[NGWW_DETAILS].left + 115, 48, STR_NETWORK_GAME_INFO, TC_FROMSTRING);
 			SetDParamStr(0, sel->info.server_name);
-			DrawStringCenteredTruncated(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 62, STR_ORANGE, TC_BLACK); // game name
+			DrawStringCenteredTruncated(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 62, STR_JUST_RAW_STRING, TC_ORANGE); // game name
 			SetDParamStr(0, sel->info.map_name);
-			DrawStringCenteredTruncated(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 74, STR_02BD, TC_BLACK); // map name
+			DrawStringCenteredTruncated(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 74, STR_JUST_RAW_STRING, TC_BLACK); // map name
 			SetDParam(0, sel->info.clients_on);
 			SetDParam(1, sel->info.clients_max);
 			SetDParam(2, sel->info.companies_on);
 			SetDParam(3, sel->info.companies_max);
 			DrawString(x, y, STR_NETWORK_CLIENTS, TC_GOLD);
@@ @@ -444,14 +444,15 @@ public: @@
 					case 0: NetworkUDPSearchGame(); break;
 					case 1: NetworkUDPQueryMasterServer(); break;
+				}
 				break;
 			case NGWW_ADD: // Add a server
 				SetDParamStr(0, _settings_client.network.connect_to_ip);
 				ShowQueryString(
-					BindCString(_settings_client.network.connect_to_ip),
+					STR_JUST_RAW_STRING,
 					STR_NETWORK_ENTER_IP,
 | 0x1000,  // maximum number of characters OR
 , // characters up to this width pixels, whichever is satisfied first
 					this, CS_ALPHANUMERAL);
 				break;
@@ @@ -731,13 +732,14 @@ struct NetworkStartServerWindow : public @@
 			case NSSW_GAMENAME:
 				ShowOnScreenKeyboard(this, NSSW_GAMENAME, 0, 0);
 				break;
 			case NSSW_SETPWD: // Set password button
 				this->widget_id = NSSW_SETPWD;
 				ShowQueryString(BindCString(_settings_client.network.server_password), STR_NETWORK_SET_PASSWORD, 20, 250, this, CS_ALPHANUMERAL);
 				SetDParamStr(0, _settings_client.network.server_password);
 				ShowQueryString(STR_JUST_RAW_STRING, STR_NETWORK_SET_PASSWORD, 20, 250, this, CS_ALPHANUMERAL);
 				break;
 			case NSSW_SELMAP: { // Select map
 				int y = (pt.y - NSSWND_START) / NSSWND_ROWSIZE;
 				y += this->vscroll.pos;

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -47,26 +47,31 @@ static int parse_intlist(const char *p, @@
 static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint w, uint bottom, bool show_params)
+{
 	char buff[256];
 	if (c->error != NULL) {
 		SetDParamStr(0, c->filename);
 		SetDParamStr(1, c->error->data);
 		for (uint i = 0; i < c->error->num_params; i++) {
 			uint32 param = 0;
 			byte param_number = c->error->param_number[i];
 		char message[512];
 		if (c->error->custom_message == NULL) {
 			SetDParamStr(0, c->filename);
 			SetDParamStr(1, c->error->data);
 			for (uint i = 0; i < c->error->num_params; i++) {
 				uint32 param = 0;
 				byte param_number = c->error->param_number[i];
 			if (param_number < c->num_params) param = c->param[param_number];
 				if (param_number < c->num_params) param = c->param[param_number];
 				SetDParam(2 + i, param);
+			}
 			SetDParam(2 + i, param);
 			GetString(message, c->error->message, lastof(message));
 		} else {
 			SetDParamStr(0, c->error->custom_message);
 			GetString(message, STR_JUST_RAW_STRING, lastof(message));
+		}
 		char message[512];
 		GetString(message, c->error->custom_message != NULL ? BindCString(c->error->custom_message) : c->error->message, lastof(message));
 		SetDParamStr(0, message);
 		y += DrawStringMultiLine(x, y, c->error->severity, w, bottom - y);
+	}
 	/* Draw filename or not if it is not known (GRF sent over internet) */
 	if (c->filename != NULL) {
@@ @@ -85,13 +90,14 @@ static void ShowNewGRFInfo(const GRFConf @@
 	y += DrawStringMultiLine(x, y, STR_NEWGRF_MD5SUM, w, bottom - y);
 	/* Show GRF parameter list */
 	if (show_params) {
 		if (c->num_params > 0) {
 			GRFBuildParamList(buff, c, lastof(buff));
 			SetDParamStr(0, buff);
 			SetDParam(0, STR_JUST_RAW_STRING);
 			SetDParamStr(1, buff);
 		} else {
 			SetDParam(0, STR_01A9_NONE);
+		}
 		y += DrawStringMultiLine(x, y, STR_NEWGRF_PARAMETER, w, bottom - y);
+	}
@@ @@ -99,13 +105,14 @@ static void ShowNewGRFInfo(const GRFConf @@
 	if (c->status == GCS_NOT_FOUND)        y += DrawStringMultiLine(x, y, STR_NEWGRF_NOT_FOUND, w, bottom - y);
 	if (c->status == GCS_DISABLED)         y += DrawStringMultiLine(x, y, STR_NEWGRF_DISABLED, w, bottom - y);
 	if (HasBit(c->flags, GCF_COMPATIBLE)) y += DrawStringMultiLine(x, y, STR_NEWGRF_COMPATIBLE_LOADED, w, bottom - y);
 	/* Draw GRF info if it exists */
 	if (c->info != NULL && !StrEmpty(c->info)) {
 		SetDParamStr(0, c->info);
 		SetDParam(0, STR_JUST_RAW_STRING);
 		SetDParamStr(1, c->info);
 		y += DrawStringMultiLine(x, y, STR_02BD, w, bottom - y);
 	} else {
 		y += DrawStringMultiLine(x, y, STR_NEWGRF_NO_INFO, w, bottom - y);
+	}
+}
@@ @@ -484,15 +491,16 @@ struct NewGRFWindow : public Window { @@
+				}
 				break;
 			case SNGRFS_SET_PARAMETERS: { // Edit parameters
 				if (this->sel == NULL) break;
 				char buff[512];
+				static char buff[512];
 				GRFBuildParamList(buff, this->sel, lastof(buff));
 				ShowQueryString(BindCString(buff), STR_NEWGRF_PARAMETER_QUERY, 63, 250, this, CS_ALPHANUMERAL);
 				SetDParamStr(0, buff);
 				ShowQueryString(STR_JUST_RAW_STRING, STR_NEWGRF_PARAMETER_QUERY, 63, 250, this, CS_ALPHANUMERAL);
 				break;
+			}
+		}
+	}
 	virtual void OnQueryTextFinished(char *str)

src/openttd.cpp

➞

Show inline comments

@@ @@ -755,13 +755,14 @@ static void StartScenario() @@
+{
 	_game_mode = GM_NORMAL;
 	/* invalid type */
 	if (_file_to_saveload.mode == SL_INVALID) {
 		DEBUG(sl, 0, "Savegame is obsolete or invalid format: '%s'", _file_to_saveload.name);
 		SetDParamStr(0, GetSaveLoadErrorString());
 		SetDParam(0, STR_JUST_RAW_STRING);
 		SetDParamStr(1, GetSaveLoadErrorString());
 		ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0);
 		_game_mode = GM_MENU;
 		return;
+	}
 	/* Reinitialize windows */
@@ @@ -771,13 +772,14 @@ static void StartScenario() @@
 	ResetGRFConfig(true);
 	/* Load game */
 	if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, SCENARIO_DIR) != SL_OK) {
 		LoadIntroGame();
 		SetDParamStr(0, GetSaveLoadErrorString());
 		SetDParam(0, STR_JUST_RAW_STRING);
 		SetDParamStr(1, GetSaveLoadErrorString());
 		ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0);
+	}
 	_settings_game.difficulty = _settings_newgame.difficulty;
 	/* Inititalize data */
@@ @@ -883,13 +885,14 @@ void SwitchMode(int new_mode) @@
 		case SM_LOAD: { /* Load game, Play Scenario */
 			ResetGRFConfig(true);
 			ResetWindowSystem();
 			if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, NO_DIRECTORY)) {
 				LoadIntroGame();
 				SetDParamStr(0, GetSaveLoadErrorString());
 				SetDParam(0, STR_JUST_RAW_STRING);
 				SetDParamStr(1, GetSaveLoadErrorString());
 				ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0);
 			} else {
 				if (_saveload_mode == SLD_LOAD_SCENARIO) {
 					StartupEngines();
+				}
 				/* Update the local player for a loaded game. It is either always
@@ @@ -924,13 +927,14 @@ void SwitchMode(int new_mode) @@
 		case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */
 			if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, NO_DIRECTORY)) {
 				SetLocalPlayer(OWNER_NONE);
 				_settings_newgame.game_creation.starting_year = _cur_year;
 			} else {
 				SetDParamStr(0, GetSaveLoadErrorString());
 				SetDParam(0, STR_JUST_RAW_STRING);
 				SetDParamStr(1, GetSaveLoadErrorString());
 				ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0);
+			}
 			break;
+		}
 		case SM_MENU: /* Switch to game intro menu */
@@ @@ -938,13 +942,14 @@ void SwitchMode(int new_mode) @@
 			break;
 		case SM_SAVE: /* Save game */
 			/* Make network saved games on pause compatible to singleplayer */
 			if (_networking && _pause_game == 1) _pause_game = 2;
 			if (SaveOrLoad(_file_to_saveload.name, SL_SAVE, NO_DIRECTORY) != SL_OK) {
 				SetDParamStr(0, GetSaveLoadErrorString());
 				SetDParam(0, STR_JUST_RAW_STRING);
 				SetDParamStr(1, GetSaveLoadErrorString());
 				ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0);
 			} else {
 				DeleteWindowById(WC_SAVELOAD, 0);
+			}
 			if (_networking && _pause_game == 2) _pause_game = 1;
 			break;

src/roadveh_gui.cpp

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ void DrawRoadVehDetails(const Vehicle *v @@
 				strecat(capacity, buffer, lastof(capacity));
 				first = false;
+			}
+		}
 		SetDParamStr(0, capacity);
-		DrawStringTruncated(x, y + 10 + y_offset, STR_JUST_STRING, TC_BLUE, 380 - x);
+		DrawStringTruncated(x, y + 10 + y_offset, STR_JUST_RAW_STRING, TC_BLUE, 380 - x);
 		for (const Vehicle *u = v; u != NULL; u = u->Next()) {
 			if (u->cargo_cap == 0) continue;
 			str = STR_8812_EMPTY;
 			if (!u->cargo.Empty()) {

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -1112,29 +1112,32 @@ struct CustomCurrencyWindow : Window { @@
 				break;
 			case CUSTCURR_SEPARATOR:
 				if (IsInsideMM(x, 10, 30)) { // clicked button
 					this->click = 1 << (line * 2 + 1);
+				}
 				str = BindCString(this->separator);
 				SetDParamStr(0, this->separator);
 				str = STR_JUST_RAW_STRING;
 				len = 1;
 				break;
 			case CUSTCURR_PREFIX:
 				if (IsInsideMM(x, 10, 30)) { // clicked button
 					this->click = 1 << (line * 2 + 1);
+				}
 				str = BindCString(_custom_currency.prefix);
 				SetDParamStr(0, _custom_currency.prefix);
 				str = STR_JUST_RAW_STRING;
 				len = 12;
 				break;
 			case CUSTCURR_SUFFIX:
 				if (IsInsideMM(x, 10, 30)) { // clicked button
 					this->click = 1 << (line * 2 + 1);
+				}
 				str = BindCString(_custom_currency.suffix);
 				SetDParamStr(0, _custom_currency.suffix);
 				str = STR_JUST_RAW_STRING;
 				len = 12;
 				break;
 			case CUSTCURR_TO_EURO:
 				if (IsInsideMM(x, 10, 30)) { // clicked buttons
 					if (x < 20) {

src/station_gui.cpp

➞

Show inline comments

@@ @@ -807,19 +807,20 @@ struct StationViewWindow : public Window @@
 				y += 10;
+			}
+		}
 		if (this->widget[SVW_ACCEPTS].data == STR_3032_RATINGS) { // small window with list of accepted cargo
 			char *b = _userstring;
 			char string[512];
 			char *b = string;
 			bool first = true;
 			b = InlineString(b, STR_000C_ACCEPTS);
 			for (CargoID i = 0; i < NUM_CARGO; i++) {
-				if (b >= lastof(_userstring) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode()
+				if (b >= lastof(string) - (1 + 2 * 4)) break; // ',' or ' ' and two calls to Utf8Encode()
 				if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE)) {
 					if (first) {
 						first = false;
 					} else {
 						/* Add a comma if this is not the first item */
 						*b++ = ',';
@@ @@ -832,15 +833,16 @@ struct StationViewWindow : public Window @@
 			/* If first is still true then no cargo is accepted */
 			if (first) b = InlineString(b, STR_00D0_NOTHING);
 			*b = '\0';
 			/* Make sure we detect any buffer overflow */
-			assert(b < endof(_userstring));
+			assert(b < endof(string));
 			DrawStringMultiLine(2, this->widget[SVW_ACCEPTLIST].top + 1, STR_SPEC_USERSTRING, this->widget[SVW_ACCEPTLIST].right - this->widget[SVW_ACCEPTLIST].left);
 			SetDParamStr(0, string);
 			DrawStringMultiLine(2, this->widget[SVW_ACCEPTLIST].top + 1, STR_JUST_RAW_STRING, this->widget[SVW_ACCEPTLIST].right - this->widget[SVW_ACCEPTLIST].left);
 		} else { // extended window with list of cargo ratings
 			y = this->widget[SVW_RATINGLIST].top + 1;
 			DrawString(2, y, STR_3034_LOCAL_RATING_OF_TRANSPORT, TC_FROMSTRING);
 			y += 10;

src/strgen/strgen.cpp

➞

Show inline comments

@@ @@ -487,12 +487,13 @@ static const CmdStruct _cmd_structs[] = @@
 	{"DATE_SHORT", EmitSingleChar, SCC_DATE_SHORT, 1, 0},
 	{"DATE_LONG",  EmitSingleChar, SCC_DATE_LONG, 1, 0},
 	{"SKIP", EmitSingleChar, SCC_SKIP, 1, 0},
 	{"STRING", EmitSingleChar, SCC_STRING, 1, C_CASE},
 	{"RAW_STRING", EmitSingleChar, SCC_RAW_STRING_POINTER, 1, 0},
 	// Numbers
 	{"COMMA", EmitSingleChar, SCC_COMMA, 1, 0}, // Number with comma
 	{"NUM",   EmitSingleChar, SCC_NUM,   1, 0}, // Signed number
 	{"CURRENCY",   EmitSingleChar, SCC_CURRENCY,    1, 0},
@@ @@ -714,13 +715,14 @@ static const CmdStruct *TranslateCmdForC @@
 	if (a == NULL) return NULL;
 	if (strcmp(a->cmd, "STRING1") == 0 ||
 			strcmp(a->cmd, "STRING2") == 0 ||
 			strcmp(a->cmd, "STRING3") == 0 ||
 			strcmp(a->cmd, "STRING4") == 0 ||
 			strcmp(a->cmd, "STRING5") == 0) {
 			strcmp(a->cmd, "STRING5") == 0 ||
 			strcmp(a->cmd, "RAW_STRING") == 0){
 		return FindCmd("STRING", 6);
+	}
 	if (strcmp(a->cmd, "SKIP") == 0) return NULL;
 	return a;

src/strings.cpp

➞

Show inline comments

@@ @@ -42,13 +42,12 @@ @@
 #include "saveload.h"
 #include "table/strings.h"
 #include "table/control_codes.h"
 DynamicLanguages _dynlang;
 char _userstring[128];
 uint64 _decode_parameters[20];
 static char *StationGetSpecialString(char *buff, int x, const char* last);
 static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed, const char* last);
 static char *GetSpecialPlayerNameString(char *buff, int ind, const int64 *argv, const char* last);
@@ @@ -93,23 +92,12 @@ static inline const int64 *GetArgvPtr(co @@
 	result = *argv;
 	(*argv) += n;
 	return result;
+}
 #define NUM_BOUND_STRINGS 8
 /* Array to hold the bound strings. */
 static const char *_bound_strings[NUM_BOUND_STRINGS];
 /* This index is used to implement a "round-robin" allocating of
  * slots for BindCString. NUM_BOUND_STRINGS slots are reserved.
  * Which means that after NUM_BOUND_STRINGS calls to BindCString,
  * the indices will be reused. */
 static int _bind_index;
 const char *GetStringPtr(StringID string)
+{
 	switch (GB(string, 11, 5)) {
 		case 28: return GetGRFStringPtr(GB(string, 0, 11));
 		case 29: return GetGRFStringPtr(GB(string, 0, 11) + 0x0800);
 		case 30: return GetGRFStringPtr(GB(string, 0, 11) + 0x1000);
@@ @@ -164,19 +152,13 @@ static char *GetStringWithArgs(char *buf @@
 			return FormatString(buffr, GetGRFStringPtr(index + 0x0800), argv, 0, last);
 		case 30:
 			return FormatString(buffr, GetGRFStringPtr(index + 0x1000), argv, 0, last);
 		case 31:
 			/* dynamic strings. These are NOT to be passed through the formatter,
 			 * but passed through verbatim. */
 			if (index < (STR_SPEC_USERSTRING & 0x7FF)) {
 				return strecpy(buffr, _bound_strings[index], last);
+			}
 			return FormatString(buffr, _userstring, NULL, 0, last);
 			NOT_REACHED();
+	}
 	if (index >= _langtab_num[tab]) {
 		error(
 			"String 0x%X is invalid. "
 			"Probably because an old version of the .lng file.\n", string
@@ @@ -197,38 +179,19 @@ char *InlineString(char *buf, StringID s @@
 	buf += Utf8Encode(buf, SCC_STRING_ID);
 	buf += Utf8Encode(buf, string);
 	return buf;
+}
 /**
  * This function takes a C-string and allocates a temporary string ID.
  * The StringID of the bound string is valid until BindCString is called
  * another NUM_BOUND_STRINGS times. So be careful when using it.
  * @param str temp string to add
  * @return the id of that temp string
  * @note formatting a DATE_TINY calls BindCString twice, thus reduces the
  *       amount of 'user' bound strings by 2.
  * @todo rewrite the BindCString system to make the limit flexible and
  *       non-round-robin. For example by using smart pointers that free
  *       the allocated StringID when they go out-of-scope/are freed.
  */
 StringID BindCString(const char *str)
+{
 	int idx = (++_bind_index) & (NUM_BOUND_STRINGS - 1);
 	_bound_strings[idx] = str;
 	return idx + STR_SPEC_DYNSTRING;
+}
 /** This function is used to "bind" a C string to a OpenTTD dparam slot.
  * @param n slot of the string
  * @param str string to bind
  */
 void SetDParamStr(uint n, const char *str)
+{
-	SetDParam(n, BindCString(str));
+	SetDParam(n, (uint64)str);
+}
 void InjectDParam(int amount)
+{
 	memmove(_decode_parameters + amount, _decode_parameters, sizeof(_decode_parameters) - amount * sizeof(uint64));
+}
@@ @@ -331,13 +294,13 @@ static char *FormatTinyDate(char *buff, @@
 	char day[3];
 	char month[3];
 	/* We want to zero-pad the days and months */
 	snprintf(day,   lengthof(day),   "%02i", ymd.day);
 	snprintf(month, lengthof(month), "%02i", ymd.month + 1);
-	int64 args[3] = { BindCString(day), BindCString(month), ymd.year };
+	int64 args[3] = { (int64)day, (int64)month, ymd.year };
 	return FormatString(buff, GetStringPtr(STR_DATE_TINY), args, 0, last);
+}
 static char *FormatGenericCurrency(char *buff, const CurrencySpec *spec, Money number, bool compact, const char* last)
+{
 	/* We are going to make number absolute for printing, so
@@ @@ -589,12 +552,18 @@ static char* FormatString(char* buff, co @@
 				break;
 			case SCC_STRING_ID: // {STRINL}
 				buff = GetStringWithArgs(buff, Utf8Consume(&str), argv, last);
 				break;
 			case SCC_RAW_STRING_POINTER: { // {RAW_STRING}
 				const char *str = (const char*)GetInt64(&argv);
 				buff = FormatString(buff, str, argv, casei, last);
 				break;
+			}
 			case SCC_DATE_LONG: // {DATE_LONG}
 				buff = FormatYmdString(buff, GetInt32(&argv), last);
 				break;
 			case SCC_DATE_SHORT: // {DATE_SHORT}
 				buff = FormatMonthAndYear(buff, GetInt32(&argv), last);
@@ @@ -1516,14 +1485,14 @@ void CheckForMissingGlyphsInLoadedLangua @@
 					 * we just Utf8 Encode it into the string, which takes
 					 * exactly three characters, so it replaces the "XXX" with
 					 * the color marker.
 					 */
 					static char *err_str = strdup("XXXThe current font is missing some of the characters used in the texts for this language. Read the readme to see how to solve this.");
 					Utf8Encode(err_str, SCC_YELLOW);
 					StringID err_msg = BindCString(err_str);
 					ShowErrorMessage(INVALID_STRING_ID, err_msg, 0, 0);
 					SetDParamStr(0, err_str);
 					ShowErrorMessage(INVALID_STRING_ID, STR_JUST_RAW_STRING, 0, 0);
 					return;
+				}
+			}
+		}
+	}
+}

src/strings_func.h

➞

Show inline comments

@@ @@ -8,14 +8,12 @@ @@
 #include "strings_type.h"
 char *InlineString(char *buf, StringID string);
 char *GetString(char *buffr, StringID string, const char *last);
 const char *GetStringPtr(StringID string);
 extern char _userstring[128];
 void InjectDParam(int amount);
 static inline void SetDParamX(uint64 *s, uint n, uint64 v)
+{
 	s[n] = v;
+}
@@ @@ -25,22 +23,14 @@ static inline void SetDParam(uint n, uin @@
 	extern uint64 _decode_parameters[20];
 	assert(n < lengthof(_decode_parameters));
 	_decode_parameters[n] = v;
+}
 /* Used to bind a C string name to a dparam number.
  * NOTE: This has a short lifetime. You can't
  *       use this string much later or it will be gone. */
 void SetDParamStr(uint n, const char *str);
 /** This function takes a C-string and allocates a temporary string ID.
  * The duration of the bound string is valid only until the next call to GetString,
  * so be careful. */
 StringID BindCString(const char *str);
 static inline uint64 GetDParamX(const uint64 *s, uint n)
+{
 	return s[n];
+}
 static inline uint64 GetDParam(uint n)

src/strings_type.h

➞

Show inline comments

@@ @@ -76,13 +76,9 @@ enum SpecialStrings { @@
 	SPECSTR_RESOLUTION_START   = SPECSTR_LANGUAGE_END + 1,
 	SPECSTR_RESOLUTION_END     = SPECSTR_RESOLUTION_START + 0x1F,
 	// reserve 32 strings for screenshot formats
 	SPECSTR_SCREENSHOT_START   = SPECSTR_RESOLUTION_END + 1,
 	SPECSTR_SCREENSHOT_END     = SPECSTR_SCREENSHOT_START + 0x1F,
 	// Used to implement SetDParamStr
 	STR_SPEC_DYNSTRING         = 0xF800,
 	STR_SPEC_USERSTRING        = 0xF808,
 };
 #endif /* STRINGS_TYPE_H */

src/table/control_codes.h

➞

Show inline comments

@@ @@ -63,12 +63,13 @@ enum StringControlCode { @@
 	SCC_SKIP,
 	SCC_STRING,
 	SCC_COMMA,
 	SCC_NUM,
 	SCC_STRING_ID,
 	SCC_RAW_STRING_POINTER,
 	SCC_PLURAL_LIST,
 	SCC_GENDER_LIST,
 	SCC_GENDER_INDEX,
 	SCC_ARG_INDEX,
 	SCC_SETCASE,
 	SCC_SWITCH_CASE,

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -450,13 +450,14 @@ uint ShowAdditionalText(int x, int y, ui @@
 uint ShowRefitOptionsList(int x, int y, uint w, EngineID engine)
+{
 	/* List of cargo types of this engine */
 	uint32 cmask = EngInfo(engine)->refit_mask;
 	/* List of cargo types available in this climate */
 	uint32 lmask = _cargo_mask;
 	char *b = _userstring;
 	char string[512];
 	char *b = string;
 	/* Draw nothing if the engine is not refittable */
 	if (CountBits(cmask) <= 1) return 0;
 	b = InlineString(b, STR_PURCHASE_INFO_REFITTABLE_TO);
@@ @@ -474,28 +475,28 @@ uint ShowRefitOptionsList(int x, int y, @@
 		bool first = true;
 		/* Add each cargo type to the list */
 		for (CargoID cid = 0; cid < NUM_CARGO; cid++) {
 			if (!HasBit(cmask, cid)) continue;
-			if (b >= lastof(_userstring) - (2 + 2 * 4)) break; // ", " and two calls to Utf8Encode()
+			if (b >= lastof(string) - (2 + 2 * 4)) break; // ", " and two calls to Utf8Encode()
-			if (!first) b = strecpy(b, ", ", lastof(_userstring));
+			if (!first) b = strecpy(b, ", ", lastof(string));
 			first = false;
 			b = InlineString(b, GetCargo(cid)->name);
+		}
+	}
 	/* Terminate and display the completed string */
 	*b = '\0';
 	/* Make sure we detect any buffer overflow */
-	assert(b < endof(_userstring));
+	assert(b < endof(string));
-	return DrawStringMultiLine(x, y, STR_SPEC_USERSTRING, w);
+	return DrawStringMultiLine(x, y, STR_JUST_RAW_STRING, w);
+}
 /** Sort vehicles by their number */
 static int CDECL VehicleNumberSorter(const Vehicle* const *a, const Vehicle* const *b)
+{

0 comments (0 inline, 0 general)