stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/121-settings-menu' into UI

Browse Source 
# Conflicts:
#	app/src/main/java/org/toop/app/menu/OptionsMenu.java
#	app/src/main/resources/assets/localization/localization_de.properties
#	app/src/main/resources/assets/localization/localization_en_US.properties
#	app/src/main/resources/assets/localization/localization_es.properties
#	app/src/main/resources/assets/localization/localization_fr.properties
#	app/src/main/resources/assets/localization/localization_it.properties
#	app/src/main/resources/assets/localization/localization_nl.properties
#	app/src/main/resources/assets/localization/localization_zh.properties
This commit is contained in:
lieght
2025-10-03 03:25:20 +02:00
parent 3471ae54a5 547ea55300
commit a5513bf87b
13 changed files with 219 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/resources/assets/localization/localization_de.properties
View File

@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Gib hier deine IP-Adresse ein:
# Game Menu
gameMenuHint=Tipp
gameMenuBack=Zur\u00FCck
# Options menu
optionsMenuLabelSelectLanguage=Sprache: