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 22.2 final to trunk #18339

Merged
merged 7 commits into from
Apr 30, 2023
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
4 changes: 2 additions & 2 deletions WordPress/src/main/res/layout/notifications_list_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
android:gravity="start|center_vertical"
android:text="@string/notifications_permission_off_desc"
android:textAppearance="?attr/textAppearanceBody2"
android:textColor="?attr/colorOnSurface" />
android:textColor="@android:color/black" />

<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
Expand All @@ -73,7 +73,7 @@
android:contentDescription="@string/notifications_permission_dismiss_content_description"
android:padding="@dimen/margin_large"
android:src="@drawable/ic_cross_small_white_24dp"
app:tint="?attr/colorOnSurface" />
app:tint="@android:color/black" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>

Expand Down
1,519 changes: 760 additions & 759 deletions WordPress/src/main/res/values-de/strings.xml

Large diffs are not rendered by default.

748 changes: 374 additions & 374 deletions WordPress/src/main/res/values-he/strings.xml

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions WordPress/src/main/res/values-id/strings.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2023-04-26 09:54:08+0000
Translation-Revision-Date: 2023-04-27 09:54:07+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/4.0.0-alpha.4
Language: id
-->
<resources>
<string name="jp_migration_delete_message">Kami menyarankan agar &lt;b&gt;aplikasi WordPress&lt;/b&gt; di perangkat Anda di-uninstall untuk mencegah konflik data.</string>
<string name="jp_migration_delete_message">Kami sarankan untuk &lt;b&gt;menghapus instalan aplikasi WordPress&lt;/b&gt; di perangkat Anda guna mencegah terjadinya konflik data.</string>
<string name="jp_migration_delete_subtitle">Aplikasi WordPress sepertinya masih terinstal.</string>
<string name="jp_migration_delete_title">Anda tidak lagi membutuhkan aplikasi WordPress di perangkat Anda</string>
<string name="jp_migration_done_delete_wp_message">Kami sarankan untuk menghapus aplikasi WordPress guna mencegah terjadinya konflik data.&lt;b&gt;&lt;/b&gt;</string>
<string name="jp_migration_done_delete_wp_message">Kami sarankan untuk &lt;b&gt;menghapus instalan aplikasi WordPress&lt;/b&gt; di perangkat Anda guna mencegah terjadinya konflik data.</string>
<string name="jp_migration_success_card_message">Selamat datang di aplikasi Jetpack. Anda dapat menghapus instalan aplikasi WordPress.</string>
<string name="gutenberg_native_remove_blocks">Hapus blok</string>
<string name="gutenberg_native_privacy_and_rating">Privasi dan rating</string>
<string name="gutenberg_native_playback_settings">Pengaturan Playback</string>
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2023-04-25 22:54:07+0000
Translation-Revision-Date: 2023-04-27 20:43:38+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/4.0.0-alpha.4
Language: it
Expand Down Expand Up @@ -814,6 +814,7 @@ Language: it
<string name="gutenberg_native_custom_url">URL personalizzata</string>
<string name="gutenberg_native_create_embed">Crea l\'incorporamento</string>
<string name="gutenberg_native_column_d">Colonna %d</string>
<string name="gutenberg_native_more">Ulteriori informazioni</string>
<string name="gutenberg_native_briefly_describe_the_link_to_help_screen_reader_user">Descrivi brevemente il link per aiutare l\'utente del lettore di schermo</string>
<string name="gutenberg_native_add_blocks">Aggiungi blocchi</string>
<string name="login_no_jetpack_sites">Nessun sito Jetpack trovato</string>
Expand Down
14 changes: 13 additions & 1 deletion WordPress/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2023-04-25 13:54:07+0000
Translation-Revision-Date: 2023-04-27 20:42:53+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/4.0.0-alpha.4
Language: nl
Expand All @@ -13,7 +13,10 @@ Language: nl
<string name="jp_migration_success_card_message">Welkom bij de Jetpack-app. Je kan de WordPress-app verwijderen.</string>
<string name="gutenberg_native_remove_blocks">Blokken verwijderen</string>
<string name="gutenberg_native_privacy_and_rating">Privacy en beoordeling</string>
<string name="gutenberg_native_playback_settings">Afspeelinstellingen</string>
<string name="gutenberg_native_playback_bar_color">Kleur afspeelbalk</string>
<string name="gutenberg_native_manual">Handmatig</string>
<string name="gutenberg_native_dynamic">Dynamisch</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_decorative">Beschrijf het doel van de afbeelding. Laat dit veld leeg als de afbeelding decoratief is.</string>
<string name="dashboard_pages_card_create_another_page_description">Ga aan de slag met op maat gemaakte lay-outs die geschikt zijn voor mobiele apparaten</string>
<string name="dashboard_pages_card_create_another_page_button">Nog een pagina aanmaken</string>
Expand All @@ -22,13 +25,18 @@ Language: nl
<string name="dashboard_card_domain_sub_title">Eis je eigen hoekje van het internet op met een site-adres dat eenvoudig te vinden, te delen en te volgen is.</string>
<string name="dashboard_card_domain_title">Bemachtig je eigen online identiteit met een aangepast domein</string>
<string name="blogging_reminders_notifications_permission_caption">Als je blog herinneringen wilt gebruiken, moet je berichtgeving inschakelen.</string>
<string name="blogging_reminders_notifications_permission_title">Zet berichtgeving aan</string>
<string name="site_creation_domain_button_continue_with_subdomain">Doorgaan met subdomein</string>
<string name="site_creation_domain_button_purchase_domain">Domein aanschaffen</string>
<string name="permission_images_video_audio">Foto’s en video\'s + Muziek en audio</string>
<string name="permission_audio">Muziek en audio</string>
<string name="permission_images">Foto\'s en video\'s</string>
<string name="photo_picker_soft_ask_audios_label">%s heeft toestemming nodig om je audio te openen</string>
<string name="photo_picker_soft_ask_videos_label">%s heeft toestemming nodig om je video\'s te openen</string>
<string name="photo_picker_soft_ask_photos_label">%s heeft toestemming nodig om je foto\'s te openen</string>
<string name="photo_picker_soft_ask_photos_videos_label">%s heeft toestemming nodig om je foto\'s en video\'s te openen</string>
<string name="photo_picker_soft_ask_photos_videos_audio_label">%s heeft toestemming nodig om je muziek, audio, foto\'s en video\'s te openen</string>
<string name="notifications_permission_bottom_sheet_button">Zet meldingen aan</string>
<string name="notifications_permission_bottom_sheet_description_2">Ga naar Instellingen &amp;rarr; Meldingen &amp;rarr; App-instellingen, en zet %1$s aan om direct op de hoogte te worden gesteld.</string>
<string name="notifications_permission_bottom_sheet_description_1">Je moet de app openen om meldingen te kunnen zien.</string>
<string name="notifications_permission_bottom_sheet_title">Pushmeldingen zijn uitgeschakeld</string>
Expand All @@ -40,6 +48,7 @@ Language: nl
<string name="wp_jetpack_individual_plugin_overlay_multiple_sites_content_1">Sites met individuele Jetpack-plugins worden niet ondersteund door de WordPress-app.</string>
<string name="wp_jetpack_individual_plugin_overlay_single_site_multiple_plugins_content_1">&lt;b&gt;%1$s&lt;/b&gt; gebruikt individuele Jetpack-plugins, deze worden niet ondersteund door de WordPress-app.</string>
<string name="wp_jetpack_individual_plugin_overlay_single_site_single_plugin_content_1">&lt;b&gt;%1$s&lt;/b&gt; gebruikt de &lt;b&gt;%2$s&lt;/b&gt;-plugin, deze wordt niet ondersteund door de WordPress-app.</string>
<string name="wp_jetpack_individual_plugin_overlay_multiple_sites_title">Kan sommige van je sites niet openen</string>
<string name="wp_jetpack_individual_plugin_overlay_single_site_title">Kan een van je sites niet openen</string>
<string name="wp_jetpack_individual_plugin_overlay_content_2">Schakel over naar de Jetpack-app waarin we je helpen de volledige Jetpack-plugin te koppelen, zodat je deze site kunt gebruiken met de app.</string>
<string name="wp_jetpack_individual_plugin_overlay_primary_button">Schakel over naar de Jetpack-app</string>
Expand Down Expand Up @@ -796,6 +805,7 @@ Language: nl
<string name="gutenberg_native_retry">Opnieuw proberen</string>
<string name="gutenberg_native_gif">GIF</string>
<string name="gutenberg_native_one">Eén</string>
<string name="gutenberg_native_add_title">Titel toevoegen</string>
<string name="gutenberg_native_no_preview_available">Geen voorbeeld beschikbaar</string>
<string name="gutenberg_native_text_color">Tekstkleur</string>
<string name="gutenberg_native_padding">Padding</string>
Expand All @@ -804,6 +814,7 @@ Language: nl
<string name="gutenberg_native_custom_url">Aangepaste URL</string>
<string name="gutenberg_native_create_embed">Maak insluiting</string>
<string name="gutenberg_native_column_d">Kolom %d</string>
<string name="gutenberg_native_more">Meer</string>
<string name="gutenberg_native_briefly_describe_the_link_to_help_screen_reader_user">Beschrijf kort de link om de scherm reader gebruiker te helpen</string>
<string name="gutenberg_native_add_blocks">Blokken toevoegen</string>
<string name="login_no_jetpack_sites">Geen Jetpack sites gevonden</string>
Expand Down Expand Up @@ -1699,6 +1710,7 @@ Language: nl
<string name="gutenberg_native_add_image_or_video">AFBEELDING OF VIDEO TOEVOEGEN</string>
<string name="gutenberg_native_add_image">AFBEELDING TOEVOEGEN</string>
<string name="gutenberg_native_add_block_here">BLOK HIER TOEVOEGEN</string>
<string name="gutenberg_native_add_description">Beschrijving toevoegen</string>
<string name="reader_empty_saved_posts_content_description">Tik op de knop \'Toevoegen om berichten op te slaan\' om een bericht op te slaan in je lijst.</string>
<string name="reader_acessibility_list_loaded">\"De lijst is geladen met %1$d items.\"</string>
<string name="notifications_tab_dialog_switch_desc">Meldingen</string>
Expand Down
Loading