78 changes: 33 additions & 45 deletions data/languages/persian.txt
Expand Up @@ -79,7 +79,7 @@ Delete demo
Demo details
== ﻮﻣﺩ ﺕﺎﯿﺋﺰﺟ
Demofile: %s
== s% :ﻮﻣﺩ ﻞﯾﺎﻓ
== %s :ﻮﻣﺩ ﻞﯾﺎﻓ
Demos
== ﺎﻫ ﻮﻣﺩ
Disconnect
Expand Down Expand Up @@ -217,7 +217,7 @@ Saving ddnet-settings.cfg failed
Replay feature is disabled!
==

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Warning
Expand Down Expand Up @@ -256,6 +256,9 @@ Server best:
Personal best:
==

Reset
==

News
==

Expand Down Expand Up @@ -760,6 +763,15 @@ Show entities
Show HUD
==

45° aim
==

Deepfly on
==

Deepfly off
==

UI mouse s.
==

Expand All @@ -772,6 +784,9 @@ Reset to defaults
Voting
==

Dummy
==

Miscellaneous
==

Expand Down Expand Up @@ -889,7 +904,7 @@ Alpha
Use DDRace Scoreboard
==

Show client IDs in Scoreboard
Show client IDs
==

Show score
Expand All @@ -898,9 +913,6 @@ Show score
Show health + ammo
==

Use old chat style
==

Show names in chat in team colors
==

Expand All @@ -910,64 +922,37 @@ Show kill messages
Show votes window after voting
==

Messages
Laser Outline Color
==

System message
Laser Inner Color
==

Reset
Use old chat style
==

Highlighted message
Messages
==

Spectator
System message
==

Look out!
Highlighted message
==

Team message
==

We will win
==

Friend message
==

Highlight
==

Friend
==

Hi o/
==

Normal message
==

Hello and welcome
==

Client message
==

Inner color
==

Outline color
==

Wait before try for
==

second
==

seconds
Preview
==

Save the best demo of each race
Expand Down Expand Up @@ -1024,10 +1009,10 @@ Show other players' key presses
Old mouse mode
==

Background (regular)
Background
==

Background (entities)
Entities Background color
==

Use current map as background
Expand All @@ -1036,9 +1021,15 @@ Use current map as background
Show tiles layers from BG map
==

Regular Background Color
==

Try fast HTTP map download first
==

New random timeout code
==

DDNet %s is available:
==

Expand All @@ -1057,9 +1048,6 @@ No updates available
Check now
==

New random timeout code
==

Entities
==

Expand Down
234 changes: 110 additions & 124 deletions data/languages/polish.txt

Large diffs are not rendered by default.

74 changes: 31 additions & 43 deletions data/languages/portuguese.txt
Expand Up @@ -653,9 +653,6 @@ Map sound volume
Countries
== Países

Background (entities)
== Plano de fundo (entidades)

Show kill messages
== Mostrar mensagens de morte

Expand All @@ -671,18 +668,12 @@ No updates available
Enable server message sound
== Ativar o som de mensagem do servidor

second
== segundo

Show votes window after voting
== Mostrar janela de voto depois de votar

HUD
== HUD

Look out!
== Cuidado!

Show names in chat in team colors
== Mostrar nomes no chat com cores da equipa

Expand All @@ -692,12 +683,6 @@ Select a name
Enable team chat sound
== Ativar o som do chat de equipa

We will win
== Nós vamos ganhar

Hi o/
== Olá o/

Deaths
== Mortes

Expand All @@ -707,9 +692,6 @@ Enable game sounds
DDNet Client needs to be restarted to complete update!
== O cliente DDNet precisa de ser reiniciado para completar a atualização!

Spectator
== Espectador

Please use a different name
== Por favor usa um nome diferente

Expand Down Expand Up @@ -764,9 +746,6 @@ Remove chat
Check now
== Verifica agora

Background (regular)
== Plano de fundo (regular)

AntiPing: predict other players
== Antiping: prever os outros jogadores

Expand Down Expand Up @@ -803,15 +782,9 @@ Default zoom
Show score
== Mostrar pontuação

Show client IDs in Scoreboard
== Mostrar os IDs do cliente na tabela de pontuação

Max CSVs
== CSVs máximos

seconds
== segundos

Use DDRace Scoreboard
== Usa a tabela de pontuações de DDRace

Expand Down Expand Up @@ -848,9 +821,6 @@ Exclude
Enable highlighted chat sound
== Ativar o som do chat em destaque

Hello and welcome
== Olá e bem-vindo

AntiPing: predict weapons
== AntiPing: prever as armas

Expand All @@ -860,18 +830,12 @@ DDNet Client updated!
Highlighted message
== Mensagem em destaque

Friend
== Amigo

Switch weapon when out of ammo
== Mudar de arma quando ficar sem munição

AntiPing: predict grenade paths
== Antiping: prever os caminhos da granada

Inner color
== Cor interior

Successfully saved the replay!
==

Expand All @@ -881,7 +845,7 @@ Saving ddnet-settings.cfg failed
Replay feature is disabled!
==

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Warning
Expand Down Expand Up @@ -1112,9 +1076,21 @@ Show entities
Show HUD
==

45° aim
==

Deepfly on
==

Deepfly off
==

UI mouse s.
==

Dummy
==

may cause delay
==

Expand Down Expand Up @@ -1148,22 +1124,25 @@ Background music volume
Assets
==

Use old chat style
Show client IDs
==

Friend message
Laser Outline Color
==

Highlight
Laser Inner Color
==

Client message
Use old chat style
==

Outline color
Friend message
==

Wait before try for
Client message
==

Preview
==

Default length: %d
Expand Down Expand Up @@ -1193,12 +1172,21 @@ Show other players' hook collision lines
Show other players' key presses
==

Background
==

Entities Background color
==

Use current map as background
==

Show tiles layers from BG map
==

Regular Background Color
==

Try fast HTTP map download first
==

Expand Down
76 changes: 32 additions & 44 deletions data/languages/romanian.txt
Expand Up @@ -643,7 +643,7 @@ Saving ddnet-settings.cfg failed
Replay feature is disabled!
==

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Warning
Expand All @@ -658,6 +658,9 @@ Server best:
Personal best:
==

Reset
==

Browser
==

Expand Down Expand Up @@ -946,9 +949,21 @@ Show entities
Show HUD
==

45° aim
==

Deepfly on
==

Deepfly off
==

UI mouse s.
==

Dummy
==

Borderless window
==

Expand Down Expand Up @@ -1021,7 +1036,7 @@ DDNet Client needs to be restarted to complete update!
Use DDRace Scoreboard
==

Show client IDs in Scoreboard
Show client IDs
==

Show score
Expand All @@ -1030,9 +1045,6 @@ Show score
Show health + ammo
==

Use old chat style
==

Show names in chat in team colors
==

Expand All @@ -1042,64 +1054,37 @@ Show kill messages
Show votes window after voting
==

Messages
Laser Outline Color
==

System message
Laser Inner Color
==

Reset
Use old chat style
==

Highlighted message
Messages
==

Spectator
System message
==

Look out!
Highlighted message
==

Team message
==

We will win
==

Friend message
==

Highlight
==

Friend
==

Hi o/
==

Normal message
==

Hello and welcome
==

Client message
==

Inner color
==

Outline color
==

Wait before try for
==

second
==

seconds
Preview
==

Save the best demo of each race
Expand Down Expand Up @@ -1156,10 +1141,10 @@ Show other players' key presses
Old mouse mode
==

Background (regular)
Background
==

Background (entities)
Entities Background color
==

Use current map as background
Expand All @@ -1168,9 +1153,15 @@ Use current map as background
Show tiles layers from BG map
==

Regular Background Color
==

Try fast HTTP map download first
==

New random timeout code
==

DDNet %s is available:
==

Expand All @@ -1189,9 +1180,6 @@ No updates available
Check now
==

New random timeout code
==

Entities
==

Expand Down
124 changes: 56 additions & 68 deletions data/languages/russian.txt
Expand Up @@ -580,9 +580,6 @@ Borderless window
Use DDRace Scoreboard
== Использовать DDRace табло

Show client IDs in Scoreboard
== Показывать ID клиентов в табло

Show kill messages
== Показывать сообщения о смерти

Expand Down Expand Up @@ -709,39 +706,21 @@ Name plates size
Type:
== Тип:

Background (entities)
== Задний фон

Show ghost
== Показать тень

No updates available
== Нет доступных обновлений

second
== секунд

Look out!
== Берегись!

Select a name
== Выберите имя

Show other players' hook collision lines
== Показывать коллизии крюка других игроков

We will win
== Мы выиграем

Hi o/
== Привет ^^/

DDNet Client needs to be restarted to complete update!
== Перезапустите DDNet Client для завершения обновления!

Spectator
== Наблюдатель

Please use a different name
== Пожалуйста, используйте другое имя

Expand Down Expand Up @@ -793,27 +772,15 @@ Update now
Save ghost
== Сохранять тень

Hello and welcome
== Привет и добро пожаловать

DDNet Client updated!
== DDNet Client обновлён!

Outline color
== Цвет контура

Highlighted message
== Выделенное сообщение

Friend
== Друг

Demo
== Демо

Inner color
== Внутренний цвет

Successfully saved the replay!
== Повтор сохранен!

Expand All @@ -833,10 +800,10 @@ Reconnect in %d sec
== Переподключение через %d сек.

Render demo
== Начать рендер демо
== Рендер

Replace video
== Переместить видео
== Переместить

File already exists, do you want to overwrite it?
== Файл уже существует, хотите ли Вы перезаписать его?
Expand All @@ -848,10 +815,10 @@ Are you sure that you want to disconnect your dummy?
== Вы уверены, что хотите отключить вашего дамми?

Welcome to DDNet
== Добро пожаловать в DDnet
== Добро пожаловать в 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.
== DDraceNetwork кооперативная онлайн игра, где Вашей главной целью и целью вашей команды является достижением финиша карты. Как новенький, Вы должны начать свой путь на Novice серверах, на которых стоят лёгкие карты. Также учитывайте пинг и выбирайте ближайший к вам сервер.
== DDraceNetwork кооперативная онлайн-игра, где Вашей главной целью и целью вашей команды является достижением финиша карты. Как новенький, Вы должны начать свой путь на Novice серверах, на которых стоят лёгкие карты. Также учитывайте пинг и выбирайте ближайший к вам сервер.

The maps contain freeze, which temporarily make a tee unable to move. You have to work together to get through these parts.
== Карта содержит фриз-тайлы, которые временно лишают вас возможности двигаться. Вы должны работать сообща, чтобы пройти такие уровни.
Expand All @@ -869,7 +836,7 @@ It's recommended that you check the settings to adjust them to your liking befor
== Перед посещением сервера рекомендуем изменить настройки на Ваш вкус.

Please enter your nickname below.
== Пожалуйста, ниже укажите свой никнейм.
== Пожалуйста, укажите ниже свой никнейм.

Destination file already exist
== Конечный файл уже существует
Expand All @@ -896,7 +863,7 @@ Unfinished map
== Нефинишированная карта

DDNet %s is out!
== Вышел DDnet %s!
== Вышел DDNet %s!

Downloading %s:
== Скачивание %s:
Expand All @@ -923,7 +890,7 @@ Date
== Дата

Fetch Info
== Проверить информацию
== Показать

Render
== Начать рендер
Expand Down Expand Up @@ -983,16 +950,16 @@ Show all
== Показывать всех

Toggle dyncam
== Переключить дин. камеру
== Смен. дин. камеры

Toggle dummy
== Переключить дамми
== Сменить ти

Toggle ghost
== Переключить призрака
== Вкл./выкл. призрака

Dummy copy
== Повторение движений дамми
== Повт. движений

Hammerfly dummy
== Полёт с дамми
Expand All @@ -1007,7 +974,7 @@ Lock team
== Закрыть команду

Show entities
== Показать сущности
== Показать тайлы

Show HUD
== Показавать HUD
Expand Down Expand Up @@ -1045,12 +1012,6 @@ DDNet
Friend message
== Сообщение от друга

Wait before try for
== Подождите прежде чем повторить

seconds
== секунд

Save the best demo of each race
== Сохранять лучшее демо каждой попытки

Expand All @@ -1064,7 +1025,7 @@ Gameplay
== Игровой процесс

Overlay entities
== Наложить entities
== Наложить тайлы

Size
== Размер
Expand All @@ -1076,7 +1037,7 @@ Show others (own team only)
== Всегда показывать вашу команду

Show quads
== Показывать quads
== Показывать квады

AntiPing
== AntiPing
Expand All @@ -1093,9 +1054,6 @@ AntiPing: predict grenade paths
Show other players' key presses
== Показывать нажатия других игроков

Background (regular)
== Фон (обычный)

Show tiles layers from BG map
== Показывать слои с тайлами из фоновой карты

Expand Down Expand Up @@ -1153,9 +1111,6 @@ Grabs
Client message
== Сообщение от клиента

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
== Ширина или высота текстуры %s не делится на 16, что может быть причиной проблем с визуалом.

Warning
== Предупреждение

Expand Down Expand Up @@ -1263,28 +1218,22 @@ Background music volume
== Громкость фоновой музыки

Assets
== Графика
== Текстуры

Use old chat style
== Использовать старый чат

Highlight
== Подсветка

Use current map as background
== Использовать данную карту как фон

Entities
==

Emoticons
== Эмоции
== Значки-эмоции

Particles
== Частицы

Assets directory
== Папка с графикой
== Расп. текстур

Manual
== Ручное
Expand All @@ -1297,3 +1246,42 @@ Auto

Replay
== Запись

Entities
== Тайлы

The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

45° aim
==

Deepfly on
==

Deepfly off
==

Dummy
==

Show client IDs
==

Laser Outline Color
==

Laser Inner Color
==

Preview
==

Background
==

Entities Background color
==

Regular Background Color
==
76 changes: 32 additions & 44 deletions data/languages/serbian.txt
Expand Up @@ -653,7 +653,7 @@ Use k key to kill (restart), q to pause and watch other players. See settings fo
Saving ddnet-settings.cfg failed
==

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Warning
Expand All @@ -668,6 +668,9 @@ Server best:
Personal best:
==

Reset
==

Browser
==

Expand Down Expand Up @@ -944,9 +947,21 @@ Show entities
Show HUD
==

45° aim
==

Deepfly on
==

Deepfly off
==

UI mouse s.
==

Dummy
==

Borderless window
==

Expand Down Expand Up @@ -1019,7 +1034,7 @@ DDNet Client needs to be restarted to complete update!
Use DDRace Scoreboard
==

Show client IDs in Scoreboard
Show client IDs
==

Show score
Expand All @@ -1028,9 +1043,6 @@ Show score
Show health + ammo
==

Use old chat style
==

Show names in chat in team colors
==

Expand All @@ -1040,64 +1052,37 @@ Show kill messages
Show votes window after voting
==

Messages
Laser Outline Color
==

System message
Laser Inner Color
==

Reset
Use old chat style
==

Highlighted message
Messages
==

Spectator
System message
==

Look out!
Highlighted message
==

Team message
==

We will win
==

Friend message
==

Highlight
==

Friend
==

Hi o/
==

Normal message
==

Hello and welcome
==

Client message
==

Inner color
==

Outline color
==

Wait before try for
==

second
==

seconds
Preview
==

Save the best demo of each race
Expand Down Expand Up @@ -1154,10 +1139,10 @@ Show other players' key presses
Old mouse mode
==

Background (regular)
Background
==

Background (entities)
Entities Background color
==

Use current map as background
Expand All @@ -1166,9 +1151,15 @@ Use current map as background
Show tiles layers from BG map
==

Regular Background Color
==

Try fast HTTP map download first
==

New random timeout code
==

DDNet %s is available:
==

Expand All @@ -1187,9 +1178,6 @@ No updates available
Check now
==

New random timeout code
==

Entities
==

Expand Down
100 changes: 44 additions & 56 deletions data/languages/serbian_cyrillic.txt
Expand Up @@ -657,9 +657,6 @@ Successfully saved the replay!
Replay feature is disabled!
== Функција понављања је онемогућена!

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
== Ширина и висина текстуре %s није дељива са 16, што може проузроковати визуелне проблеме.

Warning
== Упозорење

Expand Down Expand Up @@ -1000,9 +997,6 @@ DDNet Client needs to be restarted to complete update!
Use DDRace Scoreboard
== Користи DDRace табелу резултата

Show client IDs in Scoreboard
== Прикажи клијент идиове у табели резултата

Show score
== Прикажи бодове

Expand All @@ -1027,51 +1021,18 @@ System message
Highlighted message
== Истакнута порука

Spectator
== Разгледач

Look out!
== Пази!

Team message
== Тимска порука

We will win
== Победићемо

Friend message
== Порука пријатеља

Friend
== Пријатељ

Hi o/
== Здраво

Normal message
== Класична порука

Hello and welcome
== Здраво и добро дошли

Client message
== Порука клијента

Inner color
== Унутрашња боја

Outline color
== Спољашња боја

Wait before try for
== Сачекајте пре него што покушате

second
== Секунда

seconds
== Секунде

Save the best demo of each race
== Сачувајте најбољи снимак сваке трке

Expand Down Expand Up @@ -1123,12 +1084,6 @@ Show other players' key presses
Old mouse mode
== Стари мод миша

Background (regular)
== Позадина (редовно)

Background (entities)
== Позадина (entities)

Show tiles layers from BG map
== Прикажи слојеве плочица са BG мапе

Expand Down Expand Up @@ -1244,9 +1199,24 @@ Grabs
9+ new mentions
== 9+ нових помињања

Manual
== Упутство

Race
== Трка

Auto
== Ауто

Replay
== Помнови

Saving ddnet-settings.cfg failed
==

The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
==

Expand All @@ -1262,6 +1232,18 @@ Checking for existing player with your name
Smooth Dynamic Camera
==

45° aim
==

Deepfly on
==

Deepfly off
==

Dummy
==

Game sound volume
==

Expand All @@ -1271,23 +1253,29 @@ Chat sound volume
Background music volume
==

Use old chat style
Show client IDs
==

Highlight
Laser Outline Color
==

Use current map as background
Laser Inner Color
==

Manual
== Упутство
Use old chat style
==

Race
== Трка
Preview
==

Auto
== Ауто
Background
==

Replay
== Помнови
Entities Background color
==

Use current map as background
==

Regular Background Color
==
157 changes: 73 additions & 84 deletions data/languages/simplified_chinese.txt
Expand Up @@ -10,6 +10,7 @@
# 2020.8.14 Night_L
# 2020.8.19 TsFreddie
# 2020.8.20 Dan_cao
# 2020.11.12 TsFreddie
##### /authors #####

##### translated strings #####
Expand Down Expand Up @@ -699,9 +700,6 @@ Type:
Use DDRace Scoreboard
== 使用 DDRace 计分板

Show client IDs in Scoreboard
== 在计分板上显示客户端ID

Show score
== 显示比分

Expand All @@ -726,30 +724,15 @@ System message
Highlighted message
== 被提及消息

Look out!
== 小心!

Team message
== 队伍消息

We will win
== 我们赢定了

Normal message
== 普通消息

Hello and welcome
== 你好,欢迎

Friend message
== 好友消息

Inner color
== 内部颜色

Outline color
== 外部颜色

Save the best demo of each race
== 保存竞速模式最高记录的回放

Expand Down Expand Up @@ -792,20 +775,14 @@ Show other players' hook collision lines
Show other players' key presses
== 显示其他玩家的按键

Background (regular)
== 背景(常规)

Background (entities)
== 背景(实体)

Show tiles layers from BG map
== 在背景地图显示图块层
== 显示实体层背景地图的图块层

Try fast HTTP map download first
== 优先尝试用HTTP快速下载地图

DDNet %s is available:
== DDnet %s 现已可用:
== DDNet %s 现已可用:

Update now
== 现在更新
Expand All @@ -831,9 +808,6 @@ Browser
Connecting dummy
== 正在连接分身

Spectator
== 旁观者

Search
== 搜索

Expand Down Expand Up @@ -866,24 +840,15 @@ Grabs
DDNet
== DDNet

second
== 秒

Select a name
== 另存为

Hi o/
== 你好

Deaths
== 死亡数

Please use a different name
== 请换一个不同的文件名

Wait before try for
== 请等待

Restart
== 重新开始

Expand Down Expand Up @@ -918,7 +883,7 @@ Refresh Rate
== 刷新率

New random timeout code
== 新随机超时代码
== 随机生成新的超时代码(Timeout代码)

Suicides
== 自杀数
Expand All @@ -939,9 +904,6 @@ Spree
Max CSVs
== 最大csv文件数

seconds
== 秒

%.2f KiB
== %.2f KiB

Expand All @@ -951,9 +913,6 @@ Best
Exclude
== 排除

Friend
== 好友

may cause delay
== 可能会产生延迟

Expand Down Expand Up @@ -1138,7 +1097,7 @@ Server best:
== 服务器最佳

Learn
== 学习
== 教程

Use high DPI
== 使用高 DPI
Expand Down Expand Up @@ -1176,9 +1135,6 @@ Country / Region
https://wiki.ddnet.tw/
== https://docs.qq.com/doc/DWGFrV0xPRmVWVkla

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
== 宽和高无法被16整除,这可能会导致画面异常

Warning
== 警告

Expand All @@ -1189,7 +1145,7 @@ Skip the main menu
== 跳过主菜单

Website
== 网站
== 官网

Settings
== 设置
Expand All @@ -1210,95 +1166,128 @@ Server executable not found, can't run server
Editor
== 编辑器

Manual
== 手动

Race
== 竞速

Auto
== 自动

Replay
== 回放

Saving ddnet-settings.cfg failed
==
== 配置文件 ddnet-settings.cfg 保存失败

Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
==
== 调试模式已启用。按 Ctrl+Shift+D 禁用调试模式。

Existing Player
==
== 玩家已存在

Your nickname '%s' is already used (%d points). Do you still want to use it?
==
== 你使用的昵称"%s"在DDNet中有%d分的记录,这可能代表该昵称已经被其他人使用过。确认要使用这个名字吗?

Checking for existing player with your name
==
== 正在查找该昵称的DDNet记录

Theme
==
== 主题

%d of %d servers
==
== 符合条件 %d / 总共 %d 个服务器

%d of %d server
==
== 符合条件 %d / 总共 %d 个服务器

%d players
==
== %d 在线玩家

%d player
==
== %d 在线玩家

Demos directory
==
== 回放目录

Smooth Dynamic Camera
==
== 平滑动态镜头

Themes directory
==
== 主题目录

Download skins
==
== 在线获取皮肤

Skin Database
==
== 皮肤数据库

Skins directory
==
== 皮肤目录

Game sound volume
==
== 游戏音效音量

Chat sound volume
==
== 聊天提示音量

Background music volume
==
== 背景音樂音量

Assets
==
== 材质

Use old chat style
== 旧版聊天框

Use current map as background
== 使用当前地图作为实体层背景地图

Entities
== 实体层

Emoticons
== 表情

Particles
== 粒子

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.
==

Highlight
45° aim
==

Use current map as background
Deepfly on
==

Entities
Deepfly off
==

Emoticons
Dummy
==

Particles
Show client IDs
==

Assets directory
Laser Outline Color
==

Manual
== 手动
Laser Inner Color
==

Race
== 竞速赛
Preview
==

Auto
== 自动
Background
==

Replay
== 回放
Entities Background color
==

Regular Background Color
==
76 changes: 32 additions & 44 deletions data/languages/slovak.txt
Expand Up @@ -631,7 +631,7 @@ Saving ddnet-settings.cfg failed
Replay feature is disabled!
==

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Warning
Expand All @@ -649,6 +649,9 @@ Server best:
Personal best:
==

Reset
==

Browser
==

Expand Down Expand Up @@ -940,9 +943,21 @@ Show entities
Show HUD
==

45° aim
==

Deepfly on
==

Deepfly off
==

UI mouse s.
==

Dummy
==

Borderless window
==

Expand Down Expand Up @@ -1015,7 +1030,7 @@ DDNet Client needs to be restarted to complete update!
Use DDRace Scoreboard
==

Show client IDs in Scoreboard
Show client IDs
==

Show score
Expand All @@ -1024,9 +1039,6 @@ Show score
Show health + ammo
==

Use old chat style
==

Show names in chat in team colors
==

Expand All @@ -1036,64 +1048,37 @@ Show kill messages
Show votes window after voting
==

Messages
Laser Outline Color
==

System message
Laser Inner Color
==

Reset
Use old chat style
==

Highlighted message
Messages
==

Spectator
System message
==

Look out!
Highlighted message
==

Team message
==

We will win
==

Friend message
==

Highlight
==

Friend
==

Hi o/
==

Normal message
==

Hello and welcome
==

Client message
==

Inner color
==

Outline color
==

Wait before try for
==

second
==

seconds
Preview
==

Save the best demo of each race
Expand Down Expand Up @@ -1150,10 +1135,10 @@ Show other players' key presses
Old mouse mode
==

Background (regular)
Background
==

Background (entities)
Entities Background color
==

Use current map as background
Expand All @@ -1162,9 +1147,15 @@ Use current map as background
Show tiles layers from BG map
==

Regular Background Color
==

Try fast HTTP map download first
==

New random timeout code
==

DDNet %s is available:
==

Expand All @@ -1183,9 +1174,6 @@ No updates available
Check now
==

New random timeout code
==

Entities
==

Expand Down
84 changes: 36 additions & 48 deletions data/languages/spanish.txt
Expand Up @@ -965,9 +965,6 @@ DDNet Client needs to be restarted to complete update!
Use DDRace Scoreboard
== Utiliza el marcador DDRace

Show client IDs in Scoreboard
== Mostrar IDs de clientes en el marcador

Show score
== Mostrar puntaje

Expand Down Expand Up @@ -995,48 +992,15 @@ Reset
Highlighted message
== Mensaje resaltado

Spectator
== Espectador

Look out!
== ¡Ten cuidado!

Team message
== Mensaje del equipo

We will win
== Nosotros ganaremos

Friend message
== Mensaje de un amigo

Friend
== Amigo

Hi o/
== Hola o/

Normal message
== Mensaje normal

Hello and welcome
== Hola y bienvenido

Inner color
== Color interior

Outline color
== Color de contorno

Wait before try for
== Espera antes de intentar

second
== segundo

seconds
== segundos

Save the best demo of each race
== Guardar la mejor demo de cada carrera

Expand Down Expand Up @@ -1091,12 +1055,6 @@ Show other players' key presses
Old mouse mode
== Modo de mouse viejo

Background (regular)
== Fondo (regular)

Background (entities)
== Fondo (entidades)

Show tiles layers from BG map
== Mostrar capas de tiles del mapa BG

Expand Down Expand Up @@ -1163,9 +1121,6 @@ Grabs
Saving ddnet-settings.cfg failed
== Error al guardar ddnet-settings.cfg

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
== El ancho o alto de la textura %s no es divisible por 16, por lo que puede causar errores visuales.

Warning
== Advertencia

Expand Down Expand Up @@ -1241,9 +1196,6 @@ Assets
Use old chat style
== Usar estilo viejo de chat

Highlight
== Resaltado

Client message
== Mensaje de cliente

Expand Down Expand Up @@ -1298,3 +1250,39 @@ Auto

Replay
== Repetición

The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

45° aim
==

Deepfly on
==

Deepfly off
==

Dummy
==

Show client IDs
==

Laser Outline Color
==

Laser Inner Color
==

Preview
==

Background
==

Entities Background color
==

Regular Background Color
==
104 changes: 46 additions & 58 deletions data/languages/swedish.txt
Expand Up @@ -643,9 +643,6 @@ Select a name
Enable long pain sound (used when shooting in freeze)
== Aktivera ett långt ont ljud (använt vid sjutning i freeze)

We will win
== Vi kommer att vinna

Default zoom
== Standard zoom

Expand Down Expand Up @@ -709,9 +706,6 @@ Browser
Default length: %d
== Standard längd: %d

Hello and welcome
== Hej och välkommen

Switch weapon when out of ammo
== Byt vapen vid slut av ammunition

Expand Down Expand Up @@ -820,9 +814,6 @@ Time
Filter connecting players
== Filtrera spelare som ansluter

Friend
== Vän

Enable game sounds
== Aktivera spel ljud

Expand All @@ -832,9 +823,6 @@ Max CSVs
Zoom in
== Zooma in

Hi o/
== Hej o/

Update failed! Check log...
== Updatering misslyckades! Kolla logg...

Expand All @@ -844,9 +832,6 @@ Update failed! Check log...
Check now
== Kolla nu

second
== sekund

Reset wanted weapon on death
== Återställ önskade vapen vid död

Expand Down Expand Up @@ -886,9 +871,6 @@ Show ghost
1 new mention
== 1 ny nämning

Wait before try for
== Vänta innan försök för

Are you sure that you want to disconnect your dummy?
== Är du säker att du vill koppla ifrån din dummy?

Expand Down Expand Up @@ -934,9 +916,6 @@ Follow
Restart
== Starta om

Background (regular)
== Bakgrund (vanlig)

Hammerfly dummy
== Hammerfly dummy

Expand All @@ -949,15 +928,9 @@ Enable team chat sound
Disconnect Dummy
== Koppla ifrån dummy

Background (entities)
== Bakgrund (entities)

Replace video
== Ersätt video

Look out!
== Se upp!

Server best:
== Serverens bästa:

Expand All @@ -973,12 +946,6 @@ Fat skins (DDFat)
Net
== Nät

seconds
== sekunder

Spectator
== Åskådare

Demo
== Demo

Expand Down Expand Up @@ -1036,9 +1003,6 @@ Preinit VBO (iGPUs only)
Clan plates size
== Klanskylt storlek

Outline color
== Kontur färg

Size
== Storlek

Expand Down Expand Up @@ -1072,9 +1036,6 @@ Please use a different name
Destination file already exist
== Destinations fil finns redan

Show client IDs in Scoreboard
== Visa klient IDen i poänglista

Game paused
== Spel pausad

Expand All @@ -1087,9 +1048,6 @@ Automatically create statboard csv
Old mouse mode
== Gammal mus metod

Inner color
== Innre färg

Enable regular chat sound
== Aktivera vanligt chatt ljud

Expand Down Expand Up @@ -1156,9 +1114,6 @@ Connect Dummy
Show others (own team only)
== Visa andra (eget lag endast)

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
== Bredden eller höjden av texturen %s är ej delbar med 16, och kan därav skapa visuella buggar.

Warning
== Varning

Expand Down Expand Up @@ -1217,9 +1172,24 @@ Editor
Play
== Spela

Manual
== Manual

Race
== Race

Auto
== Auto

Replay
== Repris

Saving ddnet-settings.cfg failed
==

The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
==

Expand Down Expand Up @@ -1250,6 +1220,18 @@ Skin Database
Skins directory
==

45° aim
==

Deepfly on
==

Deepfly off
==

Dummy
==

Game sound volume
==

Expand All @@ -1262,15 +1244,33 @@ Background music volume
Assets
==

Show client IDs
==

Laser Outline Color
==

Laser Inner Color
==

Use old chat style
==

Highlight
Preview
==

Background
==

Entities Background color
==

Use current map as background
==

Regular Background Color
==

Entities
==

Expand All @@ -1282,15 +1282,3 @@ Particles

Assets directory
==

Manual
== Manual

Race
== Race

Auto
== Auto

Replay
== Repris
191 changes: 90 additions & 101 deletions data/languages/traditional_chinese.txt
Expand Up @@ -4,6 +4,7 @@
#modified by:
# 2020.8.19 TsFreddie
# 2020.8.20 Dan_cao
# 2020.11.12 TsFreddie
##### /authors #####

##### translated strings #####
Expand Down Expand Up @@ -207,7 +208,7 @@ General
== 常規

Graphics
== 影象
== 顯示

Grenade
== 榴彈槍
Expand Down Expand Up @@ -693,9 +694,6 @@ Type:
Use DDRace Scoreboard
== 使用 DDRace 計分板

Show client IDs in Scoreboard
== 在計分板上顯示客戶端ID

Show score
== 顯示比分

Expand All @@ -720,30 +718,15 @@ System message
Highlighted message
== 被提及訊息

Look out!
== 小心!

Team message
== 隊伍訊息

We will win
== 我們贏定了

Normal message
== 普通訊息

Hello and welcome
== 你好,歡迎

Friend message
== 好友訊息

Inner color
== 內部顏色

Outline color
== 外部顏色

Save the best demo of each race
== 儲存競速模式最高記錄的回放

Expand Down Expand Up @@ -786,20 +769,14 @@ Show other players' hook collision lines
Show other players' key presses
== 顯示其他玩家的按鍵

Background (regular)
== 背景(常規)

Background (entities)
== 背景(實體)

Show tiles layers from BG map
== 在背景地圖顯示圖塊層
== 顯示實體層背景地圖的圖塊層

Try fast HTTP map download first
== 優先嚐試用HTTP高速下載地圖

DDNet %s is available:
== DDnet %s 現已可用:
== DDNet %s 現已可用:

Update now
== 現在更新
Expand All @@ -825,9 +802,6 @@ Browser
Connecting dummy
== 正在連線分身

Spectator
== 旁觀者

Search
== 搜尋

Expand Down Expand Up @@ -860,24 +834,15 @@ Grabs
DDNet
== DDNet

second
== 秒

Select a name
== 另存為

Hi o/
== 你好

Deaths
== 死亡數

Please use a different name
== 請換一個不同的檔名

Wait before try for
== 請等待

Restart
== 重新開始

Expand Down Expand Up @@ -933,9 +898,6 @@ Spree
Max CSVs
== 最大csv檔案數

seconds
== 秒

%.2f KiB
== %.2f KiB

Expand All @@ -945,9 +907,6 @@ Best
Exclude
== 排除

Friend
== 好友

may cause delay
== 可能會產生延遲

Expand Down Expand Up @@ -1132,7 +1091,7 @@ Server best:
== 伺服器最佳

Learn
== 學習
== 教程

Use high DPI
== 使用高 DPI
Expand Down Expand Up @@ -1170,129 +1129,159 @@ Country / Region
https://wiki.ddnet.tw/
== https://docs.qq.com/doc/DWGFrV0xPRmVWVkla

Saving ddnet-settings.cfg failed
==
Warning
== 警告

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
==
Speed
== 速度

Warning
==
Skip the main menu
== 跳過主選單

Website
== 網站

Settings
== 設定

[Start menu]
Play
== 開始遊戲

Stop server
== 停止伺服器

Run server
== 開啟伺服器

Server executable not found, can't run server
== 找不到伺服器的可執行檔案,無法開啟

Editor
== 編輯器

Manual
== 手動

Race
== 競速

Auto
== 自動

Replay
== 回放

Saving ddnet-settings.cfg failed
== 配置檔案 ddnet-settings.cfg 儲存失敗

Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
==
== 偵錯模式已啟用。按 Ctrl+Shift+D 禁用偵錯模式。

Existing Player
==
== 玩家已存在

Your nickname '%s' is already used (%d points). Do you still want to use it?
==
== 你使用的暱稱"%s"在DDNet中有%d分的記錄,這可能代表這個暱稱已經被其他人使用過。確認要使用這個名字嗎?

Checking for existing player with your name
==

Speed
==
== 正在查詢該暱稱的DDNet記錄

Theme
==
== 主題

%d of %d servers
==
== 符合條件 %d / 總共 %d 個伺服器

%d of %d server
==
== 符合條件 %d / 總共 %d 個伺服器

%d players
==
== %d 在線玩家

%d player
==
== %d 在線玩家

Demos directory
==
== 回放目錄

Smooth Dynamic Camera
==

Skip the main menu
==
== 動態視距平滑化

Themes directory
==
== 主題目錄

Download skins
==
== 在線獲取外觀

Skin Database
==
== 外觀數據庫

Skins directory
==
== 外觀目錄

Game sound volume
==
== 遊戲音效音量

Chat sound volume
==
== 聊天提示音量

Background music volume
==
== 背景音樂音量

Assets
==
== 材質

Use old chat style
==

Highlight
==
== 舊版聊天框

Use current map as background
==
== 使用當前地圖作爲實體層背景地圖

Entities
==
== 實體層

Emoticons
==
== 表情

Particles
==
== 粒子

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.
==

Website
45° aim
==

Settings
Deepfly on
==

Stop server
Deepfly off
==

Run server
Dummy
==

Server executable not found, can't run server
Show client IDs
==

Editor
Laser Outline Color
==

[Start menu]
Play
Laser Inner Color
==

Manual
== 手動
Preview
==

Race
== 競速賽
Background
==

Auto
== 自動
Entities Background color
==

Replay
== 回放
Regular Background Color
==
102 changes: 45 additions & 57 deletions data/languages/turkish.txt
Expand Up @@ -127,7 +127,7 @@ Demo details
== Demo ayrıntıları

Demofile: %s
== Demo dosyası
== Demo dosyası: %s

Demos
== Demolar
Expand Down Expand Up @@ -966,9 +966,6 @@ DDNet Client needs to be restarted to complete update!
Use DDRace Scoreboard
== DDRace Skor Tahtası kulan

Show client IDs in Scoreboard
== Client ID'lerini skor tahtasında göster

Show score
== Skoru göster

Expand Down Expand Up @@ -996,51 +993,18 @@ Reset
Highlighted message
== Vurgulanmış mesaj

Spectator
== İzleyici

Look out!
== Dikkat et!

Team message
== Takım mesajı

We will win
== Kazanacağız

Friend message
== Arkadaş mesajı

Friend
== Arkadaş

Hi o/
== Selam o/

Normal message
== Normal mesaj

Hello and welcome
== Selam ve hoşgeldin

Client message
== İstemci mesajı

Inner color
== İç renk

Outline color
== Dış renk

Wait before try for
== Denemeden önce şu kadar bekle:

second
== saniye

seconds
== saniye

Save the best demo of each race
== Her yarış için en iyi demoyu kaydet

Expand Down Expand Up @@ -1095,12 +1059,6 @@ Show other players' key presses
Old mouse mode
== Eski mouse modu

Background (regular)
== Arkaplan (normal)

Background (entities)
== Arkaplan (yapı)

Show tiles layers from BG map
== Yapı katmanlarını göster

Expand Down Expand Up @@ -1164,10 +1122,22 @@ Grabs
9+ new mentions
== 9+ yeni bildirim

Manual
== Manual

Race
== Yarış

Auto
== Otomatik

Replay
== Yeniden oynatma

Saving ddnet-settings.cfg failed
==

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Warning
Expand Down Expand Up @@ -1227,6 +1197,18 @@ Skin Database
Skins directory
==

45° aim
==

Deepfly on
==

Deepfly off
==

Dummy
==

Game sound volume
==

Expand All @@ -1239,15 +1221,33 @@ Background music volume
Assets
==

Show client IDs
==

Laser Outline Color
==

Laser Inner Color
==

Use old chat style
==

Highlight
Preview
==

Background
==

Entities Background color
==

Use current map as background
==

Regular Background Color
==

Entities
==

Expand Down Expand Up @@ -1284,15 +1284,3 @@ Editor
[Start menu]
Play
==

Manual
== Manual

Race
== Yarış

Auto
== Otomatik

Replay
== Yeniden oynatma
102 changes: 45 additions & 57 deletions data/languages/ukrainian.txt
Expand Up @@ -635,7 +635,7 @@ Add Friend
== Додати друга

DDNet %s is out!
== Вийшов DDnet %s!
== Вийшов DDNet %s!

Downloading %s:
== Завантаження %s:
Expand Down Expand Up @@ -952,9 +952,6 @@ DDNet Client needs to be restarted to complete update!
Use DDRace Scoreboard
== Використовувати DDRace табло

Show client IDs in Scoreboard
== Показувати ID клієнтів в табло

Show score
== Показувати лідерів

Expand Down Expand Up @@ -982,51 +979,18 @@ Reset
Highlighted message
== Виділене повідомлення

Spectator
== Спостерігач

Look out!
== Стережися!

Team message
== Повідомлення команди

We will win
== Ми переможемо

Friend message
== Повідомлення від друга

Friend
== Друг

Hi o/
== Привіт o/

Normal message
== Звичайне повідомлення

Hello and welcome
== Привіт і ласкаво просимо

Client message
== Повідомлення від клієнта

Inner color
== Внутрішній колір

Outline color
== колір контуру

Wait before try for
== Зачекайте перш ніж повторити

second
== секнуда

seconds
== секунд

Save the best demo of each race
== Зберігати краще демо кожної спроби

Expand Down Expand Up @@ -1081,12 +1045,6 @@ Show other players' key presses
Old mouse mode
== Режим старої мишки

Background (regular)
== Фон (звичайний)

Background (entities)
== Задній фон

Show tiles layers from BG map
== Показувати шари з тайлами з фонової карти

Expand Down Expand Up @@ -1153,10 +1111,22 @@ Grabs
9+ new mentions
== 9+ нових згадок

Manual
== Ручна

Race
== Гонка

Auto
== Авто

Replay
== Повтор

Saving ddnet-settings.cfg failed
==

The width or height of texture %s is not divisible by 16, which might cause visual bugs.
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

Warning
Expand Down Expand Up @@ -1222,6 +1192,18 @@ Skin Database
Skins directory
==

45° aim
==

Deepfly on
==

Deepfly off
==

Dummy
==

Game sound volume
==

Expand All @@ -1234,15 +1216,33 @@ Background music volume
Assets
==

Show client IDs
==

Laser Outline Color
==

Laser Inner Color
==

Use old chat style
==

Highlight
Preview
==

Background
==

Entities Background color
==

Use current map as background
==

Regular Background Color
==

Entities
==

Expand Down Expand Up @@ -1279,15 +1279,3 @@ Editor
[Start menu]
Play
==

Manual
== Ручна

Race
== Гонка

Auto
== Авто

Replay
== Повтор
Binary file modified data/mapres/basic_freeze.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/bg_cloud1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/bg_cloud2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/bg_cloud3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/ddmax_freeze.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/ddnet_start.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/ddnet_tiles.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/desert_background.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/desert_doodads.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/desert_main.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/desert_mountains.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/desert_mountains_new_background.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/desert_mountains_new_foreground.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/desert_sun.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/entities.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/fadeout.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/font_teeworlds.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/font_teeworlds_alt.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/generic_clear.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/generic_deathtiles.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/generic_lamps.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/generic_unhookable.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/generic_unhookable_0.7.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/grass_doodads.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/grass_doodads_0.7.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/mapres/grass_main.png
Binary file modified data/mapres/grass_main_0.7.png
Binary file modified data/mapres/jungle_deathtiles.png
Binary file modified data/mapres/jungle_doodads.png
Binary file modified data/mapres/jungle_main.png
Binary file modified data/mapres/jungle_unhookables.png
Binary file modified data/mapres/moon.png
Binary file modified data/mapres/mountains.png
Binary file modified data/mapres/snow_mountain.png
Binary file modified data/mapres/stars.png
Binary file modified data/mapres/sun.png
Binary file modified data/mapres/water.png
Binary file modified data/mapres/winter_doodads.png
Binary file modified data/mapres/winter_main.png
Binary file modified data/mapres/winter_mountains.png
Binary file modified data/mapres/winter_mountains2.png
Binary file modified data/menuimages/demos.png
Binary file modified data/menuimages/editor.png
Binary file modified data/menuimages/local_server.png
Binary file modified data/menuimages/play_game.png
Binary file modified data/menuimages/settings.png
Binary file modified data/particles.png
15 changes: 7 additions & 8 deletions data/shader/prim.frag
@@ -1,16 +1,15 @@
uniform int isTextured;
uniform sampler2D textureSampler;
uniform sampler2D gTextureSampler;

noperspective in vec2 texCoord;
noperspective in vec4 vertColor;

out vec4 FragClr;
void main()
{
if(isTextured == 1)
{
vec4 tex = texture(textureSampler, texCoord);
FragClr = tex * vertColor;
}
else FragClr = vertColor;
#ifdef TW_TEXTURED
vec4 tex = texture(gTextureSampler, texCoord);
FragClr = tex * vertColor;
#else
FragClr = vertColor;
#endif
}
4 changes: 2 additions & 2 deletions data/shader/prim.vert
Expand Up @@ -2,14 +2,14 @@ layout (location = 0) in vec2 inVertex;
layout (location = 1) in vec2 inVertexTexCoord;
layout (location = 2) in vec4 inVertexColor;

uniform mat4x2 Pos;
uniform mat4x2 gPos;

noperspective out vec2 texCoord;
noperspective out vec4 vertColor;

void main()
{
gl_Position = vec4(Pos * vec4(inVertex, 0.0, 1.0), 0.0, 1.0);
gl_Position = vec4(gPos * vec4(inVertex, 0.0, 1.0), 0.0, 1.0);
texCoord = inVertexTexCoord;
vertColor = inVertexColor;
}
17 changes: 9 additions & 8 deletions data/shader/primex.vert
Expand Up @@ -4,7 +4,9 @@ layout (location = 2) in vec4 inVertexColor;

uniform mat4x2 gPos;

#ifndef TW_ROTATIONLESS
uniform float gRotation;
#endif
uniform vec2 gCenter;

noperspective out vec2 texCoord;
Expand All @@ -13,14 +15,13 @@ noperspective out vec4 vertColor;
void main()
{
vec2 FinalPos = vec2(inVertex.xy);
if(gRotation != 0.0)
{
float X = FinalPos.x - gCenter.x;
float Y = FinalPos.y - gCenter.y;

FinalPos.x = X * cos(gRotation) - Y * sin(gRotation) + gCenter.x;
FinalPos.y = X * sin(gRotation) + Y * cos(gRotation) + gCenter.y;
}
#ifndef TW_ROTATIONLESS
float X = FinalPos.x - gCenter.x;
float Y = FinalPos.y - gCenter.y;

FinalPos.x = X * cos(gRotation) - Y * sin(gRotation) + gCenter.x;
FinalPos.y = X * sin(gRotation) + Y * cos(gRotation) + gCenter.y;
#endif

gl_Position = vec4(gPos * vec4(FinalPos, 0.0, 1.0), 0.0, 1.0);
texCoord = inVertexTexCoord;
Expand Down
4 changes: 3 additions & 1 deletion data/shader/quad.vert
Expand Up @@ -9,6 +9,8 @@ uniform mat4x2 gPos;
uniform vec2 gOffsets[TW_MAX_QUADS];
uniform float gRotations[TW_MAX_QUADS];

uniform int gQuadOffset;

noperspective out vec4 QuadColor;
flat out int QuadIndex;
#ifdef TW_QUAD_TEXTURED
Expand All @@ -19,7 +21,7 @@ void main()
{
vec2 FinalPos = vec2(inVertex.xy);

int TmpQuadIndex = int(gl_VertexID / 4);
int TmpQuadIndex = int(gl_VertexID / 4) - gQuadOffset;

if(gRotations[TmpQuadIndex] != 0.0)
{
Expand Down
8 changes: 4 additions & 4 deletions data/shader/spritemulti.frag
@@ -1,13 +1,13 @@
uniform sampler2D textureSampler;
uniform sampler2D gTextureSampler;

uniform vec4 VerticesColor;
uniform vec4 gVerticesColor;

noperspective in vec2 texCoord;
noperspective in vec4 vertColor;

out vec4 FragClr;
void main()
{
vec4 tex = texture(textureSampler, texCoord);
FragClr = tex * vertColor * VerticesColor;
vec4 tex = texture(gTextureSampler, texCoord);
FragClr = tex * vertColor * gVerticesColor;
}
26 changes: 13 additions & 13 deletions data/shader/spritemulti.vert
Expand Up @@ -2,33 +2,33 @@ layout (location = 0) in vec2 inVertex;
layout (location = 1) in vec2 inVertexTexCoord;
layout (location = 2) in vec4 inVertexColor;

uniform mat4x2 Pos;
uniform mat4x2 gPos;

uniform vec4 RSP[228];
uniform vec2 Center;
uniform vec4 gRSP[228];
uniform vec2 gCenter;

noperspective out vec2 texCoord;
noperspective out vec4 vertColor;

void main()
{
vec2 FinalPos = vec2(inVertex.xy);
if(RSP[gl_InstanceID].w != 0.0)
if(gRSP[gl_InstanceID].w != 0.0)
{
float X = FinalPos.x - Center.x;
float Y = FinalPos.y - Center.y;
float X = FinalPos.x - gCenter.x;
float Y = FinalPos.y - gCenter.y;

FinalPos.x = X * cos(RSP[gl_InstanceID].w) - Y * sin(RSP[gl_InstanceID].w) + Center.x;
FinalPos.y = X * sin(RSP[gl_InstanceID].w) + Y * cos(RSP[gl_InstanceID].w) + Center.y;
FinalPos.x = X * cos(gRSP[gl_InstanceID].w) - Y * sin(gRSP[gl_InstanceID].w) + gCenter.x;
FinalPos.y = X * sin(gRSP[gl_InstanceID].w) + Y * cos(gRSP[gl_InstanceID].w) + gCenter.y;
}

FinalPos.x *= RSP[gl_InstanceID].z;
FinalPos.y *= RSP[gl_InstanceID].z;
FinalPos.x *= gRSP[gl_InstanceID].z;
FinalPos.y *= gRSP[gl_InstanceID].z;

FinalPos.x += RSP[gl_InstanceID].x;
FinalPos.y += RSP[gl_InstanceID].y;
FinalPos.x += gRSP[gl_InstanceID].x;
FinalPos.y += gRSP[gl_InstanceID].y;

gl_Position = vec4(Pos * vec4(FinalPos, 0.0, 1.0), 0.0, 1.0);
gl_Position = vec4(gPos * vec4(FinalPos, 0.0, 1.0), 0.0, 1.0);
texCoord = inVertexTexCoord;
vertColor = inVertexColor;
}
16 changes: 6 additions & 10 deletions data/shader/text.frag
@@ -1,17 +1,17 @@
uniform sampler2D textSampler;
uniform sampler2D textOutlineSampler;
uniform sampler2D gTextSampler;
uniform sampler2D gTextOutlineSampler;

uniform vec4 vertColor;
uniform vec4 vertOutlineColor;
uniform vec4 gVertColor;
uniform vec4 gVertOutlineColor;

noperspective in vec2 texCoord;
noperspective in vec4 outVertColor;

out vec4 FragClr;
void main()
{
vec4 textColor = vertColor * outVertColor * texture(textSampler, texCoord);
vec4 textOutlineTex = vertOutlineColor * texture(textOutlineSampler, texCoord);
vec4 textColor = gVertColor * outVertColor * texture(gTextSampler, texCoord);
vec4 textOutlineTex = gVertOutlineColor * texture(gTextOutlineSampler, texCoord);

// ratio between the two textures
float OutlineBlend = (1.0 - textColor.a);
Expand All @@ -29,10 +29,6 @@ void main()

float RealAlpha = (textOutlineFrag.a + textColor.a);

// discard transparent fragments
if(RealAlpha == 0.0)
discard;

// simply add the color we will loose through blending
FragClr = vec4(finalFragColor / RealAlpha, RealAlpha);
}
8 changes: 4 additions & 4 deletions data/shader/text.vert
Expand Up @@ -2,16 +2,16 @@ layout (location = 0) in vec2 inVertex;
layout (location = 1) in vec2 inVertexTexCoord;
layout (location = 2) in vec4 inVertexColor;

uniform mat4x2 Pos;
uniform float textureSize;
uniform mat4x2 gPos;
uniform float gTextureSize;

noperspective out vec2 texCoord;
noperspective out vec4 outVertColor;

void main()
{
gl_Position = vec4(Pos * vec4(inVertex, 0.0, 1.0), 0.0, 1.0);
gl_Position = vec4(gPos * vec4(inVertex, 0.0, 1.0), 0.0, 1.0);

texCoord = vec2(inVertexTexCoord.x / textureSize, inVertexTexCoord.y / textureSize);
texCoord = vec2(inVertexTexCoord.x / gTextureSize, inVertexTexCoord.y / gTextureSize);
outVertColor = inVertexColor;
}
Binary file modified data/skins/Aoe4leg.png
Binary file modified data/skins/PaladiN.png
Binary file modified data/skins/antiantey.png
Binary file modified data/skins/beast.png
Binary file modified data/skins/blacktee.png
Binary file modified data/skins/chinese_by_whis.png
Binary file modified data/skins/coala_bluekitty.png
Binary file modified data/skins/coala_limekitty.png
Binary file modified data/skins/coala_x_ninja.png
Binary file modified data/skins/demonlimekitty.png
Binary file modified data/skins/dino.png
Binary file modified data/skins/dragon.png
Binary file modified data/skins/evil.png
Binary file modified data/skins/evilwolfe.png
Binary file modified data/skins/ghost.png
Binary file modified data/skins/ghostjtj.png
Binary file modified data/skins/giraffe.png
Binary file modified data/skins/greensward.png
Binary file modified data/skins/greyfox.png
Binary file modified data/skins/greyfox_2.png
Binary file modified data/skins/hammie-chew.png
Binary file modified data/skins/hammie-whis.png
Binary file modified data/skins/jeet.png
Binary file modified data/skins/kintaro_2.png
Binary file modified data/skins/kitty_brownbear.png
Binary file modified data/skins/kitty_x_ninja.png
Binary file modified data/skins/limekitty.png
Binary file modified data/skins/mermydon-coala.png
Binary file modified data/skins/mermydon.png
Binary file modified data/skins/mouse.png
Binary file modified data/skins/musmann.png
Binary file modified data/skins/nanami.png
Binary file modified data/skins/nanas.png
Binary file modified data/skins/nersif.png
Binary file modified data/skins/oldman.png
Binary file modified data/skins/oldschool.png
Binary file modified data/skins/penguin.png
Binary file modified data/skins/random.png
Binary file modified data/skins/redbopp.png
Binary file modified data/skins/santa_bluekitty.png
Binary file modified data/skins/santa_bluestripe.png
Binary file modified data/skins/santa_brownbear.png
Binary file modified data/skins/santa_cammo.png
Binary file modified data/skins/santa_cammostripes.png
Binary file modified data/skins/santa_coala.png
Binary file modified data/skins/santa_default.png
Binary file modified data/skins/santa_limekitty.png
Binary file modified data/skins/santa_pinky.png
Binary file modified data/skins/santa_redbopp.png
Binary file modified data/skins/santa_redstripe.png
Binary file modified data/skins/santa_saddo.png
Binary file modified data/skins/santa_toptri.png
Binary file modified data/skins/santa_twinbop.png
Binary file modified data/skins/santa_twintri.png
Binary file modified data/skins/santa_warpaint.png
Binary file modified data/skins/teerasta.png
Binary file modified data/skins/veteran.png
Binary file modified data/skins/voodoo_tee.png
Binary file modified data/skins/wartee.png
Binary file modified data/skins/whis.png
Binary file modified data/skins/x_ninja.png
Binary file modified data/themes/auto.png
Binary file modified data/themes/autumn.png
Binary file modified data/themes/heavens.png
Binary file modified data/themes/jungle.png
Binary file added data/themes/newyear.map
Binary file not shown.
Binary file added data/themes/newyear.png
Binary file modified data/themes/none.png
Binary file modified data/themes/rand.png
Binary file modified data/themes/winter.png