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:
lieght
2025-10-03 03:25:20 +02:00
13 changed files with 219 additions and 25 deletions

View File

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

View File

@@ -2,8 +2,8 @@
windowTitle=ISY Games Selector
# Main Menu buttons
mainMenuSelectTicTacToe=Tic Tac Toe
mainMenuSelectReversi=Reversi
mainMenuSelectTicTacToe=Tic Tac Toe\u5426
mainMenuSelectReversi=Reversi\u5426
mainMenuSelectSudoku=Sudoku
mainMenuSelectBattleship=Battleship
mainMenuSelectOther=Other
@@ -33,4 +33,7 @@ gameSelectMenuEnterIP=Enter your IP address here:
# Game Menu
gameMenuHint=Hint
gameMenuBack=Back
gameMenuBack=Back
# Options menu
optionsMenuLabelSelectLanguage=Language:

View File

@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Introduce aqu\u00ED tu direcci\u00F3n IP:
# Game Menu
gameMenuHint=Pista
gameMenuBack=Atr\u00E1s
# Options menu
optionsMenuLabelSelectLanguage=Idioma:

View File

@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Entrez votre adresse IP ici :
# Game Menu
gameMenuHint=Indice
gameMenuBack=Retour
# Options menu
optionsMenuLabelSelectLanguage=Langue:

View File

@@ -35,3 +35,7 @@ gameSelectMenuEnterIP=Inserisci qui il tuo indirizzo IP:
gameMenuHint=Suggerimento
gameMenuBack=Indietro
# Options menu
optionsMenuLabelSelectLanguage=Lingua:

View File

@@ -34,3 +34,7 @@ gameSelectMenuEnterIP=Voer hier je IP-adres in:
# Game Menu
gameMenuHint=Hint
gameMenuBack=Terug
# Options menu
optionsMenuLabelSelectLanguage=Taal:

View File

@@ -46,3 +46,7 @@ gameSelectMenuEnterIP=\u5728\u6B64\u8F93\u5165\u4F60\u7684IP\u5730\u5740\uFF1A
# Game Menu
gameMenuHint=\u63D0\u793A
gameMenuBack=\u8FD4\u56DE
# Options menu
optionsMenuLabelSelectLanguage=\u8BED\u8A00: