edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2635

Browse source 
2635: We don't just list countries, but also regions like EU  r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-08-29 10:37:52 +00:00 committed by GitHub
parent 5f6df2b5a4 e9edca65e9
commit a6738d9fd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 178 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/languages/belarusian.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Лічыць толькі гульцоў
Country
== Сцяг вашай краіны
Current
== Бягучы
@ -720,6 +717,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

102
data/languages/bosnian.txt
View file

@ -108,9 +108,6 @@ Controls
Count players only
== Izbroj samo igrače
Country
== Država
Current
== Current
@ -785,12 +782,6 @@ Remove chat
Markers:
== Markeri
%.2f MiB
==
%.2f KiB
==
Demo
== Demo-snimak
@ -854,9 +845,6 @@ Automatically take statboard screenshot
Automatically create statboard csv
== Automatski kreiraj csv tablice bodova
Max CSVs
==
Dummy settings
== Postavke Dummy-a
@ -926,9 +914,6 @@ Show HUD
UI mouse s.
== Osjet. miša u UI
Borderless window
==
may cause delay
== može prouzrokovati kašnjenje
@ -974,12 +959,6 @@ Threaded sound loading
Map sound volume
== Glasnoća zvuka mape
HUD
==
DDNet
==
DDNet Client needs to be restarted to complete update!
== DDNet Klijent mora da se restartuje da bi završio ažuriranje!
@ -1079,9 +1058,6 @@ Save ghost
Gameplay
== Igra
Overlay entities
==
Size
== Veličina
@ -1094,12 +1070,6 @@ Show others (own team only)
Show quads
== Prikaži quads
AntiPing limit
==
AntiPing
==
AntiPing: predict other players
== AntiPing: preduhitri ostale igrače
@ -1148,18 +1118,6 @@ New random timeout code
Time
== Vrijeme
Manual %3d:%02d
==
Race %3d:%02d
==
Auto %3d:%02d
==
Replay %3d:%02d
==
Follow
== Prati
@ -1178,18 +1136,9 @@ Ratio
Net
== Net
FPM
==
Spree
==
Best
== Najbolji
Grabs
==
1 new mention
== 1 novo označenje
@ -1198,3 +1147,54 @@ Grabs
9+ new mentions
== 9+ novih označenja
Country / Region
==
%.2f MiB
==
%.2f KiB
==
Max CSVs
==
Borderless window
==
HUD
==
DDNet
==
Overlay entities
==
AntiPing limit
==
AntiPing
==
Manual %3d:%02d
==
Race %3d:%02d
==
Auto %3d:%02d
==
Replay %3d:%02d
==
FPM
==
Spree
==
Grabs
==

6
data/languages/brazilian_portuguese.txt
View file

@ -120,9 +120,6 @@ Controls
Count players only
== Contar apenas jogadores
Country
== País
Current
== Atual
@ -1188,6 +1185,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/bulgarian.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Брой на играчите
Country
== Държава
Current
== Текущ
@ -717,6 +714,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/catalan.txt
View file

@ -102,9 +102,6 @@ Controls
Count players only
== Només contar jugadors
Country
== País
Current
== Actual
@ -1187,5 +1184,8 @@ Replay %3d:%02d
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Client message
==

6
data/languages/chuvash.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Çынсене анчах шутлама
Country
== Çĕрĕн ялавĕ
Current
== Хальхи
@ -720,6 +717,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/czech.txt
View file

@ -109,9 +109,6 @@ Controls
Count players only
== Započítat hrající hráče
Country
== Národnost
Current
== Aktuálně
@ -723,6 +720,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/danish.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Tæl kun spillere
Country
== Land
Current
== Nuværende
@ -720,6 +717,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/dutch.txt
View file

@ -118,9 +118,6 @@ Controls
Count players only
== Tel alleen spelers
Country
== Land
Current
== Huidig
@ -1199,6 +1196,9 @@ Grabs
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Client message
==

6
data/languages/finnish.txt
View file

@ -107,9 +107,6 @@ Controls
Count players only
== Laske vain pelaajat
Country
== Maa
Current
== Nykyinen
@ -721,6 +718,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/french.txt
View file

@ -118,9 +118,6 @@ Controls
Count players only
== Seulement les joueurs
Country
== Pays
Current
== Actuellement
@ -1215,6 +1212,9 @@ transmits your player name to info2.ddnet.tw
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Client message
==

6
data/languages/german.txt
View file

@ -120,9 +120,6 @@ Controls
Count players only
== Nur Spieler zählen
Country
== Land
Current
== Aktuell
@ -1211,3 +1208,6 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
Client message
== Client-Nachricht
Country / Region
== Land / Region

6
data/languages/greek.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Μέτρηση παικτών μόνο
Country
== Χώρα
Current
== Τρέχουσα
@ -723,6 +720,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/hungarian.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Számontartott játékosok
Country
== Ország
Current
== Aktuális
@ -1193,6 +1190,9 @@ Are you sure that you want to disconnect your dummy?
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Skin prefix
==

6
data/languages/italian.txt
View file

@ -110,9 +110,6 @@ Controls
Count players only
== Conta solo giocatori
Country
== Paese
Current
== Attuale
@ -726,6 +723,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/japanese.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== 実際のプレイヤー数を表示
Country
== 国
Current
== 現行
@ -720,6 +717,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/korean.txt
View file

@ -105,9 +105,6 @@ Controls
Count players only
== 플레이어만 세기
Country
== 국가
Current
== 현재
@ -719,6 +716,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/kyrgyz.txt
View file

@ -105,9 +105,6 @@ Controls
Count players only
== Оюнчуларды гана саноо
Country
== Өлкө
Crc:
== Crc:
@ -714,6 +711,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/norwegian.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Tell bare spillere
Country
== Land
Current
== Nåværende
@ -720,6 +717,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

5
data/languages/persian.txt
View file

@ -68,8 +68,6 @@ Controls
== ﺎﻫ ﻝﺮﺘﻨﻛ
Count players only
== ﺎﻫ ﻦﻜﯾﺯﺎﺑ ﺩﺍﺪﻌﺗ
Country
== ﺭﻮﺸﻛ
Current
== ﯽﻠﻌﻓ
Custom colors
@ -791,6 +789,9 @@ Best
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
may cause delay
==

6
data/languages/polish.txt
View file

@ -111,9 +111,6 @@ Controls
Count players only
== Licz tylko graczy
Country
== Kraj
Current
== Aktualnie
@ -1199,5 +1196,8 @@ Show others (own team only)
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Client message
==

6
data/languages/portuguese.txt
View file

@ -112,9 +112,6 @@ Controls
Count players only
== Contar apenas jogadores
Country
== País
Current
== Atual
@ -958,6 +955,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/romanian.txt
View file

@ -112,9 +112,6 @@ Controls
Count players only
== Numără doar jucătorii
Country
== Țara
Current
== Curent
@ -729,6 +726,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/russian.txt
View file

@ -112,9 +112,6 @@ Controls
Count players only
== Считать только игроков
Country
== Флаг вашей страны
Current
== Текущий
@ -1200,5 +1197,8 @@ Client message
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Markers
==

47
data/languages/serbian.txt
View file

@ -109,9 +109,6 @@ Controls
Count players only
== Broj samo igrače
Country
== Država
Current
== Trenutno
@ -655,30 +652,39 @@ Replay feature is disabled!
Game paused
== Igra pauzirana
Learn
== Nauči
Loading DDNet Client
== Učitavanje DDNet Klijenta
Render demo
== Renderuj demo
Disconnect Dummy
== Diskonektuj Dummy
Video name:
== Video naziv:
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
== Tipka K da se ubijes (restart), tipka q da pauziras i gledas druge igrače.
Server best:
==
Personal best:
==
Learn
== Nauči
Browser
==
Ghost
==
Loading DDNet Client
== Učitavanje DDNet Klijenta
Reconnect in %d sec
==
Render demo
== Renderuj demo
Replace video
==
@ -688,14 +694,11 @@ File already exists, do you want to overwrite it?
Are you sure that you want to disconnect?
==
Disconnect Dummy
== Diskonektuj Dummy
Are you sure that you want to disconnect your dummy?
==
Welcome to DDNet
==
==
DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you.
==
@ -718,11 +721,11 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Destination file already exist
Country / Region
==
Video name:
== Video naziv:
Destination file already exist
==
Show DDNet map finishes in server browser
==
@ -1194,9 +1197,3 @@ Grabs
9+ new mentions
==
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
== Tipka K da se ubijes (restart), tipka q da pauziras i gledas druge igrače.
Client message
==

6
data/languages/simplified_chinese.txt
View file

@ -113,9 +113,6 @@ Controls
Count players only
== 屏蔽旁观位
Country
== 国家/地区
Current
== 当前
@ -1207,3 +1204,6 @@ Show others (own team only)
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
== 使用 k键 自杀以重新开始，使用 q键 可以暂停以旁观他人或查看地图。 请在设置中查看其他按键。
Country / Region
== 国家 / 地区

6
data/languages/slovak.txt
View file

@ -106,9 +106,6 @@ Controls
Count players only
== Nepočítať divákov
Country
== Krajina
Current
== Aktuálne
@ -720,6 +717,9 @@ It's recommended that you check the settings to adjust them to your liking befor
Please enter your nick name below.
==
Country / Region
==
Destination file already exist
==

6
data/languages/spanish.txt
View file

@ -112,9 +112,6 @@ Controls
Count players only
== Solo contar jugadores
Country
== País
Current
== Actual
@ -1200,5 +1197,8 @@ Grabs
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Client message
==

6
data/languages/swedish.txt
View file

@ -108,9 +108,6 @@ Controls
Count players only
== Räkna endast spelare
Country
== Land
Current
== Nuvarande
@ -1196,5 +1193,8 @@ Show others (own team only)
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Client message
==

32
data/languages/traditional_chinese.txt
View file

@ -107,9 +107,6 @@ Controls
Count players only
== 過濾旁觀位
Country
== 國家/地區
Current
== 當前
@ -1028,21 +1025,12 @@ Time
Show entities
== 實體層顯示開關
Race %3d:%02d
== 競速賽 %3d:%02d
Replay %3d:%02d
== 回放 %3d:%02d
Show all
== 顯示所有玩家
Downloading %s:
== 正在下載 %s:
Manual %3d:%02d
== 手動 %3d:%02d
%d new mentions
== %d 條新提示
@ -1103,9 +1091,6 @@ Size
Dummy copy
== 分身同步動作
Auto %3d:%02d
== 自動 %3d:%02d
9+ new mentions
== 9+ 條新提示
@ -1200,4 +1185,19 @@ Show others (own team only)
== 顯示其他玩家 (僅同隊伍)
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
== 使用 k鍵 自殺以重新開始，使用 q鍵 可以暫停以旁觀他人或檢視地圖。 請在設定中檢視其他按鍵。
== 使用 k鍵 自殺以重新開始，使用 q鍵 可以暫停以旁觀他人或檢視地圖。 請在設定中檢視其他按鍵。
Country / Region
== 國家/地區
Manual %3d:%02d
== 手動 %3d:%02d
Race %3d:%02d
== 競速賽 %3d:%02d
Auto %3d:%02d
== 自動 %3d:%02d
Replay %3d:%02d
== 回放 %3d:%02d

6
data/languages/turkish.txt
View file

@ -111,9 +111,6 @@ Controls
Count players only
== Sadece oyuncuları say
Country
== Ülke
Current
== Şimdiki
@ -1201,3 +1198,6 @@ Grabs
9+ new mentions
== 9+ yeni bildirim
Country / Region
==

6
data/languages/ukrainian.txt
View file

@ -579,9 +579,6 @@ Quit anyway?
%i seconds left
== Залишилось %i секунд
Country
== Країна
Unable to delete the demo
== Неможливо видалити демо
@ -1194,5 +1191,8 @@ Grabs
Use k key to kill (restart), q to pause and watch other players. See settings for other key binds.
==
Country / Region
==
Markers
==

2
src/game/client/components/menus.cpp
View file

@ -1454,7 +1454,7 @@ int CMenus::Render()
ActSelection = g_Config.m_BrFilterCountryIndex;
static float s_ScrollValue = 0.0f;
int OldSelected = -1;
UiDoListboxStart(&s_ScrollValue, &Box, 50.0f, Localize("Country"), "", m_pClient->m_pCountryFlags->Num(), 6, OldSelected, s_ScrollValue);
UiDoListboxStart(&s_ScrollValue, &Box, 50.0f, Localize("Country / Region"), "", m_pClient->m_pCountryFlags->Num(), 6, OldSelected, s_ScrollValue);
for(int i = 0; i < m_pClient->m_pCountryFlags->Num(); ++i)
{

2
src/game/client/components/menus_settings.cpp
View file

@ -349,7 +349,7 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView)
MainView.HSplitTop(20.0f, 0, &MainView);
static float s_ScrollValue = 0.0f;
int OldSelected = -1;
UiDoListboxStart(&s_ScrollValue, &MainView, 50.0f, Localize("Country"), "", m_pClient->m_pCountryFlags->Num(), 6, OldSelected, s_ScrollValue);
UiDoListboxStart(&s_ScrollValue, &MainView, 50.0f, Localize("Country / Region"), "", m_pClient->m_pCountryFlags->Num(), 6, OldSelected, s_ScrollValue);
for(int i = 0; i < m_pClient->m_pCountryFlags->Num(); ++i)
{