Skip to content

Commit aacc613

Browse files
committed
Fix merge conflicts
1 parent b0b7e6c commit aacc613

File tree

17 files changed

+117
-373
lines changed

17 files changed

+117
-373
lines changed

WooCommerce/Resources/ar.lproj/Localizable.strings

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"Certificate error" = "خطأ في الشهادة";
136136

137137
/* Deletes all activity logs except for the marked 'Current'. */
138-
"Reset Activity Log" = "مسح سجلات النشاط القديمة";
138+
"Clear old activity logs" = "مسح سجلات النشاط القديمة";
139139

140140
/* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
141141
"Collect Information" = "جمع المعلومات";
@@ -233,9 +233,6 @@
233233
/* WordPress.com (unmapped!) error */
234234
"Dotcom Error: [(code)] (theMessage)" = "خطأ في الدوت كوم: [(رمز)] (theMessage)";
235235

236-
/* WordPress.com error thrown when the the request REST API url is invalid. */
237-
"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
238-
239236
/* WordPress.com Missing Token */
240237
"Dotcom Missing Token" = "رمز الدوت كوم المميز مفقود";
241238

@@ -426,7 +423,7 @@
426423
"Log in with your WordPress.com account email address to manage your WooCommerce stores." = "سجِّل الدخول باستخدام عنوان البريد الإلكتروني لحساب وردبرس.كوم الخاص بك لإدارة متاجر WooCommerce الخاصة بك.";
427424

428425
/* Log out button title */
429-
"Log Out" = "تسجيل الخروج من الحساب";
426+
"Log out account" = "تسجيل الخروج من الحساب";
430427

431428
/* Title of a button. */
432429
"Lost your password?" = "هل فقدت كلمة مرورك؟";
@@ -479,8 +476,7 @@
479476
/* My Tickets title */
480477
"My Tickets" = "تذاكري";
481478

482-
/* My Store Notice Title for loading error
483-
Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
479+
/* Dashboard navigation title */
484480
"My store" = "متجري";
485481

486482
/* Name text field placeholder */
@@ -639,6 +635,9 @@
639635
/* Message to ask the user to check their email and look for a WordPress.com email. */
640636
"Please open your email app and look for an email from WordPress.com." = "يُرجى فتح تطبيق البريد الإلكتروني والبحث عن بريد إلكتروني من وردبرس.كوم.";
641637

638+
/* My Store > Settings > Primary Store information section */
639+
"Primary Store" = "متجر أساسي";
640+
642641
/* Opens the Privacy Policy web page */
643642
"Privacy Policy" = "سياسة الخصوصية";
644643

@@ -720,9 +719,6 @@
720719
/* Search Orders */
721720
"Search orders" = "البحث عن الطلبات";
722721

723-
/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
724-
"Selected Store" = "Selected Store";
725-
726722
/* Title of a button. The text should be uppercase. Clicking requests a hyperlink be emailed ot the user. */
727723
"Send Link" = "إرسال رابط";
728724

@@ -832,9 +828,6 @@
832828
/* Subtotal label for payment view */
833829
"Subtotal" = "الإجمالي الفرعي";
834830

835-
/* This action allows the user to change stores without logging out and logging back in again. */
836-
"Switch Store" = "Switch Store";
837-
838831
/* Labels an order note to let user know it's a system status message */
839832
"System status" = "حالة النظام";
840833

@@ -968,18 +961,9 @@
968961
/* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
969962
"Unable To Connect" = "يتعذر الاتصال";
970963

971-
/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
972-
"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
973-
974964
/* Displayed during the Login flow, whenever the user has no woo stores associated. */
975965
"Unable to find WooCommerce stores connected to this account" = "يتعذر العثور على متاجر WooCommerce المتصلة بهذا الحساب";
976966

977-
/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
978-
"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
979-
980-
/* Load Action Failed */
981-
"Unable to load content" = "Unable to load content";
982-
983967
/* Review error notice message. It reads: Unable to mark review as {attempted status} */
984968
"Unable to mark review as %@" = "Unable to mark review as %@";
985969

WooCommerce/Resources/de.lproj/Localizable.strings

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"Certificate error" = "Zertifikatsfehler";
136136

137137
/* Deletes all activity logs except for the marked 'Current'. */
138-
"Reset Activity Log" = "Alte Aktivitätsprotokolle löschen";
138+
"Clear old activity logs" = "Alte Aktivitätsprotokolle löschen";
139139

140140
/* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
141141
"Collect Information" = "Informationen erfassen";
@@ -233,9 +233,6 @@
233233
/* WordPress.com (unmapped!) error */
234234
"Dotcom Error: [(code)] (theMessage)" = "Dotcom-Fehler: [(code)] (theMessage)";
235235

236-
/* WordPress.com error thrown when the the request REST API url is invalid. */
237-
"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
238-
239236
/* WordPress.com Missing Token */
240237
"Dotcom Missing Token" = "Fehlender Dotcom-Token";
241238

@@ -426,7 +423,7 @@
426423
"Log in with your WordPress.com account email address to manage your WooCommerce stores." = "Melde dich mit der E-Mail-Adresse deines WordPress.com-Kontos an, um deine WooCommerce-Shops zu verwalten.";
427424

428425
/* Log out button title */
429-
"Log Out" = "Von Konto abmelden";
426+
"Log out account" = "Von Konto abmelden";
430427

431428
/* Title of a button. */
432429
"Lost your password?" = "Passwort vergessen?";
@@ -479,8 +476,7 @@
479476
/* My Tickets title */
480477
"My Tickets" = "Meine Tickets";
481478

482-
/* My Store Notice Title for loading error
483-
Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
479+
/* Dashboard navigation title */
484480
"My store" = "Mein Shop";
485481

486482
/* Name text field placeholder */
@@ -639,6 +635,9 @@
639635
/* Message to ask the user to check their email and look for a WordPress.com email. */
640636
"Please open your email app and look for an email from WordPress.com." = "Bitte öffne deine E-Mail-App und suche nach einer E-Mail von WordPress.com.";
641637

638+
/* My Store > Settings > Primary Store information section */
639+
"Primary Store" = "Hauptshop";
640+
642641
/* Opens the Privacy Policy web page */
643642
"Privacy Policy" = "Datenschutzerklärung";
644643

@@ -720,9 +719,6 @@
720719
/* Search Orders */
721720
"Search orders" = "Bestellungen durchsuchen";
722721

723-
/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
724-
"Selected Store" = "Selected Store";
725-
726722
/* Title of a button. The text should be uppercase. Clicking requests a hyperlink be emailed ot the user. */
727723
"Send Link" = "Link senden";
728724

@@ -832,9 +828,6 @@
832828
/* Subtotal label for payment view */
833829
"Subtotal" = "Zwischensumme";
834830

835-
/* This action allows the user to change stores without logging out and logging back in again. */
836-
"Switch Store" = "Switch Store";
837-
838831
/* Labels an order note to let user know it's a system status message */
839832
"System status" = "Systemstatus";
840833

@@ -968,18 +961,9 @@
968961
/* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
969962
"Unable To Connect" = "Verbindung kann nicht hergestellt werden";
970963

971-
/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
972-
"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
973-
974964
/* Displayed during the Login flow, whenever the user has no woo stores associated. */
975965
"Unable to find WooCommerce stores connected to this account" = "Es können keine WooCommerce-Shops gefunden werden, die mit diesem Konto verknüpft sind";
976966

977-
/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
978-
"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
979-
980-
/* Load Action Failed */
981-
"Unable to load content" = "Unable to load content";
982-
983967
/* Review error notice message. It reads: Unable to mark review as {attempted status} */
984968
"Unable to mark review as %@" = "Unable to mark review as %@";
985969

WooCommerce/Resources/en.lproj/Localizable.strings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Title for an untitled post, should match WP core */
1+
/* Title for an untitled post, should match WP core */
22
"(no title)" = "(no title)";
33

44
/* An error message. */
@@ -133,7 +133,7 @@
133133
"Certificate error" = "Certificate error";
134134

135135
/* Deletes all activity logs except for the marked 'Current'. */
136-
"Reset Activity Log" = "Reset Activity Log";
136+
"Clear old activity logs" = "Clear old activity logs";
137137

138138
/* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
139139
"Collect Information" = "Collect Information";
@@ -430,7 +430,7 @@
430430
"Log Out" = "Log Out";
431431

432432
/* Log out button title */
433-
"Log Out" = "Log Out";
433+
"Log out account" = "Log out account";
434434

435435
/* Title of a button. */
436436
"Lost your password?" = "Lost your password?";

WooCommerce/Resources/es.lproj/Localizable.strings

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"Certificate error" = "Error del certificado";
136136

137137
/* Deletes all activity logs except for the marked 'Current'. */
138-
"Reset Activity Log" = "Borrar registros de actividad antiguos";
138+
"Clear old activity logs" = "Borrar registros de actividad antiguos";
139139

140140
/* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
141141
"Collect Information" = "Recopilar información";
@@ -233,9 +233,6 @@
233233
/* WordPress.com (unmapped!) error */
234234
"Dotcom Error: [(code)] (theMessage)" = "Error de Dotcom: [(code)] (theMessage)";
235235

236-
/* WordPress.com error thrown when the the request REST API url is invalid. */
237-
"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
238-
239236
/* WordPress.com Missing Token */
240237
"Dotcom Missing Token" = "Token Dotcom perdido";
241238

@@ -426,7 +423,7 @@
426423
"Log in with your WordPress.com account email address to manage your WooCommerce stores." = "Accede con la dirección de correo electrónico de tu cuenta de WordPress.com para gestionar tus tiendas de WooCommerce.";
427424

428425
/* Log out button title */
429-
"Log Out" = "Salir de la cuenta";
426+
"Log out account" = "Salir de la cuenta";
430427

431428
/* Title of a button. */
432429
"Lost your password?" = "¿Has perdido tu contraseña?";
@@ -479,8 +476,7 @@
479476
/* My Tickets title */
480477
"My Tickets" = "Mis tickets";
481478

482-
/* My Store Notice Title for loading error
483-
Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
479+
/* Dashboard navigation title */
484480
"My store" = "Mi tienda";
485481

486482
/* Name text field placeholder */
@@ -639,6 +635,9 @@
639635
/* Message to ask the user to check their email and look for a WordPress.com email. */
640636
"Please open your email app and look for an email from WordPress.com." = "Por favor, abre tu aplicación de correo electrónico y busca un correo de WordPress.com.";
641637

638+
/* My Store > Settings > Primary Store information section */
639+
"Primary Store" = "Tienda principal";
640+
642641
/* Opens the Privacy Policy web page */
643642
"Privacy Policy" = "Política de privacidad";
644643

@@ -720,9 +719,6 @@
720719
/* Search Orders */
721720
"Search orders" = "Buscar en pedidos";
722721

723-
/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
724-
"Selected Store" = "Selected Store";
725-
726722
/* Title of a button. The text should be uppercase. Clicking requests a hyperlink be emailed ot the user. */
727723
"Send Link" = "Enviar enlace";
728724

@@ -832,9 +828,6 @@
832828
/* Subtotal label for payment view */
833829
"Subtotal" = "Subtotal";
834830

835-
/* This action allows the user to change stores without logging out and logging back in again. */
836-
"Switch Store" = "Switch Store";
837-
838831
/* Labels an order note to let user know it's a system status message */
839832
"System status" = "Estado del sistema";
840833

@@ -968,18 +961,9 @@
968961
/* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
969962
"Unable To Connect" = "No fue posible conectar";
970963

971-
/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
972-
"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
973-
974964
/* Displayed during the Login flow, whenever the user has no woo stores associated. */
975965
"Unable to find WooCommerce stores connected to this account" = "No se han podido encontrar tiendas WooCommerce conectadas a esta cuenta";
976966

977-
/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
978-
"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
979-
980-
/* Load Action Failed */
981-
"Unable to load content" = "Unable to load content";
982-
983967
/* Review error notice message. It reads: Unable to mark review as {attempted status} */
984968
"Unable to mark review as %@" = "Unable to mark review as %@";
985969

WooCommerce/Resources/fr.lproj/Localizable.strings

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"Certificate error" = "Erreur de certificat";
136136

137137
/* Deletes all activity logs except for the marked 'Current'. */
138-
"Reset Activity Log" = "Effacer vos anciens journaux d'activités";
138+
"Clear old activity logs" = "Effacer vos anciens journaux d'activités";
139139

140140
/* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
141141
"Collect Information" = "Recueil d’information";
@@ -233,9 +233,6 @@
233233
/* WordPress.com (unmapped!) error */
234234
"Dotcom Error: [(code)] (theMessage)" = "Erreur Dotcom : [(code)] (theMessage)";
235235

236-
/* WordPress.com error thrown when the the request REST API url is invalid. */
237-
"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
238-
239236
/* WordPress.com Missing Token */
240237
"Dotcom Missing Token" = "Jeton Dotcom manquant";
241238

@@ -426,7 +423,7 @@
426423
"Log in with your WordPress.com account email address to manage your WooCommerce stores." = "Connectez-vous avec l’adresse e-mail de votre compte WordPress.com afin de gérer toutes vos boutiques WooCommerce.";
427424

428425
/* Log out button title */
429-
"Log Out" = "Déconnecter le compte";
426+
"Log out account" = "Déconnecter le compte";
430427

431428
/* Title of a button. */
432429
"Lost your password?" = "Mot de passe oublié ?";
@@ -479,8 +476,7 @@
479476
/* My Tickets title */
480477
"My Tickets" = "Mes tickets";
481478

482-
/* My Store Notice Title for loading error
483-
Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
479+
/* Dashboard navigation title */
484480
"My store" = "Ma boutique";
485481

486482
/* Name text field placeholder */
@@ -639,6 +635,9 @@
639635
/* Message to ask the user to check their email and look for a WordPress.com email. */
640636
"Please open your email app and look for an email from WordPress.com." = "Merci d'ouvrir votre boîte de réception et de rechercher un e-mail de WordPress.com.";
641637

638+
/* My Store > Settings > Primary Store information section */
639+
"Primary Store" = "Boutique principale";
640+
642641
/* Opens the Privacy Policy web page */
643642
"Privacy Policy" = "Politique de confidentialité";
644643

@@ -720,9 +719,6 @@
720719
/* Search Orders */
721720
"Search orders" = "Rechercher des commandes";
722721

723-
/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
724-
"Selected Store" = "Selected Store";
725-
726722
/* Title of a button. The text should be uppercase. Clicking requests a hyperlink be emailed ot the user. */
727723
"Send Link" = "Envoyer le lien";
728724

@@ -832,9 +828,6 @@
832828
/* Subtotal label for payment view */
833829
"Subtotal" = "Sous-total";
834830

835-
/* This action allows the user to change stores without logging out and logging back in again. */
836-
"Switch Store" = "Switch Store";
837-
838831
/* Labels an order note to let user know it's a system status message */
839832
"System status" = "État du système";
840833

@@ -968,18 +961,9 @@
968961
/* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
969962
"Unable To Connect" = "Impossible de connecter";
970963

971-
/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
972-
"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
973-
974964
/* Displayed during the Login flow, whenever the user has no woo stores associated. */
975965
"Unable to find WooCommerce stores connected to this account" = "Boutiques WooCommerce connectées à ce compte introuvables";
976966

977-
/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
978-
"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
979-
980-
/* Load Action Failed */
981-
"Unable to load content" = "Unable to load content";
982-
983967
/* Review error notice message. It reads: Unable to mark review as {attempted status} */
984968
"Unable to mark review as %@" = "Unable to mark review as %@";
985969

0 commit comments

Comments
 (0)