mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 10:54:51 +00:00
Merge remote-tracking branch 'origin/121-settings-menu' into UI
# 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:
@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Voer hier je IP-adres in:
|
||||
# Game Menu
|
||||
gameMenuHint=Hint
|
||||
gameMenuBack=Terug
|
||||
|
||||
|
||||
# Options menu
|
||||
optionsMenuLabelSelectLanguage=Taal:
|
||||
Reference in New Issue
Block a user