Merge remote-tracking branch 'origin/Development' into UI

# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/menu/MainMenu.java
This commit is contained in:
lieght
2025-10-03 01:18:18 +02:00

View File

@@ -2,8 +2,8 @@
windowTitle=ISY Games Selector windowTitle=ISY Games Selector
# Main Menu buttons # Main Menu buttons
mainMenuSelectTicTacToe=Tic Tac Toe mainMenuSelectTicTacToe=Tic Tac Toe\u5426
mainMenuSelectReversi=Reversi mainMenuSelectReversi=Reversi\u5426
mainMenuSelectSudoku=Sudoku mainMenuSelectSudoku=Sudoku
mainMenuSelectBattleship=Battleship mainMenuSelectBattleship=Battleship
mainMenuSelectOther=Other mainMenuSelectOther=Other