Skip to content

Commit

Permalink
Merge branch 'develop' into fix/4655
Browse files Browse the repository at this point in the history
  • Loading branch information
monsieurtanuki authored Sep 27, 2023
2 parents b8fd243 + 53a75a3 commit 82e6c2e
Show file tree
Hide file tree
Showing 16 changed files with 68 additions and 66 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- run: echo Release type ${{ inputs.RELEASE_TYPE }} + Build type ${{ inputs.BUILD_TYPE }} + Tag name null if not github release ${{ inputs.TAG_NAME }}

- name: Setup Java JDK
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v3.13.0
with:
distribution: 'zulu'
java-version: ${{ env.JAVA_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-assign-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
assign-author:
runs-on: ubuntu-latest
steps:
- uses: toshimaru/auto-author-assign@v1.6.2
- uses: toshimaru/auto-author-assign@v2.0.0

Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: bundle install
working-directory: ./packages/smooth_app/android/
- name: Setup Java JDK
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v3.13.0
with:
distribution: 'zulu'
java-version: ${{ env.JAVA_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Java JDK
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v3.13.0
with:
distribution: 'zulu'
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/waldo_sessions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0

- name: Setup Java JDK
uses: actions/setup-java@v3.12.0
uses: actions/setup-java@v3.13.0
with:
distribution: 'zulu'
java-version: 11
Expand Down
36 changes: 18 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -239,21 +239,21 @@ android_keys.zip
.fvm/


# Unsupported locals
app_ach.arb
app_ast.arb
app_ber.arb
app_crs.arb
app_chr.arb
pp_fil.arb
app_kab.arb
app_lol.arb
app_sat.arb
app_sco.arb
app_sma.arb
app_son.arb
app_tzl.arb
app_val.arb
app_vec.arb
app_vls.arb
app_zea.arb
# Unsupported locales
packages/smooth_app/lib/l10n/app_ach.arb
packages/smooth_app/lib/l10n/app_ast.arb
packages/smooth_app/lib/l10n/app_ber.arb
packages/smooth_app/lib/l10n/app_crs.arb
packages/smooth_app/lib/l10n/app_chr.arb
packages/smooth_app/lib/l10n/app_fil.arb
packages/smooth_app/lib/l10n/app_kab.arb
packages/smooth_app/lib/l10n/app_lol.arb
packages/smooth_app/lib/l10n/app_sat.arb
packages/smooth_app/lib/l10n/app_sco.arb
packages/smooth_app/lib/l10n/app_sma.arb
packages/smooth_app/lib/l10n/app_son.arb
packages/smooth_app/lib/l10n/app_tzl.arb
packages/smooth_app/lib/l10n/app_val.arb
packages/smooth_app/lib/l10n/app_vec.arb
packages/smooth_app/lib/l10n/app_vls.arb
packages/smooth_app/lib/l10n/app_zea.arb
2 changes: 2 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
project_id_env: CROWDIN_PROJECT_ID
api_token_env: CROWDIN_PERSONAL_TOKEN
pull_request_title: "l10n: New Crowdin translations to review and merge"
pull_request_body: '### What\n- Automated pull request pulling in new or updated translations from Crowdin (https://translate.openfoodfacts.org).\n## Checklist\n- [ ] Check that they are no bad translations. If there are, correct them directly in Crowdin so that they are not resynced again. Then you can correct them here as well, or wait 24 hours for the sync to happen automatically.\n- [ ] Put extra attention on Acholi, which is used mistakenly as a sandbox by people discovering the self-service translation button on Open Food Facts\n- [ ] Once you are happy, that automated checks pass, you can approve the PR and merge it.\n### Part of\n- Translations'
files:
- source: /packages/smooth_app/lib/l10n/app_en.arb
dist: /packages/smooth_app/lib/l10n/app_en.arb
Expand Down
6 changes: 3 additions & 3 deletions packages/smooth_app/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.824.0)
aws-sdk-core (3.181.1)
aws-partitions (1.825.0)
aws-sdk-core (3.182.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
Expand Down Expand Up @@ -146,7 +146,7 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.8.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/lib/l10n/app_ar.arb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"go_back_to_top": "العودة لأعلى",
"save": "حفظ",
"save_confirmation": "هل أنت متأكد أنك تريد المغادرة؟",
"skip": "Skip",
"skip": "تخطي",
"cancel": "إلغاء",
"@cancel": {},
"ignore": "تجاهل",
Expand Down
18 changes: 9 additions & 9 deletions packages/smooth_app/lib/l10n/app_bg.arb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"description": "Description of what a user can use the Eco data in a product for."
},
"@user_management": {},
"sign_in_text": "Sign in to your OpenFoodFacts account to save your contributions",
"sign_in_text": "Влез в акаунта си в Open Food Facts, за да запазиш приноса си",
"incorrect_credentials": "Грешно потребителско име или парола.",
"password_lost_incorrect_credentials": "This email or username doesn't exist. Please check your credentials.",
"password_lost_server_unavailable": "We are currently experiencing slowdowns on our servers and we apologise for it. Please try again later.",
Expand Down Expand Up @@ -262,7 +262,7 @@
"sign_up_page_user_name_already_used": "Потребителското име вече съществува, моля избери друго потребителско име.",
"sign_up_page_email_already_exists": "вече съществува, влез в акаунта или опитай с друг имейл.",
"sign_up_page_provide_valid_email": "Моля, посочи валиден имейл адрес.",
"sign_up_page_server_busy": "We are deeply sorry, we have some technical difficulties to create your account. Please try again later.",
"sign_up_page_server_busy": "Много съжаляваме, но имаме някои технически затруднения при създаването на твоя акаунт. Моля, опитай отново по-късно.",
"@Settings": {},
"settingsTitle": "Настройки",
"@settingsTitle": {
Expand Down Expand Up @@ -389,7 +389,7 @@
"@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."
},
"question_sign_in_text": "Sign in to your OpenFoodFacts account to get credit for your contributions",
"question_sign_in_text": "Влез в акаунта си в Open Food Facts, за да запишеш своите приноси",
"question_yes_button_accessibility_value": "Answer with yes",
"question_no_button_accessibility_value": "Answer with no",
"question_skip_button_accessibility_value": "Skip this question",
Expand Down Expand Up @@ -476,7 +476,7 @@
"@search": {
"description": "Hint text of a search text input field"
},
"tap_for_more": "Tap to see more info…",
"tap_for_more": "Докосни, за повече информация…",
"@Product": {},
"product": "Продукт",
"@product": {},
Expand Down Expand Up @@ -703,11 +703,11 @@
"@product_refreshed": {
"description": "Confirmation, that the product data refresh is done"
},
"tagline_app_review": "Do you like the app?",
"tagline_app_review_button_positive": "I love it! 😍",
"tagline_app_review_button_negative": "Not really…",
"tagline_app_review_button_later": "Ask me later",
"app_review_negative_modal_title": "You don't like our app?",
"tagline_app_review": "Харесваш ли приложението?",
"tagline_app_review_button_positive": "Обичам го! 😍",
"tagline_app_review_button_negative": "Не особено…",
"tagline_app_review_button_later": "Попитай по-късно",
"app_review_negative_modal_title": "Не харесваш приложението?",
"app_review_negative_modal_text": "Could you take a few seconds to tell us why?",
"app_review_negative_modal_positive_button": "Yes, absolutely!",
"app_review_negative_modal_negative_button": "Не",
Expand Down
6 changes: 3 additions & 3 deletions packages/smooth_app/lib/l10n/app_cs.arb
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
"@contribute_translate_text": {},
"contribute_translate_text_2": "Překlady jsou jedním z klíčových úkolů projektu",
"@contribute_translate_text_2": {},
"contribute_join_skill_pool": "Contribute your skills to Open Food Facts. Join the skill pool!",
"contribute_join_skill_pool": "Přispějte svými dovednostmi do Open Food Facts. Připojte se k fondu dovedností!",
"contribute_share_header": "Sdílejte Open Food Facts se svými přáteli",
"@contribute_share_header": {},
"contribute_share_content": "Chtěl jsem vám dát vědět o aplikaci, kterou používám, Open Food Facts, která vám umožňuje personalizovaným způsobem získat informace o dopadech vašeho jídla na zdraví a životní prostředí. Funguje naskenováním čárových kódů na obalu. Konečně je to zdarma, nevyžaduje registraci a dokonce můžete pomoci zvýšit počet dešifrovaných produktů. Zde je odkaz, jak jej získat pro váš telefon: https://openfoodfacts.app",
Expand Down Expand Up @@ -864,9 +864,9 @@
},
"retry_button_label": "Opakovat",
"connect_with_us": "Spojte se s námi",
"instagram": "Follow us on Instagram",
"instagram": "Sledujte nás na Instagramu",
"instagram_link": "https://instagram.com/open.food.facts",
"twitter": "Follow us on X (formerly Twitter)",
"twitter": "Sledujte nás na X (dříve Twitter)",
"twitter_link": "https://www.twitter.com/openfoodfacts",
"blog": "Blog",
"faq": "Často kladené otázky",
Expand Down
4 changes: 2 additions & 2 deletions packages/smooth_app/lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@
"description": "Button label when no category is available"
},
"user_preferences_item_accessibility_hint": "Click to open in your browser or in the application (if installed)",
"@user_preferences_item_accessibility_hint":{
"@user_preferences_item_accessibility_hint": {
"description": "A hint for screen readers to explain how external links work"
},
"dev_preferences_screen_title": "DEV Mode",
Expand Down Expand Up @@ -2476,4 +2476,4 @@
"hunger_games_loading_line2": "We're downloading the questions!",
"hunger_games_error_label": "Argh! Something went wrong… and we couldn't load the questions.",
"hunger_games_error_retry_button": "Let's retry!"
}
}
12 changes: 6 additions & 6 deletions packages/smooth_app/lib/l10n/app_id.arb
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
"@contribute_translate_text": {},
"contribute_translate_text_2": "Penerjemahan adalah salah satu tugas utama dari proyek ini",
"@contribute_translate_text_2": {},
"contribute_join_skill_pool": "Contribute your skills to Open Food Facts. Join the skill pool!",
"contribute_join_skill_pool": "Kontribusikanlah keterampilan Anda pada Open Food Facts. Bergabunglah ke kumpulan keterampilan!",
"contribute_share_header": "Share Open Food Facts with your friends",
"@contribute_share_header": {},
"contribute_share_content": "I wanted to let you know about the app I've been using, Open Food Facts, which allows you to get the health and environmental impacts of your food, in a personalized way. It works by scanning the barcodes on the packaging. Finally it's free, does not require registration, and you can even help increase the number of products decyphered. Here's the link to get it for your phone: https://openfoodfacts.app",
Expand Down Expand Up @@ -2455,17 +2455,17 @@
"ecoscore_e": "Eco-Score E",
"ecoscore_unknown": "Unknown Eco-Score",
"ecoscore_not_applicable": "Eco-Score is not applicable",
"nova_group_generic": "Ultra-processing - NOVA groups",
"nova_group_generic": "Pemrosesan ultra - grup NOVA",
"nova_group_1": "NOVA Group 1",
"nova_group_2": "NOVA Group 2",
"nova_group_3": "NOVA Group 3",
"nova_group_4": "NOVA Group 4",
"nova_group_unknown": "Unknown NOVA Group",
"nutrition_facts": "Tingkat Kandungan Gizi",
"faq_title_partners": "Partners & Patrons of the NGO",
"faq_title_vision": "The Open Food Facts Vision, Mission, Values and Programs",
"faq_title_install_beauty": "Install Open Beauty Facts to create a cosmetic database",
"faq_title_install_pet": "Install Open Pet Food Facts to create a pet food database",
"faq_title_partners": "Para Mitra & Pelindung LSM",
"faq_title_vision": "Visi, Misi, Tata Nilai, dan Program Open Food Facts",
"faq_title_install_beauty": "Instal Open Beauty Facts untuk membuat basis data kosmetik",
"faq_title_install_pet": "Instal Open Pet Food Facts untuk membuat basis data makanan hewan peliharaan",
"faq_title_install_product": "Install Open Products Facts to create a products database to extend the life of objects",
"contact_title_pro_page": "Pro? Import your products in Open Food Facts",
"contact_title_pro_email": "Producer Contact",
Expand Down
12 changes: 6 additions & 6 deletions packages/smooth_app/lib/l10n/app_lt.arb
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"go_back_to_top": "Grįžti į viršų",
"save": "Išsaugoti",
"save_confirmation": "Ar tikrai norite išsaugoti?",
"skip": "Skip",
"cancel": "Cancel",
"skip": "Praleisti",
"cancel": "Atšaukti",
"@cancel": {},
"ignore": "Ignoruoti",
"@ignore": {
Expand Down Expand Up @@ -1162,7 +1162,7 @@
"permission_photo_denied_dialog_settings_title": "Leidimas atmestas",
"permission_photo_denied_dialog_settings_message": "Kadangi anksčiau atmetėte fotoaparato leidimą, turite jį leisti rankiniu būdu nustatymuose.",
"permission_photo_denied_dialog_settings_button_open": "Atidaryti nustatymus",
"permission_photo_denied_dialog_settings_button_cancel": "Cancel",
"permission_photo_denied_dialog_settings_button_cancel": "Atšaukti",
"permission_photo_none_found": "Kamera neaptikta",
"@permission_photo_none_found": {
"description": "Message for the user when no camera was detected, replacing the barcode scanner"
Expand Down Expand Up @@ -1338,7 +1338,7 @@
"@edit_product_form_item_nutrition_facts_subtitle": {
"description": "Product edition - Nutrition facts - SubTitle"
},
"edit_product_form_save": "Edit",
"edit_product_form_save": "Redaguoti",
"@edit_product_form_save": {
"description": "Product edition - Nutrition facts - Save button"
},
Expand Down Expand Up @@ -1547,7 +1547,7 @@
"@dev_preferences_button_positive": {
"description": "User dev preferences - Positive button label"
},
"dev_preferences_button_negative": "Cancel",
"dev_preferences_button_negative": "Atšaukti",
"@dev_preferences_button_negative": {
"description": "User dev preferences - Negative button label"
},
Expand Down Expand Up @@ -1713,7 +1713,7 @@
"@summary_card_button_add_basic_details": {
"description": "Summary card - Button to add details about the product"
},
"edit_photo_button_label": "Edit",
"edit_photo_button_label": "Redaguoti",
"@edit_photo_button_label": {
"description": "Edit photo button label"
},
Expand Down
24 changes: 12 additions & 12 deletions packages/smooth_app/lib/l10n/app_ro.arb
Original file line number Diff line number Diff line change
Expand Up @@ -703,13 +703,13 @@
"@product_refreshed": {
"description": "Confirmation, that the product data refresh is done"
},
"tagline_app_review": "Do you like the app?",
"tagline_app_review_button_positive": "I love it! 😍",
"tagline_app_review_button_negative": "Not really…",
"tagline_app_review_button_later": "Ask me later",
"app_review_negative_modal_title": "You don't like our app?",
"app_review_negative_modal_text": "Could you take a few seconds to tell us why?",
"app_review_negative_modal_positive_button": "Yes, absolutely!",
"tagline_app_review": "Îți place aplicația?",
"tagline_app_review_button_positive": "O ador! 😍",
"tagline_app_review_button_negative": "Nu chiar...",
"tagline_app_review_button_later": "Întreabă-mă mai târziu",
"app_review_negative_modal_title": "Nu îți place aplicația noastră?",
"app_review_negative_modal_text": "Poți să aloci câteva secunde pentru a ne spune de ce?",
"app_review_negative_modal_positive_button": "Da, cu siguranță!",
"app_review_negative_modal_negative_button": "Nu",
"could_not_refresh": "Produsul nu a putut fi reîmprospătat",
"@could_not_refresh": {
Expand Down Expand Up @@ -795,7 +795,7 @@
"@clear": {
"description": "Clears a product list (short label)"
},
"clear_long": "Empty the list",
"clear_long": "Golește lista",
"@clear_long": {
"description": "Clears a product list (long label)"
},
Expand Down Expand Up @@ -2472,8 +2472,8 @@
"contact_title_press_page": "Apăsați Pagina",
"contact_title_press_email": "Apăsați Contact",
"contact_title_newsletter": "Abonează-te la newsletter-ul nostru",
"hunger_games_loading_line1": "Please let us a few seconds…",
"hunger_games_loading_line2": "We're downloading the questions!",
"hunger_games_error_label": "Argh! Something went wrong… and we couldn't load the questions.",
"hunger_games_error_retry_button": "Let's retry!"
"hunger_games_loading_line1": "Te rugăm să ne lași câteva secunde...",
"hunger_games_loading_line2": "Descărcăm întrebările!",
"hunger_games_error_label": "Of! Ceva nu a mers bine...și nu am putut încărca întrebările.",
"hunger_games_error_retry_button": "Să reîncercăm!"
}
2 changes: 1 addition & 1 deletion packages/smooth_app/lib/l10n/app_th.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1804,7 +1804,7 @@
}
}
},
"confirm_delete_user_list_button": "Yes, I confirm",
"confirm_delete_user_list_button": "สวัสดี​",
"@confirm_delete_user_list_button": {
"description": "Button to delete a list"
},
Expand Down

0 comments on commit 82e6c2e

Please sign in to comment.