Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #5484: Multiple substitutions specified in non-positional format of st… #5560

Merged
merged 5 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@
<string name="topic_name">الموضوع: %s</string>
<string name="topic">موضوع</string>
<string name="ongoing_topic_list_activity_title">المواضيع قيد التقدم</string>
<string name="chapter_name">فصل %s: %s</string>
<string name="chapter_completed">تم انهاء الفصل %s الذي يحمل عنوان %s</string>
<string name="chapter_in_progress">الفصل %s الذي يحمل عنوان %s ما زال قيد التقدم</string>
<string name="chapter_prerequisite_title_label">قم بإنهاء الفصل %s: %s لكي تفتح هذا الفصل.</string>
<string name="chapter_name">فصل s$2% :s$1%</string>
<string name="chapter_completed">تم انهاء الفصل s$1% الذي يحمل عنوان s$2%</string>
<string name="chapter_in_progress">ما زال قيد التقدم الفصل s$1% الذي يحمل عنوان s$2%</string>
<string name="chapter_prerequisite_title_label">قم بإنهاء الفصل %1$s%2$ :s لكي تفتح هذا الفصل.</string>
<string name="chapter_prerequisite_title_label_without_chapter_title">أكمل الفصل السابق لفتح هذا الفصل.</string>
<string name="text_input_default_content_description">أدخل النص.</string>
<string name="fractions_default_hint_text">أدخل كسر عشري في الصيغة (بسط/مقام)، أو عدد كسري في الصيغة (عدد بسط/مقام).</string>
Expand All @@ -110,7 +110,7 @@
<string name="math_expression_error_multiple_redundant_parentheses">الرجاء إزالة الأقواس الزائدة حول \"( %1$s )\" ، على سبيل المثال: \" %1$s \".</string>
<string name="math_expression_error_redundant_parentheses_individual_term">الرجاء إزالة الأقواس الزائدة حول \'( %1$s )\' ، على سبيل المثال: \' %1$s \'.</string>
<string name="math_expression_error_unnecessary_symbols">يوجد \' %s \' غير صالح في الإجابة. يرجى إزالته.</string>
<string name="math_expression_error_number_after_var_term">الرجاء إعادة ترتيب ترتيب %1$s و %2$s . على سبيل المثال: %2$s% 1 $ s.</string>
<string name="math_expression_error_number_after_var_term">الرجاء إعادة ترتيب ترتيب %1$s و %2$s . على سبيل المثال: %1$s%2$s.</string>
<string name="math_expression_error_consecutive_binary_operators">يجب فصل %1$s و %2$s برقم أو متغير.</string>
<string name="math_expression_error_consecutive_unary_operators">الرجاء إزالة الرموز الإضافية في إجابتك.</string>
<string name="math_expression_error_missing_lhs_for_addition_operator">هل هناك رقم أو متغير مفقود قبل أو بعد رمز الإضافة \' %1$s \'؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
Expand Down Expand Up @@ -149,7 +149,7 @@
<string name="topic_downloaded">المواضيع التي تم تنزيلها</string>
<string name="downloaded">تم التنزيل</string>
<string name="question_player_title">وضع الممارسة</string>
<string name="question_training_session_progress">السؤال %s من أصل %s</string>
<string name="question_training_session_progress">السؤال s$1% من أصل s$2%</string>
<string name="question_training_session_progress_finished">تمّ</string>
<string name="question_training_session_finished_header">تم الإنتهاء</string>
<string name="question_training_session_finished_message">تم الإنتهاء من جميع الأسئلة! يمكنك بدأ مجموعة أسئلة أخرى، أو العودة للموضوع.</string>
Expand Down Expand Up @@ -285,7 +285,7 @@
<string name="skip">تخطي</string>
<string name="next_arrow">التالي</string>
<string name="get_started">ابدأ</string>
<string name="onboarding_slide_dots_content_description">شاشة العرض %s من %s</string>
<string name="onboarding_slide_dots_content_description">شاشة العرض s$1% من s$2%</string>
<string name="pin_password_hello">أهلًا، %s!</string>
<string name="pin_password_admin_enter">من فضلك أدخل رقم التعريف الشخصي الخاص بالمشرف.</string>
<string name="pin_password_user_enter">من فضلك أدخل رقم التعريف الشخصي الخاص بك.</string>
Expand Down Expand Up @@ -443,7 +443,7 @@
<string name="move_item_up_content_description">تحريك العنصر إلى الأعلى عند %s</string>
<string name="up_button_disabled">أعلى</string>
<string name="down_button_disabled">أسفل</string>
<string name="profile_last_visited">%s %s</string>
<string name="profile_last_visited">s$2% s$1%</string>
<string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
<string name="ongoing_recycler_view_tag">ongoing_recycler_view_tag</string>
<string name="item_selection_text">برجاء اختيار خيار واحد على الأقل.</string>
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/res/values-pcm-rNG/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@
<string name="topic_name">Topic: %s</string>
<string name="topic">Topic</string>
<string name="ongoing_topic_list_activity_title">Topics wey dey in Progress</string>
<string name="chapter_name">Chapter %s: %s</string>
<string name="chapter_completed">Chapter %s with title %s don complete</string>
<string name="chapter_in_progress">Chapter %s with title %s dey in progress</string>
<string name="chapter_prerequisite_title_label">Complete Chapter %s: %s to unlock dis chapter.</string>
<string name="chapter_locked_prerequisite_title_label">Chapter %s: %s dey locked currently. Abeg complete chapter %s: %s to fit unlock dis chapter.</string>
<string name="chapter_name">Chapter %1$s: %2$s</string>
<string name="chapter_completed">Chapter %1$s with title %2$s don complete</string>
<string name="chapter_in_progress">Chapter %1$s with title %2$s dey in progress</string>
<string name="chapter_prerequisite_title_label">Complete Chapter %1$s: %2$s to unlock dis chapter.</string>
<string name="chapter_locked_prerequisite_title_label">Chapter %1$s: %2$s dey locked currently. Abeg complete chapter %3$s: %4$s to fit unlock dis chapter.</string>
<string name="chapter_prerequisite_title_label_without_chapter_title">Finish the chapter wey dey before to fit open dis chapter</string>
<string name="text_input_default_content_description">Enter text.</string>
<string name="fractions_default_hint_text">Enter fraction wey dey in di form x/x, or mixed nomba wey dey in di form x x/x.</string>
Expand Down Expand Up @@ -153,7 +153,7 @@
<string name="topic_downloaded">Topic Wey You Don Download</string>
<string name="downloaded">You don download am</string>
<string name="question_player_title">Practice Mode</string>
<string name="question_training_session_progress">Question %s of %s</string>
<string name="question_training_session_progress">Question %1$s of %2$s</string>
<string name="question_training_session_progress_finished">Complete</string>
<string name="question_training_session_finished_header">Finished</string>
<string name="question_training_session_finished_message">You don finish all of di questions! You fit choose to play anoda set of questions, or go back to di topic.</string>
Expand Down Expand Up @@ -193,8 +193,8 @@
<item quantity="other">%s Stories</item>
</plurals>
<plurals name="story_total_chapters">
<item quantity="one">%s of %s Chapter Completed</item>
<item quantity="other">%s of %s Chapters Completed</item>
<item quantity="one">%1$s of %2$s Chapter Completed</item>
<item quantity="other">%1$s of %2$s Chapters Completed</item>
</plurals>
<plurals name="lesson_count">
<item quantity="one">1 Lesson</item>
Expand Down Expand Up @@ -267,7 +267,7 @@
<string name="skip">Skip</string>
<string name="next_arrow">Next</string>
<string name="get_started">Get Started</string>
<string name="onboarding_slide_dots_content_description">Slide %s of %s</string>
<string name="onboarding_slide_dots_content_description">Slide %1$s of %2$s</string>
<string name="pin_password_hello">Hi, %s!</string>
<string name="pin_password_admin_enter">Abeg put your Administrator PIN.</string>
<string name="pin_password_user_enter">Abeg put your PIN.</string>
Expand Down Expand Up @@ -426,7 +426,7 @@
<string name="move_item_up_content_description">Move item up to %s</string>
<string name="up_button_disabled">Up</string>
<string name="down_button_disabled">Down</string>
<string name="profile_last_visited">%s %s</string>
<string name="profile_last_visited">%1$s %2$s</string>
<plurals name="minutes_ago" fuzzy="true">
<item quantity="zero">0 minutes ago</item>
<item quantity="one">a minute ago</item>
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@
<string name="topic_name">Tópico: %s</string>
<string name="topic">Tópico</string>
<string name="ongoing_topic_list_activity_title">Tópicos em Andamento</string>
<string name="chapter_name">Capítulo %s: %s</string>
<string name="chapter_completed">O capítulo %s com o título %s foi concluído</string>
<string name="chapter_in_progress">O capítulo %s com o título %s está em andamento</string>
<string name="chapter_prerequisite_title_label">Conclua o capítulo %s: %s para desbloquear este capítulo.</string>
<string name="chapter_locked_prerequisite_title_label">O capítulo %s: %s está bloqueado no momento. Conclua o capítulo %s: %s para desbloquear esse capítulo.</string>
<string name="chapter_name">Capítulo %1$s: %2$s</string>
<string name="chapter_completed">O capítulo %1$s com o título %2$s foi concluído</string>
<string name="chapter_in_progress">O capítulo %1$s com o título %2$s está em andamento</string>
<string name="chapter_prerequisite_title_label">Conclua o capítulo %1$s: %2$s para desbloquear este capítulo.</string>
<string name="chapter_locked_prerequisite_title_label">O capítulo %1$s: %2$s está bloqueado no momento. Conclua o capítulo %3$s: %4$s para desbloquear esse capítulo.</string>
<string name="chapter_prerequisite_title_label_without_chapter_title">Conclua o capítulo anterior para desbloquear este capítulo.</string>
<string name="text_input_default_content_description">Inserir texto.</string>
<string name="fractions_default_hint_text">Insira uma fração na forma x/x, ou um número misto na forma x x/x.</string>
Expand Down Expand Up @@ -153,7 +153,7 @@
<string name="topic_downloaded">Tópico Baixado</string>
<string name="downloaded">Baixado</string>
<string name="question_player_title">Modo de Prática</string>
<string name="question_training_session_progress">Questão %s de %s</string>
<string name="question_training_session_progress">Questão %1$s de %2$s</string>
<string name="question_training_session_progress_finished">Concluído</string>
<string name="question_training_session_finished_header">Concluído</string>
<string name="question_training_session_finished_message">Você concluiu todas as perguntas! Você pode escolher reproduzir outro conjunto de perguntas ou retornar ao tópico.</string>
Expand Down Expand Up @@ -193,8 +193,8 @@
<item quantity="other">%s Histórias</item>
</plurals>
<plurals name="story_total_chapters">
<item quantity="one">%s de %s Capítulo Concluído</item>
<item quantity="other">%s de %s Capítulos Concluídos</item>
<item quantity="one">%1$s de %2$s Capítulo Concluído</item>
<item quantity="other">%1$s de %2$s Capítulos Concluídos</item>
</plurals>
<plurals name="lesson_count" fuzzy="true">
<item quantity="one">%s Lição</item>
Expand Down Expand Up @@ -265,7 +265,7 @@
<string name="skip">Pular</string>
<string name="next_arrow">Próximo</string>
<string name="get_started">Começar</string>
<string name="onboarding_slide_dots_content_description">Slide %s de %s</string>
<string name="onboarding_slide_dots_content_description">Slide %1$s de %2$s</string>
<string name="pin_password_hello">Olá, %s!</string>
<string name="pin_password_admin_enter">Por favor, insira o PIN do Administrador.</string>
<string name="pin_password_user_enter">Por favor, insira seu PIN.</string>
Expand Down Expand Up @@ -423,7 +423,7 @@
<string name="move_item_up_content_description">Mover o item para cima para %s</string>
<string name="up_button_disabled">Para cima</string>
<string name="down_button_disabled">Para baixo</string>
<string name="profile_last_visited">%s %s</string>
<string name="profile_last_visited">%1$s %2$s</string>
<string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
<string name="ongoing_recycler_view_tag">ongoing_recycler_view_tag</string>
<string name="item_selection_text">Por favor, selecione todas as alternativas corretas.</string>
Expand Down
32 changes: 16 additions & 16 deletions app/src/main/res/values-sw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@
<string name="topic_name">mada: %s</string>
<string name="topic">mada</string>
<string name="ongoing_topic_list_activity_title">mada zinazoendelea</string>
<string name="chapter_name">Sura ya %s: %s</string>
<string name="chapter_completed">Sura ya %s yenye kichwa %s imekamilika</string>
<string name="chapter_in_progress">Sura ya %s yenye kichwa %s inaendelea</string>
<string name="chapter_prerequisite_title_label">Kamilisha Sura ya %s: %s ili kufungua sura hii.</string>
<string name="chapter_name">Sura ya %1$s: %2$s</string>
<string name="chapter_completed">Sura ya %1$s yenye kichwa %2$s imekamilika</string>
<string name="chapter_in_progress">Sura ya %1$s yenye kichwa %2$s inaendelea</string>
<string name="chapter_prerequisite_title_label">Kamilisha Sura ya %1$s: %2$s ili kufungua sura hii.</string>
<string name="text_input_default_content_description">Ingiza maandishi.</string>
<string name="fractions_default_hint_text">Ingiza sehemu katika mpangilio huu x/x, au nambari iliyochanganywa katika mpangilio huu x/x.</string>
<string name="fractions_default_hint_text_no_integer">Ingiza sehemu katika mpangilio huu X/X.</string>
Expand All @@ -91,15 +91,15 @@
<string name="math_expression_error_spaces_in_numerical_input">Tafadhali ondoa nafasi katikati ya nambari katika jibu lako.</string>
<string name="math_expression_error_unbalanced_parentheses">Tafadhali funga au uondoe mabano.</string>
<string name="math_expression_error_single_redundant_parentheses">Tafadhali ondoa mabano karibu na jibu mzima: \' %s\'.</string>
<string name="math_expression_error_multiple_redundant_parentheses">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'% 1 $ s\'.</string>
<string name="math_expression_error_redundant_parentheses_individual_term">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'% 1 $ s\'.</string>
<string name="math_expression_error_multiple_redundant_parentheses">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'%1$s\'.</string>
<string name="math_expression_error_redundant_parentheses_individual_term">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'%1$s\'.</string>
<string name="math_expression_error_unnecessary_symbols">Kuna\'%s\' isiyo halali katika jibu. Tafadhali ondoa.</string>
<string name="math_expression_error_number_after_var_term">Tafadhali panga upya utaratibu wa % %1$s &amp; %2$s. Kwa mfano:% $ 2% $ s.</string>
<string name="math_expression_error_consecutive_binary_operators">%1$s na % $%2$s inapaswa kutengwa na nambari au kitu tofauti.</string>
<string name="math_expression_error_number_after_var_term">Tafadhali panga upya utaratibu wa %1$s &amp; %2$s. Kwa mfano:%1$s %2$s.</string>
<string name="math_expression_error_consecutive_binary_operators">%1$s na %2$s inapaswa kutengwa na nambari au kitu tofauti.</string>
<string name="math_expression_error_consecutive_unary_operators">Tafadhali ondoa alama za ziada katika jibu lako.</string>
<string name="math_expression_error_missing_lhs_for_addition_operator">Je! Kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya kuongeza \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'% 1 $ s\' ya ziada.</string>
<string name="math_expression_error_missing_lhs_for_multiplication_operator">Je, kuna nambari au kitu tofauti inayokosa kabla au baada ya ishara ya kuzidisha \'%1$s\'? Ikiwa sivyo, tafadhali ondoa \'% 1 $ s\' ya ziada.</string>
<string name="math_expression_error_missing_lhs_for_division_operator">Je, kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya mgawanyiko \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'% 1 $ s\' ya ziada.</string>
<string name="math_expression_error_missing_lhs_for_addition_operator">Je! Kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya kuongeza \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'%1$s\' ya ziada.</string>
<string name="math_expression_error_missing_lhs_for_multiplication_operator">Je, kuna nambari au kitu tofauti inayokosa kabla au baada ya ishara ya kuzidisha \'%1$s\'? Ikiwa sivyo, tafadhali ondoa \'%1$s\' ya ziada.</string>
<string name="math_expression_error_missing_lhs_for_division_operator">Je, kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya mgawanyiko \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'%1$s\' ya ziada.</string>
<string name="math_expression_error_missing_lhs_for_exponentiation_operator">Je! Kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya ufafanuzi\'%1$s\'? Ikiwa sivyo, tafadhali ondoa \'%1$s\' ya ziada.</string>
<string name="math_expression_error_missing_rhs_for_addition_operator">Inaonekana kuwa nambari au kitu tofauti inakosa baada ya alama ya kuongeza \'%s\'.</string>
<string name="math_expression_error_missing_rhs_for_subtraction_operator">Inaonekana kuwa nambari au kitu tofauti inakosekana baada ya ishara ya kuondoa \'%s\'.</string>
Expand Down Expand Up @@ -133,7 +133,7 @@
<string name="topic_downloaded">Mada Imepakuliwa</string>
<string name="downloaded">Imepakuliwa</string>
<string name="question_player_title">Hali ya Mazoezi</string>
<string name="question_training_session_progress">Swali %s kati ya %s</string>
<string name="question_training_session_progress">Swali %1$s kati ya %2$s</string>
<string name="question_training_session_progress_finished">imekamilika</string>
<string name="question_training_session_finished_header">imekamilika</string>
<string name="question_training_session_finished_message">Umemaliza maswali yote! Unaweza kuchagua kucheza seti nyingine ya maswali, au kurudi kwenye mada.</string>
Expand Down Expand Up @@ -173,8 +173,8 @@
<item quantity="other">Hadithi %s</item>
</plurals>
<plurals name="story_total_chapters">
<item quantity="one">%s kati ya Sura %s Imekamilika</item>
<item quantity="other">%s ya Sura %s Imekamilika</item>
<item quantity="one">%1$s kati ya Sura %2$s Imekamilika</item>
<item quantity="other">%1$s ya Sura %2$s Imekamilika</item>
</plurals>
<plurals name="lesson_count" fuzzy="true">
<item quantity="one">Somo 1</item>
Expand Down Expand Up @@ -237,7 +237,7 @@
<string name="skip">Ruka</string>
<string name="next_arrow">Inayofuata</string>
<string name="get_started">Anza</string>
<string name="onboarding_slide_dots_content_description">Slaidi %s ya %s</string>
<string name="onboarding_slide_dots_content_description">Slaidi %1$s ya %2$s</string>
<string name="pin_password_hello">Habari, %s!</string>
<string name="pin_password_admin_enter">Tafadhali weka Nambari yako ya Siri ya Msimamizi.</string>
<string name="pin_password_user_enter">Tafadhali weka Nambari yako ya Siri.</string>
Expand Down Expand Up @@ -374,7 +374,7 @@
<string name="move_item_up_content_description">Hamisha kipengee juu hadi %s</string>
<string name="up_button_disabled">Juu</string>
<string name="down_button_disabled">Chini</string>
<string name="profile_last_visited">%s %s</string>
<string name="profile_last_visited">%1$s %2$s</string>
<string name="topic_revision_recyclerview_tag">mada_marudio_mtazamo wa kuchakata tena_tag</string>
<string name="ongoing_recycler_view_tag">Inaendelea_kuchakata tena_mtazamo_tag</string>
<string name="item_selection_text" fuzzy="true">Tafadhali chagua angalau chaguo moja.</string>
Expand Down
Loading
Loading