Merge branch 'ddnet' into chillerbot

chillerbot · Oct 3, 2023 · 53b2637 · 53b2637
2 parents 90cb3af + 78b70eb
commit 53b2637
Show file tree

Hide file tree

Showing 73 changed files with 1,053 additions and 701 deletions.
diff --git a/data/autoexec_server.cfg b/data/autoexec_server.cfg
@@ -55,9 +55,6 @@ logfile "autoexec_server.log"
 # Log level (-3 = None, -2 = Error, -1 = Warn, 0 = Info, 1 = Debug, 2 = Trace)
 loglevel 0
 
-# Folder where map records will be saved
-sv_score_folder "records"
-
 # Max players on server
 sv_max_clients 64
 
@@ -75,9 +72,6 @@ sv_rescue 1
 # Number of seconds between two rescues
 sv_rescue_delay 5
 
-# Enable ranks after rcon cheats have been used
-sv_rank_cheats 1
-
 
 
 # SERVER CUSTOMIZATION

diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt
@@ -4,6 +4,7 @@
 #modified by:
 # Chill & PoKeMoN 2023-03-31 16:00:00
 # Chill & PoKeMoN 2023-07-02 00:54:00
+# Chill [TD] & PoKeMoN [TD] 2023-09-22 17:49:00
 # 
 ##### /authors #####
 
@@ -1091,7 +1092,7 @@ Show HUD
 == Паказваць HUD
 
 Chat command
-== Камандны чат
+== Каманда чата
 
 Enable controller
 == Уключыць кантролер
@@ -1628,13 +1629,13 @@ Grabs
 == Зах.
 
 1 new mention
-== 1 згадка
+== 1 новая згадка
 
 %d new mentions
-== %d згадак
+== %d новых згадак
 
 9+ new mentions
-== 9+ згадак
+== 9+ новых згадак
 
 A demo with this name already exists
 == Дэма з такой назвай ужо існуе 
@@ -1692,60 +1693,60 @@ Graphics card
 == Відэакарта
 
 Quitting. Please wait…
-== 
+== Выхад. Пачакайце, калі ласка…
 
 Restarting. Please wait…
-== 
+== Перазапуск. Пачакайце, калі ласка…
 
 Multi-View
-== 
+== Мульты-агляд
 
 Rename folder
-== 
+== Пераназваць тэчку
 
 A folder with this name already exists
-== 
+== Тэчка з такой назвай ужо існуе
 
 Unable to rename the folder
-== 
+== Немагчыма пераназваць тэчку
 
 (paused)
-== 
+== (паўза)
 
 Go back the specified duration
-== 
+== Назад на выбраную працягласць
 
 [Demo player duration]
 %d min.
-== 
+== %d хв.
 
 [Demo player duration]
 %d sec.
-== 
+== % сек.
 
 Change the skip duration
-== 
+== Змяніць працягласць пропуску
 
 Go forward the specified duration
-== 
+== Уперад на выбраную працягласць
 
 Render cut to video
-== 
+== Рэндэрыць адрэзак у відэа
 
 All combined
-== 
+== Усе разам
 
 Folder Link
-== 
+== Ярлык тэчкі
 
 Are you sure that you want to delete the folder '%s'?
-== 
+== Вы ўпэўненыя, што хочаце выдаліць тэчку '%s'?
 
 Delete folder
-== 
+== Выдаліць тэчку
 
 Unable to delete the folder '%s'. Make sure it's empty first.
-== 
+== Немагчыма выдаліць тэчку '%s'. Спачатку пераканайцеся, што яна пустая.
 
 Moved ingame
-== 
+== Перамешчаны ў гульні
diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt
@@ -28,6 +28,7 @@
 # Rafael Fontenelle 2023-03-26 19:11:00
 # Rafael Fontenelle 2023-07-07 12:11:00
 # Rafael Fontenelle 2023-08-14 14:17:00
+# Rafael Fontenelle 2023-09-25 14:23:00
 ##### /authors #####
 
 ##### translated strings #####
@@ -1754,21 +1755,21 @@ Moved ingame
 == Movido no jogo
 
 Go back the specified duration
-== 
+== Voltar na duração especificada
 
 [Demo player duration]
 %d min.
-== 
+== %d min.
 
 [Demo player duration]
 %d sec.
-== 
+== $d seg.
 
 Change the skip duration
-== 
+== Alterar a duração de pulo
 
 Go forward the specified duration
-== 
+== Avançar na duração especificada
 
 Render cut to video
-== 
+== Renderizar corte do vídeo
diff --git a/other/bundle/client/Info.plist.in b/other/bundle/client/Info.plist.in
@@ -56,6 +56,8 @@
  <true/>
  <key>NSPrefersDisplaySafeAreaCompatibilityMode</key>
  <true/>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.games</string>
  <key>NSQualityOfService</key>
  <string>NSQualityOfServiceUserInteractive</string>
  </dict>

diff --git a/other/manifest/client.manifest.in b/other/manifest/client.manifest.in
@@ -11,10 +11,16 @@
 
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
  <application>
- <!-- Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
- <!-- Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows 10 and Windows 11 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
  </application>
  </compatibility>