Merge branch 'development' into refactoring/68-mvp-refactoring

# Conflicts:
#	lib/l10n/generated/app_localizations.dart
#	lib/l10n/generated/app_localizations_de.dart
#	lib/l10n/generated/app_localizations_en.dart
This commit is contained in:
2026-01-07 16:58:15 +01:00
4 changed files with 22 additions and 18 deletions

View File

@@ -564,7 +564,7 @@ abstract class AppLocalizations {
/// ///
/// In en, this message translates to: /// In en, this message translates to:
/// **'Winner'** /// **'Winner'**
String get winner; String winner(Object winnerName);
/// Label for winrate statistic /// Label for winrate statistic
/// ///

View File

@@ -15,7 +15,7 @@ class AppLocalizationsDe extends AppLocalizations {
String get all_players_selected => 'Alle Spieler:innen ausgewählt'; String get all_players_selected => 'Alle Spieler:innen ausgewählt';
@override @override
String get amount_of_matches => 'Anzahl der Spiele'; String get amount_of_matches => 'Anzahl der Matches';
@override @override
String get cancel => 'Abbrechen'; String get cancel => 'Abbrechen';
@@ -38,13 +38,13 @@ class AppLocalizationsDe extends AppLocalizations {
String get create_group => 'Gruppe erstellen'; String get create_group => 'Gruppe erstellen';
@override @override
String get create_match => 'Spiel erstellen'; String get create_match => 'Match erstellen';
@override @override
String get create_new_group => 'Neue Gruppe erstellen'; String get create_new_group => 'Neue Gruppe erstellen';
@override @override
String get create_new_match => 'Neues Spiel erstellen'; String get create_new_match => 'Neues Match erstellen';
@override @override
String get data_successfully_deleted => 'Daten erfolgreich gelöscht'; String get data_successfully_deleted => 'Daten erfolgreich gelöscht';
@@ -119,13 +119,13 @@ class AppLocalizationsDe extends AppLocalizations {
String get least_points => 'Niedrigste Punkte'; String get least_points => 'Niedrigste Punkte';
@override @override
String get match_in_progress => 'Spiel läuft...'; String get match_in_progress => 'Match läuft...';
@override @override
String get match_name => 'Spieltitel'; String get match_name => 'Matchname';
@override @override
String get matches => 'Spiele'; String get matches => 'Matches';
@override @override
String get menu => 'Menü'; String get menu => 'Menü';
@@ -140,7 +140,7 @@ class AppLocalizationsDe extends AppLocalizations {
String get no_groups_created_yet => 'Noch keine Gruppen erstellt'; String get no_groups_created_yet => 'Noch keine Gruppen erstellt';
@override @override
String get no_matches_created_yet => 'Noch keine Spiele erstellt'; String get no_matches_created_yet => 'Noch keine Matches erstellt';
@override @override
String get no_players_created_yet => 'Noch keine Spieler:in erstellt'; String get no_players_created_yet => 'Noch keine Spieler:in erstellt';
@@ -153,10 +153,10 @@ class AppLocalizationsDe extends AppLocalizations {
String get no_players_selected => 'Keine Spieler:in ausgewählt'; String get no_players_selected => 'Keine Spieler:in ausgewählt';
@override @override
String get no_recent_matches_available => 'Keine letzten Spiele verfügbar'; String get no_recent_matches_available => 'Keine letzten Matches verfügbar';
@override @override
String get no_second_match_available => 'Kein zweites Spiel verfügbar'; String get no_second_match_available => 'Kein zweites Match verfügbar';
@override @override
String get no_statistics_available => 'Keine Statistiken verfügbar'; String get no_statistics_available => 'Keine Statistiken verfügbar';
@@ -174,7 +174,7 @@ class AppLocalizationsDe extends AppLocalizations {
String get player_name => 'Spieler:innenname'; String get player_name => 'Spieler:innenname';
@override @override
String get players => 'Spieler:innen'; String get players => 'Spieler:in';
@override @override
String players_count(int count) { String players_count(int count) {
@@ -185,7 +185,7 @@ class AppLocalizationsDe extends AppLocalizations {
String get quick_create => 'Schnellzugriff'; String get quick_create => 'Schnellzugriff';
@override @override
String get recent_matches => 'Letzte Spiele'; String get recent_matches => 'Letzte Matches';
@override @override
String get ruleset => 'Regelwerk'; String get ruleset => 'Regelwerk';
@@ -222,7 +222,7 @@ class AppLocalizationsDe extends AppLocalizations {
); );
final String countString = countNumberFormat.format(count); final String countString = countNumberFormat.format(count);
return 'Ausgewählte Spieler:innen: $countString'; return 'Ausgewählte Spieler:in: $countString';
} }
@override @override
@@ -265,7 +265,9 @@ class AppLocalizationsDe extends AppLocalizations {
String get unknown_exception => 'Unbekannter Fehler (siehe Konsole)'; String get unknown_exception => 'Unbekannter Fehler (siehe Konsole)';
@override @override
String get winner => 'Gewinner*in'; String winner(Object winnerName) {
return 'Gewinner:in: $winnerName';
}
@override @override
String get winrate => 'Siegquote'; String get winrate => 'Siegquote';

View File

@@ -264,7 +264,9 @@ class AppLocalizationsEn extends AppLocalizations {
String get unknown_exception => 'Unknown Exception (see console)'; String get unknown_exception => 'Unknown Exception (see console)';
@override @override
String get winner => 'Winner'; String winner(Object winnerName) {
return 'Winner';
}
@override @override
String get winrate => 'Winrate'; String get winrate => 'Winrate';

View File

@@ -58,7 +58,7 @@ class _SettingsViewState extends State<SettingsView> {
), ),
SettingsListTile( SettingsListTile(
title: loc.export_data, title: loc.export_data,
icon: Icons.upload_outlined, icon: Icons.upload_rounded,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () async { onPressed: () async {
final String json = final String json =
@@ -73,7 +73,7 @@ class _SettingsViewState extends State<SettingsView> {
), ),
SettingsListTile( SettingsListTile(
title: loc.import_data, title: loc.import_data,
icon: Icons.download_outlined, icon: Icons.download_rounded,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () async { onPressed: () async {
final result = await DataTransferService.importData( final result = await DataTransferService.importData(
@@ -85,7 +85,7 @@ class _SettingsViewState extends State<SettingsView> {
), ),
SettingsListTile( SettingsListTile(
title: loc.delete_all_data, title: loc.delete_all_data,
icon: Icons.download_outlined, icon: Icons.delete_rounded,
suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16), suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
onPressed: () { onPressed: () {
showDialog<bool>( showDialog<bool>(