Merge branch 'trunk' into issue/20688-emails-card

wordpress-mobile · May 1, 2024 · 762f745 · 762f745
2 parents 9dc4970 + f0081cb
commit 762f745
Show file tree

Hide file tree

Showing 29 changed files with 94 additions and 113 deletions.
diff --git a/WordPress/src/main/res/values-ar/strings.xml b/WordPress/src/main/res/values-ar/strings.xml
@@ -131,10 +131,6 @@ Language: ar
     <string name="reader_filter_by_tag_title">التصفية حسب الوسم</string>
     <string name="reader_filter_by_blog_title">التصفية حسب المدونة</string>
     <string name="reader_filter_empty_blogs_list">الإطلاع على أجدد المقالات من المدونات التي اشتركت فيها</string>
-    <string name="stats_timeframe_by_year">حسب العام</string>
-    <string name="stats_timeframe_by_month">حسب الشهر</string>
-    <string name="stats_timeframe_by_week">حسب الأسبوع</string>
-    <string name="stats_timeframe_by_day">حسب اليوم</string>
     <string name="gutenberg_native_waiting_for_connection">انتظار الاتصال</string>
     <string name="stats_traffic">حركة المرور</string>
     <string name="gutenberg_native_working_offline">العمل من دون اتصال بالإنترنت</string>
@@ -1167,6 +1163,7 @@ Language: ar
     <string name="gutenberg_native_no_preview_available">لا توجد معاينة متاحة</string>
     <string name="gutenberg_native_add_title">أضف عنواناً</string>
     <string name="gutenberg_native_loading">تحميل</string>
+    <string name="gutenberg_native_link_label">تسمية الرابط</string>
     <string name="gutenberg_native_s_link">%s رابط</string>
     <string name="gutenberg_native_text_color">لون النص</string>
     <string name="gutenberg_native_padding">الهوامش الداخلية</string>

diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml
@@ -762,6 +762,7 @@ Language: cs_CZ
     <string name="gutenberg_native_gif">GIF</string>
     <string name="gutenberg_native_one">Jeden</string>
     <string name="gutenberg_native_no_preview_available">Náhled není k dispozici.</string>
+    <string name="gutenberg_native_link_label">Popisek odkazu</string>
     <string name="gutenberg_native_s_link">%s odkaz</string>
     <string name="gutenberg_native_text_color">Barva textu</string>
     <string name="gutenberg_native_padding">Odsazení</string>

diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-04-16 07:37:12+0000
+Translation-Revision-Date: 2024-04-30 07:31:08+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.1
 Language: de
 -->
 <resources>
+    <string name="page_upload_conflict_error">Es existiert eine neuere Revision dieser Seite</string>
+    <string name="editor_updating_content">Inhalt wird aktualisiert</string>
+    <string name="stats_subscribers">Abonnenten</string>
+    <string name="stats_subscribers_subscribers">Abonnenten</string>
     <string name="weekly_roundup_notification_text_views_and_comment">Letzte Woche hattest du %1$s Aufrufe und 1 Kommentar</string>
     <string name="weekly_roundup_notification_text_views_and_like">Letzte Woche hattest du %1$s Aufrufe und 1 Like</string>
     <string name="weekly_roundup_notification_text_views_like_comment">Letzte Woche hattest du %1$s Aufrufe, 1 Like und 1 Kommentar.</string>
@@ -59,6 +63,7 @@ Language: de
     <string name="gutenberg_native_copy_error_details">Fehlerdetails kopieren</string>
     <string name="gutenberg_native_button_to_copy_post_text">Button zum Kopieren des Beitragstexts</string>
     <string name="gutenberg_native_button_to_copy_error_details">Button zum Kopieren von Fehlerdetails</string>
+    <string name="editor_updating_content_failed">Das Aktualisieren des Beitragsinhalts ist fehlgeschlagen</string>
     <string name="gutenberg_native_video_caption_s_0141bd20">Videountertitel. %s</string>
     <string name="gutenberg_native_video_caption_empty_663aab49">Videountertitel. Leer</string>
     <string name="gutenberg_native_edit_video_024aee6d">Video bearbeiten</string>
@@ -131,10 +136,6 @@ Language: de
     <string name="reader_filter_empty_blogs_list">Sieh dir die neuesten Beiträge der Blogs an, die du abonniert hast</string>
     <string name="reader_filter_by_tag_title">Nach Schlagwort filtern</string>
     <string name="reader_filter_by_blog_title">Nach Blog filtern</string>
-    <string name="stats_timeframe_by_year">Nach Jahr</string>
-    <string name="stats_timeframe_by_month">Nach Monat</string>
-    <string name="stats_timeframe_by_week">Nach Woche</string>
-    <string name="stats_timeframe_by_day">Nach Tag</string>
     <string name="gutenberg_native_waiting_for_connection">Warten auf Verbindung</string>
     <string name="stats_traffic">Traffic</string>
     <string name="gutenberg_native_working_offline">Offline arbeiten</string>
@@ -1167,6 +1168,7 @@ Language: de
     <string name="gutenberg_native_add_title">Titel hinzufügen</string>
     <string name="gutenberg_native_no_preview_available">Keine Vorschau verfügbar</string>
     <string name="gutenberg_native_loading">Wird geladen</string>
+    <string name="gutenberg_native_link_label">Link-Label</string>
     <string name="gutenberg_native_text_color">Textfarbe</string>
     <string name="gutenberg_native_s_link">%s Link</string>
     <string name="gutenberg_native_padding">Innenabstand</string>

diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml
@@ -76,10 +76,6 @@ Language: en_CA
     <string name="reader_filter_empty_blogs_action">Subscribe to a blog</string>
     <string name="reader_filter_empty_blogs_list">See the newest posts from blogs you\'re subscribed to</string>
     <string name="reader_filter_empty_blogs_list_title">No blog subscriptions</string>
-    <string name="stats_timeframe_by_day">By day</string>
-    <string name="stats_timeframe_by_month">By month</string>
-    <string name="stats_timeframe_by_week">By week</string>
-    <string name="stats_timeframe_by_year">By year</string>
     <string name="gutenberg_native_waiting_for_connection">Waiting for connection</string>
     <string name="stats_traffic">Traffic</string>
     <string name="gutenberg_native_file_type_not_supported_as_a_media_file">File type not supported as a media file.</string>
@@ -1112,6 +1108,7 @@ Language: en_CA
     <string name="gutenberg_native_no_preview_available">No preview available</string>
     <string name="gutenberg_native_add_title">Add title</string>
     <string name="gutenberg_native_loading">Loading</string>
+    <string name="gutenberg_native_link_label">Link label</string>
     <string name="gutenberg_native_text_color">Text colour</string>
     <string name="gutenberg_native_s_link">%s link</string>
     <string name="gutenberg_native_padding">Padding</string>

diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-04-15 19:10:28+0000
+Translation-Revision-Date: 2024-04-29 20:27:13+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.1
 Language: en_GB
 -->
 <resources>
+    <string name="page_upload_conflict_error">There is a revision of this page that is more recent</string>
+    <string name="editor_updating_content">Updating content</string>
+    <string name="stats_subscribers">Subscribers</string>
+    <string name="stats_subscribers_subscribers">Subscribers</string>
     <string name="weekly_roundup_notification_text_views_and_comment">Last week you had %1$s views and 1 comment</string>
     <string name="weekly_roundup_notification_text_views_and_like">Last week you had %1$s views and 1 like</string>
     <string name="weekly_roundup_notification_text_views_like_comment">Last week you had %1$s views, 1 like, and 1 comment.</string>
@@ -59,6 +63,7 @@ Language: en_GB
     <string name="gutenberg_native_copy_error_details">Copy error details</string>
     <string name="gutenberg_native_button_to_copy_post_text">Button to copy post text</string>
     <string name="gutenberg_native_button_to_copy_error_details">Button to copy error details</string>
+    <string name="editor_updating_content_failed">Failed to update content</string>
     <string name="gutenberg_native_video_caption_s_0141bd20">Video caption. %s</string>
     <string name="gutenberg_native_video_caption_empty_663aab49">Video caption. Empty</string>
     <string name="gutenberg_native_edit_video_024aee6d">Edit video</string>
@@ -131,10 +136,6 @@ Language: en_GB
     <string name="reader_filter_empty_blogs_list">See the newest posts from blogs to which you\'re subscribed</string>
     <string name="reader_filter_by_tag_title">Filter by tag</string>
     <string name="reader_filter_by_blog_title">Filter by blog</string>
-    <string name="stats_timeframe_by_year">By year</string>
-    <string name="stats_timeframe_by_month">By month</string>
-    <string name="stats_timeframe_by_week">By week</string>
-    <string name="stats_timeframe_by_day">By day</string>
     <string name="gutenberg_native_waiting_for_connection">Waiting for connection</string>
     <string name="stats_traffic">Traffic</string>
     <string name="gutenberg_native_working_offline">Working offline</string>
@@ -1167,6 +1168,7 @@ Language: en_GB
     <string name="gutenberg_native_add_title">Add title</string>
     <string name="gutenberg_native_no_preview_available">No preview available</string>
     <string name="gutenberg_native_loading">Loading</string>
+    <string name="gutenberg_native_link_label">Link label</string>
     <string name="gutenberg_native_text_color">Text colour</string>
     <string name="gutenberg_native_s_link">%s link</string>
     <string name="gutenberg_native_padding">Padding</string>

diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-04-23 18:44:10+0000
+Translation-Revision-Date: 2024-04-30 20:14:46+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.1
 Language: es_CL
 -->
 <resources>
+    <string name="page_upload_conflict_error">Hay una revisión más reciente de esta página</string>
+    <string name="editor_updating_content">Actualizando el contenido</string>
+    <string name="stats_subscribers">Suscriptores</string>
+    <string name="stats_subscribers_subscribers">Suscriptores</string>
     <string name="weekly_roundup_notification_text_views_and_comment">La semana pasada tuviste %1$s visitas y 1 comentario</string>
     <string name="weekly_roundup_notification_text_views_and_like">La semana pasada tuviste %1$s visitas y 1 Me gusta</string>
     <string name="weekly_roundup_notification_text_views_like_comment">La semana pasada tuviste %1$s visitas, 1 Me gusta y 1 comentario.</string>
@@ -59,6 +63,7 @@ Language: es_CL
     <string name="gutenberg_native_copy_error_details">Copiar detalles del error</string>
     <string name="gutenberg_native_button_to_copy_post_text">Botón para copiar el texto de la entrada</string>
     <string name="gutenberg_native_button_to_copy_error_details">Botón para copiar los detalles del error</string>
+    <string name="editor_updating_content_failed">Error al actualizar el contenido</string>
     <string name="gutenberg_native_video_caption_s_0141bd20">Leyenda del video. %s</string>
     <string name="gutenberg_native_video_caption_empty_663aab49">Leyenda del video. Vacío</string>
     <string name="gutenberg_native_edit_video_024aee6d">Editar el video</string>
@@ -131,10 +136,6 @@ Language: es_CL
     <string name="reader_filter_empty_blogs_list">Ver las últimas entradas de los blogs a los que estás suscrito</string>
     <string name="reader_filter_by_tag_title">Filtrar por etiqueta</string>
     <string name="reader_filter_by_blog_title">Filtrar por blog</string>
-    <string name="stats_timeframe_by_year">Por año</string>
-    <string name="stats_timeframe_by_month">Por mes</string>
-    <string name="stats_timeframe_by_week">Por semana</string>
-    <string name="stats_timeframe_by_day">Por día</string>
     <string name="gutenberg_native_waiting_for_connection">Esperando conexión</string>
     <string name="stats_traffic">Tráfico</string>
     <string name="gutenberg_native_working_offline">Trabajo sin conexión</string>
@@ -1167,6 +1168,7 @@ Language: es_CL
     <string name="gutenberg_native_add_title">Agregar título</string>
     <string name="gutenberg_native_no_preview_available">Vista previa no disponible</string>
     <string name="gutenberg_native_loading">Cargando</string>
+    <string name="gutenberg_native_link_label">Etiqueta del enlace</string>
     <string name="gutenberg_native_text_color">Color del texto</string>
     <string name="gutenberg_native_s_link">Enlace %s</string>
     <string name="gutenberg_native_padding">Relleno</string>

diff --git a/WordPress/src/main/res/values-es-rCO/strings.xml b/WordPress/src/main/res/values-es-rCO/strings.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-04-16 17:37:48+0000
+Translation-Revision-Date: 2024-04-30 20:01:55+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.1
 Language: es_CO
 -->
 <resources>
+    <string name="page_upload_conflict_error">Hay una revisión más reciente de esta página</string>
+    <string name="editor_updating_content">Actualizando el contenido</string>
+    <string name="stats_subscribers">Suscriptores</string>
+    <string name="stats_subscribers_subscribers">Suscriptores</string>
     <string name="weekly_roundup_notification_text_views_and_comment">La semana pasada tuviste %1$s vistas y 1 comentario</string>
     <string name="weekly_roundup_notification_text_views_and_like">La semana pasada tuviste %1$s vistas y 1 like</string>
     <string name="weekly_roundup_notification_text_views_like_comment">La semana pasada tuviste %1$s vistas, 1 like y 1 comentario.</string>
@@ -59,6 +63,7 @@ Language: es_CO
     <string name="gutenberg_native_copy_error_details">Copiar los detalles del error</string>
     <string name="gutenberg_native_button_to_copy_post_text">Botón para copiar el texto de la publicación</string>
     <string name="gutenberg_native_button_to_copy_error_details">Botón para copiar los detalles del error</string>
+    <string name="editor_updating_content_failed">Error al actualizar el contenido</string>
     <string name="gutenberg_native_video_caption_s_0141bd20">Leyenda del vídeo. %s</string>
     <string name="gutenberg_native_video_caption_empty_663aab49">Leyenda del vídeo. Vacía</string>
     <string name="gutenberg_native_edit_video_024aee6d">Editar vídeo</string>
@@ -131,10 +136,6 @@ Language: es_CO
     <string name="reader_filter_empty_blogs_list">Ver las últimas entradas de los blogs a los que estás suscrito</string>
     <string name="reader_filter_by_tag_title">Filtrar por etiqueta</string>
     <string name="reader_filter_by_blog_title">Filtrar por blog</string>
-    <string name="stats_timeframe_by_year">Por año</string>
-    <string name="stats_timeframe_by_month">Por mes</string>
-    <string name="stats_timeframe_by_week">Por semana</string>
-    <string name="stats_timeframe_by_day">Por día</string>
     <string name="gutenberg_native_waiting_for_connection">Esperando conexión</string>
     <string name="stats_traffic">Tráfico</string>
     <string name="gutenberg_native_working_offline">Trabajo sin conexión</string>
@@ -1167,6 +1168,7 @@ Language: es_CO
     <string name="gutenberg_native_add_title">Añadir título</string>
     <string name="gutenberg_native_no_preview_available">Vista previa no disponible</string>
     <string name="gutenberg_native_loading">Cargando</string>
+    <string name="gutenberg_native_link_label">Etiqueta del enlace</string>
     <string name="gutenberg_native_text_color">Color del texto</string>
     <string name="gutenberg_native_s_link">Enlace %s</string>
     <string name="gutenberg_native_padding">Relleno</string>

diff --git a/WordPress/src/main/res/values-es-rVE/strings.xml b/WordPress/src/main/res/values-es-rVE/strings.xml
@@ -530,6 +530,7 @@ Language: es_VE
     <string name="gutenberg_native_gif">GIF</string>
     <string name="gutenberg_native_one">Uno</string>
     <string name="gutenberg_native_no_preview_available">Vista previa no disponible</string>
+    <string name="gutenberg_native_link_label">Etiqueta del enlace</string>
     <string name="gutenberg_native_text_color">Color del texto</string>
     <string name="gutenberg_native_s_link">Enlace %s</string>
     <string name="gutenberg_native_padding">Relleno</string>

diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-04-17 18:54:10+0000
+Translation-Revision-Date: 2024-04-30 07:01:35+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.1
 Language: es
 -->
 <resources>
+    <string name="page_upload_conflict_error">Hay una revisión más reciente de esta página</string>
+    <string name="editor_updating_content">Actualizando el contenido</string>
+    <string name="stats_subscribers">Suscriptores</string>
+    <string name="stats_subscribers_subscribers">Suscriptores</string>
     <string name="weekly_roundup_notification_text_views_and_comment">La semana pasada tuviste %1$s visitas y 1 comentario</string>
     <string name="weekly_roundup_notification_text_views_and_like">La semana pasada tuviste %1$s visitas y 1 Me gusta</string>
     <string name="weekly_roundup_notification_text_views_like_comment">La semana pasada tuviste %1$s visitas, 1 Me gusta y 1 comentario.</string>
@@ -59,6 +63,7 @@ Language: es
     <string name="gutenberg_native_copy_error_details">Copiar detalles del error</string>
     <string name="gutenberg_native_button_to_copy_post_text">Botón para copiar el texto de la entrada</string>
     <string name="gutenberg_native_button_to_copy_error_details">Botón para copiar los detalles del error</string>
+    <string name="editor_updating_content_failed">Error al actualizar el contenido</string>
     <string name="gutenberg_native_video_caption_s_0141bd20">Leyenda del vídeo. %s</string>
     <string name="gutenberg_native_video_caption_empty_663aab49">Leyenda del vídeo. Vacío</string>
     <string name="gutenberg_native_edit_video_024aee6d">Editar el vídeo</string>
@@ -131,10 +136,6 @@ Language: es
     <string name="reader_filter_empty_blogs_list">Ver las últimas entradas de los blogs a los que estás suscrito</string>
     <string name="reader_filter_by_tag_title">Filtrar por etiqueta</string>
     <string name="reader_filter_by_blog_title">Filtrar por blog</string>
-    <string name="stats_timeframe_by_year">Por año</string>
-    <string name="stats_timeframe_by_month">Por mes</string>
-    <string name="stats_timeframe_by_week">Por semana</string>
-    <string name="stats_timeframe_by_day">Por día</string>
     <string name="gutenberg_native_waiting_for_connection">Esperando conexión</string>
     <string name="stats_traffic">Tráfico</string>
     <string name="gutenberg_native_working_offline">Trabajo sin conexión</string>
@@ -661,7 +662,7 @@ Language: es
     <string name="qrcode_auth_flow_dismiss_dialog_message">¿Seguro que quieres continuar?</string>
     <string name="qrcode_auth_flow_dismiss_dialog_title">Salir del flujo de escaneo de código de acceso</string>
     <string name="qrcode_auth_flow_error_auth_failed_subtitle">No se ha podido acceder con este código de acceso. Toca el botón Analizar de nuevo para volver a escanear el código.</string>
-    <string name="qrcode_auth_flow_error_auth_failed_title">Ha fallado la autentificación</string>
+    <string name="qrcode_auth_flow_error_auth_failed_title">Identificación fallida</string>
     <string name="qrcode_auth_flow_error_expired_subtitle">Este código de acceso ha caducado. Toca el botón Analizar de nuevo para volver a escanear el código.</string>
     <string name="qrcode_auth_flow_error_expired_title">El código de acceso ha caducado</string>
     <string name="qrcode_auth_flow_error_invalid_data_subtitle">No se ha podido validar el código de acceso escaneado. Toca el botón Analizar de nuevo para volver a escanear el código.</string>
@@ -1167,6 +1168,7 @@ Language: es
     <string name="gutenberg_native_add_title">Añadir título</string>
     <string name="gutenberg_native_no_preview_available">Vista previa no disponible</string>
     <string name="gutenberg_native_loading">Cargando</string>
+    <string name="gutenberg_native_link_label">Etiqueta del enlace</string>
     <string name="gutenberg_native_text_color">Color del texto</string>
     <string name="gutenberg_native_s_link">Enlace %s</string>
     <string name="gutenberg_native_padding">Relleno</string>