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 release/12.1 into develop #9537

Merged
merged 10 commits into from
Apr 8, 2019
Merged

Merge release/12.1 into develop #9537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d84d43b
12.1-rc-4 / 702 version bump
jtreanor Apr 5, 2019
d665ac9
fixed merge cherry-pick conflict
marecar3 Apr 5, 2019
d4cec01
fixed merge conflict
marecar3 Apr 5, 2019
7cf3d94
removed unnecessary onSaveInstanceState method
mzorz Apr 6, 2019
e7f5aa7
Merge pull request #9524 from wordpress-mobile/merge/fix-images-priva…
mzorz Apr 6, 2019
9ae9024
Log the content of the editor (when privacy conditions are met) in ca…
daniloercoli Apr 8, 2019
047fbdd
Merge pull request #9535 from wordpress-mobile/issue/805-Take-2-Aztec…
jtreanor Apr 8, 2019
b64445e
Merge remote-tracking branch 'origin/develop' into merge-release/12.1…
jtreanor Apr 8, 2019
ba65799
Update translations for 12.1 release
jtreanor Apr 8, 2019
3783490
Merge branch 'release/12.1' into merge-release/12.1-develop
jtreanor Apr 8, 2019
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
18 changes: 15 additions & 3 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,9 +596,21 @@ private void initializePostObject() {
mOriginalPostHadLocalChangesOnOpen = mOriginalPost.isLocallyChanged();
mPost = UploadService.updatePostWithCurrentlyCompletedUploads(mPost);
if (mShowAztecEditor) {
mMediaMarkedUploadingOnStartIds =
AztecEditorFragment.getMediaMarkedUploadingInPostContent(this, mPost.getContent());
Collections.sort(mMediaMarkedUploadingOnStartIds);
try {
mMediaMarkedUploadingOnStartIds =
AztecEditorFragment.getMediaMarkedUploadingInPostContent(this, mPost.getContent());
Collections.sort(mMediaMarkedUploadingOnStartIds);
} catch (NumberFormatException err) {
// see: https://github.com/wordpress-mobile/AztecEditor-Android/issues/805
if (getSite() != null && getSite().isWPCom() && !getSite().isPrivate()
&& TextUtils.isEmpty(mPost.getPassword())
&& !PostStatus.PRIVATE.toString().equals(mPost.getStatus())) {
AppLog.e(T.EDITOR, "There was an error initializing post object!");
AppLog.e(AppLog.T.EDITOR, "HTML content of the post before the crash:");
AppLog.e(AppLog.T.EDITOR, mPost.getContent());
throw err;
}
}
}
mIsPage = mPost.isPage();

Expand Down
124 changes: 69 additions & 55 deletions WordPress/src/main/res/values-ar/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

131 changes: 130 additions & 1 deletion WordPress/src/main/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Translation-Revision-Date: 2019-03-08 10:07:14+0000
Translation-Revision-Date: 2019-04-01 15:55: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
-->
<resources>
<string name="new_site_creation_preview_subtitle">Později budete moci přizpůsobit zobrazení a vzhled svých stránek</string>
<string name="publish_on">Publikovat na: %s</string>
<string name="schedule_for">Naplánováno na: %s</string>
<string name="published_on">Publikováno na: %s</string>
<string name="scheduled_for">Naplánováno na: %s</string>
<string name="stats_detail_recent_weeks">Nedávné týdny</string>
<string name="stats_detail_average_views_per_day">Průměrné zobrazení za den</string>
<string name="stats_months_and_years_views_label">Zobrazení</string>
<string name="stats_months_and_years_period_label">Doba</string>
<string name="stats_detail_months_and_years">Měsíce a roky</string>
<string name="stats_insights_load_more">Zobrazit více</string>
<string name="stats_insights_today_stats">Dnes</string>
<string name="stats_insights_best_hour">Nejlepší hodiny</string>
<string name="stats_insights_best_day">Nejlepší den</string>
<string name="showing_stats_for">Zobrazeny statistiky pro:</string>
<string name="app_rating_rate_never">Děkuji nechci</string>
<string name="app_rating_rate_later">Později</string>
<string name="app_rating_rate_now">Ohodnotit teď</string>
<string name="app_rating_message">Nice to see you again! If you’re digging the app, we’d love a rating on the Google Play Store.</string>
<string name="app_rating_title">Enjoying WordPress?</string>
<string name="editor_post_converted_back_to_draft">Příspěvek byl převeden zpět na koncept</string>
<string name="stats_insights_posting_activity">Aktivita publikování</string>
<string name="stats_site_not_loaded_yet">Stránka dosud nenačtena</string>
<string name="stats_more_posts">Více příspěvků</string>
<string name="stats_fewer_posts">Méně příspěvků</string>
<string name="gutenberg_mobile_src_block_management_inline_toolbar_index_js_66">Odstranit obsah</string>
<string name="gutenberg_mobile_src_block_management_inline_toolbar_index_js_55">Posunout blok dolů</string>
<string name="gutenberg_mobile_src_block_management_inline_toolbar_index_js_48">Posunout blok nahoru</string>
<string name="gutenberg_mobile_src_block_management_block_manager_js_285">PŘIDAT TADY BLOK</string>
<string name="gutenberg_mobile_src_block_types_unsupported_block_edit_js_27">Nepodporováno</string>
<string name="gutenberg_mobile_src_block_types_unsupported_block_index_js_23">Nepodporovaný typ bloku.</string>
<string name="gutenberg_mobile_src_block_types_unsupported_block_index_js_21">Nepodporovaný blok</string>
<string name="gutenberg_mobile_gutenberg_packages_editor_src_components_url_input_index_native_js_27">Vložte adresu URL</string>
<string name="gutenberg_mobile_gutenberg_packages_editor_src_components_media_placeholder_index_native_js_26">ZVOLIT OBRÁZEK</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_image_edit_native_js_374">Vložení média se nezdařilo .\nKlepněte na nastavení.</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_image_edit_native_js_280">Vymazat všechna nastavení</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_image_edit_native_js_273">Zarovnání textu</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_image_edit_native_js_198">WordPress knihovna médií</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_image_edit_native_js_197">Vyfoť</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_image_edit_native_js_196">Vyberte si ze zařízení</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_paragraph_edit_native_js_128">Začněte psát…</string>
<string name="gutenberg_mobile_gutenberg_packages_format_library_src_link_modal_native_js_152">Odebrat odkaz</string>
<string name="gutenberg_mobile_gutenberg_packages_format_library_src_link_modal_native_js_138">Přidat text odkazu</string>
<string name="gutenberg_mobile_gutenberg_packages_format_library_src_link_modal_native_js_136">Text odkazu</string>
<string name="gutenberg_mobile_gutenberg_packages_block_library_src_image_edit_native_js_214">Přidat URL</string>
<string name="gutenberg_mobile_gutenberg_packages_format_library_src_link_modal_native_js_101">Odkaz vložen</string>
<string name="new_site_creation_preview_back_pressed_warning">Můžete ztratit svůj pokrok. Opravdu chcete skončit?</string>
<string name="plans_loading_error_with_cache_button">Zobrazit plány stejně</string>
<string name="site_settings_gutenberg_default_for_new_posts">Použijte Editor bloků</string>
<string name="exit">exit</string>
<string name="stats_traffic_change">%1$s (%2$s%%)</string>
<string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
<string name="new_site_creation_screen_title_step_count">%1$d z %2$d</string>
<string name="new_site_creation_screen_title_general">Vytvořit webovou stránku</string>
<string name="preference_strip_image_location">Odstranit polohu z médií</string>
<string name="giphy_powered_by_giphy">Powered by GIPHY</string>
<string name="giphy_picker_search_hint">Prohledat Giphy</string>
<string name="photo_picker_giphy">Zvolit z Giphy</string>
<string name="stats_author_views_label">Zobrazení</string>
<string name="stats_author_label">Autor</string>
<string name="stats_authors">Autoři</string>
<string name="stats_search_terms_views_label">Zobrazení</string>
<string name="stats_search_terms_label">Hledaný výraz</string>
<string name="stats_search_terms">Hledaný výrazy</string>
<string name="stats_videos_views_label">Zobrazení</string>
<string name="stats_videos_title_label">Název</string>
<string name="stats_videos">Videa</string>
<string name="stats_country_views_label">Zobrazení</string>
<string name="stats_country_label">Země</string>
<string name="stats_countries">Země</string>
<string name="stats_clicks_label">Kliknutí</string>
<string name="stats_clicks_link_label">Odkaz</string>
<string name="stats_clicks">Kliknutí</string>
<string name="stats_referrer_views_label">Zobrazení</string>
<string name="stats_referrer_label">Referrer</string>
<string name="stats_referrers">Referrers</string>
<string name="stats_posts_and_pages">Příspěvky a Stránky</string>
<string name="stats_insights_path">Cesta</string>
<string name="stats_insights_linkedin">LinkedIn</string>
<string name="stats_insights_google_plus">Google+</string>
<string name="stats_insights_tumblr">Tumblr</string>
<string name="stats_insights_twitter">Twitter</string>
<string name="stats_insights_facebook">Facebook</string>
<string name="stats_insights_view_more">Zobrazit více</string>
<string name="stats_insights_share_post">Sdílet příspěvek</string>
<string name="stats_insights_create_post">Vytvořit příspěvek</string>
<string name="stats_insights_tags_and_categories">Štítky a Rubriky</string>
<string name="stats_insights_all_time_stats">Pořád</string>
<string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
<string name="stats_publicize_followers_label">Fanoušci</string>
<string name="stats_publicize_service_label">Služba</string>
<string name="stats_category_folded_name">%1$s | %2$s</string>
<string name="stats_tags_and_categories_views_label">Zobrazení</string>
<string name="stats_tags_and_categories_title_label">Název</string>
<string name="stats_posts_and_pages_views_label">Zobrazení</string>
<string name="stats_posts_and_pages_title_label">Název</string>
<string name="stats_comments_label">Komentáře</string>
<string name="stats_comments_title_label">Název</string>
<string name="stats_comments_author_label">Autor</string>
<string name="stats_comments_posts_and_pages">Příspěvky a stránky</string>
<string name="stats_comments_authors">Autoři</string>
<string name="stats_follower_since_label">Od té doby</string>
<string name="stats_follower_label">Fanoušek</string>
<string name="stats_followers_count_message">Celkem %1$s fanoušků: %2$s</string>
<string name="stats_followers_email">Email</string>
<string name="stats_followers_wordpress_com">WordPress.com</string>
<string name="stats_button_manage_insights">Správa přehledů</string>
<string name="stats_no_data_yet">Zatím žádná data</string>
<string name="menu_debug">Debug Menu</string>
<string name="change_password_dialog_message">Změna hesla…</string>
<string name="change_password_dialog_hint">Heslo musí mít alespoň 6 znaků. Pro zvýšení bezpečnosti použijte kombinaci malých a velkých písmen a speciálních znaků ! \" ? $ % ^ &amp; ).</string>
<string name="change_password">Změnit heslo</string>
<string name="support_identity_input_dialog_name_label">Jméno</string>
<string name="history_no_title">(žádný název)</string>
<string name="history_preview_html">HTML náhled</string>
<string name="history_preview_visual">Náhled</string>
<string name="history_detail_title">Revize</string>
Expand Down Expand Up @@ -37,6 +148,7 @@ Language: cs_CZ
<string name="async_promo_title_schedule">Plánujte bez starostí</string>
<string name="pages_pending">Čeká na schválení</string>
<string name="pages_open_page_error">Požadovaná stránka není dostupná</string>
<string name="news_card_announcement_action_sample_announcement">[Číst více]</string>
<string name="pages_empty_trashed">Seznam smazaných stránek je prázdný</string>
<string name="pages_empty_scheduled">Momentálně nemáte stránky naplanované k zveřejnění</string>
<string name="pages_empty_drafts">Nemáte žádné koncepty</string>
Expand All @@ -48,6 +160,7 @@ Language: cs_CZ
<string name="pages_move_to_draft">Přesunout do konceptů</string>
<string name="pages_publish_now">Zveřejnit</string>
<string name="pages_set_parent">Přiřadit nadřazenou stránku</string>
<string name="pages_view">Zobrazení</string>
<string name="pages_trashed">Smazané</string>
<string name="pages_scheduled">Naplánované</string>
<string name="pages_drafts">Koncepty</string>
Expand Down Expand Up @@ -93,9 +206,16 @@ Language: cs_CZ
<string name="quick_start_dialog_choose_theme_title">Volba šablony</string>
<string name="quick_start_dialog_browse_themes_message_short">Klikněte na %1$s Šablony %2$s a prozkoumejte možnosti </string>
<string name="quick_start_dialog_choose_theme_message">Prozkoumejte seznam šablon a nejděte tu co se hodí nejvíce.</string>
<string name="quick_start_button_positive">Go</string>
<string name="quick_start_button_negative_short">Zrušit</string>
<string name="quick_start_button_negative">Né teď</string>
<string name="content_description_more">Hotovo</string>
<string name="reader_empty_followed_tags_title">Žádné sledované štítky</string>
<string name="install_jetpack_retry">Odpověď</string>
<string name="install_jetpack_continue">Pokračovat</string>
<string name="jetpack_installation_problem">Vyskytl se problém</string>
<string name="jetpack_installed">Jetpack nainstalován</string>
<string name="installing_jetpack">Instalování Jetpacku</string>
<string name="install_jetpack">Instalovat Jetpack</string>
<string name="jetpack">Jetpack</string>
<string name="stats_jetpack_connection_faq">Jetpack FAQ</string>
Expand All @@ -106,6 +226,14 @@ Language: cs_CZ
<string name="site_settings_tags_empty_title">Nemáte žádné vlastní štítky</string>
<string name="site_settings_tags_empty_subtitle">Přidejte si sem nejčastěji používané štítky, abyste je měli po ruce.</string>
<string name="site_settings_tags_empty_button">Vytvořit štítek</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Odhlásit se z WordPressu?</string>
<string name="people_empty_list_filtered_viewers">Zatím žádné zobrazení</string>
<string name="people_empty_list_filtered_followers">Zatím žádní fanoušci</string>
<string name="people_empty_list_filtered_users">Zatím žádní uživatelé</string>
<string name="activity_log_empty_title">Zatím žádná aktivita</string>
<string name="posts_empty_list_button">Vytvořit příspěvek</string>
<string name="pages_empty_list_button">Vytvořit stránku</string>
<string name="media_empty_upload_media">Nahrát média</string>
<string name="reader_gallery_images_desc">galerie obrázků</string>
<string name="blavatar_desc">ikona stránky</string>
<string name="theme_image_desc">obrázek šablony</string>
Expand Down Expand Up @@ -1635,6 +1763,7 @@ Language: cs_CZ
<string name="reader_btn_follow">Sledovat</string>
<string name="reader_btn_share">Sdílet</string>
<string name="reader_untitled_post">(bez názvu)</string>
<string name="comments_empty_list">Zatím žádné komentáře</string>
<string name="empty_list_default">Tento seznam je prázdný</string>
<string name="stats_totals_plays">Přehrávání</string>
<string name="stats_totals_clicks">Prokliky</string>
Expand Down
20 changes: 17 additions & 3 deletions 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: 2019-03-12 11:08:05+0000
Translation-Revision-Date: 2019-04-03 13:54:09+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: de
-->
<resources>
<string name="new_site_creation_preview_subtitle">Du kannst das Erscheinungsbild deiner Website später anpassen</string>
<string name="publish_on">Veröffentlichen auf: %s</string>
<string name="schedule_for">Planen für: %s</string>
<string name="published_on">Veröffentlicht am: %s</string>
<string name="scheduled_for">Geplant für: %s</string>
<string name="stats_detail_recent_weeks">Letzte Wochen</string>
<string name="stats_detail_average_views_per_day">Durchschnittliche Aufrufe pro Tag</string>
<string name="stats_months_and_years_views_label">Ansichten</string>
<string name="stats_months_and_years_period_label">Zeitraum</string>
<string name="stats_detail_months_and_years">Monate und Jahre</string>
<string name="stats_insights_load_more">Mehr laden</string>
<string name="stats_insights_today_stats">Heute</string>
<string name="stats_insights_best_hour">Beste Uhrzeit</string>
<string name="stats_insights_best_day">Bester Tag</string>
<string name="showing_stats_for">Anzeigen von Statistiken für:</string>
<string name="app_rating_rate_never">Nein, danke</string>
<string name="app_rating_rate_later">Später</string>
<string name="app_rating_rate_now">Jetzt bewerten</string>
Expand Down Expand Up @@ -182,8 +197,7 @@ Language: de
<string name="stats_insights_latest_post_with_no_engagement">%2$s wurde vor %1$s veröffentlicht. Erhalte mehr Aufrufe deines Beitrags, indem du ihn teilst:</string>
<string name="stats_insights_latest_post_empty">Du hast noch keine Beiträge veröffentlicht. Sobald du Beiträge veröffentlichst, wird hier eine Übersicht zum aktuellsten Beitrag angezeigt:</string>
<string name="stats_insights_tags_and_categories">Schlagwörter und Kategorien</string>
<string name="stats_insights_all_time_stats">Gesamtstatistik</string>
<string name="stats_insights_today_stats">Statistiken von heute</string>
<string name="stats_insights_all_time_stats">Gesamte Zeit</string>
<string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
<string name="stats_publicize_followers_label">Follower</string>
<string name="stats_publicize_service_label">Dienst</string>
Expand Down
1 change: 0 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
Expand Up @@ -60,7 +60,6 @@ Language: el_GR
<string name="stats_insights_share_post">Μοιραστείτε το άρθρο</string>
<string name="stats_insights_create_post">Δημιουργία άρθρου</string>
<string name="stats_insights_tags_and_categories">Ετικέτες και Κατηγορίες</string>
<string name="stats_insights_today_stats">Στατιστικά Ημέρας</string>
<string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
<string name="stats_publicize_followers_label">Ακόλουθοι</string>
<string name="stats_publicize_service_label">Υπηρεσία</string>
Expand Down
Loading