Skip to content

Commit

Permalink
Merge branch 'main' into nearby_design
Browse files Browse the repository at this point in the history
  • Loading branch information
cooltey authored Nov 27, 2023
2 parents b285d6c + 3626742 commit c09d279
Show file tree
Hide file tree
Showing 46 changed files with 1,460 additions and 139 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
applicationId 'org.wikipedia'
minSdk 21
targetSdk 34
versionCode 50460
versionCode 50461
testApplicationId 'org.wikipedia.test'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values-b+sr+Latn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1429,8 +1429,7 @@
<string name="talk_templates_edit_message_dialog_save">Sačuvaj</string>
<string name="talk_templates_edit_message_dialog_delete">Obriši</string>
<string name="talk_templates_edit_message_updated">Poruka je izmenjena</string>
<string name="talk_templates_edit_message_delete_description">Da li ste sigurni da želite da obrišete ovu \"%s\" poruku sa liste?</string>
<string name="talk_templates_message_deleted">Poruka je obrisana</string>
<string name="talk_templates_message_deleted" fuzzy="true">Poruka je obrisana</string>
<string name="patroller_tasks_edits_list_title">Spisak izmena</string>
<string name="patroller_tasks_edits_list_search_hint">Pretraga ili filtriranje izmena</string>
<string name="patroller_tasks_edits_list_card_tags_text">Oznake: %s</string>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values-b+tt+Cyrl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1455,8 +1455,7 @@
<string name="talk_templates_edit_message_dialog_save">Сакларга</string>
<string name="talk_templates_edit_message_dialog_delete">Бетерергә</string>
<string name="talk_templates_edit_message_updated">Хәбәр яңартылды</string>
<string name="talk_templates_edit_message_delete_description">Сез чыннан да \"%s\" хәбәрен исемлектән бетерергә телисезме?</string>
<string name="talk_templates_message_deleted">Хәбәр бетерелде</string>
<string name="talk_templates_message_deleted" fuzzy="true">Хәбәр бетерелде</string>
<string name="patroller_tasks_edits_list_title">Төзәтмәләр исемлеге</string>
<string name="patroller_tasks_edits_list_search_hint">Үзгәрешләрне эзләү яки фильтрлау</string>
<string name="patroller_tasks_edits_list_card_tags_text">Теглар: %s</string>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values-ba/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1459,8 +1459,7 @@
<string name="talk_templates_edit_message_dialog_save">Һаҡларға</string>
<string name="talk_templates_edit_message_dialog_delete">Юйырға</string>
<string name="talk_templates_edit_message_updated">Хәбәр яңыртылған</string>
<string name="talk_templates_edit_message_delete_description">\"%s\" хәбәрен исемлектән юйырға теләйһегеҙме?</string>
<string name="talk_templates_message_deleted">Хәбәр юйылған</string>
<string name="talk_templates_message_deleted" fuzzy="true">Хәбәр юйылған</string>
<string name="talk_templates_message_title_empty">Атама буш була алмай.</string>
<string name="patroller_tasks_edits_list_title">Үҙгәртеүҙәр исемлеге</string>
<string name="patroller_tasks_edits_list_search_hint">Төҙәтеүҙәрҙе табырға йәки фильтрларға</string>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values-be/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1554,8 +1554,7 @@
<string name="talk_templates_edit_message_dialog_save">Захаваць</string>
<string name="talk_templates_edit_message_dialog_delete">Выдаліць</string>
<string name="talk_templates_edit_message_updated">Паведамленне захавана</string>
<string name="talk_templates_edit_message_delete_description">Вы ўпэўнены, што хочаце выдаліць гэтае паведамленне \"%s\" са спісу?</string>
<string name="talk_templates_message_deleted">Паведамленне выдалена</string>
<string name="talk_templates_message_deleted" fuzzy="true">Паведамленне выдалена</string>
<string name="talk_templates_message_title_empty">Тэма не можа быць пустой.</string>
<string name="patroller_tasks_edits_list_title">Спіс правак</string>
<string name="patroller_tasks_edits_list_search_hint">Пошук або фільтр правак</string>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values-bew/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1448,8 +1448,7 @@
<string name="talk_templates_edit_message_dialog_save">Simpen</string>
<string name="talk_templates_edit_message_dialog_delete">Apus</string>
<string name="talk_templates_edit_message_updated">Pesen udah diperbaruin</string>
<string name="talk_templates_edit_message_delete_description">Apa lu yakin pèngèn ngapus ni pesen \"%s\" deri daptar?</string>
<string name="talk_templates_message_deleted">Pesen udah diapus</string>
<string name="talk_templates_message_deleted" fuzzy="true">Pesen udah diapus</string>
<string name="patroller_tasks_edits_list_title">Daptar permakan</string>
<string name="patroller_tasks_edits_list_search_hint">Cari atawa saring permakan</string>
<string name="patroller_tasks_edits_list_card_tags_text">Tenger: %s</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@
<string name="reading_list_share_survey_title">আপনি কি আমাদের \"পড়ার তালিকা শেয়ার\" উন্নত করতে সহায়তা করতে পারবেন?</string>
<string name="reading_list_share_survey_body">\"পড়ার তালিকা শেয়ার\" একটি পরীক্ষামূলক ফিচার এবং এটি উন্নত বা অপসারণ করতে আমাদের আপনার প্রতিক্রিয়া প্রয়োজন।</string>
<string name="talk_templates_new_message_save">সংরক্ষণ</string>
<string name="talk_templates_edit_message_delete_description">আপনি কি নিশ্চিত যে আপনি এই \"%s\" বার্তাটি তালিকা থেকে মুছে ফেলতে চান?</string>
<string name="talk_templates_menu_remove_message">বার্তা সরান</string>
<string name="patroller_tasks_edits_list_card_tags_text">ট্যাগ: %s</string>
<string name="patroller_tasks_edits_list_card_tags_text_none">কোনোটি নয়</string>
<string name="patroller_tasks_edits_list_card_overflow_view_user_page">ব্যবহারকারীর পাতা দেখুন</string>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1479,8 +1479,7 @@
<string name="talk_templates_edit_message_dialog_save">Desa</string>
<string name="talk_templates_edit_message_dialog_delete">Suprimeix</string>
<string name="talk_templates_edit_message_updated">El missatge s\'ha actualitzat</string>
<string name="talk_templates_edit_message_delete_description" fuzzy="true">Esteu segur que voleu suprimir aquest missatge %s de la llista?</string>
<string name="talk_templates_message_deleted">El missatge s\'ha suprimit</string>
<string name="talk_templates_message_deleted" fuzzy="true">El missatge s\'ha suprimit</string>
<string name="talk_templates_message_title_empty">El títol no pot ser en blanc.</string>
<string name="patroller_tasks_edits_list_title">Llista d\'edicions</string>
<string name="patroller_tasks_edits_list_search_hint">Cerca o filtra edicions</string>
Expand Down
27 changes: 24 additions & 3 deletions app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
<string name="error_blocked_start">Start af blokering: %s</string>
<string name="error_blocked_expiry">Udløb af blokering: %s</string>
<string name="error_blocked_id">Blokerings-id: %s</string>
<string name="error_blocked_footer">Du kan kontakte &lt;a href=\"&lt;span class=\"notranslate\" translate=\"no\"&gt;%2$s\"&gt;%1$s&lt;/a&gt; eller en anden &lt;a href=\"https://en.wikipedia.org/wiki/Wikipedia:Administrators\"&gt;administrator&lt;/a&gt; for at diskutere blokeringen.</string>
<string name="error_blocked_footer">Du kan kontakte &lt;a href=\"%2$s\"&gt;%1$s&lt;/a&gt; eller en anden &lt;a href=\"https://en.wikipedia.org/wiki/Wikipedia:Administrators\"&gt;administrator&lt;/a&gt; for at diskutere blokeringen.</string>
<string name="theme_chooser_menu_item_short_tooltip">Tilpas din værktøjslinje</string>
<string name="error_blocked_footer_no_blocker">Du kan kontakte en &lt;a href=\"https://en.wikipedia.org/wiki/Wikipedia:Administrators\"&gt;administrator&lt;/a&gt; for at diskutere blokeringen.</string>
<string name="crash_report_activity_title">Applikationsfejl</string>
Expand Down Expand Up @@ -615,8 +615,12 @@
<string name="reading_list_delete_lists_dialog_delete_button_text">Slet</string>
<string name="reading_list_activity_title">Læseliste: %s</string>
<string name="reading_list_notification_title">Læseliste(r) eksporteret</string>
<string name="reading_list_notification_text">læselisterne %d er blevet eksporteret som \'reading_lists export.json\' til din download-mappe</string>
<string name="reading_list_notification_detailed_text">Læselisterne er blevet eksporteret til \'reading_lists_export.json\'</string>
<string name="reading_lists_action_menu_export_lists">Eksportér</string>
<string name="reading_lists_import_file_picker_title">Vælg den fil, der skal importeres</string>
<string name="reading_lists_import_failure_message">Import af læselister mislykkedes</string>
<string name="reading_lists_export_select_lists_message">Vælg den eller de lister, der skal eksporteres</string>
<string name="reading_lists_preview_save_button">Gem</string>
<string name="reading_lists_preview_save_dialog_title">Gem liste</string>
<string name="reading_lists_preview_save_dialog_text">Navngiv listen, og vælg artikler, der skal gemmes.</string>
Expand Down Expand Up @@ -946,12 +950,27 @@
<string name="suggested_edits_contribution_date_time_label">Dato / Tid</string>
<string name="suggested_edits_contribution_image_label">Billede</string>
<string name="suggested_edits_contribution_article_label">Artikel</string>
<string name="suggested_edits_contribution_views">%s visninger</string>
<plurals name="suggested_edits_contribution_seen_times">
<item quantity="one">Set en gang inden for de seneste 30 dage.</item>
<item quantity="other">Set %s gange de seneste 30 dage.</item>
</plurals>
<string name="suggested_edits_contribution_seen_text">Set %s gange de sidste 30 dage.</string>
<plurals name="suggested_edits_image_tag_contribution_label">
<item quantity="one">Du tilføjede %d tag</item>
<item quantity="other">Du tilføjede %d tags</item>
</plurals>
<string name="suggested_edits_contribution_type_title">%1$d %2$s</string>
<string name="suggested_edits_contribution_date_yesterday_text">I går</string>
<string name="suggested_edits_encourage_account_creation_title">Vidste du at gud og hver mand kan redigere Wikipedia?</string>
<string name="suggested_edits_encourage_account_creation_message">Foreslåede redigeringer er en ny måde at redigere Wikipedia på Android. Det hjælper til at give små, men vitale bidrag til Wikipedia.\nVores mål er at gøre redigering lettere og mere tilgængelig for alle! Log ind eller tilmeld dig Wikipedia for at komme i gang.</string>
<string name="suggested_edits_encourage_account_creation_login_button">Log på / registrer dig på Wikipedia</string>
<string name="suggested_edits_contribution_type_image_tag">Billedtag</string>
<string name="suggested_edits_contribution_current_revision_text">Din redigering findes nu på Wikipedia</string>
<string name="suggested_card_more_edits">Flere foreslåede redigeringer</string>
<string name="suggested_edits_article_descriptions_dialog_title">Foreslåede beskrivelser</string>
<string name="suggested_edits_descriptions_report_dialog_title">Hvad vil du rapportere?</string>
<string name="suggested_edits_descriptions_not_enough_info_suggestion">Ikke nok information</string>
<plurals name="suggested_edits_added_contribution_label">
<item quantity="one">Du tilføjede %d tegn</item>
<item quantity="other">Du tilføjede %d tegn</item>
Expand Down Expand Up @@ -1237,8 +1256,10 @@
<string name="talk_templates_edit_message_dialog_save">Gem</string>
<string name="talk_templates_edit_message_dialog_delete">Slet</string>
<string name="talk_templates_edit_message_updated">Beskeden er blevet opdateret</string>
<string name="talk_templates_edit_message_delete_description">Er du sikker på, at du vil slette denne \"%s\" besked fra listen?</string>
<string name="talk_templates_message_deleted">Beskeden er blevet slettet</string>
<plurals name="talk_templates_message_deleted">
<item quantity="one">Beskeden er slettet</item>
<item quantity="other">Beskederne er slettet</item>
</plurals>
<string name="patroller_tasks_edits_list_title">Liste over redigeringer</string>
<string name="patroller_tasks_edits_list_card_tags_text">Tags: %s</string>
<string name="patroller_tasks_edits_list_card_tags_text_none">Ingen</string>
Expand Down
Loading

0 comments on commit c09d279

Please sign in to comment.