Skip to content

Commit

Permalink
Merge branch 'ddnet' into chillerbot
Browse files Browse the repository at this point in the history
  • Loading branch information
ChillerDragon committed Aug 26, 2024
2 parents 9fe0115 + 7ee1dac commit 39fd0e8
Show file tree
Hide file tree
Showing 45 changed files with 770 additions and 528 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
run: scripts/fix_style.py --dry-run
- name: Check header guards
run: scripts/check_header_guards.py
- name: Validate Languages
run: scripts/languages/validate.py
- name: Check languages
run: scripts/languages/update_all.py
- name: Check dilated images
Expand Down
2 changes: 1 addition & 1 deletion data/languages/arabic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ Existing Player
== ﺩﻮﺟﻮﻣ ﺐﻋﻼﻟﺍ

Your nickname '%s' is already used (%d points). Do you still want to use it?
== ﻪﻣﺍﺪﺨﺘﺳﺍ ﺪﻳﺮﺗ ﺖﻟﺯﺎﻣ ﻞﻫ '%s' ﻞﻤﻌﺘﺴﻣ ﻚﻤﺳﺍ
==

Checking for existing player with your name
== ﻚﻤﺳﺎﺑ ﺐﻋﻻ ﺩﻮﺟﻭ ﻦﻣ ﻖﻘﺤﺘﻟﺍ
Expand Down
115 changes: 58 additions & 57 deletions data/languages/belarusian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
#originally created by:
# arionwt1997
#modified by:
# Chill & PoKeMoN 2023-03-31 16:00:00
# Chill & PoKeMoN 2023-07-02 00:54:00
# Chill [TD] & PoKeMoN [TD] 2023-03-31 16:00:00
# Chill [TD] & PoKeMoN [TD] 2023-07-02 00:54:00
# Chill [TD] & PoKeMoN [TD] 2023-09-22 17:49:00
# Chill [TD] & PoKeMoN [TD] 2023-11-14 12:42:00
# Chill [TD] & PoKeMoN [TD] 2024-08-23 23:17:00
#
##### /authors #####

Expand Down Expand Up @@ -345,7 +346,7 @@ Shotgun
== Драбавік

Show chat
== Паказаць чат
== Паказваць чат

Show friends only
== Толькі з сябрамі
Expand Down Expand Up @@ -381,7 +382,7 @@ Stop record
== Стоп запісу

Strict gametype filter
== Строгі фільтр рэжым.
== Строгі фільтр рэжымаў

Sudden Death
== Раптоўная смерць
Expand Down Expand Up @@ -1621,7 +1622,7 @@ Go back the specified duration

[Demo player duration]
%d sec.
== % сек.
== %d сек.

Change the skip duration
== Змяніць працягласць пропуску
Expand Down Expand Up @@ -1714,162 +1715,162 @@ A render command failed. Try to update your GPU drivers.

[Graphics error]
Failed during initialization. Try to change gfx_backend to OpenGL or Vulkan in settings_ddnet.cfg in the config directory and try again.
==
== Памылка падчас ініцыялізацыі. Паспрабуйце змяніць gfx_backend на OpenGL або Vulcan у settings_dnet.cfg ў тэчцы канфігурацыйных файлаў і паспрабуйце яшчэ раз.

[Graphics error]
Out of VRAM. Try removing custom assets (skins, entities, etc.), especially those with high resolution.
==
== Недахоп VRAM. Паспрабуйце выдаліць карыстацкія тэкстуры (скіны, энтыты і г.д.), асабліва тыя, якія маюць высокую разрознасць.

[Graphics error]
Submitting the render commands failed. Try to update your GPU drivers.
==
== Адпраўка каманд рэндэрынгу не ўдалася. Паспрабуйце абнавіць драйверы відэакарты.

Failed saving the replay!
==
== Не атрымалася захаваць паўтор!

Saving settings to '%s' failed
==
== Захаванне налад у '%s' не атрымалася

Error saving settings
==
== Памылка захавання налад

Loading demo file from storage
==
== Загрузка файла дэма са сховішча

Searching
==
== Пошук

Enter Username
==
== Увядзіце імя карыстальніка

Enter Password
==
== Увядзіце пароль

NOT CONNECTED
==
== НЕ ПАДЛУЧАНА

Match %d of %d
==
== Адпаведна %d з %d

No results
==
== Няма вынікаў

Lines %d - %d (%s)
==
== Радкі %d - %d (%s)

Locked
==
== Зафіксаваныя

Following
==
== Бягучыя

Loading commands…
==
== Загрузка каманд…

[Spectating]
Following %s
==
== Назіранне за %s

Press a key…
==
== Націсніце клавішу…

Main menu
==
== Галоўнае меню

Are you sure that you want to restart?
==
== Вы ўпэўненыя, што хочаце пачаць нанова?

There's an unsaved map in the editor, you might want to save it.
==
== У рэдактары засталася не захаваная карта, магчыма вы хочаце яе захаваць.

Continue anyway?
==
== Працягнуць у любым выпадку?

%d/%d KiB (%.1f KiB/s)
==
== %d/%d КіБ (%.1f КіБ/с)

Example of usage
==
== Прыклад выкарыстання

No login required
==
== Уваход не патрабуецца

Communities
==
== Суполкі

Server filter
==
== Фільтр сервераў

Friends
==
== Сябры

Loading…
==
== Загрузка…

Player info change cooldown
==
== Затрымка абнаўлення інфармацыі пра гульца

Tee
==
== Tee

Info Messages
==
== Інфа. Паведамленні

Show local time always
==
== Заўсёды паказваць мясцовы час

Always show chat
==
== Заўсёды паказваць чат

Show only chat messages from team members
==
== Паказваць паведамленні чата толькі ад чальцоў каманды

Chat font size
==
== Памер шрыфта чата

Chat width
==
== Шырыня чата

Show friend mark (♥) in name plates
==
== Паказваць адзнаку сябра (♥) у таблічках з імёнамі

Show hook strength icon indicator
==
== Паказваць іконку індыкатара сілы крука

Show hook strength number indicator
==
== Паказваць нумар індыкатара сілы крука

Authed name color in scoreboard
==
== Колер аўтарызаваных гульцоў у табло ачкоў

Same clan color in scoreboard
==
== Колер твайго клана ў табло ачкоў

Show own player's hook collision line
==
== Паказваць сваю лінію сутыкнення крука

Always show own player's hook collision line
==
== Заўсёды паказваць сваю лінію сутыкнення крука

Always show other players' hook collision lines
==
== Заўсёды паказваць лініі сутыкнення крука іншых гульцоў

Show finish messages
==
== Паказваць паведамленні пра фініш

Round %d/%d
==
== Раўнд %d/%d

[Spectators]
%d others…
==
== %d іншых…

[Team and size]
%d\n(%d/%d)
==
== %d\n(%d/%d)

Team %d (%d/%d)
==
== Каманда %d (%d/%d)

https://wiki.ddnet.org/wiki/Mapping
==
== https://wiki.ddnet.org/wiki/Mapping
2 changes: 1 addition & 1 deletion data/languages/hungarian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@ Replay
== Visszajátszás

The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
== Ennek a Textúrának szélessége, vagy magassága (%s) nem megfelelően osztható el ezzel a számmal: (%d), ami vizuális hibákhoz vezethet. (Méretek máshogyan fognak kinézni és a teljesítményt is ronthatja.)
==

Getting server list from master server
== Szerverlista lekérése a fő szerverekről
Expand Down
2 changes: 1 addition & 1 deletion data/languages/italian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ No server selected
== Nessun server selezionato

Online clanmates (%d)
== Compagni di clan online
== Compagni di clan online (%d)

Click to select server. Double click to join your friend.
== Fare click per selezionare il server. Fai doppio click per unirti al tuo amico.
Expand Down
2 changes: 1 addition & 1 deletion data/languages/korean.txt
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ Replay feature is disabled!
== 리플레이 기능을 비활성화했습니다!

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 으로 나눌 수 없습니다. 이는 시각적 오류를 발생시킬 수 있습니다.
==

Warning
== 주의
Expand Down
6 changes: 3 additions & 3 deletions data/languages/russian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ Toggle dyncam
== Смена дин. камеры

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

Toggle ghost
== Переключить тень
Expand Down Expand Up @@ -1835,10 +1835,10 @@ No login required
== Без логина

Player info change cooldown
== Задержка смены информации об игроке
== Кулдаун смены данных об игроке

Tee
== Ти
== Тии

Always show chat
== Всегда показывать чат
Expand Down
1 change: 1 addition & 0 deletions scripts/android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Requirements for building for Android
- At least 10-15 GiB of free disk space.
- First follow the general instructions for setting up https://github.com/ddnet/ddnet for building on Linux.
This guide has only been tested on Linux.
- Note: Use a stable version of Rust. Using the nightly version results in linking errors.
- Install the Android NDK (version 26) in the same location
where Android Studio would unpack it (`~/Android/Sdk/ndk/`):
```shell
Expand Down
1 change: 1 addition & 0 deletions scripts/android/files/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
debug {
debuggable true
minifyEnabled false
shrinkResources false
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/compile_libs/gen_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ cd compile_libs || exit 1

build_cmake_lib zlib https://github.com/madler/zlib
build_cmake_lib png https://github.com/glennrp/libpng
build_cmake_lib curl https://github.com/curl/curl
build_cmake_lib curl https://github.com/curl/curl "curl-8_8_0"
build_cmake_lib freetype2 https://gitlab.freedesktop.org/freetype/freetype
build_cmake_lib sdl https://github.com/libsdl-org/SDL SDL2
build_cmake_lib ogg https://github.com/xiph/ogg
Expand Down
19 changes: 0 additions & 19 deletions scripts/languages/twlang.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,6 @@ def __init__(self, message, filename, line):
error = f"File \"{filename}\", line {line+1}: {message}"
super().__init__(error)


# Taken from https://stackoverflow.com/questions/30011379/how-can-i-parse-a-c-format-string-in-python
cfmt = r'''\
( # start of capture group 1
% # literal "%"
(?: # first option
(?:[-+0 #]{0,5}) # optional flags
(?:\d+|\*)? # width
(?:\.(?:\d+|\*))? # precision
(?:h|l|ll|w|I|I32|I64)? # size
[cCdiouxXeEfgGaAnpsSZ] # type
) | # OR
%%) # literal "%%"
'''


def decode(fileobj, elements_per_key):
data = {}
current_context = ""
Expand All @@ -45,10 +29,7 @@ def decode(fileobj, elements_per_key):
if len(data[current_key]) >= 1+elements_per_key:
raise LanguageDecodeError("Wrong number of elements per key", fileobj.name, index)
if current_key:
original = current_key[0] # pylint: disable=unsubscriptable-object
translation = line[3:]
if translation and [m.group(1) for m in re.finditer(cfmt, original, flags=re.X)] != [m.group(1) for m in re.finditer(cfmt, translation, flags=re.X)]:
raise LanguageDecodeError("Non-matching formatting string", fileobj.name, index)
data[current_key].extend([translation])
else:
raise LanguageDecodeError("Element before key given", fileobj.name, index)
Expand Down
Loading

0 comments on commit 39fd0e8

Please sign in to comment.