Merge branch 'main' into Notification_time_ago

Author: Isira-Seneviratne

.github/workflows/android_phab.yml

@@ -16,7 +16,8 @@ jobs:
         message="${{ github.actor }} ${{ github.event.action }} ${{ github.event.pull_request._links.html.href }}"
         echo -e "${PR_BODY}" | grep -oEi "(^Bug:\s*T[0-9]+)|(^([*]*phabricator[*]*:[*]*\s*)?https:\/\/phabricator\.wikimedia\.org\/T[0-9]+)" | grep -oEi "T[0-9]+" | while IFS= read -r line; do
           echo "Processing: $line"
-          curl https://phabricator.wikimedia.org/api/maniphest.edit \
+          curl --header "User-Agent: GitHubPRBot/1.0 (https://phabricator.wikimedia.org/p/GitHubPRBot)" \
+              https://phabricator.wikimedia.org/api/maniphest.edit \
               -d api.token=${{ secrets.PHAB_BOT_API_KEY }} \
               -d transactions[0][type]=comment \
               -d transactions[0][value]="${message}" \

app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.kt

@@ -177,6 +177,10 @@ class GalleryItemFragment : Fragment(), MenuProvider {
                 // SVG thumbnails can be rendered with language-specific translations, so let's
                 // get the correct URL that points to the appropriate language.
                 url = ImageUrlUtil.insertLangIntoThumbUrl(url, activityViewModel.wikiSite.languageCode)
+            } else if (mediaInfo?.mime?.contains("gif") == true) {
+                // In the case of GIF files, just use the original url, since differently-scaled
+                // sizes of the image are not always guaranteed to be animated.
+                url = mediaInfo?.originalUrl ?: url
             }
             loadImage(url)
         }

app/src/main/java/org/wikipedia/views/SurveyDialog.kt

@@ -50,6 +50,8 @@ object SurveyDialog {
             binding.optionSatisfied.setOnClickListener(clickListener)
             binding.optionNeutral.setOnClickListener(clickListener)
             binding.optionUnsatisfied.setOnClickListener(clickListener)
+            binding.cancelButton.setOnClickListener { dialog?.dismiss() }
+            binding.submitButton.setOnClickListener(clickListener)
 
             PatrollerExperienceEvent.logAction("impression", "feedback_form")
         }

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

@@ -511,7 +511,7 @@
   <string name="default_reading_list_name">Karaksa</string>
   <string name="reading_lists_menu_create_list">Kardi lis anyar</string>
   <string name="reading_lists_menu_import_list">Impor lis</string>
-  <string name="reading_lists_menu_sort_by">Bacak mawit</string>
+  <string name="reading_lists_menu_sort_by">Urut manut</string>
   <string name="reading_list_preference_login_or_signup_to_enable_sync_dialog_login">Manjing log / kardi akun</string>
   <string name="reading_list_remove_list_dialog_ok_button_text">OK</string>
   <string name="reading_list_delete_dialog_ok_button_text">OK</string>
@@ -856,7 +856,7 @@
   <string name="talk_snackbar_undo">Ulihang</string>
   <string name="talk_last_modified">&lt;b&gt;Untat kauah %1$s&lt;/b&gt; olih %2$s</string>
   <string name="talk_snackbar_survey_action_text">Kawitin</string>
-  <string name="talk_overflow_sort_by">Bacak mawit</string>
+  <string name="talk_overflow_sort_by">Urut manut</string>
   <string name="talk_overflow_sort_date_published">Tanggal kawedar</string>
   <string name="talk_overflow_sort_date_updated">Tanggal kaanyarin</string>
   <string name="talk_overflow_sort_topic_name">Adan topik</string>

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

@@ -85,7 +85,7 @@
   <string name="page_edit_history_filter_by">Filtra per</string>
   <string name="page_edit_history_filter_by_all">Totes les edicions (%s)</string>
   <string name="page_edit_history_filter_by_user">Edicions de l\'usuari (%s)</string>
-  <string name="page_edit_history_filter_by_anon" fuzzy="true">Edicions anònimes (%s)</string>
+  <string name="page_edit_history_filter_by_anon">Edicions anònimes (%s)</string>
   <string name="page_edit_history_filter_by_bot">Edicions de bots (%s)</string>
   <string name="page_edit_history_metrics_content_description">Mètriques de %1$s a %2$s</string>
   <plurals name="page_edit_history_article_edits_since_year">
@@ -124,6 +124,7 @@
   <string name="menu_page_recently_viewed">Vist recentment</string>
   <string name="menu_page_archive">Arxiu</string>
   <string name="menu_long_press_open_page">Obre</string>
+  <string name="menu_long_press_open_in_places">Obre a Llocs</string>
   <string name="menu_long_press_open_in_new_tab">Obre en una pestanya nova</string>
   <string name="menu_long_press_copy_page">Copia l\'adreça de l\'enllaç</string>
   <string name="menu_text_select_define">Defineix</string>

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

@@ -47,6 +47,8 @@
   <string name="search_hint">Hledání ve Wikipedii</string>
   <string name="search_hint_voice_search">Vyhledávání hlasem</string>
   <string name="search_hint_search_languages">Hledat jazyk</string>
+  <string name="search_back_button_content_description">Vrátit zpět</string>
+  <string name="search_icon_content_description">Hledat</string>
   <string name="filter_hint_filter_my_lists_and_articles">Filtrovat mé seznamy</string>
   <string name="nav_item_suggested_edits">Editace</string>
   <string name="nav_item_more">Více</string>

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

@@ -188,6 +188,8 @@
   <string name="login_2fa_hint">Kode Autentikasi Dua Faktor</string>
   <string name="login_2fa_other_workflow_error_msg">Perlu autentikasi dua faktor! Silakan kembali ke aktivitas utama dan masuk log dengan token 2FA Anda, kemudian coba lagi.</string>
   <string name="login_email_auth_hint">Kode verifikasi email</string>
+  <string name="login_email_auth_other_workflow_error_msg">Verifikasi email diperlukan! Silakan masuk dari layar utama dan masukkan kode verifikasi email Anda.</string>
+  <string name="login_background_error_msg">Tidak dapat masuk kembali. Silakan kembali ke layar utama dan masuk secara manual.</string>
   <string name="onboarding_card_login">Masuk log</string>
   <string name="page_editing_login">Masuk log</string>
   <string name="reading_lists_sync_login">Masuk log</string>

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

@@ -50,7 +50,7 @@
   <string name="dialog_title_clear_history">Browsing-Historique läschen</string>
   <string name="dialog_message_clear_history">Dëst läscht Äre kompletten Historique a mécht all d\'Tabs, déi momentan op sinn, zou. Sidd Dir sécher?</string>
   <string name="dialog_message_clear_history_yes">Jo</string>
-  <string name="dialog_message_clear_history_no">Neen</string>
+  <string name="dialog_message_clear_history_no">Nee</string>
   <string name="share_via">Deelen iwwer</string>
   <string name="image_share_via">Deelen iwwer</string>
   <string name="search_redirect_from">Virugeleet vu(n) %s</string>
@@ -245,7 +245,7 @@
   <string name="about_activity_title">Iwwer</string>
   <string name="edit_abandon_confirm">D\'Säit gouf geännert. Sidd Dir sécher, datt Dir erausgoe wëllt ouni Är Ännerungen ze späicheren?</string>
   <string name="edit_abandon_confirm_yes">Jo</string>
-  <string name="edit_abandon_confirm_no">Neen</string>
+  <string name="edit_abandon_confirm_no">Nee</string>
   <string name="user_blocked_from_editing_title">Gespaart</string>
   <string name="user_logged_in_blocked_from_editing">Äre Benotzerkont gouf fir Ännerungen op dëser Wiki gespaart.</string>
   <string name="user_anon_blocked_from_editing">Är IP-Adress gouf fir Ännerunge gespaart.</string>
@@ -294,7 +294,7 @@
   <string name="button_clear_all_recent_searches">Rezent Ufroen, fir ze sichen, läschen</string>
   <string name="clear_recent_searches_confirm">Sidd Dir sécher, datt Dir Ären Historique vum Siche läsche wëllt?</string>
   <string name="clear_recent_searches_confirm_yes">Jo</string>
-  <string name="clear_recent_searches_confirm_no">Neen</string>
+  <string name="clear_recent_searches_confirm_no">Nee</string>
   <string name="error_browser_not_found">Websäit konnt net opgemaach ginn (keng Browser-App fonnt).</string>
   <string name="table_infobox">Séier Fakten</string>
   <string name="table_other">Méi Informatiounen</string>
@@ -337,7 +337,7 @@
   <string name="menu_close_all_tabs">All Tabs zoumaachen</string>
   <string name="close_all_tabs_confirm">Sidd Dir sécher, datt Dir all Tabs zoumaache wëllt?</string>
   <string name="close_all_tabs_confirm_yes">Jo</string>
-  <string name="close_all_tabs_confirm_no">Neen</string>
+  <string name="close_all_tabs_confirm_no">Nee</string>
   <string name="button_close_tab">Tab zoumaachen</string>
   <string name="unnamed_tab_closed">Tab zougemaach.</string>
   <string name="tab_item_closed">%s zougemaach.</string>
@@ -468,14 +468,14 @@
     <item quantity="one">%1$d vun 1 Artikel offline verfügbar, %3$.2f MB</item>
     <item quantity="other">%1$d vu(n) %2$d Artikelen offline verfügbar, %3$.2f MB</item>
   </plurals>
-  <string name="reading_list_sort">Zortéieren</string>
-  <string name="reading_list_sort_ellipsis">Zortéieren no...</string>
-  <string name="reading_list_sort_by_name">Nom Numm zortéieren</string>
-  <string name="reading_list_sort_by_name_desc">Nom Numm zortéieren (ëmgedréit)</string>
-  <string name="reading_list_sort_by_recent">Nom Datum vum derbäisetzen zortéieren (neisten)</string>
-  <string name="reading_list_sort_by_recent_desc">Nom Datum vum derbäisetzen zortéieren (eelsten)</string>
-  <string name="reading_list_sort_by_created">Nom Datum vum Uleeën zortéieren (neisten)</string>
-  <string name="reading_list_sort_by_created_desc">Nom Datum vum Uleeën zortéieren (eelsten)</string>
+  <string name="reading_list_sort">Sortéieren</string>
+  <string name="reading_list_sort_ellipsis">Sortéieren no…</string>
+  <string name="reading_list_sort_by_name">Nom Numm sortéieren</string>
+  <string name="reading_list_sort_by_name_desc">Nom Numm sortéieren (ëmgedréit)</string>
+  <string name="reading_list_sort_by_recent">Nom Datum vum Derbäisetzen sortéieren (neisten)</string>
+  <string name="reading_list_sort_by_recent_desc">Nom Datum vum Derbäisetzen sortéieren (eelsten)</string>
+  <string name="reading_list_sort_by_created">Nom Datum vum Uleeën sortéieren (neisten)</string>
+  <string name="reading_list_sort_by_created_desc">Nom Datum vum Uleeën sortéieren (eelsten)</string>
   <string name="reading_list_menu_delete">Lëscht läschen</string>
   <string name="reading_list_menu_export">Lëscht exportéieren</string>
   <string name="reading_list_menu_select">Auswielen</string>
@@ -532,7 +532,7 @@
   <string name="reading_lists_login_button">Aloggen / bei Wikipedia matmaachen</string>
   <string name="reading_lists_ignore_button">Net elo</string>
   <string name="reading_lists_confirm_remote_delete_yes">Jo</string>
-  <string name="reading_lists_confirm_remote_delete_no">Neen</string>
+  <string name="reading_lists_confirm_remote_delete_no">Nee</string>
   <string name="reading_list_article_save_in_progress">Den Artikel gëtt momentan erofgelueden a wäert offline verfügbar sinn, soubal den Download fäerdeg ass.</string>
   <string name="reading_list_articles_added_to_named">%1$d Artikel op %2$s derbäigesat</string>
   <string name="reading_list_articles_moved_to_named">%1$d Artikelen op %2$s geréckelt</string>
@@ -562,7 +562,7 @@
   <string name="reading_lists_limit_message">Et ka soss keng Lëscht ugeluecht ginn. Dir hutt d\'Limitt vun 100 Lieslëschten erreecht.</string>
   <string name="reading_lists_menu_create_list">Nei Lëscht uleeën</string>
   <string name="reading_lists_menu_import_list">Lëscht importéieren</string>
-  <string name="reading_lists_menu_sort_by">Zortéieren no</string>
+  <string name="reading_lists_menu_sort_by">Sortéieren no</string>
   <string name="reading_lists_refresh_sync_option">Synchronisatioun aktualiséieren</string>
   <string name="reading_list_preference_login_or_signup_to_enable_sync_dialog_login">Aloggen / Benotzerkont opmaachen</string>
   <plurals name="reading_list_article_offline_message">
@@ -1003,7 +1003,7 @@
   <string name="image_recommendation_task_instruction">Géift Dir dëst Bild an den Artikel derbäisetzen?</string>
   <string name="image_recommendation_tutorial">Uleedung</string>
   <string name="image_recommendation_accept">Jo</string>
-  <string name="image_recommendation_reject">Neen</string>
+  <string name="image_recommendation_reject">Nee</string>
   <string name="image_recommendation_notsure">Net sécher</string>
   <string name="image_recommendation_reject_title">Ofleenungsgrond</string>
   <string name="image_recommendation_reject_subtitle">Den Ofleenungsgrond ass anonym a wäert zukünfteg Bildvirschléi besser maachen.</string>
@@ -1120,7 +1120,7 @@
   <string name="insert_media_settings_uploaded_image">Eropgeluedent Bild</string>
   <string name="insert_media_settings_caption">Bildbeschrëftung</string>
   <string name="insert_media_settings_caption_description">Siichtbar Bildbeschrëftung am Artikel</string>
-  <string name="insert_media_settings_alternative_text">Alternativen Text</string>
+  <string name="insert_media_settings_alternative_text">Alternativtext</string>
   <string name="insert_media_settings_alternative_text_description">Beschreiwung fir visuell behënnert Lieser</string>
   <string name="insert_media_advanced_settings">Erweidert Astellungen</string>
   <string name="insert_media_advanced_settings_wrap_image">Text ronderëm d\'Bild fléisse loossen</string>
@@ -1196,7 +1196,7 @@
   <string name="talk_share_talk_page">Wikipedia – Diskussiounen op der Diskussiounssäit</string>
   <string name="talk_search_hint">An de Message sichen</string>
   <string name="talk_search_topics_hint">Sujete sichen</string>
-  <string name="talk_overflow_sort_by">Zortéieren no</string>
+  <string name="talk_overflow_sort_by">Sortéieren no</string>
   <string name="talk_overflow_sort_date_published">Datum vun der Publikatioun</string>
   <string name="talk_overflow_sort_date_updated">Datum vun der Aktualiséierung</string>
   <string name="talk_overflow_sort_topic_name">Numm vum Sujet</string>
@@ -1501,7 +1501,7 @@
   <string name="survey_dialog_submit">Schécken</string>
   <string name="survey_dialog_next">Nächst</string>
   <string name="survey_dialog_general_yes">Jo</string>
-  <string name="survey_dialog_general_no">Neen</string>
+  <string name="survey_dialog_general_no">Nee</string>
   <string name="survey_dialog_general_maybe">Villäicht</string>
   <string name="survey_dialog_input_hint">Zousätzleche Feedback</string>
   <string name="survey_dialog_submitted_snackbar">Feedback ofgeschéckt. Merci!</string>
@@ -1550,7 +1550,7 @@
   <string name="on_this_day_game_turn_off_notification_dialog_subtitle">Wann Dir d\'Push-Notifikatiounen desaktivéiert, kritt Dir net méi all Dag eng Erënnerung, wann en neit Spill disponibel ass.</string>
   <string name="on_this_day_game_turn_on_notification_dialog_title">Spillnotifikatiounen aktivéieren?</string>
   <string name="on_this_day_game_turn_on_notification_dialog_subtitle">D\'Spill-Notifikatiounen informéieren Iech all Dag, wann en neit Spill disponibel ass.</string>
-  <string name="on_this_day_game_turn_off_notification_dialog_positive_btn_label">Neen, aktivéiert loossen</string>
+  <string name="on_this_day_game_turn_off_notification_dialog_positive_btn_label">Nee, aktivéiert loossen</string>
   <string name="on_this_day_game_turn_off_notification_dialog_negative_btn_label">Desaktivéieren</string>
   <string name="on_this_day_game_turn_on_notification_dialog_positive_btn_label">Jo, aktivéieren</string>
   <string name="on_this_day_game_turn_on_notification_dialog_negative_btn_label">Desaktivéiert loossen</string>
@@ -1632,5 +1632,5 @@
   <string name="recommended_reading_list_settings_notifications_title">Notifikatiounen</string>
   <string name="recommended_reading_list_settings_notifications_dialog_title">Notifikatiounen desaktivéieren?</string>
   <string name="recommended_reading_list_settings_notifications_dialog_positive_button">Desaktivéieren</string>
-  <string name="recommended_reading_list_settings_notifications_dialog_negative_button">Neen, aktivéiert loossen</string>
+  <string name="recommended_reading_list_settings_notifications_dialog_negative_button">Nee, aktivéiert loossen</string>
 </resources>

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

@@ -27,6 +27,7 @@
   <string name="search_hint_voice_search">आवाज आगत खोज</string>
   <string name="search_hint_search_languages">कुनै भाषाको लागि खोजी गर्नुहोस्</string>
   <string name="search_back_button_content_description">पछाडि पर्कनुहोस्</string>
+  <string name="search_clear_query_content_description">लाम खाली गर्नुहोस्</string>
   <string name="search_icon_content_description">खोज्नुहोस्</string>
   <string name="filter_hint_filter_my_lists_and_articles">मेरा सूचीहरू फिल्टर गर्ने</string>
   <string name="nav_item_suggested_edits">सम्पादनहरू</string>