Skip to content

Commit f7ec959

Browse files
Merge branch 'main' into Notification_time_ago
2 parents 8358296 + f78f4d1 commit f7ec959

File tree

14 files changed

+54
-6
lines changed

14 files changed

+54
-6
lines changed

app/src/main/java/org/wikipedia/staticdata/ContributionsNameData.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ object ContributionsNameData {
2323
"ami" to "使用者貢獻",
2424
"an" to "Contrebucions",
2525
"ang" to "Contributions",
26+
"anp" to "योगदान",
2627
"ar" to "مساهمات",
2728
"arc" to "ܫܘܬܦܘ̈ܬܐ",
2829
"ary" to "مساهمات",

app/src/main/java/org/wikipedia/staticdata/FileAliasData.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ object FileAliasData {
2323
"ami" to "Faylo",
2424
"an" to "Imachen",
2525
"ang" to "Ymele",
26+
"anp" to "फाईल",
2627
"ar" to "ملف",
2728
"arc" to "ܠܦܦܐ",
2829
"ary" to "فيشي",

app/src/main/java/org/wikipedia/staticdata/MainPageNameData.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ object MainPageNameData {
2323
"ami" to "Sa’ayayaw pising no tyin-naw",
2424
"an" to "Portalada",
2525
"ang" to "Hēafodtramet",
26+
"anp" to "मुख्य पृष्ठ",
2627
"ar" to "الصفحة الرئيسية",
2728
"arc" to "ܦܐܬܐ ܪܝܫܝܬܐ",
2829
"ary" to "الصفحة اللولا",

app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ object SpecialAliasData {
2323
"ami" to "Kasi’iked",
2424
"an" to "Especial",
2525
"ang" to "Syndrig",
26+
"anp" to "विशेष",
2627
"ar" to "خاص",
2728
"arc" to "ܕܝܠܢܝܐ",
2829
"ary" to "خاص",

app/src/main/java/org/wikipedia/staticdata/TalkAliasData.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ object TalkAliasData {
2323
"ami" to "Kasasowal",
2424
"an" to "Descusión",
2525
"ang" to "Mōtung",
26+
"anp" to "वार्ता",
2627
"ar" to "نقاش",
2728
"arc" to "ܡܡܠܠܐ",
2829
"ary" to "مداكرة",

app/src/main/java/org/wikipedia/staticdata/UserAliasData.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ object UserAliasData {
2323
"ami" to "Midemakay",
2424
"an" to "Usuario",
2525
"ang" to "Brūcend",
26+
"anp" to "यूजर",
2627
"ar" to "مستخدم",
2728
"arc" to "ܡܦܠܚܢܐ",
2829
"ary" to "خدايمي",

app/src/main/java/org/wikipedia/staticdata/UserTalkAliasData.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ object UserTalkAliasData {
2323
"ami" to "Kasasowal no midemakay",
2424
"an" to "Descusión usuario",
2525
"ang" to "Brūcendmōtung",
26+
"anp" to "यूजर वार्ता",
2627
"ar" to "نقاش المستخدم",
2728
"arc" to "ܡܡܠܠܐ ܕܡܦܠܚܢܐ",
2829
"ary" to "لمداكرة د لخدايمي",

app/src/main/res/values-fi/strings.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@
10181018
</plurals>
10191019
<string name="suggested_edits_contribution_type_title">%1$d %2$s</string>
10201020
<string name="suggested_edits_contribution_date_yesterday_text">Eilen</string>
1021-
<string name="suggested_edits_encourage_account_creation_title">Tiesitkö että kaikki voivat muokata Wikipediaa?</string>
1021+
<string name="suggested_edits_encourage_account_creation_title">Tiesitkö että kuka tahansa voi muokata Wikipediaa?</string>
10221022
<string name="suggested_edits_encourage_account_creation_message">Ehdotetut muokkaukset on uusi tapa muokata Wikipediaa Androidilla. Se auttaa tekemään pieniä, tärkeitä muutoksia Wikipediaan.\nTavoitteenamme on tehdä muokkaamisesta kaikille helpompaa ja helppopääsyisempää! Aloita kirjautumalla sisään tai liittymällä Wikipediaan.</string>
10231023
<string name="suggested_edits_encourage_account_creation_login_button">Kirjaudu sisään / liity Wikipediaan</string>
10241024
<string name="suggested_edits_contribution_type_image_tag">Kuvamerkintä</string>
@@ -1162,8 +1162,8 @@
11621162
<string name="insert_media_insert_button">Lisää</string>
11631163
<string name="main_drawer_help">Ohje</string>
11641164
<string name="main_drawer_login">Kirjaudu sisään / liity Wikipediaan</string>
1165-
<string name="main_tooltip_text">Hei %s, tiesitkö että kaikki voivat muokata Wikipediaa?</string>
1166-
<string name="main_tooltip_text_v2">Tiesitkö että kaikki voivat muokata Wikipediaa?</string>
1165+
<string name="main_tooltip_text">Hei %s, tiesitkö että kuka tahansa voi muokata Wikipediaa?</string>
1166+
<string name="main_tooltip_text_v2">Tiesitkö että kuka tahansa voi muokata Wikipediaa?</string>
11671167
<string name="main_tooltip_action_button">Aloittaminen</string>
11681168
<string name="main_tooltip_watchlist_title">Tarkkailulista</string>
11691169
<string name="main_tooltip_watchlist_text">Tutustu viimeksi tarkkailulistalle lisäämäsi artikkeleihin valitsemalla Lisää-valikko ja &lt;b&gt;Tarkkailulista&lt;/b&gt;.</string>
@@ -1284,6 +1284,8 @@
12841284
<string name="watchlist_page_deleted">Poistettu</string>
12851285
<string name="watchlist_filter_all_text">Kaikki</string>
12861286
<string name="watchlist_filter_user_status_newcomers">Tulokkaat</string>
1287+
<string name="watchlist_filter_automated_contributions_bot">Botti</string>
1288+
<string name="watchlist_filter_automated_contributions_human">Ihminen (ei botti)</string>
12871289
<string name="watchlist_filter_significance_minor">Pienet muutokset</string>
12881290
<string name="watchlist_filter_type_of_change_wikidata_edits">Wikidata-muokkaukset</string>
12891291
<string name="watchlist_filter_type_of_change_new_users">Uudet käyttäjät</string>

app/src/main/res/values-inh/strings.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@
448448
<string name="editing_syntax_highlight_label">Синтаксис сийрдаяккхар</string>
449449
<string name="editing_line_numbers_label">МугӀарий номераш гуш хилийта</string>
450450
<string name="editing_monospace_font_label">Моно-шера шрифт лелае</string>
451+
<string name="editing_typing_suggestions">Яздеча хана автодополнени гойта</string>
451452
<string name="nav_item_saved">ДӀайилай</string>
452453
<string name="reading_list_save_to">Éша дIаяхкача оагIонашта тIатоха</string>
453454
<string name="reading_list_move_to">Éша дIаяхкача оагIонашта юкъеяккха</string>
@@ -460,6 +461,10 @@
460461
<string name="reading_list_articles_already_exist_message">Эшац хьона! %s яхача йолаш я хьона еррига статьяш.</string>
461462
<string name="reading_list_added_view_button">МугӀамага хьажар</string>
462463
<string name="reading_list_add_to_list_button">МугӀамá тӀатоха</string>
464+
<plurals name="format_reading_list_statistical_summary_without_size">
465+
<item quantity="one">1 статья</item>
466+
<item quantity="other">%d статья</item>
467+
</plurals>
463468
<plurals name="format_reading_list_statistical_summary">
464469
<item quantity="one">1 статья, %2$.2f MB</item>
465470
<item quantity="other">%1$d статья, %2$.2f MB</item>
@@ -1224,4 +1229,6 @@
12241229
<string name="revision_initial_none">А (ер статьяй хьалхара кеп я)</string>
12251230
<string name="archive_empty">Архиве йола оагӀонаш кораяьяц.</string>
12261231
<string name="media_playback_error">Мультимедиа хьаоттаеча хана гӀалат нийсделар.</string>
1232+
<string name="data_opt_in_accept">ТӀаэца</string>
1233+
<string name="data_opt_in_reject">Юхадаккха</string>
12271234
</resources>

app/src/main/res/values-it/strings.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@
526526
<string name="reading_list_menu_export">Esporta elenco</string>
527527
<string name="reading_list_menu_select">Seleziona</string>
528528
<string name="reading_list_menu_unselect">Deseleziona</string>
529+
<string name="reading_list_export_write_permission_rationale">Il permesso di scrittura sul dispositivo è necessario per il salvataggio dell\'elenco di lettura.</string>
529530
<string name="reading_list_menu_rename">Modifica nome/descrizione</string>
530531
<string name="reading_list_action_menu_remove_from_offline">Rimuovi da offline</string>
531532
<string name="reading_list_action_menu_save_for_offline">Salva per offline</string>
@@ -553,6 +554,8 @@
553554
<string name="reading_lists_default_list_delete_message">L\'elenco predefinito (%s) non può essere cancellato.</string>
554555
<string name="reading_lists_default_plus_one_list_delete_message">%1$s cancellato. L\'elenco predefinito (%2$s) non può essere cancellato.</string>
555556
<string name="reading_lists_default_plus_many_lists_delete_message">Elenchi cancellati. L\'elenco predefinito (%s) non può essere cancellato.</string>
557+
<string name="single_list_json_file_name">%s (Elenco di lettura Wikipedia).json</string>
558+
<string name="multiple_lists_json_file_name">Elenchi di lettura Wikipedia (%s e più).json</string>
556559
<string name="reading_list_items_deleted">%d voci rimosse dagli elenchi</string>
557560
<string name="reading_lists_item_deleted">%s rimosso dagli elenchi</string>
558561
<string name="reading_list_item_delete_undo">Annulla</string>
@@ -586,6 +589,10 @@
586589
<string name="reading_list_articles_moved_to_named">Spostate %1$d voci in %2$s</string>
587590
<string name="reading_list_delete_confirm">Sei sicuro di voler cancellare %s?</string>
588591
<string name="reading_list_delete_lists_confirm_dialog_title">Cancellare gli elenchi selezionati?</string>
592+
<plurals name="reading_list_delete_lists_confirm_dialog_message">
593+
<item quantity="one">Sei sicuro di voler eliminare l\'elenco di lettura %d?</item>
594+
<item quantity="other">Sei sicuro di voler eliminare gli elenchi di lettura %d?</item>
595+
</plurals>
589596
<string name="reading_list_preference_login_to_enable_sync_dialog_title">Accedi per abilitare la sincronizzazione</string>
590597
<string name="reading_list_preference_login_to_enable_sync_dialog_text">Accedi per consentire il salvataggio degli elenchi di lettura sulla tua utenza.</string>
591598
<string name="reading_list_preference_login_to_enable_sync_dialog_cancel">Annulla</string>

0 commit comments

Comments
 (0)