Skip to content

Commit 6b931be

Browse files
authored
Merge pull request #17058 from wordpress-mobile/release/20.5
Merge final `release/20.5`
2 parents 003c616 + c18647a commit 6b931be

File tree

124 files changed

+2205
-1412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+2205
-1412
lines changed

Gemfile.lock

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ GEM
88
i18n (>= 0.7, < 2)
99
minitest (~> 5.1)
1010
tzinfo (~> 1.1)
11-
addressable (2.8.0)
12-
public_suffix (>= 2.0.2, < 5.0)
11+
addressable (2.8.1)
12+
public_suffix (>= 2.0.2, < 6.0)
1313
artifactory (3.0.15)
1414
atomos (0.1.3)
1515
aws-eventstream (1.2.0)
@@ -48,7 +48,7 @@ GEM
4848
dotenv (2.7.6)
4949
emoji_regex (3.2.3)
5050
excon (0.92.0)
51-
faraday (1.10.0)
51+
faraday (1.10.1)
5252
faraday-em_http (~> 1.0)
5353
faraday-em_synchrony (~> 1.0)
5454
faraday-excon (~> 1.1)
@@ -67,8 +67,8 @@ GEM
6767
faraday-em_synchrony (1.0.0)
6868
faraday-excon (1.1.0)
6969
faraday-httpclient (1.0.1)
70-
faraday-multipart (1.0.3)
71-
multipart-post (>= 1.2, < 3)
70+
faraday-multipart (1.0.4)
71+
multipart-post (~> 2)
7272
faraday-net_http (1.0.1)
7373
faraday-net_http_persistent (1.2.0)
7474
faraday-patron (1.0.0)
@@ -116,7 +116,7 @@ GEM
116116
xcodeproj (>= 1.13.0, < 2.0.0)
117117
xcpretty (~> 0.3.0)
118118
xcpretty-travis-formatter (>= 0.0.3)
119-
fastlane-plugin-wpmreleasetoolkit (5.2.0)
119+
fastlane-plugin-wpmreleasetoolkit (5.4.0)
120120
activesupport (~> 5)
121121
bigdecimal (~> 1.4)
122122
buildkit (~> 1.5)
@@ -133,11 +133,12 @@ GEM
133133
rake (>= 12.3, < 14.0)
134134
rake-compiler (~> 1.0)
135135
gh_inspector (1.1.3)
136-
git (1.11.0)
136+
git (1.12.0)
137+
addressable (~> 2.8)
137138
rchardet (~> 1.8)
138139
google-apis-androidpublisher_v3 (0.16.0)
139140
google-apis-core (>= 0.4, < 2.a)
140-
google-apis-core (0.4.2)
141+
google-apis-core (0.7.0)
141142
addressable (~> 2.5, >= 2.5.1)
142143
googleauth (>= 0.16.2, < 2.a)
143144
httpclient (>= 2.8.1, < 3.a)
@@ -146,27 +147,27 @@ GEM
146147
retriable (>= 2.0, < 4.a)
147148
rexml
148149
webrick
149-
google-apis-iamcredentials_v1 (0.10.0)
150-
google-apis-core (>= 0.4, < 2.a)
150+
google-apis-iamcredentials_v1 (0.13.0)
151+
google-apis-core (>= 0.7, < 2.a)
151152
google-apis-playcustomapp_v1 (0.7.0)
152153
google-apis-core (>= 0.4, < 2.a)
153-
google-apis-storage_v1 (0.11.0)
154-
google-apis-core (>= 0.4, < 2.a)
154+
google-apis-storage_v1 (0.17.0)
155+
google-apis-core (>= 0.7, < 2.a)
155156
google-cloud-core (1.6.0)
156157
google-cloud-env (~> 1.0)
157158
google-cloud-errors (~> 1.0)
158-
google-cloud-env (1.5.0)
159-
faraday (>= 0.17.3, < 2.0)
159+
google-cloud-env (1.6.0)
160+
faraday (>= 0.17.3, < 3.0)
160161
google-cloud-errors (1.2.0)
161-
google-cloud-storage (1.36.1)
162+
google-cloud-storage (1.38.0)
162163
addressable (~> 2.8)
163164
digest-crc (~> 0.4)
164165
google-apis-iamcredentials_v1 (~> 0.1)
165-
google-apis-storage_v1 (~> 0.1)
166+
google-apis-storage_v1 (~> 0.17.0)
166167
google-cloud-core (~> 1.6)
167168
googleauth (>= 0.16.2, < 2.a)
168169
mini_mime (~> 1.0)
169-
googleauth (1.1.2)
170+
googleauth (1.2.0)
170171
faraday (>= 0.17.3, < 3.a)
171172
jwt (>= 1.4, < 3.0)
172173
memoist (~> 0.16)
@@ -184,23 +185,23 @@ GEM
184185
jsonlint (0.3.0)
185186
oj (~> 3)
186187
optimist (~> 3)
187-
jwt (2.3.0)
188+
jwt (2.4.1)
188189
memoist (0.16.2)
189190
mini_magick (4.11.0)
190191
mini_mime (1.1.2)
191192
mini_portile2 (2.8.0)
192-
minitest (5.16.2)
193+
minitest (5.16.3)
193194
multi_json (1.15.0)
194195
multipart-post (2.0.0)
195196
nanaimo (0.3.0)
196197
naturally (2.2.1)
197-
nokogiri (1.13.4)
198+
nokogiri (1.13.8)
198199
mini_portile2 (~> 2.8.0)
199200
racc (~> 1.4)
200201
octokit (4.25.1)
201202
faraday (>= 1, < 3)
202203
sawyer (~> 0.9)
203-
oj (3.13.19)
204+
oj (3.13.20)
204205
optimist (3.0.1)
205206
options (2.3.2)
206207
optparse (0.1.1)
@@ -210,13 +211,13 @@ GEM
210211
progress_bar (1.3.3)
211212
highline (>= 1.6, < 3)
212213
options (~> 2.3.0)
213-
public_suffix (4.0.7)
214+
public_suffix (5.0.0)
214215
racc (1.6.0)
215216
rake (13.0.6)
216217
rake-compiler (1.2.0)
217218
rake
218219
rchardet (1.8.0)
219-
representable (3.1.1)
220+
representable (3.2.0)
220221
declarative (< 0.1.0)
221222
trailblazer-option (>= 0.1.1, < 0.2.0)
222223
uber (< 0.2.0)
@@ -230,9 +231,9 @@ GEM
230231
addressable (>= 2.3.5)
231232
faraday (>= 0.17.3, < 3)
232233
security (0.1.3)
233-
signet (0.16.1)
234+
signet (0.17.0)
234235
addressable (~> 2.8)
235-
faraday (>= 0.17.5, < 3.0)
236+
faraday (>= 0.17.5, < 3.a)
236237
jwt (>= 1.5, < 3.0)
237238
multi_json (~> 1.10)
238239
simctl (1.6.8)

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

Lines changed: 816 additions & 816 deletions
Large diffs are not rendered by default.

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-08-11 12:54:09+0000
3+
Translation-Revision-Date: 2022-08-19 11:32:54+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.1
66
Language: nl
77
-->
88
<resources>
99
<string name="wp_jetpack_powered_features">De nieuwe Jetpack-app heeft Statistieken, Lezer, Meldingen en nog meer dat je WordPress verbetert.</string>
10+
<string name="wp_jetpack_powered_better_with_jetpack">WordPress is completer met Jetpack</string>
1011
<string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">Upgrade je abonnement om video-omslagafbeeldingen te gebruiken</string>
1112
<string name="gutenberg_native_upgrade_your_plan_to_upload_audio">Upgrade je abonnement om audio te uploaden</string>
1213
<string name="gutenberg_native_jetpack_powered">Aangedreven door Jetpack</string>
@@ -17,10 +18,10 @@ Language: nl
1718
<string name="wp_jetpack_continue_to_reader">Doorgaan naar Lezer</string>
1819
<string name="wp_jetpack_get_new_jetpack_app">Krijg de Jetpack-app</string>
1920
<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>
20-
<string name="weekly_roundup_notification_text_views_and_comments">Vorige week had je %1$s weergaven en %2$s opmerkingen.</string>
21-
<string name="weekly_roundup_notification_text_views_and_likes">Vorige week had je %1$s weergaven en %2$s likes.</string>
21+
<string name="weekly_roundup_notification_text_views_and_comments">Vorige week had je %1$s weergaven en %2$s reacties</string>
22+
<string name="weekly_roundup_notification_text_views_and_likes">Vorige week had je %1$s weergaven en %2$s likes</string>
2223
<string name="weekly_roundup_notification_text_views_only">Vorige week had je %1$s weergaven.</string>
23-
<string name="weekly_roundup_notification_text_all">Vorige week had je %1$s weergaven, %2$s likes, en %3$s opmerkingen.</string>
24+
<string name="weekly_roundup_notification_text_all">Vorige week had je %1$s weergaven, %2$s likes, en %3$s reacties.</string>
2425
<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>
2526
<string name="stats_insights_like_guide_card">⭐️ Je nieuwste bericht %1$s heeft %2$s likes gekregen.</string>
2627
<string name="wp_jetpack_powered">Door Jetpack aangedreven</string>
@@ -47,7 +48,7 @@ Language: nl
4748
<string name="stats_revamp_v2_intro_header_title">Update aan inzichten</string>
4849
<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>
4950
<string name="stats_insights_comments_guide_card">💡Tik op \'MEER INFORMATIE\' om je topreageerders te bekijken.</string>
50-
<string name="stats_insights_latest_post_empty">Publiceer een eerste bericht en kijk dan nog eens hier.</string>
51+
<string name="stats_insights_latest_post_empty">Publiceer je eerste bericht en kijk dan nog eens hier!</string>
5152
<string name="stats_insights_views_and_visitors_visitors_empty_state">Bekijk onze beste tips voor meer weergaven en bezoekers %1$s</string>
5253
<string name="stats_view_publicize">Social-mediakoppelingen</string>
5354
<string name="stats_action_card_schedule_post_message">✍️ Plan wanneer je conceptversies worden gepubliceerd om op het beste moment je publiek te bereiken.</string>
@@ -61,7 +62,7 @@ Language: nl
6162
<string name="hpp_preview_tapped_theme">Themavoorbeeld bekijken %s</string>
6263
<string name="hpp_title">Kies een thema</string>
6364
<string name="my_site_blogging_prompt_card_skipped_snackbar">Heeft de blogmelding van vandaag overgeslagen</string>
64-
<string name="my_site_blogging_prompt_card_menu_learn_more">Meer informatie.</string>
65+
<string name="my_site_blogging_prompt_card_menu_learn_more">Meer informatie</string>
6566
<string name="my_site_blogging_prompt_card_attribution_dayone">Van </string>
6667
<string name="stats_follower_types_pie_chart_total_label">Totalen</string>
6768
<string name="stats_referrers_pie_chart_others">Anderen</string>
@@ -147,7 +148,7 @@ Language: nl
147148
<string name="blogging_prompts_onboarding_notification_text">Word een betere schrijver door elke dag te schrijven. Tik voor meer informatie.</string>
148149
<string name="blogging_prompts_onboarding_notification_title">Nieuw in de mobiele WordPress-app: Herinneringen</string>
149150
<string name="new_site_creation_site_name_header_subtitle">Een goede naam is kort en eenvoudig te onthouden.\nJe kunt deze later wijzigen.</string>
150-
<string name="new_site_creation_site_name_header_title">Geef je %s website een naam</string>
151+
<string name="new_site_creation_site_name_header_title">Geef je %s site een naam</string>
151152
<string name="new_site_creation_site_name_title">Naam site</string>
152153
<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>
153154
<string name="stats_insights_views_and_visitors">Weergaven en bezoekers</string>
@@ -650,7 +651,7 @@ Language: nl
650651
<string name="disable">Uitschakelen</string>
651652
<string name="quick_start_card_menu_unpin">Losmaken</string>
652653
<string name="quick_start_list_review_pages_subtitle">Controleer je pagina\'s en maak wijzigingen, of voeg pagina\'s toe of verwijder ze.</string>
653-
<string name="quick_start_list_view_site_title">Website bekijken</string>
654+
<string name="quick_start_list_view_site_title">Je site bekijken</string>
654655
<string name="quick_start_list_follow_site_subtitle">Ontdek en volg sites die je inspireren.</string>
655656
<string name="quick_start_list_enable_sharing_title">Sociaal delen</string>
656657
<string name="quick_start_list_enable_sharing_subtitle">Deel automatisch nieuwe berichten op je social media.</string>
@@ -1440,7 +1441,7 @@ Language: nl
14401441
<string name="gutenberg_native_move_block_up">Blok omhoog verplaatsen</string>
14411442
<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>
14421443
<string name="gutenberg_native_move_block_down">Blok omlaag verplaatsen</string>
1443-
<string name="gutenberg_native_link_text">Link tekst</string>
1444+
<string name="gutenberg_native_link_text">Linktekst</string>
14441445
<string name="gutenberg_native_link_inserted">Link ingevoerd</string>
14451446
<string name="gutenberg_native_image_caption_s">Afbeelding vastleggen. %s</string>
14461447
<string name="gutenberg_native_hide_keyboard">Toetsenbord verbergen</string>
@@ -2153,10 +2154,10 @@ Language: nl
21532154
<string name="reader_screen_title">Reader</string>
21542155
<string name="me_section_screen_title">Ik</string>
21552156
<string name="my_site_section_screen_title">Mijn site</string>
2156-
<string name="notif_settings_screen_title">Melding instellingen</string>
2157+
<string name="notif_settings_screen_title">Notificatie instellingen</string>
21572158
<string name="help_screen_title">Hulp en ondersteuning</string>
21582159
<string name="license_screen_title">Licentie</string>
2159-
<string name="release_notes_screen_title">Release notes</string>
2160+
<string name="release_notes_screen_title">Releaselog</string>
21602161
<string name="signup_epilogue_error_avatar_view">Je avatar is geüpload en binnenkort beschikbaar.</string>
21612162
<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>
21622163
<string name="permissions_denied_title">Machtigingen</string>
@@ -3309,7 +3310,7 @@ Language: nl
33093310
<string name="error">Fout</string>
33103311
<string name="no">Nee</string>
33113312
<string name="yes">Ja</string>
3312-
<string name="notification_settings">Melding instellingen</string>
3313+
<string name="notification_settings">Notificatie instellingen</string>
33133314
<string name="add">Toevoegen</string>
33143315
<string name="save">Opslaan</string>
33153316
<string name="cancel">Annuleren</string>

WordPress/src/main/res/values-pt-rBR/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-08-03 04:15:54+0000
3+
Translation-Revision-Date: 2022-08-19 14:46:51+0000
44
Plural-Forms: nplurals=2; plural=n > 1;
55
Generator: GlotPress/4.0.0-alpha.1
66
Language: pt_BR
77
-->
88
<resources>
9+
<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>
10+
<string name="wp_jetpack_powered_better_with_jetpack">WordPress é melhor com Jetpack</string>
911
<string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">Faça upgrade do seu plano para usar capas de vídeo</string>
1012
<string name="gutenberg_native_upgrade_your_plan_to_upload_audio">Faça upgrade do seu plano para enviar arquivos de áudio</string>
1113
<string name="gutenberg_native_jetpack_powered">Com tecnologia Jetpack</string>

0 commit comments

Comments
 (0)