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 Jan 4, 2025
2 parents adafda9 + 8bb8a17 commit 5cad96f
Show file tree
Hide file tree
Showing 56 changed files with 1,714 additions and 226 deletions.
42 changes: 38 additions & 4 deletions data/languages/arabic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,9 @@ Error saving settings
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
==

The format of texture %s is not RGBA which will cause visual bugs.
==

Expand Down Expand Up @@ -1152,6 +1155,9 @@ Restarting. Please wait…
Loading skin files
==

Loading background map
==

Searching
==

Expand Down Expand Up @@ -1198,6 +1204,10 @@ Multi-View
Following %s
==

[Spectating Camera Mode Icon]
AUTO
==

Team %d
==

Expand Down Expand Up @@ -1450,6 +1460,9 @@ Close the demo player
Toggle keyboard shortcuts
==

Toggle auto camera
==

Export demo cut
==

Expand Down Expand Up @@ -1517,6 +1530,9 @@ Edit touch controls
Close
==

https://wiki.ddnet.org/wiki/Touch_controls
==

Save changes
==

Expand Down Expand Up @@ -1753,6 +1769,12 @@ Show health, shields and ammo
Show local time always
==

Authed name color in scoreboard
==

Same clan color in scoreboard
==

DDRace HUD
==

Expand Down Expand Up @@ -1801,19 +1823,28 @@ Preview
Show friend mark (♥) in name plates
==

Show client IDs in name plates
==

Hook Strength
==

Show hook strength icon indicator
==

Show hook strength number indicator
==

Show local player's key presses
Size of hook strength icon and number indicator
==

Authed name color in scoreboard
Key Presses
==

Same clan color in scoreboard
Show local player's key presses
==

Size of key press icons
==

Hook collision line
Expand Down Expand Up @@ -1906,7 +1937,7 @@ Opacity
Only save improvements
==

Adjust the opacity of entities belonging to other teams, such as tees and nameplates
Adjust the opacity of entities belonging to other teams, such as tees and name plates
==

Quads are used for background decoration
Expand Down Expand Up @@ -1972,6 +2003,9 @@ Tutorial
Can't find a Tutorial server
==

Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
==

Loading race demo files
==

Expand Down
36 changes: 35 additions & 1 deletion data/languages/azerbaijani.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ When you cross the start line, show a ghost tee replicating the movements of you
Opacity
== Şəffaflıq

Adjust the opacity of entities belonging to other teams, such as tees and nameplates
Adjust the opacity of entities belonging to other teams, such as tees and name plates
== Teelər və istifadəçi adları kimi digər qruplara aid varlıqların qeyri-şəffaflığını düzəldin

Quads are used for background decoration
Expand Down Expand Up @@ -2039,3 +2039,37 @@ Active: Fire

Active: Hook
== Aktiv: Qarmaq

"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
==

Loading background map
==

[Spectating Camera Mode Icon]
AUTO
==

Toggle auto camera
==

https://wiki.ddnet.org/wiki/Touch_controls
==

Show client IDs in name plates
==

Hook Strength
==

Size of hook strength icon and number indicator
==

Key Presses
==

Size of key press icons
==

Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
==
36 changes: 35 additions & 1 deletion data/languages/belarusian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@ Show text entities
Opacity
== Непразр.

Adjust the opacity of entities belonging to other teams, such as tees and nameplates
Adjust the opacity of entities belonging to other teams, such as tees and name plates
== Рэгуляванне непразрыстасці аб'ектаў іншых каманд, такіх як Tee і таблічкі з імёнамі.

Show others (own team only)
Expand Down Expand Up @@ -1867,9 +1867,19 @@ Connect address error
Could not connect dummy
==

"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
==

Some fonts could not be loaded. Check the local console for details.
==

Loading background map
==

[Spectating Camera Mode Icon]
AUTO
==

Save skin
==

Expand Down Expand Up @@ -1897,6 +1907,9 @@ Add clanmates by entering their clan below and leaving the name blank.
Offline friends and clanmates will appear here.
==

Toggle auto camera
==

Dummy is not allowed on this server
==

Expand All @@ -1909,6 +1922,9 @@ Edit touch controls
Close
==

https://wiki.ddnet.org/wiki/Touch_controls
==

Save changes
==

Expand Down Expand Up @@ -1984,6 +2000,21 @@ Hz
Show client IDs (scoreboard, chat, spectator)
==

Show client IDs in name plates
==

Hook Strength
==

Size of hook strength icon and number indicator
==

Key Presses
==

Size of key press icons
==

Width of your own hook collision line
==

Expand All @@ -2008,6 +2039,9 @@ Delete skin
Unable to delete skin
==

Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
==

[skins]
Body
==
Expand Down
48 changes: 41 additions & 7 deletions data/languages/bosnian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,9 @@ Error saving settings
The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
==

"%s" is not compatible with pnglite and cannot be loaded by old DDNet versions:
==

The format of texture %s is not RGBA which will cause visual bugs.
==

Expand Down Expand Up @@ -1017,6 +1020,9 @@ Restarting. Please wait…
Loading skin files
==

Loading background map
==

Searching
==

Expand Down Expand Up @@ -1066,6 +1072,10 @@ Multi-View
Following %s
==

[Spectating Camera Mode Icon]
AUTO
==

Team %d
==

Expand Down Expand Up @@ -1348,6 +1358,9 @@ Close the demo player
Toggle keyboard shortcuts
==

Toggle auto camera
==

Export demo cut
==

Expand Down Expand Up @@ -1424,6 +1437,9 @@ Edit touch controls
Close
==

https://wiki.ddnet.org/wiki/Touch_controls
==

Save changes
==

Expand Down Expand Up @@ -1699,6 +1715,12 @@ Show health, shields and ammo
Show local time always
==

Authed name color in scoreboard
==

Same clan color in scoreboard
==

DDRace HUD
==

Expand Down Expand Up @@ -1750,19 +1772,28 @@ Preview
Show friend mark (♥) in name plates
==

Show client IDs in name plates
==

Hook Strength
==

Show hook strength icon indicator
==

Show hook strength number indicator
==

Show local player's key presses
Size of hook strength icon and number indicator
==

Authed name color in scoreboard
Key Presses
==

Same clan color in scoreboard
Show local player's key presses
==

Size of key press icons
==

Hook collision line
Expand Down Expand Up @@ -1861,7 +1892,7 @@ Only save improvements
Overlay entities
==

Adjust the opacity of entities belonging to other teams, such as tees and nameplates
Adjust the opacity of entities belonging to other teams, such as tees and name plates
==

Quads are used for background decoration
Expand Down Expand Up @@ -1951,13 +1982,16 @@ Stop server
Run server
==

Server executable not found, can't run server
==

[Start menu]
Play
==

Server could not be started. Make sure to grant the notification permission in the app settings so the server can run in the background.
==

Server executable not found, can't run server
==

Loading race demo files
==

Expand Down
Loading

0 comments on commit 5cad96f

Please sign in to comment.