Skip to content

Commit

Permalink
Merge branch 'main' into patroller-tasks-template-update-design
Browse files Browse the repository at this point in the history
  • Loading branch information
cooltey authored Nov 16, 2023
2 parents 6cd332f + 9e4d58c commit 91a0d40
Show file tree
Hide file tree
Showing 12 changed files with 136 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build_alpha:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build_branch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
test_pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android_smoke_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
timeout-minutes: 30

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2013-2022 Wikimedia Foundation et al.
Copyright 2013-2023 Wikimedia Foundation et al.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-cv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,11 @@
<string name="other_languages_indication_text">Урӑх чӗлхепе вула</string>
<string name="language_count_link_text">Ытти %d чӗлхепе пур</string>
<string name="edit_save_action_license_logged_in">Хӑвӑрӑн улшӑнусене янӑ май эсир &lt;a href=\"%1$s\"&gt;усӑ курмалли условисемпе&lt;/a&gt;, ҫавӑн пекех &lt;a href=\"%2$s\"&gt;CC BY-SA 4.0&lt;/a&gt; лицензипе яланлӑха вырнаҫтарассипе килӗшетӗр.</string>
<string name="edit_save_action_license_anon">Тӳрлетӳсене вырнаҫтарнӑ май эсир &lt;a href=\"%1$s\"&gt;усӑ курмалли условисемпе&lt;/a&gt;, ҫаван пекех &lt;a href=\"%2$s\"&gt;CC BY-SA 4.0&lt;/a&gt; лицензипе кӗртнине каялла илмесӗр вырнаҫтарма килӗшетӗр. Тӳрлетӳсем сирӗн хатӗрӗн IP адресӗпе ҫыхӑнӗҫ. &lt;a href=\"https://#login\"&gt;Системӑна кӗрсен&lt;/a&gt; хӑвӑрӑн ҫинчен пӗлтерекен информаци ыттисене сахалтарах курӑнӗ.</string>
<string name="edit_anon_warning">Тӳрлетӳсене тӑваканӗ пек сирӗн хатӗрӗн IP адресӗ кӑтартӑнӗ. &lt;a href=\"https://#login\"&gt;Системӑна кӗрсен&lt;/a&gt; ыттисем куракан информаци сахалрах пулӗ, ун чухне эсир усӑ куракан IP адрес курӑнмӗ.</string>
<string name="preference_title_language">Википеди чӗлхисем</string>
<string name="langlinks_filter_hint">Шыра</string>
<string name="langlinks_empty">Ку страницӑпа ытти чӗлхепе паллашма май ҫук.</string>
<string name="langlinks_no_match">Чӗлхесем тупӑнмарӗҫ</string>
<string name="langlinks_activity_title">Ытти чӗлхесем</string>
<string name="langlinks_your_wikipedia_languages">Википедири сирӗн чӗлхесем</string>
Expand All @@ -129,6 +132,7 @@
<string name="search_reading_list_no_results">\"%s\"-ра нимӗн те тупӑнмарӗ</string>
<string name="search_reading_lists_no_results">Вуламалли списокра нимӗн те тупӑнмарӗ</string>
<string name="search_history_no_results">Историре нимӗн те тупӑнмарӗ</string>
<string name="edit_section_captcha_message">Пире спамран хӳтӗленме пулӑшмашкӑн аяларах кӑтартнӑ сӑмахсене ҫырса кӗртӗр.</string>
<string name="title_captcha">CAPTCHA кӗртӗр</string>
<string name="edit_section_captcha_reload">CAPTCHA ҫӗнетме ӑна тӗкӗнӗр</string>
<string name="nav_item_login">Википедине кӗрӗр</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@
<item quantity="other">%1$d artikulu deskargatzen...</item>
</plurals>
<plurals name="notification_syncing_description">
<item quantity="one">Artikulu %1$d geratzen da</item>
<item quantity="one">Artikulu bat geratzen da</item>
<item quantity="other">%1$d artikulu geratzen dira</item>
</plurals>
<plurals name="notification_syncing_reading_list_channel_name">
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values-kn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* MuratTheTurkish
* Nayvik
* Omshivaprakash
* SHaran (WMF)
* VASANTH S.N.
* Vikashegde
* ~aanzx
Expand Down Expand Up @@ -47,13 +48,15 @@
<string name="history_list_title">ಇತಿಹಾಸ</string>
<string name="image_content_description">ಚಿತ್ರ: %s</string>
<string name="page_content_description">ಪುಟ: %s</string>
<string name="wikimedia_commons">ವಿಕಿಮೀಡಿಯಾ ಕಾಮನ್ಸ್</string>
<string name="dialog_title_clear_history">ಬ್ರೌಸಿಂಗ್ ಇತಿಹಾಸವನ್ನು ಅಳಿಸಿ</string>
<string name="dialog_message_clear_history">ಇದು ನಿಮ್ಮ ಎಲ್ಲಾ ಬ್ರೌಸಿಂಗ್ ಇತಿಹಾಸವನ್ನು ಅಳಿಸುತ್ತದೆ ಮತ್ತು ಪ್ರಸ್ತುತ ತೆರೆದಿರುವ ಯಾವುದೇ ಟ್ಯಾಬ್‌ಗಳನ್ನು ಮುಚ್ಚುತ್ತದೆ. ನೀವು ಖಚಿತವಾಗಿರುವಿರಾ?</string>
<string name="dialog_message_clear_history_yes">ಹೌದು</string>
<string name="dialog_message_clear_history_no">ಇಲ್ಲ</string>
<string name="share_via">ಮೂಲಕ ಹಂಚು</string>
<string name="image_share_via">ಮೂಲಕ ಹಂಚು</string>
<string name="search_redirect_from">%s ಇಂದ ಪುನರ್ನಿರ್ದೇಶಿತ</string>
<string name="page_edit_history_activity_title">ಬದಲಾವಣೆಗಳ ಇತಿಹಾಸ: %s</string>
<string name="page_edit_history_filter_by_all">ಎಲ್ಲಾ ಸಂಪಾದನೆಗಳು (%s)</string>
<string name="page_edit_history_filter_by_user">ಬಳಕೆದಾರರ ಸಂಪಾದನೆಗಳು (%s)</string>
<string name="page_edit_history_filter_by_anon">ಅನಾಮಧೇಯ ಸಂಪಾದನೆಗಳು (%s)</string>
Expand Down
Loading

0 comments on commit 91a0d40

Please sign in to comment.