Merge pull request #15042 from wordpress-mobile/merge/17.8-rc-3-to-de…

…velop

Merge 17.8-rc-3 to develop

WordPress/src/main/res/values-pl/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2021-07-15 18:32:00+0000
+Translation-Revision-Date: 2021-07-16 10:59:24+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: pl
@@ -41,12 +41,17 @@ Language: pl
     <string name="storage_utils_dialog_dont_show_button">Nie pokazuj ponownie</string>
     <string name="storage_utils_dialog_ok_button">Sprawdź pamięć</string>
     <string name="storage_utils_dialog_title">Niewystarczająca ilość pamięci w urządzeniu</string>
+    <string name="gutenberg_native_y_axis_position">Pozycja osi Y</string>
+    <string name="gutenberg_native_x_axis_position">Pozycja osi X</string>
     <string name="gutenberg_native_type_a_url">Wpisz adres URL</string>
     <string name="gutenberg_native_tap_to_add_content">Stuknij aby dodać treści</string>
     <string name="gutenberg_native_s_block">blok %s</string>
     <string name="gutenberg_native_minimum_height">Minimalna wysokość</string>
     <string name="gutenberg_native_media_options">Opcje mediów</string>
     <string name="gutenberg_native_invalid_url_audio_file_not_found">NIeprawidłowy adres URL. Nie odnaleziono pliku dźwiękowego.</string>
+    <string name="gutenberg_native_drag_to_adjust_focal_point">Przesuń i dostosuj punkt ostrości</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_add_image_or_video">Stuknij dwukrotnie aby otworzyć dolną zakładkę aby dodać zdjęcie lub film</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_add_image_or_video">Stuknij dwukrotnie aby otworzyć zakładkę Akcji aby dodać zdjęcie lub film</string>
     <string name="gutenberg_native_current_unit_is_s">Bieżącą jednostką jest %s</string>
     <string name="gutenberg_native_columns_settings">Ustawienia kolumn</string>
     <string name="gutenberg_native_add_link_to_s">Dodaj odnośnik do %s</string>

WordPress/src/main/res/values-sr/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2021-04-17 21:48:14+0000
+Translation-Revision-Date: 2021-07-15 23:21:07+0000
 Plural-Forms: nplurals=3; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: sr_RS
@@ -10,6 +10,7 @@ Language: sr_RS
     <string name="gutenberg_native_search_input_field">Поље за унос претраге</string>
     <string name="gutenberg_native_search_button_current_button_text_is">Дугме за претрагу. Тренутни текст на дугмету је</string>
     <string name="gutenberg_native_search_block_label_current_text_is">Натпис блока претраге. Тренутни текст је</string>
+    <string name="gutenberg_native_outside">Изван</string>
     <string name="gutenberg_native_no_button">Без дугмета</string>
     <string name="gutenberg_native_inside">Унутар</string>
     <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s је %3$s %4$s.</string>
@@ -32,6 +33,7 @@ Language: sr_RS
     <string name="gutenberg_native_open">ОТВОРИ</string>
     <string name="gutenberg_native_lock_icon">Иконица за закључавање</string>
     <string name="gutenberg_native_choose_audio">Одабери звучни запис</string>
+    <string name="gutenberg_native_audio_file">Датотека звучног записа</string>
     <string name="gutenberg_native_add_audio">ДОДАЈ ЗВУЧНИ ЗАПИС</string>
     <string name="photo_picker_use_audio">Употреби овај звучни запис</string>
     <string name="photo_picker_choose_audio">Одабери звучни запис са уређаја</string>
@@ -411,6 +413,8 @@ Language: sr_RS
     <string name="gutenberg_native_move_block_up">Помери блок горе</string>
     <string name="gutenberg_native_help_icon">Иконица помоћи</string>
     <string name="gutenberg_native_hide_keyboard">Сакриј тастатуру</string>
+    <string name="gutenberg_native_link_text">Текст везе</string>
+    <string name="gutenberg_native_link_inserted">Веза уметнута</string>
     <string name="gutenberg_native_move_block_down">Помери блок доле</string>
     <string name="gutenberg_native_current_value_is_s">Тренутна вредност је %s</string>
     <string name="gutenberg_native_choose_from_device">Одабери свој уређај</string>
@@ -421,6 +425,7 @@ Language: sr_RS
     <string name="gutenberg_native_add_image">ДОДАЈ СЛИКУ</string>
     <string name="gutenberg_native_add_block_here">ДОДАЈ БЛОК ОВДЕ</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Јавила се непозната грешка. Молимо вас да покушате поново касније.</string>
+    <string name="gutenberg_native_add_alt_text">Додај алтернативни текст</string>
     <string name="notifications_tab_dialog_switch_desc">Обавештења</string>
     <string name="main_switch_default_title_off">Искључи</string>
     <string name="main_switch_default_title_on">Укључи</string>
@@ -634,6 +639,7 @@ Language: sr_RS
     <string name="notification_new_site_creation_failed">Дошло је до проблема</string>
     <string name="notification_new_site_creation_title">Креирај сајт</string>
     <string name="new_site_creation_create_site_button">Креирај сајт</string>
+    <string name="new_site_creation_site_preview_content_description">Приказујем преглед сајта</string>
     <string name="site_creation_error_generic_title">Дошло је до проблема</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Дошло је до проблема</string>
     <string name="new_site_creation_preview_title">Ваша страница је креирана!</string>
@@ -967,6 +973,7 @@ Language: sr_RS
     <string name="site_settings_quota_space_title">Искоришћен простор</string>
     <string name="site_settings_quota_space_hint">Ако Вам је потребан додатни простор, размислите о надоградњи Вордпрес плана.</string>
     <string name="site_settings_quota_header">Садржај</string>
+    <string name="comment_unliked_talkback">Уклоњено свиђање са коментара</string>
     <string name="notifications_screen_title">Обавештења</string>
     <string name="publicize_buttons_screen_title">Дугмићи за дељење</string>
     <string name="login_epilogue_screen_title">Пријављен као</string>
@@ -1196,6 +1203,7 @@ Language: sr_RS
     <string name="reader_excerpt_link">Посети %s за више</string>
     <string name="add_media_progress">Додавање садржаја</string>
     <string name="upload_failed_param">Отпремање неуспело за \"%s\"</string>
+    <string name="error_media_canceled">Отпремање садржаја је отказано</string>
     <string name="editor_uploading_post">Ваш чланак се отпрема</string>
     <string name="uploading_media">Отпремање садржаја…</string>
     <string name="post_scheduled">Чланак заказан</string>
@@ -1305,6 +1313,7 @@ Language: sr_RS
     <string name="photo_picker_choose_photo">Одабери фотографију са уређаја</string>
     <string name="media_insert_as_gallery">Додај као галерију</string>
     <string name="wp_media_title">Вордпресов садржај</string>
+    <string name="media_insert_individually">Додај индивидуално</string>
     <string name="media_insert_title">Додај више фотографија</string>
     <string name="media_gallery_column_count_multi">%d колоне</string>
     <string name="media_gallery_column_count_single">1 колона</string>
@@ -1446,6 +1455,7 @@ Language: sr_RS
     <string name="export_your_content">Извезите ваш садржај</string>
     <string name="exporting_content_progress">Извозим садржај…</string>
     <string name="show_purchases">Прикажи купљено</string>
+    <string name="checking_purchases">Провера куповина</string>
     <string name="premium_upgrades_title">Премијум унапређења</string>
     <string name="delete_site_progress">Бришем сајт…</string>
     <string name="delete_site_hint">Обриши сајт</string>

WordPress/src/main/res/values-zh-rCN/strings.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2021-07-14 00:36:17+0000
+Translation-Revision-Date: 2021-07-18 19:49:24+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/3.0.0-alpha.2
 Language: zh_CN
 -->
 <resources>
+    <string name="gutenberg_native_invalid_url_please_enter_a_valid_url">无效 URL。请输入有效 URL。</string>
+    <string name="gutenberg_native_embedded_content_from_s_can_t_be_viewed_in_the_mobile_editor_at_t">来自 %s 的嵌入内容目前无法在手机编辑器中查看。请预览该页面以查看嵌入内容。</string>
+    <string name="gutenberg_native_embed_caption_s">嵌入说明文字。%s</string>
+    <string name="gutenberg_native_embed_caption_empty">嵌入说明文字。空</string>
     <string name="gutenberg_native_add_link_0fcaed3b">添加链接</string>
+    <string name="activity_log_visit_our_documentation_page">访问我们的文档页面</string>
+    <string name="activity_log_multisite_message">多站点安装的 Jetpack Backup 只提供可下载的备份，没有一键还原。更多信息 %1$s。</string>
     <string name="blogging_reminders_tip_message">定期发布文章有助于留住读者以及吸引新访客访问您的站点。</string>
     <string name="blogging_reminders_tip">提示</string>
     <string name="blogging_reminders_select_days_message">您可以随时更新</string>

fastlane/Fastfile

@@ -66,7 +66,13 @@ ALL_LOCALES = [
   { glotpress: "kmr", android: "kmr", promo_config: false},
 ].freeze
 
-RELEASE_NOTES_LOCALES = ALL_LOCALES.reject { |h| h[:google_play].nil? }.map { |h| [h[:glotpress], h[:google_play]] }
+RELEASE_NOTES_LOCALES = ALL_LOCALES
+  .reject { |h| h[:google_play].nil? }
+  .map { |h| [h[:glotpress], h[:google_play]] }
+JP_RELEASE_NOTES_LOCALES = ALL_LOCALES
+  .reject { |h| h[:google_play].nil? }
+  .select { |h| %w[ar de-DE es-ES fr-FR iw-IL id it-IT ja-JP ko-KR nl-NL pt-BR ru-RU sv-SE tr-TR zh-CN zh-TW].include?(h[:google_play]) }
+  .map { |h| [h[:glotpress], h[:google_play]] }
 
 APP_SPECIFIC_VALUES = {
   wordpress: {
@@ -671,8 +677,13 @@ REPOSITORY_NAME="WordPress-Android"
   #####################################################################################
   desc "Downloads translated metadata from GlotPress"
   lane :download_metadata_strings do |options|
-    app = options[:app] || 'wordpress'
-    paths = APP_SPECIFIC_VALUES[app.to_sym]
+    download_wordpress_metadata_strings(options) unless options[:app] != 'wordpress'
+    download_jetpack_metadata_strings(options) unless options[:app] != 'jetpack'
+  end
+
+  desc "Downloads WordPress's translated metadata from GlotPress"
+  lane :download_wordpress_metadata_strings do |options|
+    app_values = APP_SPECIFIC_VALUES[:wordpress]
     values = options[:version].split('.')
     files = {
       "release_note_#{values[0]}#{values[1]}" => {desc: "changelogs/#{options[:build_number]}.txt", max_size: 500, alternate_key:"release_note_short_#{values[0]}#{values[1]}"},
@@ -681,24 +692,55 @@ REPOSITORY_NAME="WordPress-Android"
       play_store_app_title: {desc:"title.txt", max_size: 50}
     }
 
-    delete_old_changelogs(build: options[:build_number])
-    download_path = File.join(Dir.pwd, paths[:metadata_dir], 'android')
+    delete_old_changelogs(app: 'wordpress', build: options[:build_number])
+    download_path = File.join(Dir.pwd, app_values[:metadata_dir], 'android')
+    # The case for the source locale (en-US) is pulled in a hacky way, by having an {en-gb => en-US} mapping as part of the RELEASE_NOTES_LOCALES,
+    # which is then treated in a special way by gp_downloadmetadata by specifying a `source_locale: 'en-US'` to process it differently from the rest.
     gp_downloadmetadata(
-      project_url: paths[:gp_url],
+      project_url: app_values[:gp_url],
       target_files: files,
-      locales: RELEASE_NOTES_LOCALES, # Currently the same for WP and JP
+      locales: RELEASE_NOTES_LOCALES,
       source_locale: "en-US",
       download_path: download_path
     )
 
-    if app == 'jetpack'
-      # For WordPress, the en-US release notes come from what's downloaeded from GlotPress' en-gb locale.
-      # But for Jetpack, we don't have en-gb in its GP release note project, so copy from source instead as a fallback
-      FileUtils.cp(File.join(Dir.pwd, '..', 'WordPress', 'metadata', 'jetpack_release_notes.txt'), File.join(download_path, 'en-US', 'changelogs', "#{options[:build_number]}.txt"))
-    end
-
     android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: RELEASE_NOTES_LOCALES)
-    sh("git add #{download_path} && git commit -m \"Update #{app} metadata translations for #{options[:version]}\" && git push origin HEAD")
+    sh("git add #{download_path} && git commit -m \"Update WordPress metadata translations for #{options[:version]}\" && git push origin HEAD")
+  end
+
+  desc "Downloads Jetpack's translated metadata from GlotPress"
+  lane :download_jetpack_metadata_strings do |options|
+    UI.message("Hey")
+    app_values = APP_SPECIFIC_VALUES[:jetpack]
+    values = options[:version].split('.')
+    files = {
+      "release_note_#{values[0]}#{values[1]}" => {desc: "changelogs/#{options[:build_number]}.txt", max_size: 500, alternate_key:"release_note_short_#{values[0]}#{values[1]}"},
+      'short-description': {desc:"short_description.txt", max_size: 80},
+      'app-store-description': {desc:"full_description.txt", max_size: 0},
+      'app-store-name': {desc:"title.txt", max_size: 50}
+    }
+
+    delete_old_changelogs(app: 'jetpack', build: options[:build_number])
+    download_path = File.join(Dir.pwd, app_values[:metadata_dir], 'android')
+    gp_downloadmetadata(
+      project_url: app_values[:gp_url],
+      target_files: files,
+      locales: JP_RELEASE_NOTES_LOCALES,
+      download_path: download_path
+    )
+
+    # For WordPress, the en-US release notes come from using the source keys (instead of translations) downloaded from GlotPress' en-gb locale (which is unused otherwise).
+    # But for Jetpack, we don't have an unused locale like en-gb in the GP release notes project, so copy from source instead as a fallback
+    metadata_source_dir = File.join(Dir.pwd, '..', 'WordPress', 'jetpack_metadata')
+    FileUtils.cp(File.join(metadata_source_dir, 'release_notes.txt'), File.join(download_path, 'en-US', 'changelogs', "#{options[:build_number]}.txt"))
+    FileUtils.cp(
+      ['title.txt', 'short_description.txt', 'full_description.txt'].map { |f| File.join(metadata_source_dir, f) },
+      File.join(download_path, 'en-US')
+    )
+
+    locales_including_enUS = [['en-gb', 'en-US']] + JP_RELEASE_NOTES_LOCALES # first item (GlotPress locale) unused for this action; second param = google_play locale
+    android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: locales_including_enUS)
+    sh("git add #{download_path} && git commit -m \"Update Jetpack metadata translations for #{options[:version]}\" && git push origin HEAD")
   end
 
 ########################################################################
@@ -971,11 +1013,11 @@ REPOSITORY_NAME="WordPress-Android"
 #####################################################################################
 # Private lanes
 #####################################################################################
-  private_lane :delete_old_changelogs do | options |
-    Dir.glob("./metadata/android/*/").each do | folder |
-      Dir["#{folder}changelogs/*"].each do | file |
-        File.delete(file) if Integer(File.basename(file, ".*")) < Integer(options[:build]) rescue puts "Cannot delete file #{file}"
-      end
+  private_lane :delete_old_changelogs do |options|
+    app = options[:app] || 'wordpress'
+    app_values = APP_SPECIFIC_VALUES[app.to_sym]
+    Dir.glob(File.join(app_values[:metadata_dir], 'android', '*', 'changelogs', '*')).each do |file|
+      File.delete(file) if Integer(File.basename(file, ".*")) < Integer(options[:build]) rescue puts "Cannot delete file #{file}"
     end
   end
 

fastlane/jetpack_metadata/android/ar/full_description.txt

@@ -0,0 +1,9 @@
+احصل على أدوات الأمان والأداء الفعالة في متناول يديك بفضل Jetpack الخاص بنظام تشغيل Android.
+
+استعد موقعك من أي مكان إذا حدث خطأ ما. افحص بحثًا عن تهديدات وقم بإصلاحها بنقرة واحدة. راقب نشاط الموقع لمعرفة من غيَّر ماذا ومتى. راجع إحصاءاتك لمعرفة البلدان الجديدة التي يأتي منها الزائرون اليوم.
+
+يدعم التطبيق كذلك ميزات ووردبريس التي تتوقعها. يمكنك إنشاء مسودة من قصيدة شعرية وأنت جالس على الأريكة. التقط صورة وانشرها في فترة استراحتك لتناول الغداء. رد على تعليقاتك الأخيرة.
+
+يدعم Jetpack الخاص بنظام تشغيل Android مواقع ووردبريس التي تتضمن Jetpack تم تمكينه وحسابًا متصلاً بووردبريس.كوم.
+
+View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa.

fastlane/jetpack_metadata/android/ar/short_description.txt

@@ -0,0 +1 @@
+احصل على أدوات الأمان والأداء الفعالة في متناول يديك.

fastlane/jetpack_metadata/android/ar/title.txt

@@ -0,0 +1 @@
+Jetpack: أمان ووردبريس وسرعته

fastlane/jetpack_metadata/android/de-DE/full_description.txt

@@ -0,0 +1,9 @@
+Jetpack für Android bietet dir leistungsstarke Sicherheits- und Performance-Tools für deine Hosentasche.
+
+Stelle deine Website wieder her, wenn ein Problem auftritt. Prüfe auf Bedrohungen und entferne sie mit einmaligem Tippen. Bleibe auf dem Laufenden über die Website-Aktivität und sieh dir an, wer wann was geändert hat. Rufe deine Statistiken dazu ab, aus welchen neuen Ländern die heutigen Besucher kommen.
+
+Die App unterstützt darüber hinaus die von dir erwarteten WordPress-Funktionen. Entwirf ein spontanes Haiku auf der Couch. Schieße in deiner Mittagspause ein Foto und lade es gleich hoch. Antworte auf die neuesten Kommentare.
+
+Jetpack für Android unterstützt WordPress-Websites mit aktiviertem Jetpack und einem mit WordPress.com verbundenen Konto.
+
+View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa.

fastlane/jetpack_metadata/android/de-DE/short_description.txt

@@ -0,0 +1 @@
+Leistungsstarke Sicherheits- und Performance-Tools für deine Hosentasche.

fastlane/jetpack_metadata/android/de-DE/title.txt

@@ -0,0 +1 @@
+Jetpack: WP-Sicherheit und -Geschwindigkeit