Skip to content

Commit 39e5f34

Browse files
authored
Merge pull request #1049 from Automattic/release/2.16
Merge 2.16 final to develop
2 parents 8fc898b + 34e368f commit 39e5f34

34 files changed

+83
-94
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.17
2+
-----
3+
4+
15
2.16
26
-----
37

Simplenote/Resources/AppStoreStrings.pot

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

49-
msgctxt "v2.15-whats-new"
49+
msgctxt "v2.16-whats-new"
5050
msgid ""
51-
"- In app account deletion: Now you can delete your account from the app\n"
51+
"- Bug fixes\n"
5252
msgstr ""
5353

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- In app account deletion: Now you can delete your account from the app
1+
- Bug fixes

Simplenote/ar.lproj/Localizable.strings

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2021-08-24 11:32:34+0000 */
1+
/* Translation-Revision-Date: 2021-09-05 19:54:03+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 */
@@ -16,7 +16,7 @@
1616
"- Password cannot match email" = "- يتعذر تطابق كلمة المرور مع البريد الإلكتروني";
1717

1818
/* Email verification required alert title */
19-
"Account Verification Required" = "Account Verification Required";
19+
"Account Verification Required" = "يلزم التحقُّق من الحساب";
2020

2121
/* Text presented when sharing a Note */
2222
"Add an email address as a tag to share this note with someone. Then you can both make changes to it." = "أضف عنوان بريد إلكتروني كوسم لمشاركة هذه الملحوظة مع شخص ما. بعدها يمكنكما إجراء التغييرات عليها.";
@@ -29,7 +29,7 @@
2929
"Already have an account?" = "ألديك حساب بالفعل؟";
3030

3131
/* Delete account confirmation instructions */
32-
"An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation.";
32+
"An email has been sent to %@. Check your inbox and follow the instructions to confirm account deletion.\n\nYour account won't be deleted until we receive your confirmation." = "تم إرسال رسالة بريد إلكتروني إلى %@. راجع علبة الوارد لديك واتبع الإرشادات لتأكيد حذف الحساب.\n\nلن يتم حذف حسابك حتى نتلقى تأكيدك.";
3333

3434
/* Deletion error message */
3535
"An error occured. Please, try again. If the problem continues, contact us at support@simplenote.com for help." = "حدث خطأ. يُرجى المحاولة مرة أخرى. إذا استمرت المشكلة، فاتصل بنا على support@simplenote.com للحصول على المساعدة.";
@@ -41,13 +41,13 @@
4141
"Are you a developer? Automattic is Hiring." = "هل أنت مطوِّر؟ توفر Automattic فرص عمل.";
4242

4343
/* Error for authorization failure */
44-
"Authorization failed" = "Authorization failed";
44+
"Authorization failed" = "فشل الترخيص";
4545

4646
/* Error for bad email or password */
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." = "By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible.";
50+
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "عن طريق حذف حسابك، سيتم حذف جميع الملحوظات التي تم إنشاؤها باستخدام هذا الحساب بشكل نهائي. لا يمكن التراجع عن هذا الإجراء.";
5151

5252
/* Cancel button title
5353
Cancel the action
@@ -73,7 +73,7 @@
7373
"Check Your Email" = "التحقُّق من بريدك الإلكتروني";
7474

7575
/* Vefification sent alert title */
76-
"Check your Email" = "Check your Email";
76+
"Check your Email" = "التحقُّق من بريدك الإلكتروني";
7777

7878
/* Collaborate Menu Action */
7979
"Collaborate" = "تشارك";
@@ -82,7 +82,7 @@
8282
"Collect Information" = "جمع المعلومات";
8383

8484
/* Compromised passsword alert title */
85-
"Compromised Password" = "Compromised Password";
85+
"Compromised Password" = "كلمة مرور مخترقة";
8686

8787
/* Confirm button -> Review you account screen */
8888
"Confirm" = "تأكيد";
@@ -284,13 +284,13 @@
284284
"Request Account Deletion" = "طلب حذف الحساب";
285285

286286
/* Request error alert title */
287-
"Request Error" = "Request Error";
287+
"Request Error" = "خطأ في الطلب";
288288

289289
/* Resend email button -> Verify your email screen */
290290
"Resend Email" = "إعادة إرسال البريد الإلكتروني";
291291

292292
/* Send email verificaiton action */
293-
"Resend Verification Email" = "Resend Verification Email";
293+
"Resend Verification Email" = "أعد إرسال رسالة التحقق";
294294

295295
/* Password Reset: Proceed */
296296
"Reset" = "استعادة";
@@ -342,13 +342,13 @@
342342
"That email is already being used" = "يتم استخدام ذلك البريد الإلكتروني بالفعل";
343343

344344
/* Request error alert message */
345-
"There was an preparing your verification email, please try again later" = "There was an preparing your verification email, please try again later";
345+
"There was an preparing your verification email, please try again later" = "كان يتم إعداد البريد الإلكتروني للتحقُّق من الصحة الخاص بك، يرجى المحاولة مرة أخرى لاحقًا";
346346

347347
/* Privacy Policy */
348348
"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 الخاصة بك والمزيد، مثلما ورد بالتفصيل في سياسة الخصوصية الخاصة بنا.";
349349

350350
/* 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." = "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.";
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." = "لقد ظهرت كلمة المرور هذه في عملية اختراق بيانات، ما يضع حسابك في خطر كبير لاختراقه. يوصى بتغيير كلمة مرورك على الفور.";
352352

353353
/* Tooltip: Restore a trashed note */
354354
"Toggle Sidebar" = "تبديل الشريط الجانبي";
@@ -407,7 +407,7 @@
407407
"You are registered with Simplenote using the email %1$@.\n\nImprovements to account security may result in account loss if you no longer have access to this email address." = "لقد قمت بالتسجيل في Simplenote باستخدام البريد الإلكتروني %1$@.\n\nقد تؤدي التحسينات التي يتم إجراؤها على أمان الحساب إلى فقدان الحساب إذا لم يعد لديك حق الوصول إلى عنوان البريد الإلكتروني هذا.";
408408

409409
/* Erro for un verified email */
410-
"You must verify your email before being able to login." = "You must verify your email before being able to login.";
410+
"You must verify your email before being able to login." = "يجب أن تتحقَّق من بريدك الإلكتروني قبل أن تتمكن من تسجيل الدخول.";
411411

412412
/* Error when you're not connected */
413413
"You're not connected to the internet" = "أنتَ غير متصل بالإنترنت";

Simplenote/ar.lproj/MainMenu.strings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2021-08-04 16:54:03+0000 */
1+
/* Translation-Revision-Date: 2021-09-05 19:54:03+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 */
@@ -64,7 +64,7 @@
6464
"1db-JI-NZH.title" = "تبديل ضبط المعاينة";
6565

6666
/* Class = "NSMenuItem"; title = "Delete Account"; ObjectID = "1sa-fK-USq"; */
67-
"1sa-fK-USq.title" = "Delete Account";
67+
"1sa-fK-USq.title" = "حذف حساب";
6868

6969
/* Class = "NSMenu"; title = "Spelling and Grammar"; ObjectID = "200"; */
7070
"200.title" = "التدقيق الإملائي والنحوي";

Simplenote/cy.lproj/Localizable.strings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
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." = "By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible.";
50+
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "";
5151

5252
/* Cancel button title
5353
Cancel the action
@@ -219,7 +219,7 @@
219219
"No Results" = "Dim Canlyniadau";
220220

221221
/* Dismiss change password alert action */
222-
"Not Now" = "Not Now";
222+
"Not Now" = "";
223223

224224
/* Placeholder displayed when a note hasn't been published. */
225225
"Not Published" = "Not Published";
@@ -348,7 +348,7 @@
348348
"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.";
349349

350350
/* 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." = "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.";
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." = "";
352352

353353
/* Tooltip: Restore a trashed note */
354354
"Toggle Sidebar" = "Toggle Sidebar";

Simplenote/el.lproj/Localizable.strings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
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." = "By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible.";
50+
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "";
5151

5252
/* Cancel button title
5353
Cancel the action
@@ -219,7 +219,7 @@
219219
"No Results" = "Δεν βρέθηκε";
220220

221221
/* Dismiss change password alert action */
222-
"Not Now" = "Not Now";
222+
"Not Now" = "";
223223

224224
/* Placeholder displayed when a note hasn't been published. */
225225
"Not Published" = "Not Published";
@@ -348,7 +348,7 @@
348348
"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.";
349349

350350
/* 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." = "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.";
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." = "";
352352

353353
/* Tooltip: Restore a trashed note */
354354
"Toggle Sidebar" = "Toggle Sidebar";

Simplenote/en.lproj/Localizable.strings

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

4444
/* Delete account confirmation alert message */
45-
"By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible." = "By deleting your account, all notes created with this account will be permanently deleted. This action is not reversible.";
45+
"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.";
4646

4747
/* Cancel button title
4848
Cancel the action
49+
Dismiss change password alert action
4950
Password Reset: Cancel */
5051
"Cancel" = "Cancel";
5152

@@ -216,9 +217,6 @@
216217
/* Error when you enter a bad email address */
217218
"Not a valid email address" = "Not a valid email address";
218219

219-
/* Dismiss change password alert action */
220-
"Not Now" = "Not Now";
221-
222220
/* Placeholder displayed when a note hasn't been published. */
223221
"Not Published" = "Not Published";
224222

@@ -346,11 +344,14 @@
346344
"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.";
347345

348346
/* Compromised password alert message */
349-
"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." = "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.";
347+
"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.";
350348

351349
/* Tooltip: Restore a trashed note */
352350
"Toggle Sidebar" = "Toggle Sidebar";
353351

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

0 commit comments

Comments
 (0)