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 Sep 2, 2024
2 parents 11e990a + 1574987 commit cf9be41
Show file tree
Hide file tree
Showing 38 changed files with 1,496 additions and 845 deletions.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2545,6 +2545,7 @@ if(CLIENT)
editor_trackers.cpp
editor_trackers.h
editor_ui.h
enums.h
explanations.cpp
layer_selector.cpp
layer_selector.h
Expand Down Expand Up @@ -2583,8 +2584,13 @@ if(CLIENT)
mapitems/sound.cpp
mapitems/sound.h
popups.cpp
prompt.cpp
prompt.h
proof_mode.cpp
proof_mode.h
quick_action.h
quick_actions.cpp
quick_actions.h
smooth_value.cpp
smooth_value.h
tileart.cpp
Expand Down
50 changes: 25 additions & 25 deletions data/languages/czech.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Petr 2011-04-02 23:02:33
# Medik & Petr 2011-07-02 19:37:05
# TeeWorlds-org 2011-07-15 00:34:19
# dobrykafe 2024-06-09 00:00:00
# dobrykafe 2024-08-30 00:00:00
##### /authors #####

##### translated strings #####
Expand Down Expand Up @@ -1845,76 +1845,76 @@ Show only chat messages from team members
== Zobrazit pouze zprávy od členů týmu

Could not resolve connect address '%s'. See local console for details.
==
== Nelze získat adresu k připojení '%s'. Podrobnosti najdete v místní konzoli.

Connect address error
==
== Chyba v adrese k připojení

Could not connect dummy
==
== Nepodařilo se připojit dummyho

[Spectating]
Following %s
==
== Sledujete %s

Example of usage
==
== Příklad použití

Dummy is not allowed on this server
==
== Dummy není na tomto serveru povolen

Please wait…
==
== Čekejte prosím…

Show client IDs (scoreboard, chat, spectator)
==
== Zobrazit ID klientů (výsledková tabulka, chat, divák)

Normal:
==
== Normální:

Team:
==
== Tým:

Dummy settings
==
== Nastavení dummyho

Toggle to edit your dummy settings
==
== Přepnutím upravíte nastavení dummyho

Randomize
==
== Randomizovat

Are you sure that you want to delete '%s'?
==
== Jste si jisti, že chcete smazat '%s'?

Delete skin
==
== Odstranit skin

Basic
==
== Základní

Custom
==
== Vlastní

Unable to delete skin
==
== Nelze odstranit skin

Customize
==
== Přizpůsobit

Round %d/%d
==
== Kolo %d/%d

[Spectators]
%d others…
==
== %d dalších…

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

Team %d (%d/%d)
==
== Tým %d (%d/%d)

https://wiki.ddnet.org/wiki/Mapping
==
== https://wiki.ddnet.org/wiki/Mapping
52 changes: 26 additions & 26 deletions data/languages/russian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ Loading DDNet Client
== Загрузка DDNet Client

Normal message
== Обычное с.
== Обычное

Connecting dummy
== Подключение дамми
Expand All @@ -643,10 +643,10 @@ Save ghost
== Сохранять тень

DDNet Client updated!
== DDNet Client обновлён!
== DDNet клиент обновлён!

Highlighted message
== Выделенное с.
== Выделенное

Demo
== Демо
Expand Down Expand Up @@ -724,7 +724,7 @@ Downloading %s:
== Скачивание %s:

Update failed! Check log…
== Ошибка. Проверьте логи
== Не удалось обновиться! Подробности в логах

Restart
== Рестарт
Expand Down Expand Up @@ -844,7 +844,7 @@ DDNet
== DDNet

Friend message
== Дружеское с.
== Дружеское

Save the best demo of each race
== Сохранять лучшее демо каждой карты
Expand Down Expand Up @@ -916,10 +916,10 @@ Ratio
== Соотношение

Net
== Сеть
== Сальдо

FPM
== FPM
== У/мин

Spree
== Серия
Expand All @@ -940,7 +940,7 @@ Grabs
== 9+ упоминаний

Client message
== Клиентское с.
== Клиентское

Warning
== Предупреждение
Expand Down Expand Up @@ -973,7 +973,7 @@ Run server
== Запустить сервер

Server executable not found, can't run server
== Файл сервера не найден, невозможно запустить
== Файл сервера не найден, не удалось запустить сервер

Editor
== Редактор
Expand Down Expand Up @@ -1880,52 +1880,52 @@ https://wiki.ddnet.org/wiki/Mapping
== https://wiki.ddnet.org/wiki/Mapping/ru

Could not resolve connect address '%s'. See local console for details.
==
== Не удалось определить адрес подключения '%s'. Подробности в локальной консоли.

Connect address error
==
== Ошибка адреса подключения

Could not connect dummy
==
== Невозможно подключить дамми

Dummy is not allowed on this server
==
== Дамми не разрешен на этом сервере

Please wait…
==
== Пожалуйста, подождите…

Show client IDs (scoreboard, chat, spectator)
==
== Показывать ID клиента (табло, чат, наблюдатель)

Normal:
==
== Обычный:

Team:
==
== В команде:

Dummy settings
==
== Настройки дамми

Toggle to edit your dummy settings
==
== Нажмите, чтобы изменить настройки дамми

Randomize
==
== Случайный

Are you sure that you want to delete '%s'?
==
== Вы уверены, что хотите удалить '%s'?

Delete skin
==
== Удалить скин

Basic
==
== Пресеты

Custom
==
== Кастомизация

Unable to delete skin
==
== Невозможно удалить скин

Customize
==
== Кастомизировать
50 changes: 25 additions & 25 deletions data/languages/slovak.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Limit and Petr
#modified by:
# LimiT 2011-07-02 20:24:44
# dobrykafe 2024-06-09 00:00:00
# dobrykafe 2024-08-30 00:00:00
##### /authors #####

##### translated strings #####
Expand Down Expand Up @@ -1842,76 +1842,76 @@ Show only chat messages from team members
== Zobraziť iba správy od členov tímu

Could not resolve connect address '%s'. See local console for details.
==
== Nie je možné získať adresu na pripojenie '%s'. Podrobnosti nájdete v miestnej konzole.

Connect address error
==
== Chyba v adrese na pripojenie

Could not connect dummy
==
== Nepodarilo sa pripojiť dummyho

[Spectating]
Following %s
==
== Sledujete %s

Example of usage
==
== Príklad použitia

Dummy is not allowed on this server
==
== Dummy nie je na tomto serveri povolený

Please wait…
==
== Čakajte prosím…

Show client IDs (scoreboard, chat, spectator)
==
== Zobraziť ID klientov (výsledková tabuľka, chat, divák)

Normal:
==
== Normálny:

Team:
==
== Tím:

Dummy settings
==
== Nastavenie dummyho

Toggle to edit your dummy settings
==
== Prepnutím upravíte nastavenie dummyho

Randomize
==
== Randomizovať

Are you sure that you want to delete '%s'?
==
== Ste si istí, že chcete zmazať '%s'?

Delete skin
==
== Odstrániť skin

Basic
==
== Základné

Custom
==
== Vlastné

Unable to delete skin
==
== Nedá sa odstrániť skin

Customize
==
== Prispôsobiť

Round %d/%d
==
== Kolo %d/%d

[Spectators]
%d others…
==
== %d ďalších…

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

Team %d (%d/%d)
==
== Tím %d (%d/%d)

https://wiki.ddnet.org/wiki/Mapping
==
== https://wiki.ddnet.org/wiki/Mapping
Loading

0 comments on commit cf9be41

Please sign in to comment.