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.

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 final release/20.5 #17058

Merged
merged 5 commits into from
Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 26 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
Expand Down Expand Up @@ -48,7 +48,7 @@ GEM
dotenv (2.7.6)
emoji_regex (3.2.3)
excon (0.92.0)
faraday (1.10.0)
faraday (1.10.1)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -67,8 +67,8 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
Expand Down Expand Up @@ -116,7 +116,7 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-wpmreleasetoolkit (5.2.0)
fastlane-plugin-wpmreleasetoolkit (5.4.0)
activesupport (~> 5)
bigdecimal (~> 1.4)
buildkit (~> 1.5)
Expand All @@ -133,11 +133,12 @@ GEM
rake (>= 12.3, < 14.0)
rake-compiler (~> 1.0)
gh_inspector (1.1.3)
git (1.11.0)
git (1.12.0)
addressable (~> 2.8)
rchardet (~> 1.8)
google-apis-androidpublisher_v3 (0.16.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-core (0.4.2)
google-apis-core (0.7.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -146,27 +147,27 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.10.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-iamcredentials_v1 (0.13.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-playcustomapp_v1 (0.7.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.11.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.17.0)
google-apis-core (>= 0.7, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.2.0)
google-cloud-storage (1.36.1)
google-cloud-storage (1.38.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.17.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.1.2)
googleauth (1.2.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand All @@ -184,23 +185,23 @@ GEM
jsonlint (0.3.0)
oj (~> 3)
optimist (~> 3)
jwt (2.3.0)
jwt (2.4.1)
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.2)
minitest (5.16.3)
multi_json (1.15.0)
multipart-post (2.0.0)
nanaimo (0.3.0)
naturally (2.2.1)
nokogiri (1.13.4)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
oj (3.13.19)
oj (3.13.20)
optimist (3.0.1)
options (2.3.2)
optparse (0.1.1)
Expand All @@ -210,13 +211,13 @@ GEM
progress_bar (1.3.3)
highline (>= 1.6, < 3)
options (~> 2.3.0)
public_suffix (4.0.7)
public_suffix (5.0.0)
racc (1.6.0)
rake (13.0.6)
rake-compiler (1.2.0)
rake
rchardet (1.8.0)
representable (3.1.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
Expand All @@ -230,9 +231,9 @@ GEM
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
security (0.1.3)
signet (0.16.1)
signet (0.17.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.0)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
Expand Down
1,632 changes: 816 additions & 816 deletions WordPress/src/main/res/values-es/strings.xml

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions WordPress/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-08-11 12:54:09+0000
Translation-Revision-Date: 2022-08-19 11:32:54+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/4.0.0-alpha.1
Language: nl
-->
<resources>
<string name="wp_jetpack_powered_features">De nieuwe Jetpack-app heeft Statistieken, Lezer, Meldingen en nog meer dat je WordPress verbetert.</string>
<string name="wp_jetpack_powered_better_with_jetpack">WordPress is completer met Jetpack</string>
<string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">Upgrade je abonnement om video-omslagafbeeldingen te gebruiken</string>
<string name="gutenberg_native_upgrade_your_plan_to_upload_audio">Upgrade je abonnement om audio te uploaden</string>
<string name="gutenberg_native_jetpack_powered">Aangedreven door Jetpack</string>
Expand All @@ -17,10 +18,10 @@ Language: nl
<string name="wp_jetpack_continue_to_reader">Doorgaan naar Lezer</string>
<string name="wp_jetpack_get_new_jetpack_app">Krijg de Jetpack-app</string>
<string name="gutenberg_native_problem_displaying_block_tap_to_attempt_block_recovery">Probleem bij het weergeven van het blok. \nTik om blokherstel te proberen.</string>
<string name="weekly_roundup_notification_text_views_and_comments">Vorige week had je %1$s weergaven en %2$s opmerkingen.</string>
<string name="weekly_roundup_notification_text_views_and_likes">Vorige week had je %1$s weergaven en %2$s likes.</string>
<string name="weekly_roundup_notification_text_views_and_comments">Vorige week had je %1$s weergaven en %2$s reacties</string>
<string name="weekly_roundup_notification_text_views_and_likes">Vorige week had je %1$s weergaven en %2$s likes</string>
<string name="weekly_roundup_notification_text_views_only">Vorige week had je %1$s weergaven.</string>
<string name="weekly_roundup_notification_text_all">Vorige week had je %1$s weergaven, %2$s likes, en %3$s opmerkingen.</string>
<string name="weekly_roundup_notification_text_all">Vorige week had je %1$s weergaven, %2$s likes, en %3$s reacties.</string>
<string name="stats_revamp_v2_update_alert_message">Nieuwe inzichten geven je meer zicht op hoe je content presteert en wat je publiek leuk vindt.</string>
<string name="stats_insights_like_guide_card">⭐️ Je nieuwste bericht %1$s heeft %2$s likes gekregen.</string>
<string name="wp_jetpack_powered">Door Jetpack aangedreven</string>
Expand All @@ -47,7 +48,7 @@ Language: nl
<string name="stats_revamp_v2_intro_header_title">Update aan inzichten</string>
<string name="stats_insights_followers_guide_card">💡Door reacties op andere blogs achter te laten, val je op en trek je volgers naar je nieuwe site.</string>
<string name="stats_insights_comments_guide_card">💡Tik op \'MEER INFORMATIE\' om je topreageerders te bekijken.</string>
<string name="stats_insights_latest_post_empty">Publiceer een eerste bericht en kijk dan nog eens hier.</string>
<string name="stats_insights_latest_post_empty">Publiceer je eerste bericht en kijk dan nog eens hier!</string>
<string name="stats_insights_views_and_visitors_visitors_empty_state">Bekijk onze beste tips voor meer weergaven en bezoekers %1$s</string>
<string name="stats_view_publicize">Social-mediakoppelingen</string>
<string name="stats_action_card_schedule_post_message">✍️ Plan wanneer je conceptversies worden gepubliceerd om op het beste moment je publiek te bereiken.</string>
Expand All @@ -61,7 +62,7 @@ Language: nl
<string name="hpp_preview_tapped_theme">Themavoorbeeld bekijken %s</string>
<string name="hpp_title">Kies een thema</string>
<string name="my_site_blogging_prompt_card_skipped_snackbar">Heeft de blogmelding van vandaag overgeslagen</string>
<string name="my_site_blogging_prompt_card_menu_learn_more">Meer informatie.</string>
<string name="my_site_blogging_prompt_card_menu_learn_more">Meer informatie</string>
<string name="my_site_blogging_prompt_card_attribution_dayone">Van </string>
<string name="stats_follower_types_pie_chart_total_label">Totalen</string>
<string name="stats_referrers_pie_chart_others">Anderen</string>
Expand Down Expand Up @@ -147,7 +148,7 @@ Language: nl
<string name="blogging_prompts_onboarding_notification_text">Word een betere schrijver door elke dag te schrijven. Tik voor meer informatie.</string>
<string name="blogging_prompts_onboarding_notification_title">Nieuw in de mobiele WordPress-app: Herinneringen</string>
<string name="new_site_creation_site_name_header_subtitle">Een goede naam is kort en eenvoudig te onthouden.\nJe kunt deze later wijzigen.</string>
<string name="new_site_creation_site_name_header_title">Geef je %s website een naam</string>
<string name="new_site_creation_site_name_header_title">Geef je %s site een naam</string>
<string name="new_site_creation_site_name_title">Naam site</string>
<string name="my_site_todays_stats_get_more_views_message">Wil je je publiek vergroten? Check onze &lt;a href=\"%1$s\"&gt;beste tips&lt;/a&gt;.</string>
<string name="stats_insights_views_and_visitors">Weergaven en bezoekers</string>
Expand Down Expand Up @@ -650,7 +651,7 @@ Language: nl
<string name="disable">Uitschakelen</string>
<string name="quick_start_card_menu_unpin">Losmaken</string>
<string name="quick_start_list_review_pages_subtitle">Controleer je pagina\'s en maak wijzigingen, of voeg pagina\'s toe of verwijder ze.</string>
<string name="quick_start_list_view_site_title">Website bekijken</string>
<string name="quick_start_list_view_site_title">Je site bekijken</string>
<string name="quick_start_list_follow_site_subtitle">Ontdek en volg sites die je inspireren.</string>
<string name="quick_start_list_enable_sharing_title">Sociaal delen</string>
<string name="quick_start_list_enable_sharing_subtitle">Deel automatisch nieuwe berichten op je social media.</string>
Expand Down Expand Up @@ -1440,7 +1441,7 @@ Language: nl
<string name="gutenberg_native_move_block_up">Blok omhoog verplaatsen</string>
<string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Blok omlaag bewegen van rij %1$s naar rij %2$s</string>
<string name="gutenberg_native_move_block_down">Blok omlaag verplaatsen</string>
<string name="gutenberg_native_link_text">Link tekst</string>
<string name="gutenberg_native_link_text">Linktekst</string>
<string name="gutenberg_native_link_inserted">Link ingevoerd</string>
<string name="gutenberg_native_image_caption_s">Afbeelding vastleggen. %s</string>
<string name="gutenberg_native_hide_keyboard">Toetsenbord verbergen</string>
Expand Down Expand Up @@ -2153,10 +2154,10 @@ Language: nl
<string name="reader_screen_title">Reader</string>
<string name="me_section_screen_title">Ik</string>
<string name="my_site_section_screen_title">Mijn site</string>
<string name="notif_settings_screen_title">Melding instellingen</string>
<string name="notif_settings_screen_title">Notificatie instellingen</string>
<string name="help_screen_title">Hulp en ondersteuning</string>
<string name="license_screen_title">Licentie</string>
<string name="release_notes_screen_title">Release notes</string>
<string name="release_notes_screen_title">Releaselog</string>
<string name="signup_epilogue_error_avatar_view">Je avatar is geüpload en binnenkort beschikbaar.</string>
<string name="permissions_denied_message">Het lijkt erop dat je de vereiste machtigingen voor deze functie hebt uitgeschakeld.&lt;br/&gt;&lt;br/&gt;Om dit te wijzigen, moet je je machtigingen bewerken en zorgen dat &lt;strong&gt;%s&lt;/strong&gt; is ingeschakeld.</string>
<string name="permissions_denied_title">Machtigingen</string>
Expand Down Expand Up @@ -3309,7 +3310,7 @@ Language: nl
<string name="error">Fout</string>
<string name="no">Nee</string>
<string name="yes">Ja</string>
<string name="notification_settings">Melding instellingen</string>
<string name="notification_settings">Notificatie instellingen</string>
<string name="add">Toevoegen</string>
<string name="save">Opslaan</string>
<string name="cancel">Annuleren</string>
Expand Down
4 changes: 3 additions & 1 deletion WordPress/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-08-03 04:15:54+0000
Translation-Revision-Date: 2022-08-19 14:46:51+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/4.0.0-alpha.1
Language: pt_BR
-->
<resources>
<string name="wp_jetpack_powered_features">O novo aplicativo Jetpack tem estatísticas, leitor, notificações e muito mais que tornam seu WordPress melhor.</string>
<string name="wp_jetpack_powered_better_with_jetpack">WordPress é melhor com Jetpack</string>
<string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">Faça upgrade do seu plano para usar capas de vídeo</string>
<string name="gutenberg_native_upgrade_your_plan_to_upload_audio">Faça upgrade do seu plano para enviar arquivos de áudio</string>
<string name="gutenberg_native_jetpack_powered">Com tecnologia Jetpack</string>
Expand Down
Loading