Merge branch 'develop' into feat/4223

openfoodfacts · Aug 6, 2023 · 188b46d · 188b46d
2 parents 6e1a42c + e9a67b1
commit 188b46d
Show file tree

Hide file tree

Showing 158 changed files with 13,095 additions and 7,637 deletions.
diff --git a/packages/smooth_app/ios/Runner/lol.lproj/InfoPlist.strings b/packages/smooth_app/ios/Runner/lol.lproj/InfoPlist.strings
@@ -1 +1 @@
-NSCameraUsageDescription = "crwdns196872:0crwdne196872:0";
+NSCameraUsageDescription = "crwdns222115:0crwdne222115:0";
diff --git a/packages/smooth_app/ios/Runner/nb.lproj/InfoPlist.strings b/packages/smooth_app/ios/Runner/nb.lproj/InfoPlist.strings
@@ -1 +1 @@
-NSCameraUsageDescription = "This app needs camera access to scan barcodes and to take product photos";
+NSCameraUsageDescription = "Kameratilgang er nødvendig for å skanne strekkoder og ta produktbilder";
diff --git a/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart b/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart
@@ -458,36 +458,40 @@ class _SmoothActionFlatButton extends StatelessWidget {
         value: buttonData.text,
         button: true,
         excludeSemantics: true,
-        child: TextButton(
-          onPressed: buttonData.onPressed,
-          style: TextButton.styleFrom(
-            shape: const RoundedRectangleBorder(
-              borderRadius: ROUNDED_BORDER_RADIUS,
-            ),
-            textStyle: themeData.textTheme.bodyMedium!.copyWith(
-              color: themeData.colorScheme.onPrimary,
-            ),
-            padding: const EdgeInsets.symmetric(
-              horizontal: SMALL_SPACE,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 2.0),
+          child: TextButton(
+            onPressed: buttonData.onPressed,
+            style: TextButton.styleFrom(
+              shape: const RoundedRectangleBorder(
+                borderRadius: ROUNDED_BORDER_RADIUS,
+              ),
+              textStyle: themeData.textTheme.bodyMedium!.copyWith(
+                color: themeData.colorScheme.onPrimary,
+              ),
+              padding: const EdgeInsets.symmetric(
+                horizontal: SMALL_SPACE,
+              ),
+              minimumSize: const Size(0, 46.0),
             ),
-            minimumSize: const Size(0, 50.0),
-          ),
-          child: SizedBox(
-            height: buttonData.lines != null
-                ? VERY_LARGE_SPACE * buttonData.lines!
-                : null,
-            width: buttonData.minWidth,
-            child: FittedBox(
-              fit: BoxFit.scaleDown,
-              child: Text(
-                buttonData.text.toUpperCase(),
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  color: buttonData.textColor ?? themeData.colorScheme.primary,
+            child: SizedBox(
+              height: buttonData.lines != null
+                  ? VERY_LARGE_SPACE * buttonData.lines!
+                  : null,
+              width: buttonData.minWidth,
+              child: FittedBox(
+                fit: BoxFit.scaleDown,
+                child: Text(
+                  buttonData.text.toUpperCase(),
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    color:
+                        buttonData.textColor ?? themeData.colorScheme.primary,
+                  ),
+                  textAlign: TextAlign.center,
+                  overflow: TextOverflow.ellipsis,
+                  maxLines: buttonData.lines ?? 2,
                 ),
-                textAlign: TextAlign.center,
-                overflow: TextOverflow.ellipsis,
-                maxLines: buttonData.lines ?? 2,
               ),
             ),
           ),
@@ -497,6 +501,40 @@ class _SmoothActionFlatButton extends StatelessWidget {
   }
 }
 
+/// A [Button] that can be displayed in the [body] of a [SmoothAlertDialog].
+class SmoothAlertContentButton extends StatelessWidget {
+  const SmoothAlertContentButton({
+    required this.label,
+    required this.onPressed,
+    this.icon,
+  });
+
+  final String label;
+  final IconData? icon;
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      onPressed: onPressed,
+      child: FractionallySizedBox(
+        widthFactor: 0.8,
+        child: Row(
+          children: <Widget>[
+            Expanded(
+              child: Text(label),
+            ),
+            if (icon != null)
+              ExcludeSemantics(
+                child: Icon(icon),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 /// A custom dialog where you only have to pass a [title] and a [message].
 /// By default an "OK" button will be show., but you can override it by passing
 /// a [positiveAction] and/or [negativeAction]

diff --git a/packages/smooth_app/lib/l10n/app_aa.arb b/packages/smooth_app/lib/l10n/app_aa.arb
diff --git a/packages/smooth_app/lib/l10n/app_af.arb b/packages/smooth_app/lib/l10n/app_af.arb
diff --git a/packages/smooth_app/lib/l10n/app_ak.arb b/packages/smooth_app/lib/l10n/app_ak.arb
diff --git a/packages/smooth_app/lib/l10n/app_am.arb b/packages/smooth_app/lib/l10n/app_am.arb
diff --git a/packages/smooth_app/lib/l10n/app_ar.arb b/packages/smooth_app/lib/l10n/app_ar.arb
diff --git a/packages/smooth_app/lib/l10n/app_as.arb b/packages/smooth_app/lib/l10n/app_as.arb
diff --git a/packages/smooth_app/lib/l10n/app_az.arb b/packages/smooth_app/lib/l10n/app_az.arb
diff --git a/packages/smooth_app/lib/l10n/app_be.arb b/packages/smooth_app/lib/l10n/app_be.arb
diff --git a/packages/smooth_app/lib/l10n/app_bg.arb b/packages/smooth_app/lib/l10n/app_bg.arb
diff --git a/packages/smooth_app/lib/l10n/app_bm.arb b/packages/smooth_app/lib/l10n/app_bm.arb
diff --git a/packages/smooth_app/lib/l10n/app_bn.arb b/packages/smooth_app/lib/l10n/app_bn.arb
diff --git a/packages/smooth_app/lib/l10n/app_bo.arb b/packages/smooth_app/lib/l10n/app_bo.arb
diff --git a/packages/smooth_app/lib/l10n/app_br.arb b/packages/smooth_app/lib/l10n/app_br.arb
diff --git a/packages/smooth_app/lib/l10n/app_bs.arb b/packages/smooth_app/lib/l10n/app_bs.arb
diff --git a/packages/smooth_app/lib/l10n/app_ca.arb b/packages/smooth_app/lib/l10n/app_ca.arb
diff --git a/packages/smooth_app/lib/l10n/app_ce.arb b/packages/smooth_app/lib/l10n/app_ce.arb
diff --git a/packages/smooth_app/lib/l10n/app_co.arb b/packages/smooth_app/lib/l10n/app_co.arb
diff --git a/packages/smooth_app/lib/l10n/app_cs.arb b/packages/smooth_app/lib/l10n/app_cs.arb
@@ -121,13 +121,13 @@
     "@Introduction screen": {},
     "welcomeToOpenFoodFacts": "Vítejte v Open Food Facts",
     "@welcomeToOpenFoodFacts": {},
-    "whatIsOff": "Open Food Facts je globální nezisková organizace založená na místních komunitách.",
+    "whatIsOff": "Open Food Facts je globální nezisková organizace tvořená místními komunitami.",
     "@whatIsOff": {
-        "description": "Description of Open Food Facts organization."
+        "description": "Description of Open Food Facts organization."
     },
     "offUtility": "Vyberte si jídlo, které je dobré pro vás i planetu.",
     "@offUtility": {
-        "description": "Description of what a user can use Open Food Facts for."
+        "description": "Description of what a user can use Open Food Facts for."
     },
     "productDataUtility": "Podívejte se na údaje o jídle relevantní pro vaše preference.",
     "@productDataUtility": {
@@ -235,15 +235,15 @@
     "sign_up_page_confirm_password_error_invalid": "Hesla se neshodují",
     "sign_up_page_agree_text": "Souhlasím s Open Food Facts",
     "@sign_up_page_agree_text": {
-        "description": "I agree to the Open Food Facts is followed by sign_up_page_terms_text"
+        "description": "I agree to the Open Food Facts is followed by sign_up_page_terms_text"
     },
     "sign_up_page_terms_text": "podmínky použití a příspěvek",
     "@sign_up_page_terms_text": {
         "description": "terms of use and contribution is preceded by sign_up_page_agree_text"
     },
     "sign_up_page_agree_url": "https://cz.openfoodfacts.org/terms-of-use",
     "@sign_up_page_agree_url": {
-        "description": "Please insert the right url here. Go to the Open Food Facts homepage, switch to your country and then on the bottom left footer is Terms of use from which the url should be taken"
+        "description": "Please insert the right url here. Go to the Open Food Facts homepage, switch to your country and then on the bottom left footer is Terms of use from which the url should be taken"
     },
     "donate_url": "https://donate.openfoodfacts.org/",
     "@donate_url": {
@@ -281,11 +281,26 @@
     "@darkmode_system_default": {
         "description": "Indicator inside the darkmode switch (system default)"
     },
-    "thanks_for_contributing": "Děkujeme, že přispíváte",
-    "@contributors": {
+    "thanks_for_contributing": "Děkujeme za příspěvek!",
+    "contributors_label": "Vytvářejí aplikaci",
+    "@contributors_label": {
         "description": "Button label: Opens a pop up window where all contributors of this app are shown"
     },
-    "contributors": "Přispěvatelé",
+    "contributors_dialog_title": "Přispěvatelé",
+    "@contributors_dialog_title": {
+        "description": "Dialog title: A list of all contributors of this app"
+    },
+    "contributors_dialog_entry_description": "Přispěvatel: {name}",
+    "@contributors_dialog_entry_description": {
+        "description": "The user id of the contributor.",
+        "placeholders": {
+            "name": {}
+        }
+    },
+    "contributors_description": "Seznam všech přispěvatelů této aplikace",
+    "@contributors_description": {
+        "description": "Button description for accessibility purposes to explain what the Contributors button do"
+    },
     "support": "Podpora",
     "@support": {
         "description": "Button label: Opens a pop up window where all ways to get support are shown"
@@ -312,7 +327,7 @@
     },
     "contribute_develop_text": "Kód pro každý produkt Open Food Facts je k dispozici na GitHubu. Můžete znovu použít kód (je to open source) a pomoci nám jej vylepšit, pro každého na celé planetě.",
     "@contribute_develop_text": {},
-    "contribute_develop_text_2": "Můžete se připojit k chatovací místnosti Open Food Facts Slack, což je preferovaný způsob, kde klást otázky.",
+    "contribute_develop_text_2": "Můžete se připojit k chatovací místnosti Open Food Facts Slack, což je preferovaný způsob, jak klást otázky.",
     "@contribute_develop_text_2": {},
     "contribute_develop_dev_mode_title": "DEV režim?",
     "contribute_develop_dev_mode_subtitle": "Aktivovat DEV režim",
@@ -348,7 +363,7 @@
     },
     "tap_to_answer": "Klepnutím sem odpovíte na otázky",
     "@tap_to_answer": {
-        "description": "Button label shown on a product, clicking the button opens a card with unanswered product questions, users can answer these to contribute to Open food facts and gain rewards."
+        "description": "Button label shown on a product, clicking the button opens a card with unanswered product questions, users can answer these to contribute to Open Food Facts and gain rewards."
     },
     "tap_to_answer_hint": "Klepnutím sem odpovězte na otázky týkající se tohoto produktu",
     "@tap_to_answer_hint": {
@@ -364,7 +379,7 @@
     },
     "contribute_to_get_rewards": "Pomozte zlepšit transparentnost potravin a získat odměny",
     "@contribute_to_get_rewards": {
-        "description": "Button description shown on a product, clicking the button opens a card with unanswered product questions, users can answer these to contribute to Open food facts and gain rewards."
+        "description": "Button description shown on a product, clicking the button opens a card with unanswered product questions, users can answer these to contribute to Open Food Facts and gain rewards."
     },
     "question_sign_in_text": "Přihlaste se ke svému účtu Open Food Facts a získejte kredit za vaše příspěvky",
     "question_yes_button_accessibility_value": "Odpovězte ano",
@@ -630,7 +645,7 @@
     "@uploading_image_type_ingredients": {
         "description": "Message when a new ingredients picture is being uploaded to the server"
     },
-    "uploading_image_type_nutrition": "Nahrávání obrázku výživy do Open Food Facts",
+    "uploading_image_type_nutrition": "Nahrávání obrázku výživových údajů do Open Food Facts",
     "@uploading_image_type_nutrition": {
         "description": "Message when a new nutrition picture is being uploaded to the server"
     },
@@ -680,18 +695,14 @@
     "@product_refreshed": {
         "description": "Confirmation, that the product data refresh is done"
     },
-    "deprecated_header": "Používáte zastaralou verzi aplikace.",
-    "@deprecated_header": {
-        "description": "Confirmation, that the user can upgrade to new version of the app"
-    },
-    "click_here": "Klikněte zde",
-    "@click_here": {
-        "description": "Confirmation click to download new version of the app"
-    },
-    "download_new_version": "Stáhněte si novou verzi aplikace",
-    "@download_new_version": {
-        "description": "Download new version of the app text"
-    },
+    "tagline_app_review": "Líbí se vám aplikace?",
+    "tagline_app_review_button_positive": "Miluji to! 😍",
+    "tagline_app_review_button_negative": "Ani ne...",
+    "tagline_app_review_button_later": "Zeptejte se mě později",
+    "app_review_negative_modal_title": "Nelíbí se vám naše aplikace?",
+    "app_review_negative_modal_text": "Mohl byste nám dát pár sekund a říct nám proč?",
+    "app_review_negative_modal_positive_button": "Ano, samozřejmě!",
+    "app_review_negative_modal_negative_button": "Ne",
     "could_not_refresh": "Produkt se nepodařilo obnovit",
     "@could_not_refresh": {
         "description": "The product data couldn't be refreshed"
@@ -752,7 +763,7 @@
     "@native_app_settings": {
         "description": "Native App Settings in app settings"
     },
-    "native_app_description": "Otevřít systémové nastavení pro Open Food Facts",
+    "native_app_description": "Otevřít systémová nastavení pro Open Food Facts",
     "@native_app_description": {
         "description": "Native App description in app settings"
     },
@@ -774,7 +785,11 @@
     "recently_seen_products": "Historie",
     "clear": "Vymazat",
     "@clear": {
-        "description": "Clears a product list"
+        "description": "Clears a product list (short label)"
+    },
+    "clear_long": "Vyprázdnit seznam",
+    "@clear_long": {
+        "description": "Clears a product list (long label)"
     },
     "really_clear": "Opravdu chcete tento seznam smazat?",
     "@Plural": {},
@@ -1043,7 +1058,7 @@
         "description": "When the user is not connected"
     },
     "user_profile_subtitle_guest": "Přihlaste se nebo se zaregistrujte a připojte se ke komunitě Open Food Facts",
-    "user_profile_title_id_email": "Open Food Facts login: {email}",
+    "user_profile_title_id_email": "Open Food Facts přihlášení: {email}",
     "@user_profile_title_id_email": {
         "description": "User login (when it's an email)",
         "placeholders": {
@@ -1221,7 +1236,7 @@
     "@edit_product_form_item_origins_title": {
         "description": "Product edition - Origins - Title"
     },
-    "edit_product_form_item_origins_hint": "Španělsko",
+    "edit_product_form_item_origins_hint": "Zadejte původ",
     "@edit_product_form_item_origins_hint": {
         "description": "Product edition - Origins - input textfield hint"
     },
@@ -1241,7 +1256,7 @@
     "@edit_product_form_item_countries_title": {
         "description": "Product edition - Countries - Title"
     },
-    "edit_product_form_item_countries_hint": "Španělsko",
+    "edit_product_form_item_countries_hint": "Zadejte zemi",
     "@edit_product_form_item_countries_hint": {
         "description": "Product edition - Countries - input textfield hint"
     },
@@ -2071,6 +2086,7 @@
     "@show_password": {
         "description": "Show hidden password in password field"
     },
+    "rate_app": "Ohodnoťte aplikaci",
     "app_rating_dialog_title": "Skvěle! Dejte ostatním vědět, co si o aplikaci myslíte!",
     "app_rating_dialog_positive_action": "Ohodnoťte aplikaci",
     "app_rating_dialog_negative_action": "Později",
@@ -2199,7 +2215,7 @@
     },
     "color_light_brown": "Výchozí",
     "@color_light_brown": {
-        "description": "Color Light Brown, Default Open Food Facts Color"
+        "description": "Color Light Brown, Default Open Food Facts Color"
     },
     "color_magenta": "Purpurová",
     "@color_magenta": {
@@ -2303,7 +2319,7 @@
     "@update_offline_data": {
         "description": "List tile title for the update offline data page"
     },
-    "update_local_database_sub": "Aktualizovat místní databázi produktů o nejnovější data z Open Food Facts",
+    "update_local_database_sub": "Aktualizujte místní databázi produktů nejnovějšími údaji z Open Food Facts",
     "@update_local_database_sub": {
         "description": "Update the local product database with the latest data from server"
     },
@@ -2353,6 +2369,10 @@
     "@country_selector_title": {
         "description": "Label written as the title of the dialog to select the user country"
     },
+    "language_selector_title": "Vyberte svůj jazyk:",
+    "@language_selector_title": {
+        "description": "Label written as the title of the dialog to select the user language"
+    },
     "action_delete_list": "Odstranit",
     "@action_delete_list": {
         "description": "Delete a list action in a menu"
@@ -2368,5 +2388,28 @@
     "product_list_create_tooltip": "Vytvořit nový seznam",
     "@product_list_create_tooltip": {
         "description": "Button description to create a new list (long sentence)"
-    }
+    },
+    "nutriscore_a": "Nutri-Score A",
+    "nutriscore_b": "Nutri-Score B",
+    "nutriscore_c": "Nutri-Score C",
+    "nutriscore_d": "Nutri-Score D",
+    "nutriscore_e": "Nutri-Score E",
+    "nutriscore_unknown": "Neznámé Nutri-Score",
+    "nutriscore_not_applicable": "Nutri-Score nelze použít",
+    "ecoscore_a": "Eco-Score A",
+    "ecoscore_b": "Eco-Score B",
+    "ecoscore_c": "Eco-Score C",
+    "ecoscore_d": "Eco-Score D",
+    "ecoscore_e": "Eco-Score E",
+    "ecoscore_unknown": "Neznámé Eco-Score",
+    "ecoscore_not_applicable": "Eco-Score nelze použít",
+    "nova_group_1": "Skupina NOVA 1",
+    "nova_group_2": "Skupina NOVA 2",
+    "nova_group_3": "Skupina NOVA 3",
+    "nova_group_4": "Skupina NOVA 4",
+    "nova_group_unknown": "Neznámá skupina NOVA",
+    "hunger_games_loading_line1": "Dejte nám prosím pár sekund…",
+    "hunger_games_loading_line2": "Stahujeme otázky!",
+    "hunger_games_error_label": "Argh! Něco se pokazilo… a otázky se nepodařilo načíst.",
+    "hunger_games_error_retry_button": "Zkusme to znovu!"
 }