Skip to content

Commit

Permalink
Merge pull request #14576 from wordpress-mobile/merge/release-17.2-in…
Browse files Browse the repository at this point in the history
…to-develop

Merge release 17.2 into develop
  • Loading branch information
JavonDavis authored May 2, 2021
2 parents c347f49 + bb8faf0 commit ff4b4ac
Show file tree
Hide file tree
Showing 31 changed files with 1,046 additions and 945 deletions.
4 changes: 2 additions & 2 deletions WordPress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "17.2-rc-3"
versionName "17.2"
}
versionCode 1037
versionCode 1041
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
Expand Down
6 changes: 3 additions & 3 deletions WordPress/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2021-04-22 19:37:13+0000
Translation-Revision-Date: 2021-04-28 23:36:55+0000
Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5))));
Generator: GlotPress/3.0.0-alpha.2
Language: ar
Expand Down Expand Up @@ -1810,7 +1810,7 @@ Language: ar
<string name="login_error_button">إغلاق</string>
<string name="enter_wpcom_password_google">للمتابعة باستخدام حساب Google هذا، يرجى إدخال كلمة مرور متطابقة في WordPress.com. ستتم المطالبة بها لمرة واحدة.</string>
<string name="error_generic_network">حدثت مشكلة في الشبكة. يرجى التحقق من اتصالك والمحاولة لاحقًا.</string>
<string name="post_settings_remove_featured_image">إزالة صورة مميزة</string>
<string name="post_settings_remove_featured_image">إزالة الصورة البارزة</string>
<string name="post_settings_choose_featured_image">اختيار صورة مميزة</string>
<string name="login_log_in_for_share_intent">سجّل الدخول إلى WordPress.com لمشاركة المحتوى.</string>
<string name="enter_site_address_share_intent">أدخل عنوان موقع ووردبريس الذي تود مشاركة المحتوى معه.</string>
Expand Down Expand Up @@ -2276,7 +2276,7 @@ Language: ar
<string name="web_address">عنوان موقع ويب</string>
<string name="editor_toast_uploading_please_wait">أنت تقوم حاليًا برفع وسائط. يُرجى الانتظار حتى تكتمل هذه العملية.</string>
<string name="error_refresh_comments_showing_older">يتعذر تحديث التعليقات في الوقت الحالي - إظهار تعليقات أقدم</string>
<string name="post_settings_set_featured_image">تعيين صورة مميزة</string>
<string name="post_settings_set_featured_image">تعيين صورة بارزة</string>
<string name="post_settings_featured_image">الصورة المميزة</string>
<string name="email_address">عنوان البريد الإلكتروني</string>
<string name="dlg_sure_to_delete_comments">هل ترغب في إزالة هذه التعليقات نهائيًا؟</string>
Expand Down
1,718 changes: 859 additions & 859 deletions WordPress/src/main/res/values-en-rGB/strings.xml

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion WordPress/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2021-04-16 09:54:08+0000
Translation-Revision-Date: 2021-04-29 09:54:08+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/3.0.0-alpha.2
Language: fr
-->
<resources>
<string name="gutenberg_native_what_is_alt_text">Qu’est-ce que le texte alternatif ?</string>
<string name="gutenberg_native_transform_s_to">Transformer %s en</string>
<string name="gutenberg_native_transform_block">Transformer le bloc…</string>
<string name="gutenberg_native_failed_to_insert_media">Échec d’insertion du média.</string>
<string name="gutenberg_native_failed_to_insert_audio_file">Échec d’insertion du fichier audio</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Décrivez le rôle de cette image. Ne rien remplir si l’image est purement décorative. </string>
<string name="gutenberg_native_1_s_transformed_to_2_s">%1$s a été transformé en %2$s</string>
<string name="like_faces_error_loading_message">Erreur lors du chargement des données. %s.</string>
<string name="like_faces_plural_text">%d blogueurs aiment ceci.</string>
<string name="like_faces_singular_text">Un blogueur aime ceci.</string>
<string name="like_title_plural">%d mentions J\'aime</string>
<string name="like_title_singular">1 mention J\'aime</string>
<string name="threat_fix_enter_server_creds_message_plural">Entrez les identifiants de votre serveur pour résoudre les menaces.</string>
<string name="threat_fix_enter_server_creds_message_singular">Entrez les identifiants de votre serveur pour résoudre la menace.</string>
<string name="suggestion">Suggestion :</string>
<string name="gutenberg_native_search_blocks">Rechercher des blocs</string>
<string name="gutenberg_native_search_block">Rechercher un bloc</string>
<string name="gutenberg_native_double_tap_to_change_unit">Appuyer deux fois pour modifier l’unité</string>
Expand Down Expand Up @@ -830,6 +845,7 @@ Language: fr
<string name="gutenberg_native_alt_text">Texte alternatif</string>
<string name="gutenberg_native_add_video">AJOUTER UNE VIDÉO</string>
<string name="gutenberg_native_add_url">Ajouter une URL</string>
<string name="gutenberg_native_add_alt_text">Ajouter du texte alternatif</string>
<string name="gutenberg_native_add_image_or_video">AJOUTER UNE IMAGE OU UNE VIDÉO</string>
<string name="gutenberg_native_add_image">AJOUTER UNE IMAGE</string>
<string name="gutenberg_native_add_block_here">AJOUTER UN BLOC ICI</string>
Expand Down
17 changes: 16 additions & 1 deletion WordPress/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2021-04-24 09:38:02+0000
Translation-Revision-Date: 2021-04-29 16:55:00+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0-alpha.2
Language: it
-->
<resources>
<string name="gutenberg_native_what_is_alt_text">Cos\'è il testo alternativo?</string>
<string name="gutenberg_native_transform_s_to">Trasforma %s in</string>
<string name="gutenberg_native_transform_block">Trasforma il blocco…</string>
<string name="gutenberg_native_failed_to_insert_media">Impossibile inserire file multimediali.</string>
<string name="gutenberg_native_failed_to_insert_audio_file">Impossibile inserire il file audio.</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Descrivi lo scopo dell\'immagine. Lascia vuoto, se l\'immagine è semplicemente decorativa. </string>
<string name="gutenberg_native_1_s_transformed_to_2_s">%1$s trasformato in %2$s</string>
<string name="like_faces_error_loading_message">Errore durante il caricamento di dati simili. %s.</string>
<string name="like_faces_plural_text">Piace a %d blogger.</string>
<string name="like_faces_singular_text">Piace a un blogger.</string>
<string name="like_title_plural">%d Mi piace</string>
<string name="suggestion">Suggerimento:</string>
<string name="like_title_singular">1 Mi piace</string>
<string name="threat_fix_enter_server_creds_message_plural">Inserisci le tue credenziali del server per risolvere le minacce.</string>
<string name="threat_fix_enter_server_creds_message_singular">Inserisci le tue credenziali del server per risolvere la minaccia.</string>
<string name="gutenberg_native_search_blocks">Cerca blocchi</string>
<string name="gutenberg_native_search_block">Cerca blocco</string>
<string name="gutenberg_native_double_tap_to_change_unit">tocca due volte per modificare l\'unità</string>
Expand Down Expand Up @@ -887,6 +901,7 @@ Language: it
<string name="gutenberg_native_add_image">AGGIUNGI IMMAGINE</string>
<string name="gutenberg_native_add_block_here">AGGIUNGI BLOCCO QUI</string>
<string name="gutenberg_native_alt_text">Testo Alt</string>
<string name="gutenberg_native_add_alt_text">Aggiungi testo alternativo</string>
<string name="reader_empty_saved_posts_content_description">Tocca il pulsante Aggiungi ad articoli salvati per salvare un articolo nell\'elenco.</string>
<string name="reader_acessibility_list_loaded">\"L\'elenco è stato caricato con %1$d voci.\"</string>
<string name="notifications_tab_dialog_switch_desc">Notifiche</string>
Expand Down
18 changes: 17 additions & 1 deletion WordPress/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2021-04-16 14:54:08+0000
Translation-Revision-Date: 2021-04-29 09:54:07+0000
Plural-Forms: nplurals=1; plural=0;
Generator: GlotPress/3.0.0-alpha.2
Language: ko_KR
-->
<resources>
<string name="gutenberg_native_what_is_alt_text">대체 텍스트란 무엇인가요?</string>
<string name="gutenberg_native_transform_s_to">다음으로 %s 변형</string>
<string name="gutenberg_native_transform_block">블록 변형…</string>
<string name="gutenberg_native_failed_to_insert_media">미디어를 삽입하는 데 실패했습니다.</string>
<string name="gutenberg_native_failed_to_insert_audio_file">오디오 파일 삽입에 실패했습니다.</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">이미지의 용도를 설명합니다. 이미지가 장식용이면 비워 둡니다. </string>
<string name="gutenberg_native_1_s_transformed_to_2_s">%2$s(으)로 변형된 %1$s</string>
<string name="like_faces_error_loading_message">좋아요 데이터 로드 중 오류가 발생했습니다. %s.</string>
<string name="like_faces_plural_text">%d명의 블로거가 좋아합니다.</string>
<string name="like_faces_singular_text">1명의 블로거가 좋아합니다.</string>
<string name="like_title_plural">%d 좋아요</string>
<string name="like_title_singular">좋아요 1개</string>
<string name="threat_fix_enter_server_creds_message_plural">위협을 해결하려면 서버 자격 증명을 입력하세요.</string>
<string name="threat_fix_enter_server_creds_message_singular">위협을 해결하려면 서버 자격 증명을 입력하세요.</string>
<string name="suggestion">제안:</string>
<string name="gutenberg_native_search_blocks">블록 검색</string>
<string name="gutenberg_native_search_block">블록 검색</string>
<string name="gutenberg_native_double_tap_to_change_unit">두 번 눌러 단위 변경하기</string>
Expand Down Expand Up @@ -866,6 +881,7 @@ Language: ko_KR
<string name="gutenberg_native_add_image_or_video">이미지 또는 비디오 추가</string>
<string name="gutenberg_native_add_image">이미지 추가</string>
<string name="gutenberg_native_add_block_here">블록을 여기에 추가</string>
<string name="gutenberg_native_add_alt_text">대체 텍스트 추가</string>
<string name="reader_empty_saved_posts_content_description">“글을 목록에 저장하려면 글 저장 버튼을 탭합니다.”</string>
<string name="reader_acessibility_list_loaded">\"목록에 %1$d개 항목이 로드되었습니다. \"</string>
<string name="notifications_tab_dialog_switch_desc">알림</string>
Expand Down
21 changes: 20 additions & 1 deletion WordPress/src/main/res/values-zh-rHK/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2021-04-16 10:54:08+0000
Translation-Revision-Date: 2021-04-30 15:54:48+0000
Plural-Forms: nplurals=1; plural=0;
Generator: GlotPress/3.0.0-alpha.2
Language: zh_TW
-->
<resources>
<string name="gutenberg_native_what_is_alt_text">替代文字是什麼?</string>
<string name="gutenberg_native_transform_s_to">將 %s 轉換為</string>
<string name="gutenberg_native_transform_block">轉換區塊…</string>
<string name="gutenberg_native_failed_to_insert_media">無法插入媒體。</string>
<string name="gutenberg_native_failed_to_insert_audio_file">無法插入音訊檔案。</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">說明圖片用途。 如果圖片只是為了裝飾,請保留空白。 </string>
<string name="gutenberg_native_1_s_transformed_to_2_s">%1$s 已轉換為 %2$s</string>
<string name="like_faces_error_loading_message">載入讚資料時發生錯誤。%s。</string>
<string name="like_faces_plural_text">%d 位部落客說這個讚。</string>
<string name="like_faces_singular_text">1 位部落客說這個讚。</string>
<string name="like_title_plural">%d 按讚數</string>
<string name="like_title_singular">1 個讚</string>
<string name="threat_fix_enter_server_creds_message_plural">輸入你的伺服器憑證以修正威脅。</string>
<string name="threat_fix_enter_server_creds_message_singular">輸入你的伺服器憑證以修正威脅。</string>
<string name="suggestion">建議:</string>
<string name="gutenberg_native_search_blocks">搜尋區塊</string>
<string name="gutenberg_native_search_block">搜尋區塊</string>
<string name="gutenberg_native_double_tap_to_change_unit">按兩下以變更單位</string>
Expand Down Expand Up @@ -139,6 +154,7 @@ Language: zh_TW
<string name="restore_complete_visit_site_action_button">造訪網站</string>
<string name="restore_complete_description_with_two_parameters">所有你選取的項目現在都還原至 %1$s %2$s。</string>
<string name="restore_complete_header">你的網站已經還原</string>
<string name="restore_progress_label">%1$s%%</string>
<string name="restore_progress_icon_content_description">還原網站圖示</string>
<string name="restore_progress_description_with_two_parameters">我們正在將你的網站還原至 %1$s %2$s。</string>
<string name="restore_progress_header">目前正在還原網站</string>
Expand Down Expand Up @@ -211,6 +227,7 @@ Language: zh_TW
<string name="backup_download_complete_description_with_two_parameters">我們已成功建立 %1$s %2$s 的網站備份。</string>
<string name="backup_download_complete_header">你的備份現在已可下載</string>
<string name="backup_download_complete_page_title">你的備份</string>
<string name="backup_download_progress_label">%1$s%%</string>
<string name="backup_download_progress_footnote">無須等待。 我們會在備份準備就緒時通知你。</string>
<string name="backup_download_progress_icon_content_description">建立可下載備份圖示</string>
<string name="backup_download_progress_description_with_two_parameters">我們正在為你的網站建立 %1$s %2$s 的可下載備份。</string>
Expand Down Expand Up @@ -428,6 +445,7 @@ Language: zh_TW
<string name="typeface_label_libre_baskerville">傳統編輯器</string>
<string name="typeface_label_nunito">休閒</string>
<string name="toast_capture_operation_permission_needed">你需要授予應用程式錄音權限,才能錄製影片</string>
<string name="mlp_notselected_description">%s</string>
<string name="mlp_selected_description">已選取 %s</string>
<string name="login_get_link_by_email">透過電子郵件取得登入連結</string>
<string name="email_not_registered_wpcom">很抱歉,我們找不到與此電子郵件地址連結的 WordPress.com 帳號。</string>
Expand Down Expand Up @@ -869,6 +887,7 @@ Language: zh_TW
<string name="gutenberg_native_alt_text">替代文字</string>
<string name="gutenberg_native_add_video">新增視訊</string>
<string name="gutenberg_native_add_url">新增網址</string>
<string name="gutenberg_native_add_alt_text">新增替代文字</string>
<string name="gutenberg_native_add_image_or_video">新增圖片或視訊</string>
<string name="gutenberg_native_add_image">新增圖片</string>
<string name="gutenberg_native_add_block_here">在此新增區塊</string>
Expand Down
21 changes: 20 additions & 1 deletion WordPress/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2021-04-16 10:54:08+0000
Translation-Revision-Date: 2021-04-30 15:54:48+0000
Plural-Forms: nplurals=1; plural=0;
Generator: GlotPress/3.0.0-alpha.2
Language: zh_TW
-->
<resources>
<string name="gutenberg_native_what_is_alt_text">替代文字是什麼?</string>
<string name="gutenberg_native_transform_s_to">將 %s 轉換為</string>
<string name="gutenberg_native_transform_block">轉換區塊…</string>
<string name="gutenberg_native_failed_to_insert_media">無法插入媒體。</string>
<string name="gutenberg_native_failed_to_insert_audio_file">無法插入音訊檔案。</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">說明圖片用途。 如果圖片只是為了裝飾,請保留空白。 </string>
<string name="gutenberg_native_1_s_transformed_to_2_s">%1$s 已轉換為 %2$s</string>
<string name="like_faces_error_loading_message">載入讚資料時發生錯誤。%s。</string>
<string name="like_faces_plural_text">%d 位部落客說這個讚。</string>
<string name="like_faces_singular_text">1 位部落客說這個讚。</string>
<string name="like_title_plural">%d 按讚數</string>
<string name="like_title_singular">1 個讚</string>
<string name="threat_fix_enter_server_creds_message_plural">輸入你的伺服器憑證以修正威脅。</string>
<string name="threat_fix_enter_server_creds_message_singular">輸入你的伺服器憑證以修正威脅。</string>
<string name="suggestion">建議:</string>
<string name="gutenberg_native_search_blocks">搜尋區塊</string>
<string name="gutenberg_native_search_block">搜尋區塊</string>
<string name="gutenberg_native_double_tap_to_change_unit">按兩下以變更單位</string>
Expand Down Expand Up @@ -139,6 +154,7 @@ Language: zh_TW
<string name="restore_complete_visit_site_action_button">造訪網站</string>
<string name="restore_complete_description_with_two_parameters">所有你選取的項目現在都還原至 %1$s %2$s。</string>
<string name="restore_complete_header">你的網站已經還原</string>
<string name="restore_progress_label">%1$s%%</string>
<string name="restore_progress_icon_content_description">還原網站圖示</string>
<string name="restore_progress_description_with_two_parameters">我們正在將你的網站還原至 %1$s %2$s。</string>
<string name="restore_progress_header">目前正在還原網站</string>
Expand Down Expand Up @@ -211,6 +227,7 @@ Language: zh_TW
<string name="backup_download_complete_description_with_two_parameters">我們已成功建立 %1$s %2$s 的網站備份。</string>
<string name="backup_download_complete_header">你的備份現在已可下載</string>
<string name="backup_download_complete_page_title">你的備份</string>
<string name="backup_download_progress_label">%1$s%%</string>
<string name="backup_download_progress_footnote">無須等待。 我們會在備份準備就緒時通知你。</string>
<string name="backup_download_progress_icon_content_description">建立可下載備份圖示</string>
<string name="backup_download_progress_description_with_two_parameters">我們正在為你的網站建立 %1$s %2$s 的可下載備份。</string>
Expand Down Expand Up @@ -428,6 +445,7 @@ Language: zh_TW
<string name="typeface_label_libre_baskerville">傳統編輯器</string>
<string name="typeface_label_nunito">休閒</string>
<string name="toast_capture_operation_permission_needed">你需要授予應用程式錄音權限,才能錄製影片</string>
<string name="mlp_notselected_description">%s</string>
<string name="mlp_selected_description">已選取 %s</string>
<string name="login_get_link_by_email">透過電子郵件取得登入連結</string>
<string name="email_not_registered_wpcom">很抱歉,我們找不到與此電子郵件地址連結的 WordPress.com 帳號。</string>
Expand Down Expand Up @@ -869,6 +887,7 @@ Language: zh_TW
<string name="gutenberg_native_alt_text">替代文字</string>
<string name="gutenberg_native_add_video">新增視訊</string>
<string name="gutenberg_native_add_url">新增網址</string>
<string name="gutenberg_native_add_alt_text">新增替代文字</string>
<string name="gutenberg_native_add_image_or_video">新增圖片或視訊</string>
<string name="gutenberg_native_add_image">新增圖片</string>
<string name="gutenberg_native_add_block_here">在此新增區塊</string>
Expand Down
Loading

0 comments on commit ff4b4ac

Please sign in to comment.