Fix merge conflicts

Author: loremattei

.gitignore

@@ -75,6 +75,7 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/README.md 
+Preview.html
 
 \.DS_Store
 

WooCommerce/Resources/ar.lproj/Localizable.strings

@@ -233,6 +233,9 @@
 /* WordPress.com (unmapped!) error */
 "Dotcom Error: [(code)] (theMessage)" = "خطأ في الدوت كوم: [(رمز)] (theMessage)";
 
+/* WordPress.com error thrown when the the request REST API url is invalid. */
+"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
+
 /* WordPress.com Missing Token */
 "Dotcom Missing Token" = "رمز الدوت كوم المميز مفقود";
 
@@ -476,7 +479,8 @@
 /* My Tickets title */
 "My Tickets" = "تذاكري";
 
-/* Dashboard navigation title */
+/* My Store Notice Title for loading error
+   Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
 "My store" = "متجري";
 
 /* Name text field placeholder */
@@ -635,9 +639,6 @@
 /* Message to ask the user to check their email and look for a WordPress.com email. */
 "Please open your email app and look for an email from WordPress.com." = "يُرجى فتح تطبيق البريد الإلكتروني والبحث عن بريد إلكتروني من وردبرس.كوم.";
 
-/* My Store > Settings > Primary Store information section */
-"Primary Store" = "متجر أساسي";
-
 /* Opens the Privacy Policy web page */
 "Privacy Policy" = "سياسة الخصوصية";
 
@@ -719,6 +720,9 @@
 /* Search Orders */
 "Search orders" = "البحث عن الطلبات";
 
+/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
+"Selected Store" = "Selected Store";
+
 /* Title of a button. The text should be uppercase.  Clicking requests a hyperlink be emailed ot the user. */
 "Send Link" = "إرسال رابط";
 
@@ -828,6 +832,9 @@
 /* Subtotal label for payment view */
 "Subtotal" = "الإجمالي الفرعي";
 
+/* This action allows the user to change stores without logging out and logging back in again. */
+"Switch Store" = "Switch Store";
+
 /* Labels an order note to let user know it's a system status message */
 "System status" = "حالة النظام";
 
@@ -961,9 +968,18 @@
 /* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
 "Unable To Connect" = "يتعذر الاتصال";
 
+/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
+"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
+
 /* Displayed during the Login flow, whenever the user has no woo stores associated. */
 "Unable to find WooCommerce stores connected to this account" = "يتعذر العثور على متاجر WooCommerce المتصلة بهذا الحساب";
 
+/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
+"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
+
+/* Load Action Failed */
+"Unable to load content" = "Unable to load content";
+
 /* Review error notice message. It reads: Unable to mark review as {attempted status} */
 "Unable to mark review as %@" = "Unable to mark review as %@";
 

WooCommerce/Resources/de.lproj/Localizable.strings

@@ -233,6 +233,9 @@
 /* WordPress.com (unmapped!) error */
 "Dotcom Error: [(code)] (theMessage)" = "Dotcom-Fehler: [(code)] (theMessage)";
 
+/* WordPress.com error thrown when the the request REST API url is invalid. */
+"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
+
 /* WordPress.com Missing Token */
 "Dotcom Missing Token" = "Fehlender Dotcom-Token";
 
@@ -476,7 +479,8 @@
 /* My Tickets title */
 "My Tickets" = "Meine Tickets";
 
-/* Dashboard navigation title */
+/* My Store Notice Title for loading error
+   Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
 "My store" = "Mein Shop";
 
 /* Name text field placeholder */
@@ -635,9 +639,6 @@
 /* Message to ask the user to check their email and look for a WordPress.com email. */
 "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.";
 
-/* My Store > Settings > Primary Store information section */
-"Primary Store" = "Hauptshop";
-
 /* Opens the Privacy Policy web page */
 "Privacy Policy" = "Datenschutzerklärung";
 
@@ -719,6 +720,9 @@
 /* Search Orders */
 "Search orders" = "Bestellungen durchsuchen";
 
+/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
+"Selected Store" = "Selected Store";
+
 /* Title of a button. The text should be uppercase.  Clicking requests a hyperlink be emailed ot the user. */
 "Send Link" = "Link senden";
 
@@ -828,6 +832,9 @@
 /* Subtotal label for payment view */
 "Subtotal" = "Zwischensumme";
 
+/* This action allows the user to change stores without logging out and logging back in again. */
+"Switch Store" = "Switch Store";
+
 /* Labels an order note to let user know it's a system status message */
 "System status" = "Systemstatus";
 
@@ -961,9 +968,18 @@
 /* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
 "Unable To Connect" = "Verbindung kann nicht hergestellt werden";
 
+/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
+"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
+
 /* Displayed during the Login flow, whenever the user has no woo stores associated. */
 "Unable to find WooCommerce stores connected to this account" = "Es können keine WooCommerce-Shops gefunden werden, die mit diesem Konto verknüpft sind";
 
+/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
+"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
+
+/* Load Action Failed */
+"Unable to load content" = "Unable to load content";
+
 /* Review error notice message. It reads: Unable to mark review as {attempted status} */
 "Unable to mark review as %@" = "Unable to mark review as %@";
 

WooCommerce/Resources/es.lproj/Localizable.strings

@@ -233,6 +233,9 @@
 /* WordPress.com (unmapped!) error */
 "Dotcom Error: [(code)] (theMessage)" = "Error de Dotcom: [(code)] (theMessage)";
 
+/* WordPress.com error thrown when the the request REST API url is invalid. */
+"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
+
 /* WordPress.com Missing Token */
 "Dotcom Missing Token" = "Token Dotcom perdido";
 
@@ -476,7 +479,8 @@
 /* My Tickets title */
 "My Tickets" = "Mis tickets";
 
-/* Dashboard navigation title */
+/* My Store Notice Title for loading error
+   Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
 "My store" = "Mi tienda";
 
 /* Name text field placeholder */
@@ -635,9 +639,6 @@
 /* Message to ask the user to check their email and look for a WordPress.com email. */
 "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.";
 
-/* My Store > Settings > Primary Store information section */
-"Primary Store" = "Tienda principal";
-
 /* Opens the Privacy Policy web page */
 "Privacy Policy" = "Política de privacidad";
 
@@ -719,6 +720,9 @@
 /* Search Orders */
 "Search orders" = "Buscar en pedidos";
 
+/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
+"Selected Store" = "Selected Store";
+
 /* Title of a button. The text should be uppercase.  Clicking requests a hyperlink be emailed ot the user. */
 "Send Link" = "Enviar enlace";
 
@@ -828,6 +832,9 @@
 /* Subtotal label for payment view */
 "Subtotal" = "Subtotal";
 
+/* This action allows the user to change stores without logging out and logging back in again. */
+"Switch Store" = "Switch Store";
+
 /* Labels an order note to let user know it's a system status message */
 "System status" = "Estado del sistema";
 
@@ -961,9 +968,18 @@
 /* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
 "Unable To Connect" = "No fue posible conectar";
 
+/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
+"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
+
 /* Displayed during the Login flow, whenever the user has no woo stores associated. */
 "Unable to find WooCommerce stores connected to this account" = "No se han podido encontrar tiendas WooCommerce conectadas a esta cuenta";
 
+/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
+"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
+
+/* Load Action Failed */
+"Unable to load content" = "Unable to load content";
+
 /* Review error notice message. It reads: Unable to mark review as {attempted status} */
 "Unable to mark review as %@" = "Unable to mark review as %@";
 

WooCommerce/Resources/fr.lproj/Localizable.strings

@@ -233,6 +233,9 @@
 /* WordPress.com (unmapped!) error */
 "Dotcom Error: [(code)] (theMessage)" = "Erreur Dotcom : [(code)] (theMessage)";
 
+/* WordPress.com error thrown when the the request REST API url is invalid. */
+"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
+
 /* WordPress.com Missing Token */
 "Dotcom Missing Token" = "Jeton Dotcom manquant";
 
@@ -476,7 +479,8 @@
 /* My Tickets title */
 "My Tickets" = "Mes tickets";
 
-/* Dashboard navigation title */
+/* My Store Notice Title for loading error
+   Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
 "My store" = "Ma boutique";
 
 /* Name text field placeholder */
@@ -635,9 +639,6 @@
 /* Message to ask the user to check their email and look for a WordPress.com email. */
 "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.";
 
-/* My Store > Settings > Primary Store information section */
-"Primary Store" = "Boutique principale";
-
 /* Opens the Privacy Policy web page */
 "Privacy Policy" = "Politique de confidentialité";
 
@@ -719,6 +720,9 @@
 /* Search Orders */
 "Search orders" = "Rechercher des commandes";
 
+/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
+"Selected Store" = "Selected Store";
+
 /* Title of a button. The text should be uppercase.  Clicking requests a hyperlink be emailed ot the user. */
 "Send Link" = "Envoyer le lien";
 
@@ -828,6 +832,9 @@
 /* Subtotal label for payment view */
 "Subtotal" = "Sous-total";
 
+/* This action allows the user to change stores without logging out and logging back in again. */
+"Switch Store" = "Switch Store";
+
 /* Labels an order note to let user know it's a system status message */
 "System status" = "État du système";
 
@@ -961,9 +968,18 @@
 /* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
 "Unable To Connect" = "Impossible de connecter";
 
+/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
+"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
+
 /* Displayed during the Login flow, whenever the user has no woo stores associated. */
 "Unable to find WooCommerce stores connected to this account" = "Boutiques WooCommerce connectées à ce compte introuvables";
 
+/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
+"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
+
+/* Load Action Failed */
+"Unable to load content" = "Unable to load content";
+
 /* Review error notice message. It reads: Unable to mark review as {attempted status} */
 "Unable to mark review as %@" = "Unable to mark review as %@";
 

WooCommerce/Resources/he.lproj/Localizable.strings

@@ -233,6 +233,9 @@
 /* WordPress.com (unmapped!) error */
 "Dotcom Error: [(code)] (theMessage)" = "שגיאת Dotcom: [(code)] (theMessage)";
 
+/* WordPress.com error thrown when the the request REST API url is invalid. */
+"Dotcom Invalid REST Route" = "Dotcom Invalid REST Route";
+
 /* WordPress.com Missing Token */
 "Dotcom Missing Token" = "לפריט Dotcom חסר אסימון";
 
@@ -476,7 +479,8 @@
 /* My Tickets title */
 "My Tickets" = "הפנייה שלי";
 
-/* Dashboard navigation title */
+/* My Store Notice Title for loading error
+   Title of the bottom tab item that presents the user's store dashboard, and default title for the store dashboard */
 "My store" = "החנות שלי";
 
 /* Name text field placeholder */
@@ -635,9 +639,6 @@
 /* Message to ask the user to check their email and look for a WordPress.com email. */
 "Please open your email app and look for an email from WordPress.com." = "יש לפתוח את אפליקציית האימייל שלך ולחפש את ההודעה שנשלחה מ-WordPress.com.";
 
-/* My Store > Settings > Primary Store information section */
-"Primary Store" = "חנות ראשית";
-
 /* Opens the Privacy Policy web page */
 "Privacy Policy" = "מדיניות פרטיות";
 
@@ -719,6 +720,9 @@
 /* Search Orders */
 "Search orders" = "חיפוש הזמנות";
 
+/* My Store > Settings > Selected Store information section. This is the heading listed above the information row that displays the store website and their username. */
+"Selected Store" = "Selected Store";
+
 /* Title of a button. The text should be uppercase.  Clicking requests a hyperlink be emailed ot the user. */
 "Send Link" = "שליחת קישור";
 
@@ -828,6 +832,9 @@
 /* Subtotal label for payment view */
 "Subtotal" = "סכום ביניים";
 
+/* This action allows the user to change stores without logging out and logging back in again. */
+"Switch Store" = "Switch Store";
+
 /* Labels an order note to let user know it's a system status message */
 "System status" = "מצב מערכת";
 
@@ -961,9 +968,18 @@
 /* Shown when a user logs in with Google but it subsequently fails to work as login to WordPress.com */
 "Unable To Connect" = "אי אפשר להתחבר";
 
+/* Content of error presented when Add Note Action Failed. It reads: Unable to add note to order #{order number} */
+"Unable to add note to order #(viewModel.order.orderID)" = "Unable to add note to order #(viewModel.order.orderID)";
+
 /* Displayed during the Login flow, whenever the user has no woo stores associated. */
 "Unable to find WooCommerce stores connected to this account" = "אין אפשרות למצוא חנויות של WooCommerce שמקושרות לחשבון זה";
 
+/* Content of error presented when Fullfill Order Action Failed. It reads: Unable to fulfill order #{order number} */
+"Unable to fulfill order #(orderID)" = "Unable to fulfill order #(orderID)";
+
+/* Load Action Failed */
+"Unable to load content" = "Unable to load content";
+
 /* Review error notice message. It reads: Unable to mark review as {attempted status} */
 "Unable to mark review as %@" = "Unable to mark review as %@";