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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 5 commits into from
Nov 4, 2024
Merged

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

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2ee48a
Fixes Multiple substitutions specified in non-positional format of st…
jainv4156 Oct 24, 2024
31d0fd1
Merge branch 'develop' into my-bux-fixes
jainv4156 Oct 30, 2024
d09ad59
removed the changes in non-english languages
jainv4156 Oct 30, 2024
aa9cf81
Merge remote-tracking branch 'origin/my-bux-fixes' into my-bux-fixes
jainv4156 Oct 30, 2024
6f21038
Merge branch 'develop' into my-bux-fixes
adhiamboperes Nov 4, 2024
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
22 changes: 11 additions & 11 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@
<string name="ongoing_topic_list_activity_title">Topics in Progress</string>
<string name="topic_story_progress_percentage">%s\%%</string>
<string name="topic_play_chapter_index">%s</string>
<string name="chapter_name">Chapter %s: %s</string>
<string name="chapter_completed">Chapter %s with title %s is completed</string>
<string name="chapter_in_progress">Chapter %s with title %s is in progress</string>
<string name="chapter_prerequisite_title_label">Complete Chapter %s: %s to unlock this chapter.</string>
<string name="chapter_locked_prerequisite_title_label">Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter.</string>
<string name="chapter_name">Chapter %1$s: %2$s</string>
<string name="chapter_completed">Chapter %1$s with title %2$s is completed</string>
<string name="chapter_in_progress">Chapter %1$s with title %2$s is in progress</string>
<string name="chapter_prerequisite_title_label">Complete Chapter %1$s: %2$s to unlock this chapter.</string>
<string name="chapter_locked_prerequisite_title_label">Chapter %1$s: %2$s is currently locked. Please complete chapter %3$s: %4$s to unlock this chapter.</string>
<string name="chapter_prerequisite_title_label_without_chapter_title">Complete the previous chapter to unlock this chapter.</string>
<string name="text_input_default_content_description">Enter text.</string>
<string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
Expand Down Expand Up @@ -154,7 +154,7 @@
<string name="topic_downloaded">Topic Downloaded</string>
<string name="downloaded">Downloaded</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 have finished all of the questions! You can choose to play another set of questions, or return to the topic.</string>
Expand Down Expand Up @@ -190,7 +190,7 @@
<string name="size_gb">%s GB</string>
<string name="correct">Correct!</string>
<string name="topic_prefix">Topic: %s</string>
<string name="welcome_profile_name">%s %s!</string>
<string name="welcome_profile_name">%1$s %2$s!</string>
<plurals name="chapter_count">
<item quantity="one">1 Chapter</item>
<item quantity="other">%s Chapters</item>
Expand All @@ -200,8 +200,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 @@ -280,7 +280,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>
<!-- PinPasswordActivity -->
<string name="pin_password_hello">Hi, %s!</string>
<string name="pin_password_admin_enter">Please enter your Administrator PIN.</string>
Expand Down Expand Up @@ -465,7 +465,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">
<item quantity="one">a minute ago</item>
<item quantity="other">%s minutes ago</item>
Expand Down
Loading