Skip to content

Commit a299fc3

Browse files
authored
Merge pull request #1051 from Automattic/release/2.17
Merge 2.17 final to develop
2 parents 39e5f34 + 6718c3a commit a299fc3

24 files changed

+140
-117
lines changed

RELEASE-NOTES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2.18
2+
-----
3+
4+
15
2.17
26
-----
37

Simplenote/Resources/AppStoreStrings.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ msgctxt "app_store_keywords"
4646
msgid "simplenote,note,notes,sync,syncing,list,todo,simple,markdown,ideas"
4747
msgstr ""
4848

49-
msgctxt "v2.16-whats-new"
49+
msgctxt "v2.17-whats-new"
5050
msgid ""
5151
"- Bug fixes\n"
5252
msgstr ""

Simplenote/ar.lproj/Localizable.strings

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2021-09-05 19:54:03+0000 */
1+
/* Translation-Revision-Date: 2021-10-26 15:54:04+0000 */
22
/* Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: ar */
@@ -47,10 +47,11 @@
4747
"Bad email or password" = "بريد إلكتروني أو كلمة مرور سيئة";
4848

4949
/* Delete account confirmation alert message */
50-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "عن طريق حذف حسابك، سيتم حذف جميع الملحوظات التي تم إنشاؤها باستخدام هذا الحساب بشكل نهائي. لا يمكن التراجع عن هذا الإجراء.";
50+
"By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible." = "عن طريق حذف الحساب الخاص بـ %@، سيتم حذف جميع الملحوظات التي تم إنشاؤها باستخدام هذا الحساب نهائيًا. لا يمكن التراجع عن هذا الإجراء.";
5151

5252
/* Cancel button title
5353
Cancel the action
54+
Dismiss change password alert action
5455
Password Reset: Cancel */
5556
"Cancel" = "إلغاء";
5657

@@ -218,9 +219,6 @@
218219
/* No Search Results */
219220
"No Results" = "لا توجد نتائج";
220221

221-
/* Dismiss change password alert action */
222-
"Not Now" = "ليس الآن";
223-
224222
/* Placeholder displayed when a note hasn't been published. */
225223
"Not Published" = "لم يتم النشر";
226224

@@ -348,11 +346,14 @@
348346
"This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy." = "تساعدنا هذه المعلومات على تحسين منتجاتنا، وجعل التسويق لصالحك أكثر ملاءمة، وتخصيص تجربة Simplenote.com الخاصة بك والمزيد، مثلما ورد بالتفصيل في سياسة الخصوصية الخاصة بنا.";
349347

350348
/* Compromised password alert message */
351-
"This password has appeared in a data breach, which puts your account at high risk of compromise. It is recommended that you change your password immediately." = "لقد ظهرت كلمة المرور هذه في عملية اختراق بيانات، ما يضع حسابك في خطر كبير لاختراقه. يوصى بتغيير كلمة مرورك على الفور.";
349+
"This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again." = "لقد ظهرت كلمة المرور هذه في عملية اختراق بيانات، ما يضع حسابك في خطر كبير لاختراقه. لحماية بياناتك، سيتعين عليك تحديث كلمة مرورك قبل التمكن من تسجيل الدخول مجددًا.";
352350

353351
/* Tooltip: Restore a trashed note */
354352
"Toggle Sidebar" = "تبديل الشريط الجانبي";
355353

354+
/* Error for too many login attempts */
355+
"Too many log in attempts. Try again later." = "محاولات تسجيل دخول كثيرة للغاية. حاول مرة أخرى لاحقًا.";
356+
356357
/* Title for the Trash filter
357358
Title of the view that displays all your deleted notes */
358359
"Trash" = "سلة المهملات";

Simplenote/cy.lproj/Localizable.strings

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@
4747
"Bad email or password" = "Bad email or password";
4848

4949
/* Delete account confirmation alert message */
50-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "";
50+
"By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible." = "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible.";
5151

5252
/* Cancel button title
5353
Cancel the action
54+
Dismiss change password alert action
5455
Password Reset: Cancel */
5556
"Cancel" = "Cancel";
5657

@@ -218,9 +219,6 @@
218219
/* No Search Results */
219220
"No Results" = "Dim Canlyniadau";
220221

221-
/* Dismiss change password alert action */
222-
"Not Now" = "";
223-
224222
/* Placeholder displayed when a note hasn't been published. */
225223
"Not Published" = "Not Published";
226224

@@ -348,11 +346,14 @@
348346
"This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy." = "This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy.";
349347

350348
/* Compromised password alert message */
351-
"This password has appeared in a data breach, which puts your account at high risk of compromise. It is recommended that you change your password immediately." = "";
349+
"This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again." = "This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again.";
352350

353351
/* Tooltip: Restore a trashed note */
354352
"Toggle Sidebar" = "Toggle Sidebar";
355353

354+
/* Error for too many login attempts */
355+
"Too many log in attempts. Try again later." = "Too many log in attempts. Try again later.";
356+
356357
/* Title for the Trash filter
357358
Title of the view that displays all your deleted notes */
358359
"Trash" = "Trash";

Simplenote/de.lproj/Localizable.strings

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2021-09-02 09:54:04+0000 */
1+
/* Translation-Revision-Date: 2021-10-27 09:54:04+0000 */
22
/* Plural-Forms: nplurals=2; plural=n != 1; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: de */
@@ -47,10 +47,11 @@
4747
"Bad email or password" = "Falsche E-Mail-Adresse oder falsches Passwort";
4848

4949
/* Delete account confirmation alert message */
50-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "Wenn du dein Konto löschst, werden alle Notizen, die in diesem Konto erstellt wurden, unwiderruflich gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.";
50+
"By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible." = "Wenn du das Konto für %@ löschst, werden alle Notizen, die in diesem Konto erstellt wurden, unwiderruflich gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden.";
5151

5252
/* Cancel button title
5353
Cancel the action
54+
Dismiss change password alert action
5455
Password Reset: Cancel */
5556
"Cancel" = "Abbrechen";
5657

@@ -218,9 +219,6 @@
218219
/* No Search Results */
219220
"No Results" = "Keine Ergebnisse";
220221

221-
/* Dismiss change password alert action */
222-
"Not Now" = "Nicht jetzt";
223-
224222
/* Placeholder displayed when a note hasn't been published. */
225223
"Not Published" = "Nicht veröffentlicht";
226224

@@ -348,11 +346,14 @@
348346
"This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy." = "Diese Informationen helfen uns dabei, unsere Produkte zu verbessern, Marketing besser auf dich zuzuschneiden, deine Erfahrung mit Simplenote.com zu personalisieren und vielem mehr. All das kannst du auch in unserer Datenschutzerklärung nachlesen.";
349347

350348
/* Compromised password alert message */
351-
"This password has appeared in a data breach, which puts your account at high risk of compromise. It is recommended that you change your password immediately." = "Dieses Passwort ist in einer Datenschutzverletzung aufgetaucht, sodass das Risiko einer Sicherheitsverletzung bei deinem Konto hoch ist. Du solltest dein Passwort sofort ändern.";
349+
"This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again." = "Dieses Passwort ist in einer Datenschutzverletzung aufgetaucht, sodass das Risiko einer Sicherheitsverletzung bei deinem Konto hoch ist. Um deine Daten zu schützen, musst du dein Passwort aktualisieren, bevor du dich wieder anmelden kannst.";
352350

353351
/* Tooltip: Restore a trashed note */
354352
"Toggle Sidebar" = "Seitenleiste umschalten";
355353

354+
/* Error for too many login attempts */
355+
"Too many log in attempts. Try again later." = "Zu viele Anmeldeversuche. Versuche es später erneut.";
356+
356357
/* Title for the Trash filter
357358
Title of the view that displays all your deleted notes */
358359
"Trash" = "Entfernen";

Simplenote/el.lproj/Localizable.strings

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@
4747
"Bad email or password" = "Bad email or password";
4848

4949
/* Delete account confirmation alert message */
50-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "";
50+
"By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible." = "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible.";
5151

5252
/* Cancel button title
5353
Cancel the action
54+
Dismiss change password alert action
5455
Password Reset: Cancel */
5556
"Cancel" = "Cancel";
5657

@@ -218,9 +219,6 @@
218219
/* No Search Results */
219220
"No Results" = "Δεν βρέθηκε";
220221

221-
/* Dismiss change password alert action */
222-
"Not Now" = "";
223-
224222
/* Placeholder displayed when a note hasn't been published. */
225223
"Not Published" = "Not Published";
226224

@@ -348,11 +346,14 @@
348346
"This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy." = "This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy.";
349347

350348
/* Compromised password alert message */
351-
"This password has appeared in a data breach, which puts your account at high risk of compromise. It is recommended that you change your password immediately." = "";
349+
"This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again." = "This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again.";
352350

353351
/* Tooltip: Restore a trashed note */
354352
"Toggle Sidebar" = "Toggle Sidebar";
355353

354+
/* Error for too many login attempts */
355+
"Too many log in attempts. Try again later." = "Too many log in attempts. Try again later.";
356+
356357
/* Title for the Trash filter
357358
Title of the view that displays all your deleted notes */
358359
"Trash" = "Trash";

Simplenote/es.lproj/Localizable.strings

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2021-09-07 13:54:04+0000 */
1+
/* Translation-Revision-Date: 2021-10-26 09:54:03+0000 */
22
/* Plural-Forms: nplurals=2; plural=n != 1; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: es */
@@ -47,10 +47,11 @@
4747
"Bad email or password" = "Email o contraseña incorrectos";
4848

4949
/* Delete account confirmation alert message */
50-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "Si eliminas tu cuenta, se eliminarán de forma permanente todas las notas que hayas creado con ella. Esta acción es irreversible.";
50+
"By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible." = "Si eliminas la cuenta de %@, se eliminarán de forma permanente todas las notas que hayas creado con ella. Esta acción es irreversible.";
5151

5252
/* Cancel button title
5353
Cancel the action
54+
Dismiss change password alert action
5455
Password Reset: Cancel */
5556
"Cancel" = "Cancelar";
5657

@@ -218,9 +219,6 @@
218219
/* No Search Results */
219220
"No Results" = "No hay resultados";
220221

221-
/* Dismiss change password alert action */
222-
"Not Now" = "No ahora";
223-
224222
/* Placeholder displayed when a note hasn't been published. */
225223
"Not Published" = "No Publicado";
226224

@@ -348,11 +346,14 @@
348346
"This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy." = "Esta información nos ayuda a mejorar nuestros productos, hacer que el marketing sea más relevante, personalizar tu experiencia en Simplenote.com y más, tal como se detalla en nuestra política de privacidad.";
349347

350348
/* Compromised password alert message */
351-
"This password has appeared in a data breach, which puts your account at high risk of compromise. It is recommended that you change your password immediately." = "Esta contraseña ha aparecido en una filtración de datos, por lo que tu cuenta está expuesta a un alto riesgo. Te recomendamos que cambies la contraseña inmediatamente.";
349+
"This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again." = "Esta contraseña ha aparecido en una filtración de datos, por lo que tu cuenta está expuesta a un alto riesgo. Para proteger tus datos, deberás actualizar tu contraseña antes de poder volver a conectarte.";
352350

353351
/* Tooltip: Restore a trashed note */
354352
"Toggle Sidebar" = "Activar\/desactivar barra lateral";
355353

354+
/* Error for too many login attempts */
355+
"Too many log in attempts. Try again later." = "Demasiados intentos de inicio de sesión. Inténtalo de nuevo más tarde.";
356+
356357
/* Title for the Trash filter
357358
Title of the view that displays all your deleted notes */
358359
"Trash" = "Papelera";

Simplenote/fa.lproj/Localizable.strings

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@
4747
"Bad email or password" = "Bad email or password";
4848

4949
/* Delete account confirmation alert message */
50-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "";
50+
"By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible." = "By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible.";
5151

5252
/* Cancel button title
5353
Cancel the action
54+
Dismiss change password alert action
5455
Password Reset: Cancel */
5556
"Cancel" = "Cancel";
5657

@@ -218,9 +219,6 @@
218219
/* No Search Results */
219220
"No Results" = "No Results";
220221

221-
/* Dismiss change password alert action */
222-
"Not Now" = "";
223-
224222
/* Placeholder displayed when a note hasn't been published. */
225223
"Not Published" = "Not Published";
226224

@@ -348,11 +346,14 @@
348346
"This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy." = "This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy.";
349347

350348
/* Compromised password alert message */
351-
"This password has appeared in a data breach, which puts your account at high risk of compromise. It is recommended that you change your password immediately." = "";
349+
"This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again." = "This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again.";
352350

353351
/* Tooltip: Restore a trashed note */
354352
"Toggle Sidebar" = "Toggle Sidebar";
355353

354+
/* Error for too many login attempts */
355+
"Too many log in attempts. Try again later." = "Too many log in attempts. Try again later.";
356+
356357
/* Title for the Trash filter
357358
Title of the view that displays all your deleted notes */
358359
"Trash" = "Trash";

Simplenote/fr.lproj/Localizable.strings

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2021-09-02 09:54:04+0000 */
1+
/* Translation-Revision-Date: 2021-10-26 09:54:03+0000 */
22
/* Plural-Forms: nplurals=2; plural=n > 1; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: fr */
@@ -47,10 +47,11 @@
4747
"Bad email or password" = "Adresse e-mail ou mot de passe incorrect";
4848

4949
/* Delete account confirmation alert message */
50-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "En supprimant votre compte, toutes les notes créées avec ce compte seront supprimées définitivement. Cette action est irréversible.";
50+
"By deleting the account for %@, all notes created with this account will be permanently deleted. This action is not reversible." = "En supprimant le compte associé à %@, toutes les notes créées avec ce compte seront définitivement supprimées. Cette action est irréversible.";
5151

5252
/* Cancel button title
5353
Cancel the action
54+
Dismiss change password alert action
5455
Password Reset: Cancel */
5556
"Cancel" = "Annuler";
5657

@@ -218,9 +219,6 @@
218219
/* No Search Results */
219220
"No Results" = "Aucun résultat";
220221

221-
/* Dismiss change password alert action */
222-
"Not Now" = "Pas maintenant";
223-
224222
/* Placeholder displayed when a note hasn't been published. */
225223
"Not Published" = "Non publié";
226224

@@ -348,11 +346,14 @@
348346
"This information helps us improve our products, make marketing to you more relevant, personalize your Simplenote.com experience, and more as detailed in our privacy policy." = "Ces informations nous aident à améliorer nos produits, faire du marketing plus pertinent pour vous, personnaliser votre expérience avec Simplenote.com et plus encore comme détaillé dans notre politique de confidentialité.";
349347

350348
/* Compromised password alert message */
351-
"This password has appeared in a data breach, which puts your account at high risk of compromise. It is recommended that you change your password immediately." = "Ce mot de passe est apparu dans une fuite de données, ce qui augmente les risques que votre compte soit compromis. Il vous est recommandé de modifier votre mot de passe immédiatement.";
349+
"This password has appeared in a data breach, which puts your account at high risk of compromise. To protect your data, you'll need to update your password before being able to log in again." = "Ce mot de passe est apparu dans une fuite de données, ce qui augmente les risques que votre compte soit compromis. Afin de protéger vos données, vous devrez mettre à jour votre mot de passe avant de pouvoir vous reconnecter.";
352350

353351
/* Tooltip: Restore a trashed note */
354352
"Toggle Sidebar" = "Activer\/désactiver la colonne latérale";
355353

354+
/* Error for too many login attempts */
355+
"Too many log in attempts. Try again later." = "Nombre excessif de tentatives de connexion. Réessayez plus tard.";
356+
356357
/* Title for the Trash filter
357358
Title of the view that displays all your deleted notes */
358359
"Trash" = "Déplacer vers la corbeille";

0 commit comments

Comments
 (0)