Merge branch 'develop' into issue/250-tracking-ui

Author: ctarda

.swiftlint.yml

@@ -99,6 +99,9 @@ whitelist_rules:
   # TODOs and FIXMEs should be avoided.
   # - todo
 
+  # Limit vertical whitespace to a three empty lines (rule configuration is below)
+  - vertical_whitespace
+
   # Files should have a single trailing newline.
   - trailing_newline
 
@@ -129,8 +132,12 @@ whitelist_rules:
 
 # Rules configuration
 
-control_statement: 
-  severity: error 
+vertical_whitespace:
+  max_empty_lines: 3
+  severity: error
+
+control_statement:
+  severity: error
 
 custom_rules:
 

WooCommerce/Classes/ViewRelated/Dashboard/Settings/SettingsViewController.swift

@@ -209,7 +209,7 @@ private extension SettingsViewController {
         cell.selectionStyle = .default
         cell.textLabel?.textAlignment = .center
         cell.textLabel?.textColor = StyleManager.destructiveActionColor
-        cell.textLabel?.text = NSLocalizedString("Log out account", comment: "Log out button title")
+        cell.textLabel?.text = NSLocalizedString("Log Out", comment: "Log out button title")
     }
 }
 

WooCommerce/Resources/ar.lproj/Localizable.strings

@@ -423,7 +423,7 @@
 "Log in with your WordPress.com account email address to manage your WooCommerce stores." = "سجِّل الدخول باستخدام عنوان البريد الإلكتروني لحساب وردبرس.كوم الخاص بك لإدارة متاجر WooCommerce الخاصة بك.";
 
 /* Log out button title */
-"Log out account" = "تسجيل الخروج من الحساب";
+"Log Out" = "تسجيل الخروج من الحساب";
 
 /* Title of a button. */
 "Lost your password?" = "هل فقدت كلمة مرورك؟";

WooCommerce/Resources/de.lproj/Localizable.strings

@@ -423,7 +423,7 @@
 "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.";
 
 /* Log out button title */
-"Log out account" = "Von Konto abmelden";
+"Log Out" = "Von Konto abmelden";
 
 /* Title of a button. */
 "Lost your password?" = "Passwort vergessen?";

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Title for an untitled post, should match WP core */
+/* Title for an untitled post, should match WP core */
 "(no title)" = "(no title)";
 
 /* An error message. */
@@ -430,7 +430,7 @@
 "Log Out" = "Log Out";
 
 /* Log out button title */
-"Log out account" = "Log out account";
+"Log Out" = "Log Out";
 
 /* Title of a button.  */
 "Lost your password?" = "Lost your password?";

WooCommerce/Resources/es.lproj/Localizable.strings

@@ -423,7 +423,7 @@
 "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.";
 
 /* Log out button title */
-"Log out account" = "Salir de la cuenta";
+"Log Out" = "Salir de la cuenta";
 
 /* Title of a button. */
 "Lost your password?" = "¿Has perdido tu contraseña?";

WooCommerce/Resources/fr.lproj/Localizable.strings

@@ -423,7 +423,7 @@
 "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.";
 
 /* Log out button title */
-"Log out account" = "Déconnecter le compte";
+"Log Out" = "Déconnecter le compte";
 
 /* Title of a button. */
 "Lost your password?" = "Mot de passe oublié ?";

WooCommerce/Resources/he.lproj/Localizable.strings

@@ -423,7 +423,7 @@
 "Log in with your WordPress.com account email address to manage your WooCommerce stores." = "עליך להתחבר באמצעות כתובת האימייל של החשבון ב-WordPress.com כדי לנהל את החנויות שלך ב-WooCommerce.";
 
 /* Log out button title */
-"Log out account" = "ניתוק החשבון";
+"Log Out" = "ניתוק החשבון";
 
 /* Title of a button. */
 "Lost your password?" = "שחזור סיסמה";

WooCommerce/Resources/id.lproj/Localizable.strings

@@ -423,7 +423,7 @@
 "Log in with your WordPress.com account email address to manage your WooCommerce stores." = "Login dengan alamat email akun WordPress.com Anda untuk mengelola toko WooCommerce.";
 
 /* Log out button title */
-"Log out account" = "Logout dari akun";
+"Log Out" = "Logout dari akun";
 
 /* Title of a button. */
 "Lost your password?" = "Lupa sandi Anda?";

WooCommerce/Resources/it.lproj/Localizable.strings

@@ -423,7 +423,7 @@
 "Log in with your WordPress.com account email address to manage your WooCommerce stores." = "Accedi con l'indirizzo e-mail dell'account WordPress.com per gestire i negozi WooCommerce.";
 
 /* Log out button title */
-"Log out account" = "Disconnetti account";
+"Log Out" = "Disconnetti account";
 
 /* Title of a button. */
 "Lost your password?" = "Password persa?";