Skip to content

Commit 8e4d82e

Browse files
authored
Merge pull request #760 from woocommerce/merge-release-1.3-into-develop
Merge release 1.3 into develop
2 parents 49e2492 + aacc613 commit 8e4d82e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+87
-83
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ fastlane/Preview.html
7575
fastlane/screenshots
7676
fastlane/test_output
7777
fastlane/README.md
78+
Preview.html
7879

7980
\.DS_Store
8081

WooCommerce/Resources/ar.lproj/Localizable.strings

Lines changed: 2 additions & 2 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" = "جمع المعلومات";
@@ -423,7 +423,7 @@
423423
"Log in with your WordPress.com account email address to manage your WooCommerce stores." = "سجِّل الدخول باستخدام عنوان البريد الإلكتروني لحساب وردبرس.كوم الخاص بك لإدارة متاجر WooCommerce الخاصة بك.";
424424

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

428428
/* Title of a button. */
429429
"Lost your password?" = "هل فقدت كلمة مرورك؟";

WooCommerce/Resources/de.lproj/Localizable.strings

Lines changed: 2 additions & 2 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";
@@ -423,7 +423,7 @@
423423
"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.";
424424

425425
/* Log out button title */
426-
"Log Out" = "Von Konto abmelden";
426+
"Log out account" = "Von Konto abmelden";
427427

428428
/* Title of a button. */
429429
"Lost your password?" = "Passwort vergessen?";

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: 2 additions & 2 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";
@@ -423,7 +423,7 @@
423423
"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.";
424424

425425
/* Log out button title */
426-
"Log Out" = "Salir de la cuenta";
426+
"Log out account" = "Salir de la cuenta";
427427

428428
/* Title of a button. */
429429
"Lost your password?" = "¿Has perdido tu contraseña?";

WooCommerce/Resources/fr.lproj/Localizable.strings

Lines changed: 2 additions & 2 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";
@@ -423,7 +423,7 @@
423423
"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.";
424424

425425
/* Log out button title */
426-
"Log Out" = "Déconnecter le compte";
426+
"Log out account" = "Déconnecter le compte";
427427

428428
/* Title of a button. */
429429
"Lost your password?" = "Mot de passe oublié ?";

WooCommerce/Resources/he.lproj/Localizable.strings

Lines changed: 2 additions & 2 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" = "איסוף מידע";
@@ -423,7 +423,7 @@
423423
"Log in with your WordPress.com account email address to manage your WooCommerce stores." = "עליך להתחבר באמצעות כתובת האימייל של החשבון ב-WordPress.com כדי לנהל את החנויות שלך ב-WooCommerce.";
424424

425425
/* Log out button title */
426-
"Log Out" = "ניתוק החשבון";
426+
"Log out account" = "ניתוק החשבון";
427427

428428
/* Title of a button. */
429429
"Lost your password?" = "שחזור סיסמה";

WooCommerce/Resources/id.lproj/Localizable.strings

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

137137
/* Deletes all activity logs except for the marked 'Current'. */
138-
"Reset Activity Log" = "Hapus log aktivitas lama";
138+
"Clear old activity logs" = "Hapus log aktivitas lama";
139139

140140
/* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
141141
"Collect Information" = "Kumpulkan informasi";
@@ -423,7 +423,7 @@
423423
"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.";
424424

425425
/* Log out button title */
426-
"Log Out" = "Logout dari akun";
426+
"Log out account" = "Logout dari akun";
427427

428428
/* Title of a button. */
429429
"Lost your password?" = "Lupa sandi Anda?";

WooCommerce/Resources/it.lproj/Localizable.strings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"Certificate error" = "Errore di certificato";
136136

137137
/* Deletes all activity logs except for the marked 'Current'. */
138-
"Reset Activity Log" = "Cancella i log delle vecchie attività";
138+
"Clear old activity logs" = "Cancella i log delle vecchie attività";
139139

140140
/* Settings > Privacy Settings > collect info section. Label for the `Collect Information` toggle. */
141141
"Collect Information" = "Raccogli informazioni";
@@ -423,7 +423,7 @@
423423
"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.";
424424

425425
/* Log out button title */
426-
"Log Out" = "Disconnetti account";
426+
"Log out account" = "Disconnetti account";
427427

428428
/* Title of a button. */
429429
"Lost your password?" = "Password persa?";

WooCommerce/Resources/ja.lproj/Localizable.strings

Lines changed: 2 additions & 2 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" = "情報を収集";
@@ -423,7 +423,7 @@
423423
"Log in with your WordPress.com account email address to manage your WooCommerce stores." = "WooCommerce ストアを管理するには、WordPress.com アカウントのメールアドレスを使用してログインします。";
424424

425425
/* Log out button title */
426-
"Log Out" = "アカウントからログアウト";
426+
"Log out account" = "アカウントからログアウト";
427427

428428
/* Title of a button. */
429429
"Lost your password?" = "パスワードをお忘れですか ?";

0 commit comments

Comments
 (0)