Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 15.2 final to master #12431

Merged
merged 12 commits into from
Jul 13, 2020
Merged

Merge 15.2 final to master #12431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e4d7844
This tags action test had the VISIBILITY option instead of TAGS.
jd-alexander Jul 9, 2020
f38d389
removed the Visibility option from the Prepublishing bottom sheet
jd-alexander Jul 9, 2020
93abae2
lessened the minimum height required for the fragment container
jd-alexander Jul 9, 2020
84aeeea
Since there is one less option on home UI this test values are updated
jd-alexander Jul 9, 2020
05711b1
removed unused resources.
jd-alexander Jul 9, 2020
835e3e6
updated the minimum height for the bottom sheet's fragment container
jd-alexander Jul 10, 2020
9a822c9
Merge pull request #12409 from wordpress-mobile/issue-12404/remove_st…
jd-alexander Jul 10, 2020
ca452b3
Revert "Issue 12404/remove status and visibility option"
jd-alexander Jul 10, 2020
61ea3f7
Merge pull request #12423 from wordpress-mobile/revert-12409-issue-12…
jkmassel Jul 10, 2020
2eb659a
Updates translations
oguzkocer Jul 13, 2020
3524ee3
Bump version number
oguzkocer Jul 13, 2020
5335a44
Update metadata translations for 15.2
oguzkocer Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "15.2-rc-2"
versionName "15.2"
}
versionCode 888
versionCode 890
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
buildConfigField "boolean", "TENOR_AVAILABLE", "false"
buildConfigField "boolean", "READER_IMPROVEMENTS_PHASE_2", "false"
Expand Down
13 changes: 12 additions & 1 deletion WordPress/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2020-06-29 20:45:36+0000
Translation-Revision-Date: 2020-07-09 16:54:08+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
-->
<resources>
<string name="gutenberg_native_navigates_to_the_previous_content_sheet">التنقل إلى ورقة المحتوى السابقة</string>
<string name="gutenberg_native_navigates_to_customize_the_gradient">التنقل لتخصيص التدرج</string>
<string name="gutenberg_native_navigates_to_custom_color_picker">التنقل إلى منتقي اللون المخصص</string>
<string name="gutenberg_native_gradient_type">نوع التدرج</string>
<string name="gutenberg_native_double_tap_to_select_the_option">الضغط ضغطًا مزدوجًا لتحديد الخيار</string>
<string name="gutenberg_native_customize_gradient">تخصيص التدرج</string>
<string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
<string name="photo_picker_use_gif">استخدام تنسيق GIF هذا</string>
<string name="error_media_thumbnail_not_loaded">تعذر تحميل الصورة المصغَّرة للوسائط</string>
<string name="menu_content_info">هيكل المحتوى</string>
<string name="me">أنا</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m">نعمل بجد لإضافة المزيد من المكوِّنات مع كل إصدار. وفي هذه الأثناء، يمكنك أيضًا تحرير هذا المكوِّن باستخدام متصفح الويب في جهازك.</string>
<string name="gutenberg_native_edit_block_in_web_browser">تحرير المكوِّن في متصفح الويب</string>
<string name="prepublishing_tags_description">تساعد الوسوم على إخبار القراء بما تدور حوله المقالة.</string>
Expand Down
748 changes: 374 additions & 374 deletions WordPress/src/main/res/values-cs/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion WordPress/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2020-06-25 08:54:10+0000
Translation-Revision-Date: 2020-07-10 10:54:08+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0-alpha.2
Language: de
-->
<resources>
<string name="gutenberg_native_open_link_in_a_browser">Link in einem Browser öffnen</string>
<string name="gutenberg_native_navigates_to_the_previous_content_sheet">Navigiert zum vorherigen Content Sheet</string>
<string name="gutenberg_native_navigates_to_customize_the_gradient">Navigiert zum Anpassen des Verlaufs</string>
<string name="gutenberg_native_navigates_to_custom_color_picker">Navigiert zur individuellen Farbauswahl</string>
<string name="gutenberg_native_gradient_type">Verlaufstyp</string>
<string name="gutenberg_native_go_back">Zurück</string>
<string name="gutenberg_native_double_tap_to_select_the_option">Zum Auswählen der Option zweimal tippen</string>
<string name="gutenberg_native_customize_gradient">Verlauf anpassen</string>
<string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
<string name="pages_list_author">Seitenautor</string>
<string name="photo_picker_use_gif">Dieses GIF verwenden</string>
<string name="error_media_thumbnail_not_loaded">Medien-Vorschaubild konnte nicht geladen werden</string>
<string name="menu_content_info">Inhaltliche Struktur</string>
<string name="everyone">Jeder</string>
<string name="me">Ich</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m">Wir arbeiten intensiv daran, mit jeder Release mehr Blöcke hinzuzufügen. In der Zwischenzeit kannst du diesen Block auch über den Webbrowser deines Geräts bearbeiten.</string>
<string name="gutenberg_native_edit_block_in_web_browser">Block in Webbrowser bearbeiten</string>
<string name="gutenberg_native_dismiss">Verwerfen</string>
Expand Down
5 changes: 4 additions & 1 deletion WordPress/src/main/res/values-el/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2020-02-28 09:54:01+0000
Translation-Revision-Date: 2020-07-06 12:41:50+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0-alpha.2
Language: el_GR
Expand Down Expand Up @@ -37,6 +37,7 @@ Language: el_GR
<string name="gutenberg_native_link_inserted">Έγινε εισαγωγή συνδέσμου</string>
<string name="gutenberg_native_help_icon">Εικονίδιο βοήθειας</string>
<string name="gutenberg_native_content">Περιεχόμενο…</string>
<string name="post_list_tab_drafts">Προσχέδια</string>
<string name="plans_loading_error_network_title">Δεν υπάρχει σύνδεση</string>
<string name="quick_start_sites_type_customize">Προσαρμόστε τον ιστότοπο σας</string>
<string name="quick_start_sites">Επόμενα βήματα</string>
Expand Down Expand Up @@ -596,6 +597,7 @@ Language: el_GR
<string name="pending_draft_one_day_2">Το ξέρατε ότι το \'%1$s\' είναι ακόμα προσχέδιο; Δημοσιεύστε το!</string>
<string name="pending_draft_one_day_1">Κάνατε το προσχέδιο του \'%1$s\' χθες. Μην ξεχάσετε να το δημοσιεύσετε!</string>
<string name="reader_photo_by">Φωτογραφία από %s</string>
<string name="reader_label_visit">Επισκεφθείτε</string>
<string name="swipe_for_more">Σαρώστε για περισσότερα</string>
<string name="reader_err_get_post_not_authorized_signin_fallback">Δεν είστε εγκεκριμένος να δείτε αυτό το άρθρο. Προσπαθήστε να συνδεθείτε στο WordPress.com πρώτα ή χρησιμοποιήστε το κουμπί στην μπάρα ενεργειών για να ανοίξετε έναν περιηγητή.</string>
<string name="reader_err_get_post_not_authorized_signin">Δεν είστε εξουσιοδοτημένος να δείτε αυτό το άρθρο. Δοκιμάστε να συνδεθείτε στο WordPress.com πρώτα.</string>
Expand Down Expand Up @@ -1193,6 +1195,7 @@ Language: el_GR
<string name="reader_btn_unfollow">Ακολουθούν</string>
<string name="reader_btn_follow">Ακολουθήστε</string>
<string name="reader_btn_share">Μοιράσου</string>
<string name="reader_view_reblog">Αναμετάδοση</string>
<string name="reader_untitled_post">Ανώνυμο</string>
<string name="comments_empty_list">Κανένα σχόλιο.</string>
<string name="empty_list_default">Αυτή η λίστα είναι κενή</string>
Expand Down
26 changes: 13 additions & 13 deletions WordPress/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2020-07-01 13:16:03+0000
Translation-Revision-Date: 2020-07-06 10:21:43+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/3.0.0-alpha.2
Language: fr
Expand Down Expand Up @@ -451,11 +451,11 @@ Language: fr
<string name="post_waiting_for_connection_scheduled">Nous planifierons la publication de votre article lorsque votre appareil sera de nouveau connecté.</string>
<string name="post_waiting_for_connection_pending">Nous soumettrons votre article pour révision lorsque votre appareil sera de nouveau connecté.</string>
<string name="post_waiting_for_connection_publish">Nous publierons l\'article lorsque votre appareil sera de nouveau connecté.</string>
<string name="settings_username_changer_snackbar_cancel">Impossible d\'annuler cette action. Le nom d\'utilisateur a probablement déjà été mis à jour.</string>
<string name="settings_username_changer_toast_content">Votre nouveau nom d\'utilisateur est %1$s.</string>
<string name="settings_username_changer_progress_dialog">Enregistrement du nom d\'utilisateur en cours…</string>
<string name="settings_username_changer_confirm_dialog_positive_action">Modifier le nom d\'utilisateur</string>
<string name="settings_username_changer_confirm_dialog_content">Vous remplacez votre nom d\'utilisateur par %1$s%2$s%3$s. La modification de votre nom d\'utilisateur affectera également l\'adresse de vos profils Gravatar et Intense Debate. Validez votre nouveau nom d\'utilisateur pour continuer.</string>
<string name="settings_username_changer_snackbar_cancel">Impossible d\'annuler cette action. L’identifiant a probablement déjà été mis à jour.</string>
<string name="settings_username_changer_toast_content">Votre nouvel identifiant est %1$s.</string>
<string name="settings_username_changer_progress_dialog">Enregistrement de l’identifiant…</string>
<string name="settings_username_changer_confirm_dialog_positive_action">Changer l’identifiant</string>
<string name="settings_username_changer_confirm_dialog_content">Vous remplacez votre identifiant par %1$s%2$s%3$s. La modification de votre identifiant affectera également l\'adresse de vos profils Gravatar et Intense Debate. Validez votre nouvel identifiant pour continuer.</string>
<string name="settings_username_changer_confirm_dialog_title">Attention !</string>
<string name="settings_username_changer_header">Vous êtes sur le point de modifier votre identifiant actuel : %1$s%2$s%3$s. Vous ne pourrez pas réutiliser votre identifiant précédent.</string>
<string name="site_settings_jetpack_performance_settings_hint">Voir et modifier vos paramètres de performances Jetpack</string>
Expand Down Expand Up @@ -1203,10 +1203,10 @@ Language: fr
<string name="google_error_timeout">Google a mis trop longtemps à répondre. Vous devrez peut-être attendre de profiter d\'une meilleure connexion Internet.</string>
<string name="username_changer_title">Modifier l\'identifiant</string>
<string name="username_changer_hint">Appuyez pour obtenir plus de suggestions.</string>
<string name="username_changer_header">Votre nom d\'utilisateur actuel est %1$s%2$s%3$s. À quelques exceptions près, le nom que verront les autres utilisateurs est %4$s%5$s%6$s.</string>
<string name="username_changer_error_none">Aucun nom d\'utilisateur n\'est suggéré à partir de %1$s%2$s%3$s. Veuillez saisir d\'autres lettres ou chiffres pour obtenir des suggestions.</string>
<string name="username_changer_error_generic">Une erreur s\'est produite lors de la récupération des suggestions de nom d\'utilisateur.</string>
<string name="username_changer_dismiss_message">Annuler la modification du nom d\'utilisateur ?</string>
<string name="username_changer_header">Votre identifiant actuel est %1$s%2$s%3$s. À quelques exceptions près, le nom que verront les autres utilisateurs est %4$s%5$s%6$s.</string>
<string name="username_changer_error_none">Aucun identifiant n\'est suggéré depuis %1$s%2$s%3$s. Veuillez saisir d\'autres lettres ou chiffres pour obtenir des suggestions.</string>
<string name="username_changer_error_generic">Une erreur s\'est produite lors de la récupération des suggestions d’identifiant.</string>
<string name="username_changer_dismiss_message">Annuler la modification de l’identifiant ?</string>
<string name="username_changer_dismiss_button_positive">Supprimer</string>
<string name="username_changer_action">Enregistrer</string>
<string name="content_description_add_avatar">Ajouter un avatar</string>
Expand All @@ -1220,7 +1220,7 @@ Language: fr
<string name="signup_magic_link_error_button_positive">Réessayer</string>
<string name="signup_magic_link_error_button_negative">Fermer</string>
<string name="signup_magic_link_error">Une erreur s\'est produite lors de l’envoi de l\'e-mail. Vous pouvez recommencer maintenant ou fermer et réessayer ultérieurement.</string>
<string name="signup_epilogue_hint_username">Nom d\'utilisateur</string>
<string name="signup_epilogue_hint_username">Identifiant</string>
<string name="signup_epilogue_hint_password_detail">Vous pouvez toujours vous connecter avec un lien de connexion sans mot de passe comme celui que vous venez d\'utiliser. Vous pouvez également définir un mot de passe si vous le préférez.</string>
<string name="signup_epilogue_hint_password">Mot de passe (facultatif)</string>
<string name="signup_epilogue_hint_display">Nom affiché</string>
Expand All @@ -1232,7 +1232,7 @@ Language: fr
<string name="signup_email_header">Pour créer votre nouveau compte WordPress.com, veuillez saisir votre adresse e-mail.</string>
<string name="signup_email_error_generic">Une erreur s\'est produite lors de la vérification de l\'adresse e-mail.</string>
<string name="sign_up">S\'inscrire sur WordPress.com</string>
<string name="enter_username_instead">Connectez-vous avec votre nom d\'utilisateur.</string>
<string name="enter_username_instead">Connectez-vous avec votre identifiant.</string>
<string name="enter_site_address_instead">Connectez-vous en saisissant l\'adresse de votre site.</string>
<string name="plugin_needs_update">Mise à jour nécessaire</string>
<string name="plugin_caption_search">Chercher parmi les extensions</string>
Expand Down Expand Up @@ -1448,7 +1448,7 @@ Language: fr
<string name="login_logged_in_as">Connecté·e en tant que</string>
<string name="login_email_client_not_found">Aucune application de messagerie détectée</string>
<string name="login_empty_2fa">Veuillez saisir votre code de vérification</string>
<string name="login_empty_username">Veuillez saisir un nom d’utilisateur</string>
<string name="login_empty_username">Veuillez saisir un identifiant</string>
<string name="login_log_in_for_deeplink">Connectez-vous à WordPress.com pour accéder à l’article.</string>
<string name="login_error_while_adding_site">Erreur lors de l’ajout du site. Code erreur : %s</string>
<string name="login_checking_site_address">Vérification de l’adresse du site</string>
Expand Down
17 changes: 16 additions & 1 deletion WordPress/src/main/res/values-he/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2020-06-25 10:54:10+0000
Translation-Revision-Date: 2020-07-09 08:54:09+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0-alpha.2
Language: he_IL
-->
<resources>
<string name="gutenberg_native_open_link_in_a_browser">לפתוח את הקישור בדפדפן</string>
<string name="gutenberg_native_navigates_to_the_previous_content_sheet">הפעולה מנווטת אל גיליון התוכן הקודם</string>
<string name="gutenberg_native_navigates_to_customize_the_gradient">הפעולה מנווטת אל האפשרות להתאים את מעבר הצבע</string>
<string name="gutenberg_native_navigates_to_custom_color_picker">הפעולה מנווטת אל בורר הצבע המותאם</string>
<string name="gutenberg_native_gradient_type">סוג מעבר צבע</string>
<string name="gutenberg_native_go_back">חזרה</string>
<string name="gutenberg_native_double_tap_to_select_the_option">יש להקיש פעמיים כדי לבחור את האפשרות</string>
<string name="gutenberg_native_customize_gradient">להתאים אישית את מעבר הצבע</string>
<string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
<string name="pages_list_author">מחבר העמוד</string>
<string name="photo_picker_use_gif">להשתמש בקובץ GIF זה</string>
<string name="error_media_thumbnail_not_loaded">לא ניתן לטעון את התמונה הממוזערת של המדיה</string>
<string name="menu_content_info">מבנה התוכן</string>
<string name="everyone">כולם</string>
<string name="me">אני</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m">אנחנו משתדלים להוסיף עוד בלוקים בכל גרסה שמתפרסמת. בינתיים, אפשר גם לערוך את הבלוק הזה באמצעות הדפדפן במכשיר שלך.</string>
<string name="gutenberg_native_edit_block_in_web_browser">לערוך את הבלוק בדפדפן הרשת</string>
<string name="gutenberg_native_dismiss">ביטול</string>
Expand Down
17 changes: 16 additions & 1 deletion WordPress/src/main/res/values-id/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2020-06-26 08:54:10+0000
Translation-Revision-Date: 2020-07-09 17:54:08+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/3.0.0-alpha.2
Language: id
-->
<resources>
<string name="gutenberg_native_open_link_in_a_browser">Buka tautan pada perambah</string>
<string name="gutenberg_native_navigates_to_the_previous_content_sheet">Navigasi ke halaman konten sebelumnya</string>
<string name="gutenberg_native_navigates_to_customize_the_gradient">Navigasi untuk mengustomisasi gradien</string>
<string name="gutenberg_native_navigates_to_custom_color_picker">Navigasi untuk mengustomisasi pemilih warna</string>
<string name="gutenberg_native_gradient_type">Jenis Gradasi</string>
<string name="gutenberg_native_go_back">Kembali</string>
<string name="gutenberg_native_double_tap_to_select_the_option">Ketuk dua kali untuk memilih opsi</string>
<string name="gutenberg_native_customize_gradient">Kustomisasi Gradasi</string>
<string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
<string name="pages_list_author">Pembuat halaman</string>
<string name="photo_picker_use_gif">Gunakan GIF ini</string>
<string name="error_media_thumbnail_not_loaded">Thumbnail media tidak dapat dimuat</string>
<string name="menu_content_info">Struktur konten</string>
<string name="everyone">Setiap Orang</string>
<string name="me">Saya</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m">Kami berusaha keras untuk menambahkan banyak blok setiap rilis. Sementara itu, Anda juga dapat mengedit blok ini menggunakan web browser perangkat Anda.</string>
<string name="gutenberg_native_edit_block_in_web_browser">Edit blok di browser web</string>
<string name="gutenberg_native_dismiss">Tutup</string>
Expand Down
Loading