Skip to content

Commit

Permalink
Merge pull request #10221 from wordpress-mobile/release/12.8
Browse files Browse the repository at this point in the history 
Merge Release/12.8 into Master
  • Loading branch information
@loremattei
loremattei authored Jul 15, 2019
2 parents 15128c7 + 07ca792 commit a8abd4c
Show file tree
Hide file tree
Showing 27 changed files with 664 additions and 64 deletions.
4 changes: 2 additions & 2 deletions WordPress/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ android {
productFlavors {
vanilla { // used for release and beta
dimension "buildType"
versionName "12.8-rc-3"
versionCode 750
versionName "12.8"
versionCode 752
}

zalpha { // alpha version - enable experimental features
Expand Down
37 changes: 33 additions & 4 deletions WordPress/src/main/res/values-ar/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2019-06-23 06:22:36+0000
Translation-Revision-Date: 2019-07-11 21:17:12+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/2.4.0-alpha
Language: ar
-->
<resources>
<string name="post_list_search_prompt">بحث في المقالات المنشورة</string>
<string name="stats_widget_error_no_access_token">لعرض إحصائياتك، سجّل الدخول إلى حساب WordPress.com.</string>
<string name="post_list_search_nothing_found">لا تتطابق أي مقالة مع بحثك</string>
<string name="domains_suggestions_intro_description">هذا هو المكان الذي سيجده الأشخاص على الإنترنت.</string>
<string name="domains_suggestions_intro_title">اختيار اسم نطاق متميز</string>
<string name="my_site_custom_domain_name">تتضمن جميع خطط WordPress.com اسم نطاق مخصص. سجّل نطاقك المميز المجاني الآن.</string>
<string name="stats_widget_minified_name">نبذة سريعة</string>
<string name="stats_widget_today_insights_name">اليوم</string>
<string name="stats_widget_all_time_insights_name">كل الوقت</string>
<string name="stats_widget_weekly_views_name">المشاهدات هذا الأسبوع</string>
<string name="stats_widget_log_in_message">الرجاء تسجيل الدخول إلى تطبيق ووردبريس لإضافة ودجت.</string>
<string name="stats_widget_error_no_network">لا توجد شبكة متاحة</string>
<string name="stats_widget_error_no_data">لا يمكن تحميل البيانات</string>
<string name="stats_widget_select_type">النوع</string>
<string name="stats_widget_select_color">اللون</string>
<string name="stats_widget_select_your_site">تحديد الموقع الخاص بك</string>
<string name="stats_widget_color_dark">داكن</string>
<string name="stats_widget_color_light">فاتح</string>
<string name="stats_widget_color">اللون</string>
<string name="stats_widget_site_caption">تحديد الموقع الخاص بك</string>
<string name="stats_widget_site">الموقع</string>
<string name="stats_widget_all_time_title">كل الوقت</string>
<string name="stats_widget_views_title">المشاهدات هذا الأسبوع</string>
<string name="stats_widget_add">أضف الودجت</string>
<string name="dialog_confirm_update_yes">تحديث الآن</string>
<string name="dialog_confirm_update_message_page">سيتم تحديث هذه الصفحة المنشورة فورًا.</string>
<string name="dialog_confirm_update_message_post">سيتم تحديث هذه المقالة المنشورة فورًا.</string>
<string name="dialog_confirm_update_title">مستعد للتحديث؟</string>
<string name="plugin_fetching_error_after_at">استغرق تحديث تفاصيل الإضافة وقتًا أطول من المعتاد. يرجى التحقق مرة أخرى لاحقًا.</string>
<string name="plugin_install_site_ineligible_default_error">إذا قمت للتو بتسجيل اسم نطاق، فيرجى الانتظار حتى ننتهي من إعداده ومن ثم المحاولة مرة أخرى.\n\nإذا لم يكن الأمر كذلك، يبدو أنه حدث خطأ ما وقد لا تكون ميزة الإضافة متاحة لهذا الموقع.</string>
<string name="domain_contact_information_state_not_available_hint">الحالة (غير متوفرة)</string>
<string name="domain_registration_privacy_protection_tos">من خلال تسجيل هذا النطاق فإنك توافق على%1$sالشروط والأحكام%2$s</string>
<string name="error_network_connection">تحقق من اتصال الشبكة وحاول مرة أخرى.</string>
Expand Down Expand Up @@ -63,7 +93,7 @@ Language: ar
<string name="stats_insights_management_title">لن ترى إلا الإحصاءات الأكثر أهمية. أضف الرؤى الخاصة بك ونظِّمها أدناه.</string>
<string name="stats_insights_social">اجتماعي</string>
<string name="stats_insights_annual_site_stats">إحصاءات الموقع السنوية</string>
<string name="stats_view_follower_totals">إجماليات المتابعين</string>
<string name="stats_view_follower_totals">مجموع المتابعين</string>
<string name="domain_suggestions_fetch_error">تعذّر تحميل اقتراحات النطاق</string>
<string name="domain_suggestions_search_hint">كتابة كلمة مفتاحية للحصول على مزيد من الأفكار</string>
<string name="domains_suggestions_empty_list">لم يتم العثور على أي اقتراحات</string>
Expand Down Expand Up @@ -559,7 +589,6 @@ Language: ar
<string name="plugin_install_site_ineligible_site_private">تتطلب ميزة المكوّن الإضافي أن يكون الموقع عامًا.</string>
<string name="plugin_install_site_ineligible_no_business_plan">تتطلب ميزة المكوّن الإضافي باقة الشركات.</string>
<string name="plugin_install_site_ineligible_not_using_custom_domain">تتطلب ميزة المكوّن الإضافي نطاقًا مخصصًا.</string>
<string name="plugin_install_site_ineligible_default_error">مميزات الإضافة غير متاحة لهذا الموقع.</string>
<string name="plugin_install_first_plugin_almost_finished_dialog_message">نقوم بالإعداد النهائي — انتهينا تقريبًا…</string>
<string name="plugin_install_first_plugin_progress_dialog_message">جاري تثبيت الإضافة…</string>
<string name="plugin_install_first_plugin_confirmation_dialog_install_btn">تثبيت</string>
Expand Down Expand Up @@ -1989,7 +2018,7 @@ Language: ar
<string name="post_content">المحتوى (انقر لإضافة نص ووسائط)</string>
<string name="incorrect_credentials">اسم المستخدم و/أو كلمة المرور غير صحيحين.</string>
<string name="log_in">تسجيل الدخول</string>
<string name="username">إسم المستخدم</string>
<string name="username">اسم المستخدم</string>
<string name="password">كلمة المرور</string>
<string name="reader">القارئ</string>
<string name="anonymous">مجهول</string>
Expand Down
7 changes: 3 additions & 4 deletions WordPress/src/main/res/values-cs/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2019-06-19 18:45:13+0000
Translation-Revision-Date: 2019-07-02 09:08:46+0000
Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;
Generator: GlotPress/2.4.0-alpha
Language: cs_CZ
Expand All @@ -18,13 +18,13 @@ Language: cs_CZ
<string name="domain_contact_information_address_hint_two">Adresa 2</string>
<string name="domain_contact_information_address_hint">Adresa</string>
<string name="domain_contact_information_country_hint">Země</string>
<string name="domain_contact_information_country_code_hint">Předvolba země.</string>
<string name="domain_contact_information_country_code_hint">Předvolba země</string>
<string name="domain_contact_information_phone_number_hint">Telefon</string>
<string name="domain_contact_information_organization_hint">Organizace (volitelné)</string>
<string name="stats_management_new">Nový</string>
<string name="stats_management_edit">Upravit</string>
<string name="stats_management_dismiss_insights_news_card">Skrýt</string>
<string name="stats_management_try_it_now">Zkusit teď</string>
<string name="stats_management_try_it_now">Vyzkoušet</string>
<string name="post_list_drafts">Koncepty</string>
<string name="post_list_published">Publikováno</string>
<string name="post_list_author_everyone">Všichni</string>
Expand Down Expand Up @@ -373,7 +373,6 @@ Language: cs_CZ
<string name="plugin_install_site_ineligible_site_private">Funkce pluginu vyžaduje, aby byl web veřejný.</string>
<string name="plugin_install_site_ineligible_no_business_plan">Funkce pluginu vyžaduje business plán.</string>
<string name="plugin_install_site_ineligible_not_using_custom_domain">Funkce pluginu vyžaduje vlastní doménu.</string>
<string name="plugin_install_site_ineligible_default_error">If you just registered a domain name, please wait until we finish setting it up and try again.\n\nIf not, looks like something went wrong and plugin feature might not be available for this site.</string>
<string name="plugin_install_first_plugin_almost_finished_dialog_message">Dokončujeme finální nastavení - téměř hotovo…</string>
<string name="plugin_install_first_plugin_progress_dialog_message">Instaluji plugin…</string>
<string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Instalovat</string>
Expand Down
35 changes: 32 additions & 3 deletions WordPress/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2019-06-19 10:36:48+0000
Translation-Revision-Date: 2019-07-10 00:54:05+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: de
-->
<resources>
<string name="post_list_search_prompt">Veröffentlichte Beiträge suchen</string>
<string name="stats_widget_error_no_access_token">Um deine Statistiken anzuzeigen, melde dich beim WordPress.com-Konto an.</string>
<string name="post_list_search_nothing_found">Es gibt keine Beiträge, die deiner Suche entsprechen</string>
<string name="domains_suggestions_intro_description">Hier finden dich andere im Internet.</string>
<string name="domains_suggestions_intro_title">Wähle einen Premium-Domainnamen</string>
<string name="my_site_custom_domain_name">Alle Pläne auf WordPress.com enthalten einen eigenen Domainnamen. Registriere dir jetzt deine kostenlose Domain.</string>
<string name="stats_widget_minified_name">Auf einen Blick</string>
<string name="stats_widget_today_insights_name">Heute</string>
<string name="stats_widget_all_time_insights_name">Gesamter Zeitraum</string>
<string name="stats_widget_weekly_views_name">Aufrufe diese Woche</string>
<string name="stats_widget_log_in_message">Bitte melde dich an, um ein Widget hinzuzufügen.</string>
<string name="stats_widget_error_no_network">Kein Netzwerk verfügbar</string>
<string name="stats_widget_error_no_data">Daten konnten nicht geladen werden</string>
<string name="stats_widget_select_type">Art</string>
<string name="stats_widget_select_color">Farbe</string>
<string name="stats_widget_select_your_site">Wähle deine Website</string>
<string name="stats_widget_color_dark">Dunkel</string>
<string name="stats_widget_color_light">Hell</string>
<string name="stats_widget_color">Farbe</string>
<string name="stats_widget_site_caption">Wähle deine Website</string>
<string name="stats_widget_site">Website</string>
<string name="stats_widget_all_time_title">Gesamter Zeitraum</string>
<string name="stats_widget_views_title">Aufrufe dieser Woche</string>
<string name="stats_widget_add">Widget hinzufügen</string>
<string name="dialog_confirm_update_yes">Jetzt aktualisieren</string>
<string name="dialog_confirm_update_message_page">Die veröffentlichte Seite wird sofort aktualisiert.</string>
<string name="dialog_confirm_update_message_post">Der veröffentlichte Beitrag wird sofort aktualisiert.</string>
<string name="dialog_confirm_update_title">Bereit für die Aktualisierung?</string>
<string name="plugin_fetching_error_after_at">Es dauert länger als üblich, die Details des Plugins zu aktualisieren. Bitte versuche es später noch einmal.</string>
<string name="plugin_install_site_ineligible_default_error">Falls du kürzlich einen Domainnamen registriert hast, warte bitte ab, bis diese fertig eingerichtet ist und probiere es noch einmal.\n\nFalls nicht, scheint etwas schiefgegangen zu sein und die Plugin-Funktion ist möglicherweise für diese Website nicht verfügbar.</string>
<string name="domain_contact_information_state_not_available_hint">Status (nicht verfügbar)</string>
<string name="domain_registration_privacy_protection_tos">By registering this domain you agree to our %1$sBestimmungen und Konditionen%2$s</string>
<string name="domain_registration_privacy_protection_tos">Mit der Registrierung dieser Domain stimmst du unseren %1$sBestimmungen und Konditionen%2$s zu</string>
<string name="error_network_connection">Prüfe deine Netzwerkverbindung und versuche es erneut.</string>
<string name="error_browser_no_network">Diese Seite kann gerade nicht geladen werden.</string>
<string name="error_disabled_apis">Die Einstellungen konnten nicht abgerufen werden: Einige APIs sind für diese OAuth-App-ID + Konto-Kombination nicht verfügbar.</string>
Expand Down Expand Up @@ -559,7 +589,6 @@ Language: de
<string name="plugin_install_site_ineligible_site_private">Für das Plugin-Feature muss die Website öffentlich sein.</string>
<string name="plugin_install_site_ineligible_no_business_plan">Für das Plugin-Feature ist ein Business-Tarif erforderlich.</string>
<string name="plugin_install_site_ineligible_not_using_custom_domain">Für das Plugin-Feature ist eine individuelle Domain erforderlich.</string>
<string name="plugin_install_site_ineligible_default_error">If you just registered a domain name, please wait until we finish setting it up and try again.\n\nIf not, looks like something went wrong and plugin feature might not be available for this site.</string>
<string name="plugin_install_first_plugin_almost_finished_dialog_message">Die finale Einrichtung läuft – fast fertig …</string>
<string name="plugin_install_first_plugin_progress_dialog_message">Plugin wird installiert …</string>
<string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Installieren</string>
Expand Down
33 changes: 31 additions & 2 deletions WordPress/src/main/res/values-en-rAU/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2019-06-20 06:01:18+0000
Translation-Revision-Date: 2019-07-09 22:35:21+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: en_AU
-->
<resources>
<string name="post_list_search_prompt">Search published posts</string>
<string name="stats_widget_error_no_access_token">To view your stats, log in to the WordPress.com account.</string>
<string name="post_list_search_nothing_found">No posts matching your search</string>
<string name="domains_suggestions_intro_description">This is where people will find you on the internet.</string>
<string name="domains_suggestions_intro_title">Choose a premium domain name</string>
<string name="my_site_custom_domain_name">All WordPress.com plans include a custom domain name. Register your free premium domain now.</string>
<string name="stats_widget_minified_name">At a glance</string>
<string name="stats_widget_today_insights_name">Today</string>
<string name="stats_widget_all_time_insights_name">All-time</string>
<string name="stats_widget_weekly_views_name">Views this week</string>
<string name="stats_widget_log_in_message">Please log in to the WordPress app to add a widget.</string>
<string name="stats_widget_error_no_network">No network available</string>
<string name="stats_widget_error_no_data">Couldn\'t load data</string>
<string name="stats_widget_select_type">Type</string>
<string name="stats_widget_select_color">Colour</string>
<string name="stats_widget_select_your_site">Select your site</string>
<string name="stats_widget_color_dark">Dark</string>
<string name="stats_widget_color_light">Light</string>
<string name="stats_widget_color">Colour</string>
<string name="stats_widget_site_caption">Select your site</string>
<string name="stats_widget_site">Site</string>
<string name="stats_widget_all_time_title">All-time</string>
<string name="stats_widget_views_title">Views This Week</string>
<string name="stats_widget_add">Add widget</string>
<string name="dialog_confirm_update_yes">Update now</string>
<string name="dialog_confirm_update_message_page">This published page will be updated immediately.</string>
<string name="dialog_confirm_update_message_post">This published post will be updated immediately.</string>
<string name="dialog_confirm_update_title">Ready to Update?</string>
<string name="plugin_fetching_error_after_at">It takes longer than usual to refresh plugin details. Please check again later.</string>
<string name="plugin_install_site_ineligible_default_error">If you just registered a domain name, please wait until we finish setting it up and try again.\n\nIf not, looks like something went wrong and plugin feature might not be available for this site.</string>
<string name="domain_contact_information_state_not_available_hint">State (Not Available)</string>
<string name="domain_registration_privacy_protection_tos">By registering this domain you agree to our %1$sterms and conditions%2$s</string>
<string name="error_network_connection">Check your network connection and try again.</string>
Expand Down Expand Up @@ -559,7 +589,6 @@ Language: en_AU
<string name="plugin_install_site_ineligible_site_private">Plugin feature requires the site to be public.</string>
<string name="plugin_install_site_ineligible_no_business_plan">Plugin feature requires a business plan.</string>
<string name="plugin_install_site_ineligible_not_using_custom_domain">Plugin feature requires a custom domain.</string>
<string name="plugin_install_site_ineligible_default_error">If you just registered a domain name, please wait until we finish setting it up and try again.\n\nIf not, looks like something went wrong and plugin feature might not be available for this site.</string>
<string name="plugin_install_first_plugin_almost_finished_dialog_message">We\'re doing the final setup — almost done…</string>
<string name="plugin_install_first_plugin_progress_dialog_message">Installing plugin…</string>
<string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Install</string>
Expand Down
Loading

0 comments on commit a8abd4c

Please sign in to comment.