80 changes: 70 additions & 10 deletions data/languages/italian.txt
Expand Up @@ -352,9 +352,6 @@ Red team wins!
Refresh
== Aggiorna

Refreshing master servers
== Aggiornamento server principali

Remote console
== Console remota

Expand Down Expand Up @@ -970,22 +967,16 @@ Show HUD
UI mouse s.
== Sensibilità mouse nei menu

Borderless window
== Finestra senza bordi

may cause delay
== Può esserci ritardo

Screen
== Schermo

Use OpenGL 3.3 (experimental)
== Usa OpenGL 3.3 (sperimentale)

Preinit VBO (iGPUs only)
== Preinit VBO (solo iGPU)

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
== Unità multiple di texture

Use high DPI
Expand Down Expand Up @@ -1263,6 +1254,39 @@ Grabs
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Are you sure that you want to disconnect and switch to a different server?
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Refreshing...
==

Leak IP
==

Markers:
==

Expand All @@ -1281,21 +1305,57 @@ Chat command
Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

Use modern OpenGL
==

Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Preview
==

Overlay entities
==

Show local player's key presses
==

Background
==

Expand Down
576 changes: 318 additions & 258 deletions data/languages/japanese.txt

Large diffs are not rendered by default.

80 changes: 70 additions & 10 deletions data/languages/korean.txt
Expand Up @@ -337,9 +337,6 @@ Red team wins!
Refresh
== 새로고침

Refreshing master servers
== 마스터 서버를 새로 고치는 중

Remote console
== 원격 콘솔

Expand Down Expand Up @@ -714,6 +711,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -735,6 +735,30 @@ transmits your player name to info2.ddnet.tw
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Search
==

Expand All @@ -753,6 +777,9 @@ Exclude
%d player
==

Refreshing...
==

Filter connecting players
==

Expand All @@ -768,6 +795,9 @@ Countries
Types
==

Leak IP
==

Select a name
==

Expand Down Expand Up @@ -822,6 +852,9 @@ Kill
Pause
==

Time
==

Reload
==

Expand Down Expand Up @@ -948,7 +981,13 @@ UI mouse s.
Dummy
==

Borderless window
Windowed
==

Windowed borderless
==

Desktop fullscreen
==

may cause delay
Expand All @@ -957,13 +996,13 @@ may cause delay
Screen
==

Use OpenGL 3.3 (experimental)
Use modern OpenGL
==

Preinit VBO (iGPUs only)
==

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==

Use high DPI
Expand Down Expand Up @@ -1032,10 +1071,19 @@ Show health + ammo
Show names in chat in team colors
==

Show votes window after voting
==

Show kill messages
==

Show votes window after voting
Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
Expand All @@ -1044,6 +1092,18 @@ Laser Outline Color
Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Expand Down Expand Up @@ -1122,6 +1182,9 @@ Show other players' hook collision lines
Show other players' key presses
==

Show local player's key presses
==

Old mouse mode
==

Expand Down Expand Up @@ -1222,9 +1285,6 @@ Update failed! Check log...
Restart
==

Time
==

Manual
==

Expand Down
80 changes: 70 additions & 10 deletions data/languages/kyrgyz.txt
Expand Up @@ -406,9 +406,6 @@ Red team wins!
Refresh
== Жаңылоо

Refreshing master servers
== Мастер-серверлер тизмесин жаңылоо

Remote console
== Алыскы консоль

Expand Down Expand Up @@ -709,6 +706,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -730,6 +730,30 @@ transmits your player name to info2.ddnet.tw
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Search
==

Expand All @@ -748,6 +772,9 @@ Exclude
%d player
==

Refreshing...
==

Filter connecting players
==

Expand All @@ -763,6 +790,9 @@ Countries
Types
==

Leak IP
==

Select a name
==

Expand Down Expand Up @@ -814,6 +844,9 @@ Kill
Pause
==

Time
==

Reload
==

Expand Down Expand Up @@ -940,7 +973,13 @@ UI mouse s.
Dummy
==

Borderless window
Windowed
==

Windowed borderless
==

Desktop fullscreen
==

may cause delay
Expand All @@ -949,13 +988,13 @@ may cause delay
Screen
==

Use OpenGL 3.3 (experimental)
Use modern OpenGL
==

Preinit VBO (iGPUs only)
==

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==

Use high DPI
Expand Down Expand Up @@ -1024,10 +1063,19 @@ Show health + ammo
Show names in chat in team colors
==

Show votes window after voting
==

Show kill messages
==

Show votes window after voting
Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
Expand All @@ -1036,6 +1084,18 @@ Laser Outline Color
Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Expand Down Expand Up @@ -1114,6 +1174,9 @@ Show other players' hook collision lines
Show other players' key presses
==

Show local player's key presses
==

Old mouse mode
==

Expand Down Expand Up @@ -1214,9 +1277,6 @@ Update failed! Check log...
Restart
==

Time
==

Manual
==

Expand Down
82 changes: 71 additions & 11 deletions data/languages/norwegian.txt
Expand Up @@ -349,9 +349,6 @@ Red team wins!
Refresh
== Oppdater

Refreshing master servers
== Opdaterer master-servere

Remote console
== Server-konsoll

Expand Down Expand Up @@ -897,23 +894,17 @@ Show HUD
UI mouse s.
== UI museh.

Borderless window
== Rammeløst vindu

may cause delay
== kan gi forsinkelse

Screen
== Skjerm

Use OpenGL 3.3 (experimental)
== Bruk OpenGL 3.3 (eksperimentell)

Preinit VBO (iGPUs only)
== Preinit. VBO (kun iGPU)

Multiple texture units (disable for MacOS)
== Multiple texture units (slå av for MacOS)
Multiple texture units (disable for macOS)
== Multiple texture units (slå av for macOS)

Use high DPI
== Bruk høy DPI
Expand Down Expand Up @@ -1246,24 +1237,93 @@ Play
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Are you sure that you want to disconnect and switch to a different server?
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Refreshing...
==

Leak IP
==

Chat command
==

Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

Use modern OpenGL
==

Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Preview
==

Show local player's key presses
==

Background
==

Expand Down
76 changes: 68 additions & 8 deletions data/languages/persian.txt
Expand Up @@ -361,6 +361,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

There's an unsaved map in the editor, you might want to save it before you quit the game.
==

Expand Down Expand Up @@ -409,10 +412,31 @@ transmits your player name to info2.ddnet.tw
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Type
==

Refreshing master servers
Getting server list from master server
==

Search
Expand All @@ -439,6 +463,9 @@ Server address:
Refresh
==

Refreshing...
==

Server filter
==

Expand Down Expand Up @@ -475,6 +502,9 @@ Reset filter
Server details
==

Leak IP
==

Scoreboard
==

Expand Down Expand Up @@ -592,6 +622,9 @@ Vote description:
Vote command:
==

Time
==

Reload
==

Expand Down Expand Up @@ -787,7 +820,13 @@ Miscellaneous
Display Modes
==

Borderless window
Windowed
==

Windowed borderless
==

Desktop fullscreen
==

V-Sync
Expand All @@ -802,13 +841,13 @@ Screen
FSAA samples
==

Use OpenGL 3.3 (experimental)
Use modern OpenGL
==

Preinit VBO (iGPUs only)
==

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==

Use high DPI
Expand Down Expand Up @@ -907,10 +946,19 @@ Show health + ammo
Show names in chat in team colors
==

Show votes window after voting
==

Show kill messages
==

Show votes window after voting
Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
Expand All @@ -919,6 +967,18 @@ Laser Outline Color
Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Expand Down Expand Up @@ -997,6 +1057,9 @@ Show other players' hook collision lines
Show other players' key presses
==

Show local player's key presses
==

Old mouse mode
==

Expand Down Expand Up @@ -1106,9 +1169,6 @@ Round
Spectators
==

Time
==

Score
==

Expand Down
82 changes: 71 additions & 11 deletions data/languages/polish.txt
Expand Up @@ -350,9 +350,6 @@ Red team wins!
Refresh
== Odśwież

Refreshing master servers
== Odświeżanie głównych serwerów

Remote console
== Zdalna konsola

Expand Down Expand Up @@ -811,14 +808,11 @@ Automatically create statboard csv
Destination file already exist
== Plik docelowy już istnieje

Use OpenGL 3.3 (experimental)
== Użyj OpenGL 3.3 (eksperymentalne)

Reload
== Przeładuj

Multiple texture units (disable for MacOS)
== Jednostki z wieloma teksturami (wyłącz dla MacOS)
Multiple texture units (disable for macOS)
== Jednostki z wieloma teksturami (wyłącz dla macOS)

Replay feature is disabled!
== Funkcja odtwarzania jest wyłączona!
Expand Down Expand Up @@ -1030,9 +1024,6 @@ FPM
Are you sure that you want to disconnect?
== Czy jesteś pewien, że chcesz opuścić serwer?

Borderless window
== Okno bez ramek

Successfully saved the replay!
== Pomyślnie zapisano powtórkę!

Expand Down Expand Up @@ -1247,24 +1238,93 @@ Play
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Are you sure that you want to disconnect and switch to a different server?
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Refreshing...
==

Leak IP
==

Chat command
==

Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

Use modern OpenGL
==

Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Preview
==

Show local player's key presses
==

Background
==

Expand Down
82 changes: 71 additions & 11 deletions data/languages/portuguese.txt
Expand Up @@ -70,9 +70,6 @@ Blue team wins!
Body
== Corpo

Borderless window
== Janela S/ Bordas

Call vote
== Votação

Expand Down Expand Up @@ -362,9 +359,6 @@ Red team wins!
Refresh
== Atualizar

Refreshing master servers
== A Atualizar servidores

Remote console
== Remote console

Expand Down Expand Up @@ -911,6 +905,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -932,6 +929,30 @@ transmits your player name to info2.ddnet.tw
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

%d of %d servers
==

Expand All @@ -944,6 +965,9 @@ Theme
%d player
==

Refreshing...
==

Filter connecting players
==

Expand All @@ -953,6 +977,9 @@ Indicate map finish
Unfinished map
==

Leak IP
==

Markers:
==

Expand Down Expand Up @@ -989,6 +1016,9 @@ Kill
Pause
==

Time
==

Reload
==

Expand Down Expand Up @@ -1082,16 +1112,25 @@ UI mouse s.
Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

may cause delay
==

Use OpenGL 3.3 (experimental)
Use modern OpenGL
==

Preinit VBO (iGPUs only)
==

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==

Use high DPI
Expand All @@ -1118,12 +1157,33 @@ Assets
Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Expand Down Expand Up @@ -1163,6 +1223,9 @@ Show other players' hook collision lines
Show other players' key presses
==

Show local player's key presses
==

Background
==

Expand Down Expand Up @@ -1236,9 +1299,6 @@ Downloading %s:
Update failed! Check log...
==

Time
==

Manual
==

Expand Down
80 changes: 70 additions & 10 deletions data/languages/romanian.txt
Expand Up @@ -356,9 +356,6 @@ Red team wins!
Refresh
== Reîncarcă

Refreshing master servers
== Reîncarcă serverele principale

Remote console
== Consolă server

Expand Down Expand Up @@ -724,6 +721,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -745,6 +745,30 @@ transmits your player name to info2.ddnet.tw
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Search
==

Expand All @@ -763,6 +787,9 @@ Exclude
%d player
==

Refreshing...
==

Filter connecting players
==

Expand All @@ -778,6 +805,9 @@ Countries
Types
==

Leak IP
==

Select a name
==

Expand Down Expand Up @@ -829,6 +859,9 @@ Kill
Pause
==

Time
==

Reload
==

Expand Down Expand Up @@ -955,7 +988,13 @@ UI mouse s.
Dummy
==

Borderless window
Windowed
==

Windowed borderless
==

Desktop fullscreen
==

may cause delay
Expand All @@ -964,13 +1003,13 @@ may cause delay
Screen
==

Use OpenGL 3.3 (experimental)
Use modern OpenGL
==

Preinit VBO (iGPUs only)
==

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==

Use high DPI
Expand Down Expand Up @@ -1039,10 +1078,19 @@ Show health + ammo
Show names in chat in team colors
==

Show votes window after voting
==

Show kill messages
==

Show votes window after voting
Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
Expand All @@ -1051,6 +1099,18 @@ Laser Outline Color
Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Expand Down Expand Up @@ -1129,6 +1189,9 @@ Show other players' hook collision lines
Show other players' key presses
==

Show local player's key presses
==

Old mouse mode
==

Expand Down Expand Up @@ -1229,9 +1292,6 @@ Update failed! Check log...
Restart
==

Time
==

Manual
==

Expand Down
208 changes: 135 additions & 73 deletions data/languages/russian.txt

Large diffs are not rendered by default.

80 changes: 70 additions & 10 deletions data/languages/serbian.txt
Expand Up @@ -350,9 +350,6 @@ Red team wins!
Refresh
== Osveži

Refreshing master servers
== Osvežavam master servere

Remote console
== Udaljena konzola

Expand Down Expand Up @@ -722,6 +719,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -740,6 +740,30 @@ transmits your player name to info2.ddnet.tw
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Search
==

Expand All @@ -758,6 +782,9 @@ Exclude
%d player
==

Refreshing...
==

Filter connecting players
==

Expand All @@ -773,6 +800,9 @@ Countries
Types
==

Leak IP
==

Select a name
==

Expand Down Expand Up @@ -824,6 +854,9 @@ Kill
Pause
==

Time
==

Reload
==

Expand Down Expand Up @@ -953,7 +986,13 @@ UI mouse s.
Dummy
==

Borderless window
Windowed
==

Windowed borderless
==

Desktop fullscreen
==

may cause delay
Expand All @@ -962,13 +1001,13 @@ may cause delay
Screen
==

Use OpenGL 3.3 (experimental)
Use modern OpenGL
==

Preinit VBO (iGPUs only)
==

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==

Use high DPI
Expand Down Expand Up @@ -1037,10 +1076,19 @@ Show health + ammo
Show names in chat in team colors
==

Show votes window after voting
==

Show kill messages
==

Show votes window after voting
Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
Expand All @@ -1049,6 +1097,18 @@ Laser Outline Color
Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Expand Down Expand Up @@ -1127,6 +1187,9 @@ Show other players' hook collision lines
Show other players' key presses
==

Show local player's key presses
==

Old mouse mode
==

Expand Down Expand Up @@ -1224,9 +1287,6 @@ Update failed! Check log...
Restart
==

Time
==

Manual
==

Expand Down
82 changes: 71 additions & 11 deletions data/languages/serbian_cyrillic.txt
Expand Up @@ -343,9 +343,6 @@ Red team wins!
Refresh
== Освежи

Refreshing master servers
== Освежам мастер сервере

Remote console
== Удаљена конзола

Expand Down Expand Up @@ -522,9 +519,6 @@ You must restart the game for all settings to take effect.

##### needs translation #####

Borderless window
== Прозор без ивица

Demo
== Снимак

Expand Down Expand Up @@ -940,14 +934,11 @@ UI mouse s.
may cause delay
== може проузроковати кашњење

Use OpenGL 3.3 (experimental)
== Користи OpenGL 3.3 (експериментално)

Preinit VBO (iGPUs only)
== Preinit VBO (само у iGPUs)

Multiple texture units (disable for MacOS)
== Вишеструке текстурне јединице (угашено за MacOS)
Multiple texture units (disable for macOS)
== Вишеструке текстурне јединице (угашено за macOS)

Use high DPI
== Користи високи DPI
Expand Down Expand Up @@ -1226,6 +1217,39 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Refreshing...
==

Leak IP
==

Smooth Dynamic Camera
==

Expand All @@ -1235,6 +1259,18 @@ Chat command
Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

Use modern OpenGL
==

Game sound volume
==

Expand All @@ -1247,18 +1283,42 @@ Background music volume
Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Preview
==

Show local player's key presses
==

Background
==

Expand Down
124 changes: 93 additions & 31 deletions data/languages/simplified_chinese.txt
Expand Up @@ -11,6 +11,8 @@
# 2020.8.19 TsFreddie
# 2020.8.20 Dan_cao
# 2020.11.12 TsFreddie
# 2021.5.27 Momo
# 2021.6.1 TsFreddie
##### /authors #####

##### translated strings #####
Expand Down Expand Up @@ -190,7 +192,7 @@ Friends
== 好友

Fullscreen
== 全屏幕
== 独占全屏

Game
== 游戏
Expand Down Expand Up @@ -344,7 +346,7 @@ Pistol

[Demo browser]
Play
== 编辑器
== 播放

Play background music
== 播放背景音乐
Expand All @@ -362,7 +364,7 @@ Player options
== 玩家选项

Players
== 玩家数
== 玩家

Please balance teams!
== 队伍人数不平衡!
Expand All @@ -385,9 +387,6 @@ Red team wins!
Refresh
== 刷新

Refreshing master servers
== 正在刷新主服务器

Remote console
== 远程控制台

Expand Down Expand Up @@ -574,9 +573,6 @@ Yes
You must restart the game for all settings to take effect.
== 你需要重启游戏来使某些设置生效。

Borderless window
== 无边框窗口

Demo
== 回放

Expand Down Expand Up @@ -758,13 +754,13 @@ Default zoom
== 默认缩放

AntiPing: predict other players
== AntiPing:预测其他玩家
== 延迟补偿:预测其他玩家

AntiPing: predict weapons
== AntiPing:预测武器
== 延迟补偿:预测武器

AntiPing: predict grenade paths
== AntiPing:预测榴弹路径
== 延迟补偿:预测榴弹路径

Show other players' hook collision lines
== 显示其他玩家的钩索辅助线
Expand Down Expand Up @@ -823,7 +819,7 @@ Ratio
##### Ratio的算法是击杀除以死亡次数 #####

AntiPing
== AntiPing
== 延迟补偿

Countries
== 国家
Expand Down Expand Up @@ -871,7 +867,7 @@ Frags
== 击杀数

Enable long pain sound (used when shooting in freeze)
== 启用长时间痛苦的声音(在冻结时使用)
== 启用冻结呼救声

%.2f MiB
== %.2f MiB
Expand Down Expand Up @@ -928,11 +924,8 @@ Preinit VBO (iGPUs only)
Activate
== 启用

Multiple texture units (disable for MacOS)
== 多重纹理单元 (MacOS不可用)

Use OpenGL 3.3 (experimental)
== 使用 OpenGL 3.3 (实验性)
Multiple texture units (disable for macOS)
== 多重纹理单元 (macOS不可用)

File already exists, do you want to overwrite it?
== 文件已存在,是否覆盖?
Expand Down Expand Up @@ -971,7 +964,7 @@ Downloading %s:
== 正在下载 %s:

%d new mentions
== %d 条新提示
== %d 条新提及

Toggle dummy
== 切换分身
Expand Down Expand Up @@ -1001,7 +994,7 @@ Zoom in
== 视野放大

1 new mention
== 1 条新提示
== 1 条新提及

Update failed! Check log...
== 更新失败!请检查日志...
Expand Down Expand Up @@ -1031,7 +1024,7 @@ Dummy copy
== 分身同步动作

9+ new mentions
== 9+ 条新提示
== 9+ 条新提及

Statboard
== 统计板
Expand Down Expand Up @@ -1260,31 +1253,100 @@ Discord
== 开黑啦

The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==
== 材质 %s 的宽度无法被 %d 整除,或者高度无法被 %d 整除,这可能会导致视觉错误。

Chat command
==
== 聊天框指令(/)

Dummy
==
== 分身

Show client IDs
==
== 显示客户端ID

Laser Outline Color
==
== 激光边框颜色

Laser Inner Color
==
== 激光颜色

Preview
==
== 预览

Background
==
== 背景

Entities Background color
==
== 实体层背景颜色

Regular Background Color
== 背景层背景颜色

AFR
== 非洲

ASI
== 亚洲

AUS
== 澳洲

EUR
== 欧洲

NA
== 北美

SA
== 南美

CHN
== 中国

Getting server list from master server
== 正在从主服务器获取服务器列表

Leak IP
== 暴露IP

Windowed
== 窗口化

Windowed borderless
== 无边框窗口

Desktop fullscreen
== 无边框全屏

Use modern OpenGL
== 使用现代OpenGL

Hookline
== 钩索辅助线

No hit
== 未命中

Hookable
== 可钩墙壁

Tee
== 其他玩家

Are you sure that you want to disconnect and switch to a different server?
==

Refreshing...
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Show local player's key presses
==
80 changes: 70 additions & 10 deletions data/languages/slovak.txt
Expand Up @@ -347,9 +347,6 @@ Red team wins!
Refresh
== Obnoviť

Refreshing master servers
== Obnovujem master servery

Remote console
== Vzdialená konzola

Expand Down Expand Up @@ -715,6 +712,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -736,6 +736,30 @@ transmits your player name to info2.ddnet.tw
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Search
==

Expand All @@ -754,6 +778,9 @@ Exclude
%d player
==

Refreshing...
==

Filter connecting players
==

Expand All @@ -769,6 +796,9 @@ Countries
Types
==

Leak IP
==

Select a name
==

Expand Down Expand Up @@ -820,6 +850,9 @@ Kill
Pause
==

Time
==

Reload
==

Expand Down Expand Up @@ -949,7 +982,13 @@ UI mouse s.
Dummy
==

Borderless window
Windowed
==

Windowed borderless
==

Desktop fullscreen
==

may cause delay
Expand All @@ -958,13 +997,13 @@ may cause delay
Screen
==

Use OpenGL 3.3 (experimental)
Use modern OpenGL
==

Preinit VBO (iGPUs only)
==

Multiple texture units (disable for MacOS)
Multiple texture units (disable for macOS)
==

Use high DPI
Expand Down Expand Up @@ -1033,10 +1072,19 @@ Show health + ammo
Show names in chat in team colors
==

Show votes window after voting
==

Show kill messages
==

Show votes window after voting
Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
Expand All @@ -1045,6 +1093,18 @@ Laser Outline Color
Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Expand Down Expand Up @@ -1123,6 +1183,9 @@ Show other players' hook collision lines
Show other players' key presses
==

Show local player's key presses
==

Old mouse mode
==

Expand Down Expand Up @@ -1223,9 +1286,6 @@ Update failed! Check log...
Restart
==

Time
==

Manual
==

Expand Down
180 changes: 121 additions & 59 deletions data/languages/spanish.txt

Large diffs are not rendered by default.

82 changes: 71 additions & 11 deletions data/languages/swedish.txt
Expand Up @@ -350,9 +350,6 @@ Red team wins!
Refresh
== Uppdatera

Refreshing master servers
== Uppdaterar huvudservrar

Remote console
== Serverkonsol

Expand Down Expand Up @@ -835,9 +832,6 @@ Reset wanted weapon on death
Search
== Sök

Borderless window
== Gränslös fönster

FPM
== FPM

Expand Down Expand Up @@ -892,8 +886,8 @@ Normal message
Show score
== Visa poäng

Multiple texture units (disable for MacOS)
== Multiple texture units (avaktivera för MacOS)
Multiple texture units (disable for macOS)
== Multiple texture units (avaktivera för macOS)

Refresh Rate
== Uppdateringsfrekvens
Expand Down Expand Up @@ -1084,9 +1078,6 @@ Show quads
Show names in chat in team colors
== Visa namn in chatten med lag färger

Use OpenGL 3.3 (experimental)
== Använd OpenGL 3.3 (experimentell)

Update now
== Updatera nu

Expand Down Expand Up @@ -1199,9 +1190,42 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

Refreshing...
==

Leak IP
==

Demos directory
==

Expand All @@ -1223,6 +1247,18 @@ Chat command
Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

Use modern OpenGL
==

Game sound volume
==

Expand All @@ -1238,18 +1274,42 @@ Assets
Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Preview
==

Show local player's key presses
==

Background
==

Expand Down
121 changes: 91 additions & 30 deletions data/languages/traditional_chinese.txt
Expand Up @@ -5,6 +5,7 @@
# 2020.8.19 TsFreddie
# 2020.8.20 Dan_cao
# 2020.11.12 TsFreddie
# 2021.6.1 TsFreddie
##### /authors #####

##### translated strings #####
Expand Down Expand Up @@ -184,7 +185,7 @@ Friends
== 好友

Fullscreen
== 全螢幕
== 獨占全螢幕

Game
== 遊戲
Expand Down Expand Up @@ -356,7 +357,7 @@ Player options
== 玩家選項

Players
== 玩家數
== 玩家

Please balance teams!
== 隊伍人數不平衡!
Expand All @@ -379,9 +380,6 @@ Red team wins!
Refresh
== 重新整理

Refreshing master servers
== 正在重新整理主伺服器

Remote console
== 遠端控制檯

Expand Down Expand Up @@ -568,9 +566,6 @@ Yes
You must restart the game for all settings to take effect.
== 你需要重啟遊戲來使某些設定生效。

Borderless window
== 無邊框視窗

Demo
== 回放

Expand Down Expand Up @@ -865,7 +860,7 @@ Frags
== 擊殺數

Enable long pain sound (used when shooting in freeze)
== 啟用長時間痛苦的聲音(在凍結時使用)
== 啟用在凍結時的呼救聲

%.2f MiB
== %.2f MiB
Expand All @@ -874,7 +869,7 @@ Refresh Rate
== 重新整理率

New random timeout code
== 新隨機超時程式碼
== 隨機生成新的超時還原碼

Suicides
== 自殺數
Expand Down Expand Up @@ -922,11 +917,8 @@ Preinit VBO (iGPUs only)
Activate
== 啟用

Multiple texture units (disable for MacOS)
== 多重紋理單元 (MacOS不可用)

Use OpenGL 3.3 (experimental)
== 使用 OpenGL 3.3 (實驗性)
Multiple texture units (disable for macOS)
== 多重紋理單元 (macOS不可用)

File already exists, do you want to overwrite it?
== 檔案已存在,是否覆蓋?
Expand Down Expand Up @@ -965,7 +957,7 @@ Downloading %s:
== 正在下載 %s:

%d new mentions
== %d 條新提示
== %d 條新提及

Toggle dummy
== 切換分身
Expand Down Expand Up @@ -995,7 +987,7 @@ Zoom in
== 視距放大

1 new mention
== 1 條新提示
== 1 條新提及

Update failed! Check log...
== 更新失敗!請檢查日誌...
Expand Down Expand Up @@ -1025,7 +1017,7 @@ Dummy copy
== 分身同步動作

9+ new mentions
== 9+ 條新提示
== 9+ 條新提及

Statboard
== 統計板
Expand Down Expand Up @@ -1230,7 +1222,7 @@ Assets
== 材質

Use old chat style
== 舊版聊天框
== 原始聊天框

Use current map as background
== 使用當前地圖作爲實體層背景地圖
Expand All @@ -1248,37 +1240,106 @@ Assets directory
== 材質目錄

The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==
== 紋理 %s 的寬度無法被 %d 整除,或者高度無法被 %d 整除,這可能會導致視覺錯誤。

AFR
== 非洲

ASI
== 亞洲

AUS
== 澳洲

EUR
== 歐洲

NA
== 北美

SA
== 南美

CHN
== 中國

Getting server list from master server
== 正在從主伺服器獲取伺服器列表

Leak IP
== 洩露IP

Chat command
==
== 聊天框指令

Dummy
==
== 分身

Windowed
== 視窗化

Windowed borderless
== 無邊框視窗

Desktop fullscreen
== 無邊框全螢幕

Use modern OpenGL
== 使用現代OpenGL

Show client IDs
==
== 顯示客戶端ID

Laser Outline Color
==
== 鐳射線邊框顏色

Laser Inner Color
==
== 鐳射線顏色

Hookline
== 鉤索輔助線

No hit
== 沒有擊中

Hookable
== 可鉤牆壁

Tee
== 其他玩家

Preview
==
== 預覽

Background
==
== 背景

Entities Background color
==
== 實體層背景顏色

Regular Background Color
==
== 背景層背景顏色

Discord
==
== Discord

https://ddnet.tw/discord
== https://ddnet.tw/discord

Are you sure that you want to disconnect and switch to a different server?
==

Refreshing...
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Show local player's key presses
==
82 changes: 71 additions & 11 deletions data/languages/turkish.txt
Expand Up @@ -349,9 +349,6 @@ Red team wins!
Refresh
== Yenile

Refreshing master servers
== Ana sunucu yenileniyor

Remote console
== Uzak Konsol

Expand Down Expand Up @@ -903,23 +900,17 @@ Show HUD
UI mouse s.
== Arayüzde mouse duy.

Borderless window
== Kenarsız pencere

may cause delay
== gecikmelere sebep olabilir

Screen
== Ekran

Use OpenGL 3.3 (experimental)
== OpenGL 3.3 Kullan (deneysel)

Preinit VBO (iGPUs only)
== Preinit VBO (sadece iGPUs)

Multiple texture units (disable for MacOS)
== Çoklu doku birimleri (MacOS'da kullanılmaz)
Multiple texture units (disable for macOS)
== Çoklu doku birimleri (macOS'da kullanılmaz)

Use high DPI
== Yüksek DPI kullan
Expand Down Expand Up @@ -1152,6 +1143,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -1161,6 +1155,30 @@ Speed
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

%d of %d servers
==

Expand All @@ -1173,6 +1191,12 @@ Theme
%d player
==

Refreshing...
==

Leak IP
==

Demos directory
==

Expand Down Expand Up @@ -1200,6 +1224,18 @@ Chat command
Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

Use modern OpenGL
==

Game sound volume
==

Expand All @@ -1215,18 +1251,42 @@ Assets
Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Preview
==

Show local player's key presses
==

Background
==

Expand Down
82 changes: 71 additions & 11 deletions data/languages/ukrainian.txt
Expand Up @@ -269,9 +269,6 @@ Red team wins!
Refresh
== Оновити

Refreshing master servers
== Оновлення списку майстер-сервера

Remote console
== Консоль сервера

Expand Down Expand Up @@ -886,23 +883,17 @@ Show HUD
UI mouse s.
== Чутлив. миші в меню

Borderless window
== Безмежне вікно

may cause delay
== може спричинити затримку

Screen
== Екран

Use OpenGL 3.3 (experimental)
== OpenGL 3.3 (експериментально)

Preinit VBO (iGPUs only)
== Preinit VBO (iGPUs only)

Multiple texture units (disable for MacOS)
== Декілька текстурних одиниць (вимкнути для MacOS)
Multiple texture units (disable for macOS)
== Декілька текстурних одиниць (вимкнути для macOS)

Use high DPI
== Використовувати високий DPI
Expand Down Expand Up @@ -1144,6 +1135,9 @@ Your nickname '%s' is already used (%d points). Do you still want to use it?
Checking for existing player with your name
==

Are you sure that you want to disconnect and switch to a different server?
==

Country / Region
==

Expand All @@ -1153,6 +1147,30 @@ Speed
Theme
==

AFR
==

ASI
==

AUS
==

EUR
==

NA
==

SA
==

CHN
==

Getting server list from master server
==

%d of %d servers
==

Expand All @@ -1165,6 +1183,12 @@ Theme
%d player
==

Refreshing...
==

Leak IP
==

Markers
==

Expand Down Expand Up @@ -1195,6 +1219,18 @@ Chat command
Dummy
==

Windowed
==

Windowed borderless
==

Desktop fullscreen
==

Use modern OpenGL
==

Game sound volume
==

Expand All @@ -1210,18 +1246,42 @@ Assets
Show client IDs
==

Kill Messages
==

Kill Message Normal Color
==

Kill Message Highlight Color
==

Laser Outline Color
==

Laser Inner Color
==

Hookline
==

No hit
==

Hookable
==

Tee
==

Use old chat style
==

Preview
==

Show local player's key presses
==

Background
==

Expand Down
5 changes: 4 additions & 1 deletion data/shader/text.frag
Expand Up @@ -30,5 +30,8 @@ void main()
float RealAlpha = (textOutlineFrag.a + textColor.a);

// simply add the color we will loose through blending
FragClr = vec4(finalFragColor / RealAlpha, RealAlpha);
if(RealAlpha > 0.0)
FragClr = vec4(finalFragColor / RealAlpha, RealAlpha);
else
FragClr = vec4(0.0, 0.0, 0.0, 0.0);
}
Binary file added data/strong_weak.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions datasrc/content.py
Expand Up @@ -238,6 +238,7 @@ def FileList(fmt, num):
image_arrow = Image("arrow", "arrow.png")
image_demobuttons2 = Image("demobuttons2", "demo_buttons2.png")
image_audio_source = Image("audio_source", "editor/audio_source.png")
image_strongweak = Image("strongweak", "strong_weak.png")

container.images.Add(image_null)
container.images.Add(image_game)
Expand All @@ -256,6 +257,7 @@ def FileList(fmt, num):
container.images.Add(image_arrow)
container.images.Add(image_demobuttons2)
container.images.Add(image_audio_source)
container.images.Add(image_strongweak)

container.pickups.Add(Pickup("health"))
container.pickups.Add(Pickup("armor"))
Expand All @@ -274,6 +276,7 @@ def FileList(fmt, num):
set_guiicons = SpriteSet("guiicons", image_guiicons, 12, 2)
set_demobuttons2 = SpriteSet("demobuttons2", image_demobuttons2, 4, 1)
set_audio_source = SpriteSet("audio_source", image_audio_source, 1, 1)
set_strongweak = SpriteSet("strongweak", image_strongweak, 2, 1)

container.spritesets.Add(set_particles)
container.spritesets.Add(set_game)
Expand All @@ -287,6 +290,7 @@ def FileList(fmt, num):
container.spritesets.Add(set_guiicons)
container.spritesets.Add(set_demobuttons2)
container.spritesets.Add(set_audio_source)
container.spritesets.Add(set_strongweak)

container.sprites.Add(Sprite("part_slice", set_particles, 0,0,1,1))
container.sprites.Add(Sprite("part_ball", set_particles, 1,0,1,1))
Expand Down Expand Up @@ -429,6 +433,9 @@ def FileList(fmt, num):

container.sprites.Add(Sprite("audio_source", set_audio_source, 0,0,1,1))

container.sprites.Add(Sprite("hook_strong", set_strongweak, 0,0,1,1))
container.sprites.Add(Sprite("hook_weak", set_strongweak, 1,0,1,1))

anim = Animation("base")
anim.body.frames.Add(AnimKeyframe(0, 0, -4, 0))
anim.back_foot.frames.Add(AnimKeyframe(0, 0, 10, 0))
Expand Down
23 changes: 23 additions & 0 deletions datasrc/network.py
Expand Up @@ -36,6 +36,7 @@

Powerups = ["HEALTH", "ARMOR", "WEAPON", "NINJA"]
Authed = ["NO", "HELPER", "MOD", "ADMIN"]
EntityClasses = ["PROJECTILE", "DOOR", "DRAGGER_WEAK", "DRAGGER_NORMAL", "DRAGGER_STRONG", "GUN_NORMAL", "GUN_EXPLOSIVE", "GUN_FREEZE", "GUN_UNFREEZE", "LIGHT", "PICKUP"]

RawHeader = '''
Expand Down Expand Up @@ -77,6 +78,7 @@
Enum("POWERUP", Powerups),
Enum("EMOTICON", Emoticons),
Enum("AUTHED", Authed),
Enum("ENTITYCLASS", EntityClasses),
]

Flags = [
Expand Down Expand Up @@ -299,6 +301,27 @@
NetIntAny("m_X"),
NetIntAny("m_Y"),
]),

# Switch state for a player team.
NetObjectEx("SwitchState", "switch-state@netobj.ddnet.tw", [
NetIntRange("m_NumSwitchers", 0, 256),
# 256 switches / 32 bits = 8 int32
NetIntAny("m_Status1"),
NetIntAny("m_Status2"),
NetIntAny("m_Status3"),
NetIntAny("m_Status4"),
NetIntAny("m_Status5"),
NetIntAny("m_Status6"),
NetIntAny("m_Status7"),
NetIntAny("m_Status8"),
]),

# Switch info for map items
NetObjectEx("EntityEx", "entity-ex@netobj.ddnet.tw", [
NetIntAny("m_SwitchNumber"),
NetIntAny("m_Layer"),
NetIntAny("m_EntityClass"),
]),
]

Messages = [
Expand Down
2 changes: 1 addition & 1 deletion ddnet-libs
Submodule ddnet-libs updated 312 files
53 changes: 53 additions & 0 deletions scripts/android/README.md
@@ -0,0 +1,53 @@
Requirements for building:
==========================
- Android NDK (tested with NDK 23), must be in the same location in which Android studio would unpack it (~/Android/Sdk/ndk/)
atleast version 23
- Android SDK build tools
version 30.0.3
- ddnet-libs with Android libs
- Java -- JDK 11+
- 7zip (for ddnet-libs building)
- ninja
- curl runtime

How to build:
=============
- run a terminal inside the source directory:
`scripts/android/cmake_android.sh <x86/x86_64/arm/arm64/all> <Game name> <Debug/Release>`
where the first parameter is the arch (all for all arches), the second is the apk name, which must be equal to the library name (if you want to rename the APK do it after the build)
and the third parameter which simply defines the build type

- if you build with a signing key for the APK
Generate one with
`keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias my-alias`
export environment variables for the script
```
export TW_KEY_NAME=<key name>
export TW_KEY_PW=<key password>
export TW_KEY_ALIAS=<key alias>
```
so for example:
```
keytool -genkey -v -keystore Teeworlds.jks -keyalg RSA -keysize 2048 -validity 10000 -alias Teeworlds-Key
(it will prompt an input:)
Input keystore-password: mypassword

export TW_KEY_NAME=Teeworlds.jks
export TW_KEY_PW=mypassword
export TW_KEY_ALIAS=Teeworlds-Key
scripts/android/cmake_android.sh all DDNet Release
```

You can also specify the build version code and build version string before running the build script, e.g.:
```
export TW_VERSION_CODE=20210819
export TW_VERSION_NAME="1.0"
```

How to build the ddnet-libs for Android:
========================================
- There is a script to automatically download and build all repositories, this requires an active internet connection:
`scripts/android/gen_android_libs.sh <directory to build in>`
Warning!: DO NOT CHOOSE A DIRECTORY INSIDE THE SOURCE TREE

After the script finished executing it should have created a ddnet-libs directory which created all libs in the right directory format and can be merged with ddnet-libs in the source directory