summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lang/english_US.txt9
-rw-r--r--src/lang/norwegian_bokmal.txt9
-rw-r--r--src/lang/russian.txt2
3 files changed, 16 insertions, 4 deletions
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index c946e3aa2..bfeddd72a 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -783,6 +783,7 @@ STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * P
STR_STATUSBAR_AUTOSAVE :{RED}AUTOSAVE
STR_STATUSBAR_SAVING_GAME :{RED}* * SAVING GAME * *
+STR_STATUSBAR_SPECTATOR :{WHITE}(spectator)
# News message history
STR_MESSAGE_HISTORY :{WHITE}Message History
@@ -2045,6 +2046,8 @@ STR_NETWORK_SERVER_LIST_GAMESCRIPT :{SILVER}Game Sc
STR_NETWORK_SERVER_LIST_PASSWORD :{SILVER}Password protected!
STR_NETWORK_SERVER_LIST_SERVER_OFFLINE :{SILVER}SERVER OFFLINE
STR_NETWORK_SERVER_LIST_SERVER_FULL :{SILVER}SERVER FULL
+STR_NETWORK_SERVER_LIST_SERVER_BANNED :{SILVER}SERVER BANNED YOU
+STR_NETWORK_SERVER_LIST_SERVER_TOO_OLD :{SILVER}SERVER TOO OLD
STR_NETWORK_SERVER_LIST_VERSION_MISMATCH :{SILVER}VERSION MISMATCH
STR_NETWORK_SERVER_LIST_GRF_MISMATCH :{SILVER}NEWGRF MISMATCH
@@ -2112,7 +2115,7 @@ STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Company
STR_NETWORK_COMPANY_LIST_CLIENT_LIST :Online players
# Network client list
-STR_NETWORK_CLIENT_LIST_CAPTION :{WHITE}Multiplayer
+STR_NETWORK_CLIENT_LIST_CAPTION :{WHITE}Online Players
STR_NETWORK_CLIENT_LIST_SERVER :{BLACK}Server
STR_NETWORK_CLIENT_LIST_SERVER_NAME :{BLACK}Name
STR_NETWORK_CLIENT_LIST_SERVER_NAME_TOOLTIP :{BLACK}Name of the server you are playing on
@@ -2162,6 +2165,7 @@ STR_NETWORK_CLIENT_LIST_ASK_COMPANY_RESET :{YELLOW}Are you
STR_NETWORK_CLIENT_LIST_ASK_COMPANY_UNLOCK :{YELLOW}Are you sure you want to reset the password of company '{COMPANY}'?
STR_NETWORK_ASK_RELAY_CAPTION :{WHITE}Use relay?
+STR_NETWORK_ASK_RELAY_TEXT :{YELLOW}Failed to establish a connection between you and server '{STRING}'.{}Would you like to relay this session via '{STRING}'?
STR_NETWORK_ASK_RELAY_NO :{BLACK}No
STR_NETWORK_ASK_RELAY_YES_ONCE :{BLACK}Yes, this once
STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Yes, don't ask again
@@ -2200,7 +2204,7 @@ STR_NETWORK_CHAT_OSKTITLE :{BLACK}Enter te
# Network messages
STR_NETWORK_ERROR_NOTAVAILABLE :{WHITE}No network devices found
STR_NETWORK_ERROR_NOSERVER :{WHITE}Could not find any network games
-STR_NETWORK_ERROR_NOCONNECTION :{WHITE}The server didn't answer the request
+STR_NETWORK_ERROR_NOCONNECTION :{WHITE}Connection to the server timed out or was refused
STR_NETWORK_ERROR_NEWGRF_MISMATCH :{WHITE}Could not connect due to NewGRF mismatch
STR_NETWORK_ERROR_DESYNC :{WHITE}Network-Game synchronization failed
STR_NETWORK_ERROR_LOSTCONNECTION :{WHITE}Network-Game connection lost
@@ -2282,6 +2286,7 @@ STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}The serv
STR_NETWORK_MESSAGE_KICKED :*** {STRING} was kicked. Reason: ({STRING})
STR_NETWORK_ERROR_COORDINATOR_REGISTRATION_FAILED :{WHITE}Server registration failed
+STR_NETWORK_ERROR_COORDINATOR_REUSE_OF_INVITE_CODE :{WHITE}Another server with the same invite-code registered itself. Switching to "local" game-type.
STR_NETWORK_ERROR_COORDINATOR_ISOLATED :{WHITE}Your server doesn't allow remote connections
STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL :{WHITE}Other players won't be able to connect to your server
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 2bdf06fdf..0eca6a676 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -785,6 +785,7 @@ STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * SPI
STR_STATUSBAR_AUTOSAVE :{RED}AUTOLAGRING
STR_STATUSBAR_SAVING_GAME :{RED}* * LAGRER SPILL * *
+STR_STATUSBAR_SPECTATOR :{WHITE}(spectator)
# News message history
STR_MESSAGE_HISTORY :{WHITE}Meldingshistorikk
@@ -2048,6 +2049,8 @@ STR_NETWORK_SERVER_LIST_GAMESCRIPT :{SILVER}Spillsk
STR_NETWORK_SERVER_LIST_PASSWORD :{SILVER}Passordbeskyttet!
STR_NETWORK_SERVER_LIST_SERVER_OFFLINE :{SILVER}TJENEREN ER FRAKOBLET
STR_NETWORK_SERVER_LIST_SERVER_FULL :{SILVER}TJENEREN ER FULL
+STR_NETWORK_SERVER_LIST_SERVER_BANNED :{SILVER}DU ER BANNET FRA SERVEREN
+STR_NETWORK_SERVER_LIST_SERVER_TOO_OLD :{SILVER}SERVEREN FOR GAMMEL
STR_NETWORK_SERVER_LIST_VERSION_MISMATCH :{SILVER}DU HAR EN ANNEN VERSJON ENN TJENEREN
STR_NETWORK_SERVER_LIST_GRF_MISMATCH :{SILVER}DU HAR EN ANNEN NEWGRF ENN TJENEREN
@@ -2116,7 +2119,7 @@ STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Firmaet
STR_NETWORK_COMPANY_LIST_CLIENT_LIST :Påloggede spillere
# Network client list
-STR_NETWORK_CLIENT_LIST_CAPTION :{WHITE}Flerspiller
+STR_NETWORK_CLIENT_LIST_CAPTION :{WHITE}Påloggede Spillere
STR_NETWORK_CLIENT_LIST_SERVER :{BLACK}Server
STR_NETWORK_CLIENT_LIST_SERVER_NAME :{BLACK}Navn
STR_NETWORK_CLIENT_LIST_SERVER_NAME_TOOLTIP :{BLACK}Navnet på serveren du spiller på
@@ -2166,6 +2169,7 @@ STR_NETWORK_CLIENT_LIST_ASK_COMPANY_RESET :{YELLOW}Er du s
STR_NETWORK_CLIENT_LIST_ASK_COMPANY_UNLOCK :{YELLOW}Er du sikker på at du vil tilbakestille passordet til firma '{COMPANY}'?
STR_NETWORK_ASK_RELAY_CAPTION :{WHITE}Vil du bruke videresending?
+STR_NETWORK_ASK_RELAY_TEXT :{YELLOW}Kunne ikke opprette en kobling mellom deg og serveren '{STRING}'.{}Vil du videresende denne økten via '{STRING}'?
STR_NETWORK_ASK_RELAY_NO :{BLACK}Nei
STR_NETWORK_ASK_RELAY_YES_ONCE :{BLACK}Ja, denne
STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Ja, ikke spør igjen
@@ -2204,7 +2208,7 @@ STR_NETWORK_CHAT_OSKTITLE :{BLACK}Skriv in
# Network messages
STR_NETWORK_ERROR_NOTAVAILABLE :{WHITE}Ingen nettverksadapter funnet
STR_NETWORK_ERROR_NOSERVER :{WHITE}Kunne ikke finne noen nettverksspill
-STR_NETWORK_ERROR_NOCONNECTION :{WHITE}Tjeneren svarte ikke på forespørselen
+STR_NETWORK_ERROR_NOCONNECTION :{WHITE}Tilkoblingen til serveren ble tidsavbrutt eller avslått
STR_NETWORK_ERROR_NEWGRF_MISMATCH :{WHITE}Kunne ikke koble til pga. ulike versjoner av NewGRF
STR_NETWORK_ERROR_DESYNC :{WHITE}Synkronisering av nettverksspill feilet.
STR_NETWORK_ERROR_LOSTCONNECTION :{WHITE}Mistet tilkobling til nettverksspill
@@ -2286,6 +2290,7 @@ STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Tjeneren
STR_NETWORK_MESSAGE_KICKED :*** {STRING} ble kastet ut. Grunn: ({STRING})
STR_NETWORK_ERROR_COORDINATOR_REGISTRATION_FAILED :{WHITE}Serverregistrering mislykket
+STR_NETWORK_ERROR_COORDINATOR_REUSE_OF_INVITE_CODE :{WHITE}En annen server med samme invitasjons kode finnes. Bytter til "lokal" modus.
STR_NETWORK_ERROR_COORDINATOR_ISOLATED :{WHITE}Serveren din tillater ikke eksterne tilkoblinger
STR_NETWORK_ERROR_COORDINATOR_ISOLATED_DETAIL :{WHITE}Andre spillere vil ikke kunne koble seg til din server
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 584d96a35..194c6b98d 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -2197,6 +2197,8 @@ STR_NETWORK_SERVER_LIST_GAMESCRIPT :{SILVER}Игр
STR_NETWORK_SERVER_LIST_PASSWORD :{SILVER}Защищён паролем!
STR_NETWORK_SERVER_LIST_SERVER_OFFLINE :{SILVER}СЕРВЕР ОТКЛЮЧЁН
STR_NETWORK_SERVER_LIST_SERVER_FULL :{SILVER}СЕРВЕР ЗАПОЛНЕН
+STR_NETWORK_SERVER_LIST_SERVER_BANNED :{SILVER}ВЫ ЗАБЛОКИРОВАНЫ НА СЕРВЕРЕ
+STR_NETWORK_SERVER_LIST_SERVER_TOO_OLD :{SILVER}СЕРВЕР УСТАРЕВШЕЙ ВЕРСИИ
STR_NETWORK_SERVER_LIST_VERSION_MISMATCH :{SILVER}ВЕРСИЯ НЕ ПОДХОДИТ
STR_NETWORK_SERVER_LIST_GRF_MISMATCH :{SILVER}НЕ СОВПАДАЕТ НАБОР NEWGRF