diff --git a/lib/l10n/arb/app_de.arb b/lib/l10n/arb/app_de.arb index a1e4c26..63f4a30 100644 --- a/lib/l10n/arb/app_de.arb +++ b/lib/l10n/arb/app_de.arb @@ -10,6 +10,8 @@ "delete": "Löschen", "cancel": "Abbrechen", "game": "Spiel", + "games": "Spiele", + "gamemode": "Spielmodus", "ok": "OK", "player": "Spieler:in", "players": "Spieler:innen", @@ -126,7 +128,7 @@ "end_game_message": "Möchtest du das Spiel beenden? Das Spiel wird als beendet markiert und kann nicht fortgeführt werden.", "statistics": "Statistiken", - "point_overview": "Punkteübersicht", + "point_overview": "Punktetabelle", "scoring_history": "Spielverlauf", "empty_graph_text": "Du musst mindestens eine Runde spielen, damit der Graph des Spielverlaufes angezeigt werden kann.", diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb index 9ba17c4..e1f57fb 100644 --- a/lib/l10n/arb/app_en.arb +++ b/lib/l10n/arb/app_en.arb @@ -10,6 +10,8 @@ "delete": "Delete", "cancel": "Cancel", "game": "Game", + "games": "Games", + "gamemode": "Gamemode", "ok": "OK", "player": "Player", "players": "Players", @@ -40,7 +42,7 @@ "yes": "Yes", "no": "No", "bad_rating_title": "Not satisfied?", - "bad_rating_message": "If you are not satisfied with the app, please let me know before leaving a bad rating. I will try to fix the issue as soon as possible.", + "bad_rating_message": "Feel free to send me an email directly so we can solve your problem!", "contact_email": "Contact via E-Mail", "email_subject": "Feedback: Cabo Counter App", "email_body": "I have the following feedback...", diff --git a/lib/l10n/generated/app_localizations.dart b/lib/l10n/generated/app_localizations.dart index 890e1ca..eb3620c 100644 --- a/lib/l10n/generated/app_localizations.dart +++ b/lib/l10n/generated/app_localizations.dart @@ -152,6 +152,18 @@ abstract class AppLocalizations { /// **'Spiel'** String get game; + /// No description provided for @games. + /// + /// In de, this message translates to: + /// **'Spiele'** + String get games; + + /// No description provided for @gamemode. + /// + /// In de, this message translates to: + /// **'Spielmodus'** + String get gamemode; + /// No description provided for @ok. /// /// In de, this message translates to: @@ -546,7 +558,7 @@ abstract class AppLocalizations { /// No description provided for @point_overview. /// /// In de, this message translates to: - /// **'Punkteübersicht'** + /// **'Punktetabelle'** String get point_overview; /// No description provided for @scoring_history. diff --git a/lib/l10n/generated/app_localizations_de.dart b/lib/l10n/generated/app_localizations_de.dart index bb930f3..4611788 100644 --- a/lib/l10n/generated/app_localizations_de.dart +++ b/lib/l10n/generated/app_localizations_de.dart @@ -35,6 +35,12 @@ class AppLocalizationsDe extends AppLocalizations { @override String get game => 'Spiel'; + @override + String get games => 'Spiele'; + + @override + String get gamemode => 'Spielmodus'; + @override String get ok => 'OK'; @@ -265,7 +271,7 @@ class AppLocalizationsDe extends AppLocalizations { String get statistics => 'Statistiken'; @override - String get point_overview => 'Punkteübersicht'; + String get point_overview => 'Punktetabelle'; @override String get scoring_history => 'Spielverlauf'; diff --git a/lib/l10n/generated/app_localizations_en.dart b/lib/l10n/generated/app_localizations_en.dart index ff9c81a..2072fd8 100644 --- a/lib/l10n/generated/app_localizations_en.dart +++ b/lib/l10n/generated/app_localizations_en.dart @@ -35,6 +35,12 @@ class AppLocalizationsEn extends AppLocalizations { @override String get game => 'Game'; + @override + String get games => 'Games'; + + @override + String get gamemode => 'Gamemode'; + @override String get ok => 'OK'; @@ -101,7 +107,7 @@ class AppLocalizationsEn extends AppLocalizations { @override String get bad_rating_message => - 'If you are not satisfied with the app, please let me know before leaving a bad rating. I will try to fix the issue as soon as possible.'; + 'Feel free to send me an email directly so we can solve your problem!'; @override String get contact_email => 'Contact via E-Mail'; diff --git a/lib/presentation/views/about/licenses/license_detail_view.dart b/lib/presentation/views/about/licenses/license_detail_view.dart index efae60c..787c686 100644 --- a/lib/presentation/views/about/licenses/license_detail_view.dart +++ b/lib/presentation/views/about/licenses/license_detail_view.dart @@ -17,6 +17,7 @@ class LicenseDetailView extends StatelessWidget { middle: Text( AppLocalizations.of(context).license_details, ), + previousPageTitle: AppLocalizations.of(context).licenses, ), child: SafeArea( child: SingleChildScrollView( diff --git a/lib/presentation/views/about/licenses/license_view.dart b/lib/presentation/views/about/licenses/license_view.dart index d8edaa3..0b54f76 100644 --- a/lib/presentation/views/about/licenses/license_view.dart +++ b/lib/presentation/views/about/licenses/license_view.dart @@ -16,6 +16,7 @@ class LicenseView extends StatelessWidget { return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( middle: Text(AppLocalizations.of(context).licenses), + previousPageTitle: AppLocalizations.of(context).about, ), child: SafeArea( child: ListView.builder( diff --git a/lib/presentation/views/home/active_game/active_game_view.dart b/lib/presentation/views/home/active_game/active_game_view.dart index 754df18..4434787 100644 --- a/lib/presentation/views/home/active_game/active_game_view.dart +++ b/lib/presentation/views/home/active_game/active_game_view.dart @@ -57,10 +57,8 @@ class _ActiveGameViewState extends State { gameSession.playerScores, sortedPlayerIndices); return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( - middle: Text( - gameSession.gameTitle, - overflow: TextOverflow.ellipsis, - ), + previousPageTitle: AppLocalizations.of(context).games, + middle: Text(AppLocalizations.of(context).overview), ), child: SafeArea( child: SingleChildScrollView( diff --git a/lib/presentation/views/home/active_game/graph_view.dart b/lib/presentation/views/home/active_game/graph_view.dart index d67507a..f23be15 100644 --- a/lib/presentation/views/home/active_game/graph_view.dart +++ b/lib/presentation/views/home/active_game/graph_view.dart @@ -28,7 +28,7 @@ class _GraphViewState extends State { return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( middle: Text(AppLocalizations.of(context).scoring_history), - previousPageTitle: AppLocalizations.of(context).back, + previousPageTitle: AppLocalizations.of(context).overview, ), child: SafeArea( child: Visibility( diff --git a/lib/presentation/views/home/active_game/mode_selection_view.dart b/lib/presentation/views/home/active_game/mode_selection_view.dart index 0424dab..86db5ff 100644 --- a/lib/presentation/views/home/active_game/mode_selection_view.dart +++ b/lib/presentation/views/home/active_game/mode_selection_view.dart @@ -18,7 +18,9 @@ class ModeSelectionMenu extends StatelessWidget { Widget build(BuildContext context) { return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( - middle: Text(AppLocalizations.of(context).select_game_mode), + middle: Text(AppLocalizations.of(context).gamemode), + previousPageTitle: + !showDeselection ? AppLocalizations.of(context).new_game : '', ), child: ListView( children: [ diff --git a/lib/presentation/views/home/active_game/points_view.dart b/lib/presentation/views/home/active_game/points_view.dart index 8c08467..7844872 100644 --- a/lib/presentation/views/home/active_game/points_view.dart +++ b/lib/presentation/views/home/active_game/points_view.dart @@ -19,7 +19,7 @@ class _PointsViewState extends State { return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( middle: Text(AppLocalizations.of(context).point_overview), - previousPageTitle: AppLocalizations.of(context).back, + previousPageTitle: AppLocalizations.of(context).overview, ), child: SafeArea(child: LayoutBuilder(builder: (context, constraints) { const double caboFieldWidthFactor = 0.2; diff --git a/lib/presentation/views/home/create_game_view.dart b/lib/presentation/views/home/create_game_view.dart index 3b54a03..d92a375 100644 --- a/lib/presentation/views/home/create_game_view.dart +++ b/lib/presentation/views/home/create_game_view.dart @@ -80,7 +80,7 @@ class _CreateGameViewState extends State { return CupertinoPageScaffold( resizeToAvoidBottomInset: false, navigationBar: CupertinoNavigationBar( - previousPageTitle: AppLocalizations.of(context).overview, + previousPageTitle: AppLocalizations.of(context).games, middle: Text(AppLocalizations.of(context).new_game), ), child: SafeArea( diff --git a/lib/presentation/views/home/main_menu_view.dart b/lib/presentation/views/home/main_menu_view.dart index d99d61c..3363511 100644 --- a/lib/presentation/views/home/main_menu_view.dart +++ b/lib/presentation/views/home/main_menu_view.dart @@ -75,7 +75,7 @@ class _MainMenuViewState extends State { }); }, icon: const Icon(CupertinoIcons.settings, size: 30)), - middle: Text(AppLocalizations.of(context).app_name), + middle: Text(AppLocalizations.of(context).games), trailing: IconButton( onPressed: () => Navigator.push( context, diff --git a/lib/presentation/views/home/settings_view.dart b/lib/presentation/views/home/settings_view.dart index bbc471e..d8e8d6c 100644 --- a/lib/presentation/views/home/settings_view.dart +++ b/lib/presentation/views/home/settings_view.dart @@ -32,6 +32,7 @@ class _SettingsViewState extends State { return CupertinoPageScaffold( navigationBar: CupertinoNavigationBar( middle: Text(AppLocalizations.of(context).settings), + previousPageTitle: AppLocalizations.of(context).games, ), child: SafeArea( child: SingleChildScrollView(