Merge remote-tracking branch 'origin/development' into feature/118-bearbeiten-und-löschen-von-gruppen

# Conflicts:
#	lib/l10n/arb/app_de.arb
#	lib/l10n/arb/app_en.arb
#	lib/l10n/generated/app_localizations_de.dart
#	lib/presentation/views/main_menu/settings_view.dart

lib/l10n/arb/app_de.arb

@@ -17,8 +17,8 @@
   "data_successfully_imported": "Daten erfolgreich importiert",
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
-  "delete_all_data": "Alle Daten löschen?",
-  "delete_all_data": "Diese Gruppe löschen",
+  "delete_all_data": "Alle Daten löschen",
+  "delete_group": "Diese Gruppe löschen",
   "edit_group": "Gruppe bearbeiten",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
   "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",

lib/l10n/arb/app_en.arb

@@ -34,10 +34,10 @@
     "description": "Button text to create a match"
   },
   "@create_new_group": {
-    "description": "Appbar text to create a group"
+    "description": "Button text to create a new group"
   },
   "@create_new_match": {
-    "description": "Appbar text to create a match"
+    "description": "Button text to create a new match"
   },
   "@data_successfully_deleted": {
     "description": "Success message after deleting data"
@@ -289,7 +289,7 @@
   "data_successfully_imported": "Data successfully imported",
   "days_ago": "{count} days ago",
   "delete": "Delete",
-  "delete_all_data": "Delete all data?",
+  "delete_all_data": "Delete all data",
   "delete_group": "Delete this group",
   "edit_group": "Edit Group",
   "error_creating_group": "Error while creating group, please try again",

lib/l10n/generated/app_localizations.dart

@@ -164,13 +164,13 @@ abstract class AppLocalizations {
   /// **'Create match'**
   String get create_match;
 
-  /// Appbar text to create a group
+  /// Button text to create a new group
   ///
   /// In en, this message translates to:
   /// **'Create new group'**
   String get create_new_group;
 
-  /// Appbar text to create a match
+  /// Button text to create a new match
   ///
   /// In en, this message translates to:
   /// **'Create new match'**
@@ -209,13 +209,13 @@ abstract class AppLocalizations {
   /// Confirmation dialog for deleting all data
   ///
   /// In en, this message translates to:
-  /// **'Delete all data?'**
+  /// **'Delete all data'**
   String get delete_all_data;
 
   /// Confirmation dialog for deleting a group
   ///
   /// In en, this message translates to:
-  /// **'Delete this group?'**
+  /// **'Delete this group'**
   String get delete_group;
 
   /// Button & Appbar label for editing a group

lib/l10n/generated/app_localizations_de.dart

@@ -67,10 +67,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete => 'Löschen';
 
   @override
-  String get delete_all_data => 'Diese Gruppe löschen?';
+  String get delete_all_data => 'Alle Daten löschen';
 
   @override
-  String get delete_group => 'Delete this group?';
+  String get delete_group => 'Diese Gruppe löschen';
 
   @override
   String get edit_group => 'Gruppe bearbeiten';

lib/l10n/generated/app_localizations_en.dart

@@ -67,10 +67,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get delete => 'Delete';
 
   @override
-  String get delete_all_data => 'Delete all data?';
+  String get delete_all_data => 'Delete all data';
 
   @override
-  String get delete_group => 'Delete this group?';
+  String get delete_group => 'Delete this group';
 
   @override
   String get edit_group => 'Edit Group';