From cd8da0d69eaec81702ca033f375957bb24acdbf1 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 8 Apr 2009 12:52:53 +0000 Subject: (svn r15982) -Codechange: use GetAddressAsString to get the name instead of passing the hostname and the IP into a string. --- src/lang/afrikaans.txt | 2 +- src/lang/arabic_egypt.txt | 2 +- src/lang/brazilian_portuguese.txt | 2 +- src/lang/bulgarian.txt | 2 +- src/lang/catalan.txt | 2 +- src/lang/croatian.txt | 2 +- src/lang/czech.txt | 2 +- src/lang/danish.txt | 2 +- src/lang/dutch.txt | 2 +- src/lang/english.txt | 2 +- src/lang/english_US.txt | 2 +- src/lang/esperanto.txt | 2 +- src/lang/estonian.txt | 2 +- src/lang/finnish.txt | 2 +- src/lang/french.txt | 2 +- src/lang/galician.txt | 2 +- src/lang/german.txt | 2 +- src/lang/hebrew.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/icelandic.txt | 2 +- src/lang/indonesian.txt | 2 +- src/lang/italian.txt | 2 +- src/lang/japanese.txt | 2 +- src/lang/korean.txt | 2 +- src/lang/latvian.txt | 2 +- src/lang/lithuanian.txt | 2 +- src/lang/luxembourgish.txt | 2 +- src/lang/norwegian_bokmal.txt | 2 +- src/lang/norwegian_nynorsk.txt | 2 +- src/lang/piglatin.txt | 2 +- src/lang/polish.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/romanian.txt | 2 +- src/lang/russian.txt | 2 +- src/lang/simplified_chinese.txt | 2 +- src/lang/slovak.txt | 2 +- src/lang/slovenian.txt | 2 +- src/lang/spanish.txt | 2 +- src/lang/swedish.txt | 2 +- src/lang/traditional_chinese.txt | 2 +- src/lang/turkish.txt | 2 +- src/lang/ukrainian.txt | 2 +- src/lang/unfinished/greek.txt | 2 +- src/lang/welsh.txt | 2 +- src/network/core/address.cpp | 14 +++++++------- src/network/network_gui.cpp | 5 ++--- 46 files changed, 53 insertions(+), 54 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 3047e9683..81823c799 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1275,7 +1275,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Taal: STR_NETWORK_TILESET :{SILVER}Blokkiestel: {WHITE}{STRING} STR_NETWORK_MAP_SIZE :{SILVER}Kaart groote: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_VERSION :{SILVER}Verskaffer hersiening: {WHITE}{STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}Verskaffer adres: {WHITE}{STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Verskaffer adres: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Begin datum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Huidige datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Wagwoord beskerm! diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index f5feba170..2330cbbaa 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}الل 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}عنوان الخادم: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}تاريخ البداية: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}التاريخ الحالي: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}كلمت السر محمية! diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index eba76ce81..4953e2a53 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Idioma: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}IP do servidor: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Data de inicio: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Data atual: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protegido por senha! diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 6fb9469f2..43ab425fe 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1291,7 +1291,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Ези 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Адрес на сървъра: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Начална дата: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Текуща дата: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Защитено с парола! diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index a730e503b..2484e9c1f 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Idioma: STR_NETWORK_TILESET :{SILVER}Grup de cel·les: {WHITE}{STRING} STR_NETWORK_MAP_SIZE :{SILVER}Mida 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adreça del servidor: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Data inicial: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Data actual: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protegit per contrasenya! diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index d84c945a0..cc7adb815 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1373,7 +1373,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Jezik: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adresa poslužitelja: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Datum početka: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Trenutni datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Zaštićeno zaporkom! diff --git a/src/lang/czech.txt b/src/lang/czech.txt index fda3d1650..de12c6b4d 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1375,7 +1375,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Jazyk: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adresa serveru: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Počáteční datum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Současné datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Chráněno heslem! diff --git a/src/lang/danish.txt b/src/lang/danish.txt index ad81986ff..2a9d23dce 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Sprog: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Serveradresse: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Start dato: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Nuværende dato: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Beskyttet af kodeord! diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 069c73b89..7ab9614f4 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Taal: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Server adres: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Start datum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Huidige datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Beveiligd met wachtwoord! diff --git a/src/lang/english.txt b/src/lang/english.txt index 13b6ebf6c..9ae0cd068 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Languag 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}{RAW_STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}Server address: {WHITE}{RAW_STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Server address: {WHITE}{RAW_STRING} 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! diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 1ac913a77..95767cc5b 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Languag 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_ADDRESS :{SILVER}Server address: {WHITE}{STRING} 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! diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index eebb004f2..8ea14ffe3 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1171,7 +1171,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Lingvo: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Servila adreso: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Komenca dato: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Nuna dato: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protektata per pasvorto! diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index bfff9c1e3..ddb0baebd 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1338,7 +1338,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Keel: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Serveri aadress: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Aeg alguses: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Aeg hetkel: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Parooliga kaitstud! diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 3a537cd2e..1dd135f44 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Kieli: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Palvelimen osoite: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Aloitusvuosi: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Päivämäärä: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Salasanasuojattu! diff --git a/src/lang/french.txt b/src/lang/french.txt index 9e874e633..8003349f1 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Langue: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adresse du serveur : {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Date de début : {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Date courante : {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protégée par mot de passe ! diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 5124465cd..5d11d03bb 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1249,7 +1249,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Idioma: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Dirección do servidor: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Data de comezo: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Data actual: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}¡Protexido con clave! diff --git a/src/lang/german.txt b/src/lang/german.txt index c82e52aea..944d47bff 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Sprache 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Serveradresse: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Startdatum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Aktuelles Datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Passwortgeschützt! diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 31a8f3ff3..4654251c7 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1295,7 +1295,7 @@ STR_NETWORK_LANGUAGE :{SILVER}שפה: STR_NETWORK_TILESET :{WHITE}{STRING}{SILVER} :סוג הקרקע STR_NETWORK_MAP_SIZE :{SILVER}גודל המפה: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_VERSION :{SILVER}גרסת השרת: {WHITE}{STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}כתובת השרת: {WHITE}{STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}כתובת השרת: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}תאריך התחלה: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}תאריך נוכחי: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}מוגן בסיסמה! diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 9f8a8862d..c8652cb62 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1341,7 +1341,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Nyelv: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}A szerver címe: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Kezdési dátum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Jelenlegi dátum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Jelszóval védve! diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 69ae63fa2..8718d9925 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Tungum 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Veffang þjóns: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Upphafsdagsetning: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Núverandi dagsetning: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Varið með lykilorði! diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 10debdb13..943f65fcd 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Bahasa: STR_NETWORK_TILESET :{SILVER}Ukuran "Tileset": {WHITE}{STRING} STR_NETWORK_MAP_SIZE :{SILVER}Ukuran Peta: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_VERSION :{SILVER}Versi Server: {WHITE}{STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}Alamat Server: {WHITE}{STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Alamat Server: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Tanggal mulai: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Tanggal sekarang: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Terproteksi dengan kata kunci! diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 5177299be..5ee23d3e7 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1309,7 +1309,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Lingua: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Indirizzo del server: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Data di inizio: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Data corrente: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protetto da password! diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index ca386a97c..db62315be 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1289,7 +1289,7 @@ STR_NETWORK_LANGUAGE :{SILVER}国語 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}サーバアドレス：{WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}開始の日付：{WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}現在の日付：{WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}パスワードが必要！ diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 3501cadb5..5abd7757a 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}언어: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}서버 주소: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}시작 날짜: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}현재 날짜: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}암호가 걸려있습니다! diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 8e92c93a6..a4b557911 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Valoda: STR_NETWORK_TILESET :{SILVER}Attēlu komplekts: {WHITE}{STRING} STR_NETWORK_MAP_SIZE :{SILVER}Kartes izmērs: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_VERSION :{SILVER}Servera versija: {WHITE}{STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}Servera adrese: {WHITE}{STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Servera adrese: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Sākuma datums: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Šībrīža datums: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Aizsargāts ar paroli! diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 1ef89fe84..cd1a4c507 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1328,7 +1328,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Kalba: STR_NETWORK_TILESET :{SILVER}Pavadinimas: {WHITE}{STRING} STR_NETWORK_MAP_SIZE :{SILVER}Žemėlapio dydis: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_VERSION :{SILVER}Serverio versija: {WHITE}{STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}Serverio adresas: {WHITE}{STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Serverio adresas: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Žaidimo pradžia: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Dabartinė data: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Apsaugota slaptazodžiu! diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index e655236f0..691aa5c9d 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1243,7 +1243,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Sprooch STR_NETWORK_TILESET :{SILVER}Tileset: {WHITE}{STRING} STR_NETWORK_MAP_SIZE :{SILVER}Kaartgréisst: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_VERSION :{SILVER}Serverversioun: {WHITE}{STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}Serveraddress: {WHITE}{STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Serveraddress: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Start Datum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Momentanen Datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Passwuertgeschützt! diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 33e486a8f..7c6a47991 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1292,7 +1292,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Språk: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Server addresse: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Startet: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Nettverksdato: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Passordbeskyttet! diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index df2352e7e..2be2afd1c 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Språk: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adressa til tenaren: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Starta: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Noverande dato: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Passordbeskytta! diff --git a/src/lang/piglatin.txt b/src/lang/piglatin.txt index c96aafe57..ec674bd5c 100644 --- a/src/lang/piglatin.txt +++ b/src/lang/piglatin.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Anguage 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Erversay addressway: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Artstay ateday: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Urrentcay ateday: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Asswordpay otectedpray! diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 275989f74..4768a4212 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1350,7 +1350,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Język: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adres serwera: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Data uruchomienia: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Bieżąca data: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Chronione hasłem! diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 7ca125337..5c5a443a6 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Idioma: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Endereço do servidor: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Data de início: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Data actual: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protegido por password! diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 9c57b8835..d03986180 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Limba: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adresa serverului: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Data de inceput: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Data curentă: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protejat cu parola! diff --git a/src/lang/russian.txt b/src/lang/russian.txt index d6128cef5..6a79e5bb2 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1309,7 +1309,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Язы 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Адрес сервера: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Дата начала: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Текущая дата: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Защищено паролем! diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 3d123a394..32941f875 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1303,7 +1303,7 @@ STR_NETWORK_LANGUAGE :{SILVER}语　 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}服务器地址： {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}开始日期： {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}当前日期： {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}有密码保护！ diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index e007a38ea..b655a4f25 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1374,7 +1374,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Jazyk: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Adresa servera: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Datum zaciatku: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Aktualny datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Heslo: diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index aafcdbc0d..aea3c26a3 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1349,7 +1349,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Jezik: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Naslov strežnika: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Začetni datum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Tekoči datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Zaščiten z geslom! diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 862b6963e..ae1c6f4d6 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1308,7 +1308,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Idioma: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Dirección servidor: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Fecha inicio: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Fecha actual: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Protegido por contraseña! diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 8c9b9712a..a31481dc7 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Språk: 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Server adress: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Startdatum: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Nuvarande datum: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Lösenordsskyddat! diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index b34cdd8e1..7289a3a60 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1302,7 +1302,7 @@ STR_NETWORK_LANGUAGE :{SILVER}語言 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}伺服器位址：{WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}開始日期：{WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}目前日期：{WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}受密碼保護！ diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 8902191c7..bc865317f 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Dil: { 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Sunucu adresi: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Başlama tarihi: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Şimdiki tarih: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Parola korumalı! diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 49b7ea311..23ec7d33f 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1432,7 +1432,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Мов 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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Адреса серверу: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Дата початку: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Поточна дата: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Захищено паролем! diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index f192ce7f9..870332993 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -1287,7 +1287,7 @@ STR_NETWORK_CLIENTS :{SILVER}Συμ STR_NETWORK_LANGUAGE :{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} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Διεύθυνση διακομιστή: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Ημερομηνία έναρξης: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Τρέχουσα ημερομηνία: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Προστατευμένο με κωδικό! diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 9381db94c..294de16c1 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1307,7 +1307,7 @@ STR_NETWORK_LANGUAGE :{SILVER}Iaith: STR_NETWORK_TILESET :{SILVER}Set Teils: {WHITE}{STRING} STR_NETWORK_MAP_SIZE :{SILVER}Maint Map: {WHITE}{COMMA}x{COMMA} STR_NETWORK_SERVER_VERSION :{SILVER}Fersiwn Gweinydd: {WHITE}{STRING} -STR_NETWORK_SERVER_ADDRESS :{SILVER}Cyfeiriad Gweinydd: {WHITE}{STRING} : {NUM} +STR_NETWORK_SERVER_ADDRESS :{SILVER}Cyfeiriad Gweinydd: {WHITE}{STRING} STR_NETWORK_START_DATE :{SILVER}Dyddiad Cychwyn: {WHITE}{DATE_SHORT} STR_NETWORK_CURRENT_DATE :{SILVER}Dyddiad Presennol: {WHITE}{DATE_SHORT} STR_NETWORK_PASSWORD :{SILVER}Wedi'i Ddiogelu gan Gyfrinair! diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp index ad0e6b18f..963a2e970 100644 --- a/src/network/core/address.cpp +++ b/src/network/core/address.cpp @@ -16,10 +16,7 @@ const char *NetworkAddress::GetHostname() { if (StrEmpty(this->hostname)) { assert(this->address_length != 0); - char *buf = this->hostname; - if (this->address.ss_family == AF_INET6) buf = strecpy(buf, "[", lastof(this->hostname)); - getnameinfo((struct sockaddr *)&this->address, this->address_length, buf, lastof(this->hostname) - buf, NULL, 0, NI_NUMERICHOST); - if (this->address.ss_family == AF_INET6) strecat(buf, "]", lastof(this->hostname)); + getnameinfo((struct sockaddr *)&this->address, this->address_length, this->hostname, sizeof(this->hostname), NULL, 0, NI_NUMERICHOST); } return this->hostname; } @@ -60,6 +57,11 @@ const char *NetworkAddress::GetAddressAsString(bool with_family) { /* 6 = for the : and 5 for the decimal port number */ static char buf[NETWORK_HOSTNAME_LENGTH + 6 + 7]; + char *p = buf; + if (this->address.ss_family == AF_INET6) p = strecpy(p, "[", lastof(buf)); + p = strecpy(p, this->GetHostname(), lastof(buf)); + if (this->address.ss_family == AF_INET6) p = strecpy(p, "]", lastof(buf)); + p += seprintf(p, lastof(buf), ":%d", this->GetPort()); if (with_family) { char family; @@ -68,9 +70,7 @@ const char *NetworkAddress::GetAddressAsString(bool with_family) case AF_INET6: family = '6'; break; default: family = '?'; break; } - seprintf(buf, lastof(buf), "%s:%d (IPv%c)", this->GetHostname(), this->GetPort(), family); - } else { - seprintf(buf, lastof(buf), "%s:%d", this->GetHostname(), this->GetPort()); + seprintf(p, lastof(buf), " (IPv%c)", family); } return buf; } diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 50a902d59..8c16f4ddc 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -352,7 +352,7 @@ public: virtual void OnPaint() { - const NetworkGameList *sel = this->server; + NetworkGameList *sel = this->server; const SortButtonState arrow = this->servers.IsDescSortOrder() ? SBS_DOWN : SBS_UP; if (this->servers.NeedRebuild()) { @@ -453,8 +453,7 @@ public: DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_VERSION, TC_GOLD); // server version y += 10; - SetDParamStr(0, sel->info.hostname); - SetDParam(1, sel->address.GetPort()); + SetDParamStr(0, sel->address.GetAddressAsString()); DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_ADDRESS, TC_GOLD); // server address y += 10; -- cgit v1.2.3-54-g00ecf