From f1bbad2c9cd8c34926177778e3262acb6e740a82 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 15 Mar 2023 01:44:36 +0530 Subject: [PATCH 1/9] Add strings related to exporting locked notes --- app/src/main/res/values-ar/strings.xml | 4 +++- app/src/main/res/values-az/strings.xml | 4 +++- app/src/main/res/values-be/strings.xml | 4 +++- app/src/main/res/values-bg/strings.xml | 4 +++- app/src/main/res/values-ca/strings.xml | 4 +++- app/src/main/res/values-cs/strings.xml | 4 +++- app/src/main/res/values-cy/strings.xml | 4 +++- app/src/main/res/values-da/strings.xml | 4 +++- app/src/main/res/values-de/strings.xml | 4 +++- app/src/main/res/values-el/strings.xml | 2 ++ app/src/main/res/values-eo/strings.xml | 4 +++- app/src/main/res/values-es/strings.xml | 4 +++- app/src/main/res/values-et/strings.xml | 4 +++- app/src/main/res/values-fa/strings.xml | 4 +++- app/src/main/res/values-fi/strings.xml | 4 +++- app/src/main/res/values-fr/strings.xml | 4 +++- app/src/main/res/values-gl/strings.xml | 4 +++- app/src/main/res/values-hr/strings.xml | 4 +++- app/src/main/res/values-hu/strings.xml | 4 +++- app/src/main/res/values-in/strings.xml | 4 +++- app/src/main/res/values-it/strings.xml | 4 +++- app/src/main/res/values-iw/strings.xml | 4 +++- app/src/main/res/values-ja/strings.xml | 4 +++- app/src/main/res/values-lt/strings.xml | 4 +++- app/src/main/res/values-ms/strings.xml | 4 +++- app/src/main/res/values-nb-rNO/strings.xml | 4 +++- app/src/main/res/values-nl/strings.xml | 4 +++- app/src/main/res/values-pa-rPK/strings.xml | 4 +++- app/src/main/res/values-pl/strings.xml | 4 +++- app/src/main/res/values-pt-rBR/strings.xml | 4 +++- app/src/main/res/values-pt/strings.xml | 4 +++- app/src/main/res/values-ro/strings.xml | 4 +++- app/src/main/res/values-ru/strings.xml | 4 +++- app/src/main/res/values-sk/strings.xml | 2 ++ app/src/main/res/values-sl/strings.xml | 2 ++ app/src/main/res/values-sr/strings.xml | 2 ++ app/src/main/res/values-sv/strings.xml | 4 +++- app/src/main/res/values-th/strings.xml | 4 +++- app/src/main/res/values-tr/strings.xml | 4 +++- app/src/main/res/values-uk/strings.xml | 4 +++- app/src/main/res/values-vi/strings.xml | 2 ++ app/src/main/res/values-zh-rCN/strings.xml | 4 +++- app/src/main/res/values-zh-rTW/strings.xml | 4 +++- app/src/main/res/values/strings.xml | 2 ++ 44 files changed, 126 insertions(+), 38 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f60dfd50..1bbc0095 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -24,6 +24,8 @@ ملاحظة نصية Lock note إلغاء تأمين الملاحظة + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. محتوى الملاحظات مؤمن. إظهار المحتوى تحذير: إذا نسيت كلمة مرور الملاحظات، فلن تتمكن من استعادتها أو الوصول إلى محتوى الملاحظات بعد الآن. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 423769f8..df57b7b1 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -24,6 +24,8 @@ Text note Lock note Unlock note + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index de10f7a6..37154ab5 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -24,6 +24,8 @@ Тэкставая нататка Блакаваць нататку Разблакаваць нататку + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Змесціва нататкі заблакавана. Паказаць змесціва ПАПЯРЭДЖАННЕ: Калі вы забудзеце пароль, вы больш не зможаце аднавіць яго альбо атрымаць доступ да змесціва нататак. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c7c4712c..8a40dce5 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -24,6 +24,8 @@ Текстова бележка Бележка за заключване Бележка за отключване + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Съдържанието на бележките е заключено. Покажи съдържанието ПРЕДУПРЕЖДЕНИЕ: Ако забравите паролата на бележките, вече няма да можете да я възстановите или да получите достъп до съдържанието на бележките. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 79a18f61..6bc8f04e 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -24,6 +24,8 @@ Nota de text Bloqueja la nota Desbloqueja la nota + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. El contingut de la nota està bloquejat. Mostra el contingut AVÍS: Si oblideu la contrasenya de la nota, ja no podreu recuperar-la ni accedir al contingut de les notes. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2367308a..b693c2bb 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -24,6 +24,8 @@ Textová poznámka Zamknout poznámku Odemknout poznámku + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Obsah této poznámky je uzamčen. Zobrazit obsah UPOZORNĚNÍ: Pokud zapomenete heslo k poznámce, už ji nebudete schopni obnovit nebo získat přístup k jejímu obsahu. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 1e3f4508..cce79ac0 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -24,6 +24,8 @@ Nodyn testun Lock note Unlock note + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e4079a99..d627d5d7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -24,6 +24,8 @@ Tekstnote Lock note Lås note op + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Noternes indhold er låst. Vis indhold ADVARSEL: Hvis du glemmer noternes adgangskode, kan du ikke gendanne den eller få adgang til noternes indhold længere. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 762df014..51b6de06 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -24,6 +24,8 @@ Textnotiz Notiz sperren Notiz entsperren + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Der Inhalt der Notizen ist gesperrt. Inhalt anzeigen ACHTUNG: Wenn du das Kennwort für die Notizen vergisst, kannst du sie nicht mehr wiederherstellen oder auf den Inhalt der Notizen zugreifen. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3600899b..413a3fab 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -24,6 +24,8 @@ Σημείωση κειμένου Κλείδωμα Σημείωσης Ξεκλείδωμα Σημείωσης + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Το περιεχόμενο των σημειώσεων είναι κλειδωμένο. Εμφάνιση περιεχομένου ΠΡΟΣΟΧΗ: Εάν ξεχάσετε τον κωδικό των σημειώσεων, δεν θα μπορείτε πλέον να τον ανακτήσετε ή να αποκτήσετε πρόσβαση στο περιεχόμενό τους. diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index a4ce36f2..e00e546f 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -24,6 +24,8 @@ Teksta noto Ŝlosi noton Malŝlosi noton + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. The notes\' content is locked. Montri enhavon WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b6d66880..8d5bb70f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -24,6 +24,8 @@ Nota de texto Bloquear nota Desbloquear nota + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. El contenido de la nota está bloqueado. Mostrar contenido ADVERTENCIA: Si olvidas la contraseña de la nota, ya no podrás recuperarla o acceder a su contenido. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 7ca0eb89..99ba032e 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -24,6 +24,8 @@ Tekstimärge Lukusta märge Eemalda märkme lukustus + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Märkme sisu on lukustatud. Näita sisu HOIATUS: Kui sa unustad märkme salasõna, siis sa ei saa seda märget avada ega tema sisu lugeda. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 94be9c94..65e3f15c 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -24,6 +24,8 @@ یادداشت متنی قفل کردن یادداشت باز کردن قفل یادداشت + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. محتویات یادداشت، قفل است نمایش محتویات هشدار: اگر گذرواژهٔ یادداشت را فراموش کنید، دیگر قادر به بازیابی آن یا دسترسی به محتویات یادداشت نیستید. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9f9fc38e..b1288571 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -24,6 +24,8 @@ Tekstimuistiinpano Lukitse huomautus Avaa muistiinpanon lukitus + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Muistiinpanon sisältö on lukittu. Näytä sisältö VAROITUS: Jos unohdat muistiinpanon salasanan, sitä ei ole mahdollista palauttaa etkä pääse enää käsiksi muistiinpanoon. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 57272218..cfc3dda8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -24,6 +24,8 @@ Texte Verrouiller la note Déverrouiller la note + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Le contenu des notes est verrouillé. Montrer le contenu AVERTISSEMENT : Si vous oubliez le mot de passe des notes, vous ne pourrez plus le récupérer ni accéder au contenu des notes. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index b57e5900..238ad8e9 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -24,6 +24,8 @@ Nota de texto Lock note Desbloqueala nota + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. O contido das notas está bloqueado. Mostralo contido PERIGO: Se esqueces o contrasinal das notas, xa non poderás recuperalo nin acceder ao contido das notas. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 02763f55..548c06a3 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -24,6 +24,8 @@ Tekstualna bilješka Zaključaj bilješku Otključaj bilješku + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Sadržaj bilješke je zaključan. Prikaži sadržaj UPOZORENJE: Ako zaboraviš lozinku bilješke, više je nećeš moći obnoviti niti pristupiti njenom sadržaju. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 5fdba5f2..a90a1661 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -24,6 +24,8 @@ Szöveges jegyzet Jegyzet zárolása Jegyzet feloldása + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. A jegyzet tartalma zárolva van. Tartalom megjelenítése FIGYELMEZTETÉS: Ha elfelejti a jegyzetek jelszavát, akkor többé nem fogja tudni helyreállítani vagy elérni a jegyzetek tartalmát. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 9eb6e4ff..390ea857 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -24,6 +24,8 @@ Catatan teks Lock note Buka kunci kota + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Konten catatan terkunci. Tampilkan konten PERINGATAN: Jika Anda lupa kata sandi catatan, Anda tidak akan dapat memulihkan atau mengakses konten catatan. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ca379258..f412d51b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -24,6 +24,8 @@ Nota di testo Lock note Sblocca la nota + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Il contenuto delle note è bloccato. Mostra il contenuto ATTENZIONE: Se dimentichi la password delle note, non sarai più in grado di recuperarla o di accedere al contenuto delle note. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index f85d3084..6997cb51 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -24,6 +24,8 @@ פתק טקסט נעל פתק בטל נעילת פתק + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. תוכן הפתקים נעול. הראה תוכן אזהרה: אם תשכח את הסיסמה של הפתקים, לא תוכל לשחזר אותה או לגשת לתוכן הפתקים יותר. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2b160919..10d993a6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -24,6 +24,8 @@ テキストメモ メモをロック メモのロックを解除 + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. メモの内容がロックされています。 内容を表示 警告：メモのパスワードを忘れた場合、そのパスワードを復元したり、メモの内容にアクセスしたりすることはできなくなります。 @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index bf2d4126..5c1f9db4 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -24,6 +24,8 @@ Tekstinis užrašas Lock note Unlock note + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Pastabų turinys yra užrakintas. Show content ĮSPĖJIMAS: jei pamiršite užrašų slaptažodį, nebegalėsite jo atkurti ar pasiekti užrašų turinio. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index cd91a1ab..f2c59a7c 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -24,6 +24,8 @@ Text note Lock note Unlock note + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 002818f9..5b5aa3f8 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -24,6 +24,8 @@ Tekstnotat Lås notat Lås opp notat + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Notatinnholdet er låst. Vis innhold ADVARSEL: Hvis du glemmer passordet til notatene, kan du ikke gjenopprette det eller få tilgang til notatenes innhold lenger. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 42c62f76..50589092 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -23,6 +23,8 @@ Tekst Notitie vergrendelen Notitie ontgrendelen + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. De inhoud van deze notitie is vergrendeld. Inhoud weergeven WAARSCHUWING: Zonder het wachtwoord kan de inhoud van de notitie niet meer worden hersteld. @@ -81,4 +83,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 970e4011..296d2d6e 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -23,6 +23,8 @@ لکھت دا نوٹ نوٹ تالؕا مارنا نوٹ اُگھیڑو + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. ایس نوٹ دی سمگاری تالؕا مارنی اے سمگری ویکھو چیتاونی: جےتسی نوٹ دا پاس‌ورڈ بھُل جاندے او، تاں فیر نوٹ دی سمگری لبھ نہیں سکدیاں۔ @@ -74,4 +76,4 @@ میں وِجٹ دا رنگ کیویں بدل سکدا ہاں؟ In case you have only 1 active widget, you can either recreate it, or use the button in the app settings for customizing it. If you have multiple active widgets, the button in the app settings will not be available. As the app supports color customization per-widget, you will have to recreate the widget that you want to customize. - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7a6fe7b5..f2fc31c3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -24,6 +24,8 @@ Notatka tekstowa Zablokuj notatkę Odblokuj notatkę + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Treść notatki jest zablokowana. Pokaż zawartość OSTRZEŻENIE: Jeśli zapomnisz hasła do notatki, nie będziesz już mógł/mogła jej odzyskać ani uzyskać dostępu do treści notatki. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8559fd5a..810e1244 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -24,6 +24,8 @@ Anotações Bloquear anotação Desbloquear anotação + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. O conteúdo da nota está bloqueado. Mostrar conteúdo AVISO: Caso você esqueça a senha, não conseguirá recuperá-la ou acessar o conteúdo da nota. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6dafeb2e..d85f767b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -24,6 +24,8 @@ Nota de texto Bloquear nota Desbloquear nota + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. O conteúdo da nota está bloqueado. Mostrar conteúdo AVISO: se esquecer a palavra-passe, não conseguirá aceder à nota nem recuperar o seu conteúdo. @@ -82,4 +84,4 @@ Não encontrou todas as cadeias a traduzir? Existem mais algumas em: https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 647a26bb..d71422ca 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -24,6 +24,8 @@ Notiță text Blocaţi notița Deblocaţi notița + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Conținutul notiței este blocat. Afișați conținutul ATENȚIE: Dacă uitați parola notițelor, nu o veți mai putea recupera și nici nu veți mai putea accesa conținutul notițele. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4824fb0d..847a8965 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -24,6 +24,8 @@ Текстовая заметка Блокировать заметку Разблокировать заметку + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Содержимое заметки заблокировано. Показывать содержание ПРЕДУПРЕЖДЕНИЕ: если вы забудете пароль, то не сможете восстановить его или получить доступ к содержимому заметок. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 49185763..8ab0bc73 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -24,6 +24,8 @@ Textová poznámka Uzamknúť poznámku Odomknúť poznámku + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Obsah poznámky je uzamknutý. Zobraziť obsah UPOZORNENIE: Ak zabudnete heslo poznámky, nebudete ho môcť obnoviť, ani sa už dostať k obsahu poznámky. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index bfc8b0e9..4b58a789 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -23,6 +23,8 @@ Opomba k besedilu Opomba glede zaklepanja Opomba o odklepanju + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Zaklenjena vsebina opomb. Prikaži vsebino OPOZORILO: Če pozabite geslo za opombe, ga ne bo moč več obnoviti in dostopati do njihove vsebine. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index dd50d466..f4671b9b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -23,6 +23,8 @@ Текст напомене Закључај белешку Откључај белешку + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Садржај белешки је закључан. Прикажи садржај УПОЗОРЕЊЕ: Ако заборавите лозинку за белешке, више нећете моћи да је повратите нити да приступите садржају белешки. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4008232a..c6046b5c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -24,6 +24,8 @@ Anteckning Lås Lås upp + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Anteckningens innehåll är låst. Visa innehåll VARNING: Om du glömmer anteckningens lösenord så finns ingen möjlighet att återställa detta och du kommer således förlora åtkomsten till anteckningens innehåll. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 88b71c3c..82a8705b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -24,6 +24,8 @@ โน็ตข้อความ ล็อกโน็ต ปลดล็อกโน็ต + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. ข้อมูลในโน็ตถูกล็อก แสดงข้อมูล คำเตือน: ถ้าคุณลืมรหัสผ่านของโน็ต คุณจะไม่สามารถกู้คืนหรือเข้าถึงโน็ตตัวนั้นได้อีกต่อไป @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1f207dfc..e078df4a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -24,6 +24,8 @@ Metin notu Notu kilitle Notun kilidini aç + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Notların içeriği kilitlendi. İçeriği göster UYARI: Notların parolasını unutursanız, onu kurtaramaz veya notların içeriğine artık erişemezsiniz. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7a6caeae..e9f09514 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -24,6 +24,8 @@ Текст нотатки Заблокувати нотатку Розблокувати нотатку + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Вміст нотатки заблоковано. Показати нотатку ЗАСТЕРЕЖЕННЯ: Якщо ви забудете пароль, то більше не зможете його відновити або отримати доступ до вмісту нотаток. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 83a4cb96..09ba14c0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -23,6 +23,8 @@ Ghi chú văn bản Khóa ghi chú Mở khóa ghi chú + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. Nội dung của ghi chú đã bị khóa. Hiển thị nội dung Cảnh Báo: Nếu bạn quên khi chú mật khẩu, bạn sẽ không thể nào lấy lại hay truy cập vào những ghi chú nữa diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8609808c..0449b2cf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -24,6 +24,8 @@ 文本笔记 锁定笔记 解锁笔记 + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. 笔记的内容被锁定。 显示内容 警告：如果您忘记了笔记的密码，您将无法恢复或访问笔记的内容。 @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6fd21db3..5c6558ef 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -24,6 +24,8 @@ 文字筆記 Lock note 解鎖筆記 + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. @@ -82,4 +84,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9907915c..e09d225e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,6 +23,8 @@ Text note Lock note Unlock note + Unlock notes + The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. From 0bc818245c9833526538858348d80ff43d63701c Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 15 Mar 2023 02:09:28 +0530 Subject: [PATCH 2/9] Allow exporting locked notes --- .../notes/pro/activities/MainActivity.kt | 105 ++++++++++-------- .../notes/pro/dialogs/NewNoteDialog.kt | 6 +- .../notes/pro/dialogs/RenameNoteDialog.kt | 6 +- .../notes/pro/dialogs/UnlockNotesDialog.kt | 64 +++++++++++ .../notes/pro/helpers/NotesExporter.kt | 4 +- .../main/res/drawable/ic_lock_open_vector.xml | 3 + app/src/main/res/layout/dialog_new_note.xml | 2 +- .../main/res/layout/dialog_rename_note.xml | 2 +- .../main/res/layout/dialog_unlock_notes.xml | 30 +++++ app/src/main/res/layout/item_locked_note.xml | 35 ++++++ 10 files changed, 199 insertions(+), 58 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt create mode 100644 app/src/main/res/drawable/ic_lock_open_vector.xml create mode 100644 app/src/main/res/layout/dialog_unlock_notes.xml create mode 100644 app/src/main/res/layout/item_locked_note.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 101a18db..b58faddb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -904,17 +904,24 @@ class MainActivity : SimpleActivity() { } } - private fun exportNotesTo(outputStream: OutputStream?) { - toast(R.string.exporting) - ensureBackgroundThread { - val notesExporter = NotesExporter(this) - notesExporter.exportNotes(outputStream) { - val toastId = when (it) { - NotesExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful - else -> R.string.exporting_failed - } + private fun requestUnlockNotes(callback: (List) -> Unit) { + val lockedNotes = mNotes.filter { it.isLocked() } + UnlockNotesDialog(this, lockedNotes, callback) + } - toast(toastId) + private fun exportNotesTo(outputStream: OutputStream?) { + requestUnlockNotes { unlockedIds -> + toast(R.string.exporting) + ensureBackgroundThread { + val notesExporter = NotesExporter(this) + notesExporter.exportNotes(outputStream, unlockedIds) { + val toastId = when (it) { + NotesExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful + else -> R.string.exporting_failed + } + + toast(toastId) + } } } } @@ -1011,49 +1018,51 @@ class MainActivity : SimpleActivity() { } private fun exportAllNotesBelowQ() { - ExportFilesDialog(this, mNotes) { parent, extension -> - val items = arrayListOf( - RadioItem(EXPORT_FILE_SYNC, getString(R.string.update_file_at_note)), - RadioItem(EXPORT_FILE_NO_SYNC, getString(R.string.only_export_file_content)) - ) + requestUnlockNotes { unlockedIds -> + ExportFilesDialog(this, mNotes) { parent, extension -> + val items = arrayListOf( + RadioItem(EXPORT_FILE_SYNC, getString(R.string.update_file_at_note)), + RadioItem(EXPORT_FILE_NO_SYNC, getString(R.string.only_export_file_content)) + ) - RadioGroupDialog(this, items) { - val syncFile = it as Int == EXPORT_FILE_SYNC - var failCount = 0 - NotesHelper(this).getNotes { - mNotes = it - mNotes.filter { !it.isLocked() }.forEachIndexed { index, note -> - val filename = if (extension.isEmpty()) note.title else "${note.title}.$extension" - val file = File(parent, filename) - if (!filename.isAValidFilename()) { - toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename))) - } else { - val noteStoredValue = note.getNoteStoredValue(this) ?: "" - tryExportNoteValueToFile(file.absolutePath, mCurrentNote.title, note.value, false) { exportedSuccessfully -> - if (exportedSuccessfully) { - if (syncFile) { - note.path = file.absolutePath - note.value = "" - } else { - note.path = "" - note.value = noteStoredValue + RadioGroupDialog(this, items) { any -> + val syncFile = any as Int == EXPORT_FILE_SYNC + var failCount = 0 + NotesHelper(this).getNotes { notes -> + mNotes = notes + mNotes.filter { !it.isLocked() || it.id in unlockedIds }.forEachIndexed { index, note -> + val filename = if (extension.isEmpty()) note.title else "${note.title}.$extension" + val file = File(parent, filename) + if (!filename.isAValidFilename()) { + toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename))) + } else { + val noteStoredValue = note.getNoteStoredValue(this) ?: "" + tryExportNoteValueToFile(file.absolutePath, mCurrentNote.title, note.value, false) { exportedSuccessfully -> + if (exportedSuccessfully) { + if (syncFile) { + note.path = file.absolutePath + note.value = "" + } else { + note.path = "" + note.value = noteStoredValue + } + + NotesHelper(this).insertOrUpdateNote(note) } - NotesHelper(this).insertOrUpdateNote(note) - } + if (mCurrentNote.id == note.id) { + mCurrentNote.value = note.value + mCurrentNote.path = note.path + getPagerAdapter().updateCurrentNoteData(view_pager.currentItem, mCurrentNote.path, mCurrentNote.value) + } - if (mCurrentNote.id == note.id) { - mCurrentNote.value = note.value - mCurrentNote.path = note.path - getPagerAdapter().updateCurrentNoteData(view_pager.currentItem, mCurrentNote.path, mCurrentNote.value) - } + if (!exportedSuccessfully) { + failCount++ + } - if (!exportedSuccessfully) { - failCount++ - } - - if (index == mNotes.size - 1) { - toast(if (failCount == 0) R.string.exporting_successful else R.string.exporting_some_entries_failed) + if (index == mNotes.size - 1) { + toast(if (failCount == 0) R.string.exporting_successful else R.string.exporting_some_entries_failed) + } } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt index 90ccaba9..9ef06225 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewNoteDialog.kt @@ -24,16 +24,16 @@ class NewNoteDialog(val activity: Activity, title: String? = null, val setCheckl new_note_type.check(defaultType) } - view.note_title.setText(title) + view.locked_note_title.setText(title) activity.getAlertDialogBuilder() .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .apply { activity.setupDialogStuff(view, this, R.string.new_note) { alertDialog -> - alertDialog.showKeyboard(view.note_title) + alertDialog.showKeyboard(view.locked_note_title) alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { - val newTitle = view.note_title.value + val newTitle = view.locked_note_title.value ensureBackgroundThread { when { newTitle.isEmpty() -> activity.toast(R.string.no_title) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt index e9d0dd0a..e85d7631 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/RenameNoteDialog.kt @@ -18,16 +18,16 @@ class RenameNoteDialog(val activity: SimpleActivity, val note: Note, val current init { val view = activity.layoutInflater.inflate(R.layout.dialog_rename_note, null) - view.note_title.setText(note.title) + view.locked_note_title.setText(note.title) activity.getAlertDialogBuilder() .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .apply { activity.setupDialogStuff(view, this, R.string.rename_note) { alertDialog -> - alertDialog.showKeyboard(view.note_title) + alertDialog.showKeyboard(view.locked_note_title) alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener { - val title = view.note_title.value + val title = view.locked_note_title.value ensureBackgroundThread { newTitleConfirmed(title, alertDialog) } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt new file mode 100644 index 00000000..f42cbd88 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt @@ -0,0 +1,64 @@ +package com.simplemobiletools.notes.pro.dialogs + +import android.content.DialogInterface +import android.view.ViewGroup +import com.simplemobiletools.commons.activities.BaseSimpleActivity +import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.notes.pro.R +import com.simplemobiletools.notes.pro.models.Note +import kotlinx.android.synthetic.main.dialog_unlock_notes.view.* +import kotlinx.android.synthetic.main.item_locked_note.view.* + +class UnlockNotesDialog(val activity: BaseSimpleActivity, notes: List, callback: (unlockedNoteIds: List) -> Unit) { + private val view = activity.layoutInflater.inflate(R.layout.dialog_unlock_notes, null) as ViewGroup + private val redColor = activity.getColor(R.color.md_red) + private val greenColor = activity.getColor(R.color.md_green) + private val unlockedNoteIds = mutableListOf() + + init { + for (note in notes) { + addLockedNoteView(note) + } + activity.getAlertDialogBuilder() + .setPositiveButton(R.string.ok, null) + .setNegativeButton(R.string.cancel, null) + .apply { + activity.setupDialogStuff(view, this, R.string.unlock_notes, cancelOnTouchOutside = false) { alertDialog -> + alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { + callback(unlockedNoteIds) + alertDialog.dismiss() + } + } + } + } + + private fun addLockedNoteView(note: Note) { + activity.layoutInflater.inflate(R.layout.item_locked_note, null).apply { + view.notes_holder.addView(this) + activity.updateTextColors(view.notes_holder) + locked_note_title.text = note.title + locked_unlocked_image.applyColorFilter(redColor) + locked_note_holder.setOnClickListener { + if (note.id !in unlockedNoteIds) { + activity.performSecurityCheck( + protectionType = note.protectionType, + requiredHash = note.protectionHash, + successCallback = { _, _ -> + unlockedNoteIds.add(note.id!!) + locked_unlocked_image.apply { + setImageResource(R.drawable.ic_lock_open_vector) + applyColorFilter(greenColor) + } + } + ) + } else { + unlockedNoteIds.remove(note.id) + locked_unlocked_image.apply { + setImageResource(R.drawable.ic_lock_vector) + applyColorFilter(redColor) + } + } + } + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt index 74c5346b..7d0e69c3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt @@ -16,7 +16,7 @@ class NotesExporter(private val context: Context) { private val gson = Gson() - fun exportNotes(outputStream: OutputStream?, callback: (result: ExportResult) -> Unit) { + fun exportNotes(outputStream: OutputStream?, unlockedNoteIds: List, callback: (result: ExportResult) -> Unit) { ensureBackgroundThread { if (outputStream == null) { callback.invoke(ExportResult.EXPORT_FAIL) @@ -29,7 +29,7 @@ class NotesExporter(private val context: Context) { writer.beginArray() val notes = context.notesDB.getNotes() as ArrayList for (note in notes) { - if (note.protectionType == PROTECTION_NONE) { + if (!note.isLocked() || note.id in unlockedNoteIds) { val noteToSave = getNoteToExport(note) writer.jsonValue(gson.toJson(noteToSave)) written++ diff --git a/app/src/main/res/drawable/ic_lock_open_vector.xml b/app/src/main/res/drawable/ic_lock_open_vector.xml new file mode 100644 index 00000000..542b9037 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock_open_vector.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/layout/dialog_new_note.xml b/app/src/main/res/layout/dialog_new_note.xml index 26464308..dad5583a 100644 --- a/app/src/main/res/layout/dialog_new_note.xml +++ b/app/src/main/res/layout/dialog_new_note.xml @@ -17,7 +17,7 @@ android:hint="@string/label"> + + + + + + + + + + diff --git a/app/src/main/res/layout/item_locked_note.xml b/app/src/main/res/layout/item_locked_note.xml new file mode 100644 index 00000000..e77ae12b --- /dev/null +++ b/app/src/main/res/layout/item_locked_note.xml @@ -0,0 +1,35 @@ + + + + + + + + From 3cda2eb23421ab2915ec197dfc814337926bb042 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 15 Mar 2023 02:22:36 +0530 Subject: [PATCH 3/9] Avoid showing unlock notes dialog unnecessarily --- .../simplemobiletools/notes/pro/activities/MainActivity.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index b58faddb..c574d61d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -906,7 +906,11 @@ class MainActivity : SimpleActivity() { private fun requestUnlockNotes(callback: (List) -> Unit) { val lockedNotes = mNotes.filter { it.isLocked() } - UnlockNotesDialog(this, lockedNotes, callback) + if (lockedNotes.isNotEmpty()) { + UnlockNotesDialog(this, lockedNotes, callback) + } else { + callback(emptyList()) + } } private fun exportNotesTo(outputStream: OutputStream?) { From 36c4746829b0467e788a41a827e3dc2226105222 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 15 Mar 2023 02:38:38 +0530 Subject: [PATCH 4/9] Always export latest notes --- .../notes/pro/activities/MainActivity.kt | 107 ++++++++++-------- .../notes/pro/helpers/NotesExporter.kt | 4 +- 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index c574d61d..68ff10d8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -907,24 +907,29 @@ class MainActivity : SimpleActivity() { private fun requestUnlockNotes(callback: (List) -> Unit) { val lockedNotes = mNotes.filter { it.isLocked() } if (lockedNotes.isNotEmpty()) { - UnlockNotesDialog(this, lockedNotes, callback) + runOnUiThread { + UnlockNotesDialog(this, lockedNotes, callback) + } } else { callback(emptyList()) } } private fun exportNotesTo(outputStream: OutputStream?) { - requestUnlockNotes { unlockedIds -> - toast(R.string.exporting) - ensureBackgroundThread { - val notesExporter = NotesExporter(this) - notesExporter.exportNotes(outputStream, unlockedIds) { - val toastId = when (it) { - NotesExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful - else -> R.string.exporting_failed - } + ensureBackgroundThread { + NotesHelper(this).getNotes { + mNotes = it + requestUnlockNotes { unlockedIds -> + toast(R.string.exporting) + val notesExporter = NotesExporter(this) + notesExporter.exportNotes(mNotes, unlockedIds, outputStream) { result -> + val toastId = when (result) { + NotesExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful + else -> R.string.exporting_failed + } - toast(toastId) + toast(toastId) + } } } } @@ -1022,50 +1027,52 @@ class MainActivity : SimpleActivity() { } private fun exportAllNotesBelowQ() { - requestUnlockNotes { unlockedIds -> - ExportFilesDialog(this, mNotes) { parent, extension -> - val items = arrayListOf( - RadioItem(EXPORT_FILE_SYNC, getString(R.string.update_file_at_note)), - RadioItem(EXPORT_FILE_NO_SYNC, getString(R.string.only_export_file_content)) - ) + ensureBackgroundThread { + NotesHelper(this).getNotes { notes -> + mNotes = notes + requestUnlockNotes { unlockedIds -> + ExportFilesDialog(this, mNotes) { parent, extension -> + val items = arrayListOf( + RadioItem(EXPORT_FILE_SYNC, getString(R.string.update_file_at_note)), + RadioItem(EXPORT_FILE_NO_SYNC, getString(R.string.only_export_file_content)) + ) - RadioGroupDialog(this, items) { any -> - val syncFile = any as Int == EXPORT_FILE_SYNC - var failCount = 0 - NotesHelper(this).getNotes { notes -> - mNotes = notes - mNotes.filter { !it.isLocked() || it.id in unlockedIds }.forEachIndexed { index, note -> - val filename = if (extension.isEmpty()) note.title else "${note.title}.$extension" - val file = File(parent, filename) - if (!filename.isAValidFilename()) { - toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename))) - } else { - val noteStoredValue = note.getNoteStoredValue(this) ?: "" - tryExportNoteValueToFile(file.absolutePath, mCurrentNote.title, note.value, false) { exportedSuccessfully -> - if (exportedSuccessfully) { - if (syncFile) { - note.path = file.absolutePath - note.value = "" - } else { - note.path = "" - note.value = noteStoredValue + RadioGroupDialog(this, items) { any -> + val syncFile = any as Int == EXPORT_FILE_SYNC + var failCount = 0 + mNotes.filter { !it.isLocked() || it.id in unlockedIds }.forEachIndexed { index, note -> + val filename = if (extension.isEmpty()) note.title else "${note.title}.$extension" + val file = File(parent, filename) + if (!filename.isAValidFilename()) { + toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename))) + } else { + val noteStoredValue = note.getNoteStoredValue(this) ?: "" + tryExportNoteValueToFile(file.absolutePath, mCurrentNote.title, note.value, false) { exportedSuccessfully -> + if (exportedSuccessfully) { + if (syncFile) { + note.path = file.absolutePath + note.value = "" + } else { + note.path = "" + note.value = noteStoredValue + } + + NotesHelper(this).insertOrUpdateNote(note) } - NotesHelper(this).insertOrUpdateNote(note) - } + if (mCurrentNote.id == note.id) { + mCurrentNote.value = note.value + mCurrentNote.path = note.path + getPagerAdapter().updateCurrentNoteData(view_pager.currentItem, mCurrentNote.path, mCurrentNote.value) + } - if (mCurrentNote.id == note.id) { - mCurrentNote.value = note.value - mCurrentNote.path = note.path - getPagerAdapter().updateCurrentNoteData(view_pager.currentItem, mCurrentNote.path, mCurrentNote.value) - } + if (!exportedSuccessfully) { + failCount++ + } - if (!exportedSuccessfully) { - failCount++ - } - - if (index == mNotes.size - 1) { - toast(if (failCount == 0) R.string.exporting_successful else R.string.exporting_some_entries_failed) + if (index == mNotes.size - 1) { + toast(if (failCount == 0) R.string.exporting_successful else R.string.exporting_some_entries_failed) + } } } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt index 7d0e69c3..bc9ac4bf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesExporter.kt @@ -5,7 +5,6 @@ import com.google.gson.Gson import com.google.gson.stream.JsonWriter import com.simplemobiletools.commons.helpers.PROTECTION_NONE import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.notes.pro.extensions.notesDB import com.simplemobiletools.notes.pro.models.Note import java.io.OutputStream @@ -16,7 +15,7 @@ class NotesExporter(private val context: Context) { private val gson = Gson() - fun exportNotes(outputStream: OutputStream?, unlockedNoteIds: List, callback: (result: ExportResult) -> Unit) { + fun exportNotes(notes: List, unlockedNoteIds: List, outputStream: OutputStream?, callback: (result: ExportResult) -> Unit) { ensureBackgroundThread { if (outputStream == null) { callback.invoke(ExportResult.EXPORT_FAIL) @@ -27,7 +26,6 @@ class NotesExporter(private val context: Context) { try { var written = 0 writer.beginArray() - val notes = context.notesDB.getNotes() as ArrayList for (note in notes) { if (!note.isLocked() || note.id in unlockedNoteIds) { val noteToSave = getNoteToExport(note) From 7d590f3f06a4e4c3f9da36903b136b3eca273bcb Mon Sep 17 00:00:00 2001 From: Naveen Date: Sat, 18 Mar 2023 23:39:13 +0530 Subject: [PATCH 5/9] Use named parameter in lambda --- .../notes/pro/activities/MainActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 68ff10d8..d6b81d1d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -904,7 +904,7 @@ class MainActivity : SimpleActivity() { } } - private fun requestUnlockNotes(callback: (List) -> Unit) { + private fun requestUnlockNotes(callback: (unlockedNoteIds: List) -> Unit) { val lockedNotes = mNotes.filter { it.isLocked() } if (lockedNotes.isNotEmpty()) { runOnUiThread { @@ -919,10 +919,10 @@ class MainActivity : SimpleActivity() { ensureBackgroundThread { NotesHelper(this).getNotes { mNotes = it - requestUnlockNotes { unlockedIds -> + requestUnlockNotes { unlockedNoteIds -> toast(R.string.exporting) val notesExporter = NotesExporter(this) - notesExporter.exportNotes(mNotes, unlockedIds, outputStream) { result -> + notesExporter.exportNotes(mNotes, unlockedNoteIds, outputStream) { result -> val toastId = when (result) { NotesExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful else -> R.string.exporting_failed @@ -1030,7 +1030,7 @@ class MainActivity : SimpleActivity() { ensureBackgroundThread { NotesHelper(this).getNotes { notes -> mNotes = notes - requestUnlockNotes { unlockedIds -> + requestUnlockNotes { unlockedNoteIds -> ExportFilesDialog(this, mNotes) { parent, extension -> val items = arrayListOf( RadioItem(EXPORT_FILE_SYNC, getString(R.string.update_file_at_note)), @@ -1040,7 +1040,7 @@ class MainActivity : SimpleActivity() { RadioGroupDialog(this, items) { any -> val syncFile = any as Int == EXPORT_FILE_SYNC var failCount = 0 - mNotes.filter { !it.isLocked() || it.id in unlockedIds }.forEachIndexed { index, note -> + mNotes.filter { !it.isLocked() || it.id in unlockedNoteIds }.forEachIndexed { index, note -> val filename = if (extension.isEmpty()) note.title else "${note.title}.$extension" val file = File(parent, filename) if (!filename.isAValidFilename()) { From 0411d27b034207b8415d597775b5336fdbb51ab0 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 22 Mar 2023 13:47:05 +0530 Subject: [PATCH 6/9] Update locked notes info string --- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-az/strings.xml | 2 +- app/src/main/res/values-be/strings.xml | 2 +- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-cy/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-eo/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-et/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-ms/strings.xml | 2 +- app/src/main/res/values-nb-rNO/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pa-rPK/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-th/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1bbc0095..af88757c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -25,7 +25,7 @@ Lock note إلغاء تأمين الملاحظة Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. محتوى الملاحظات مؤمن. إظهار المحتوى تحذير: إذا نسيت كلمة مرور الملاحظات، فلن تتمكن من استعادتها أو الوصول إلى محتوى الملاحظات بعد الآن. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index df57b7b1..82aae43e 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -25,7 +25,7 @@ Lock note Unlock note Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 37154ab5..bdae6bfc 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -25,7 +25,7 @@ Блакаваць нататку Разблакаваць нататку Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Змесціва нататкі заблакавана. Паказаць змесціва ПАПЯРЭДЖАННЕ: Калі вы забудзеце пароль, вы больш не зможаце аднавіць яго альбо атрымаць доступ да змесціва нататак. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8a40dce5..1c6bbefc 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -25,7 +25,7 @@ Бележка за заключване Бележка за отключване Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Съдържанието на бележките е заключено. Покажи съдържанието ПРЕДУПРЕЖДЕНИЕ: Ако забравите паролата на бележките, вече няма да можете да я възстановите или да получите достъп до съдържанието на бележките. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 6bc8f04e..d1e6fb18 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -25,7 +25,7 @@ Bloqueja la nota Desbloqueja la nota Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. El contingut de la nota està bloquejat. Mostra el contingut AVÍS: Si oblideu la contrasenya de la nota, ja no podreu recuperar-la ni accedir al contingut de les notes. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b693c2bb..377f1f4f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -25,7 +25,7 @@ Zamknout poznámku Odemknout poznámku Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Obsah této poznámky je uzamčen. Zobrazit obsah UPOZORNĚNÍ: Pokud zapomenete heslo k poznámce, už ji nebudete schopni obnovit nebo získat přístup k jejímu obsahu. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index cce79ac0..cdc8e9b1 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -25,7 +25,7 @@ Lock note Unlock note Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d627d5d7..fe16a631 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -25,7 +25,7 @@ Lock note Lås note op Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Noternes indhold er låst. Vis indhold ADVARSEL: Hvis du glemmer noternes adgangskode, kan du ikke gendanne den eller få adgang til noternes indhold længere. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 51b6de06..1b1f7745 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -25,7 +25,7 @@ Notiz sperren Notiz entsperren Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Der Inhalt der Notizen ist gesperrt. Inhalt anzeigen ACHTUNG: Wenn du das Kennwort für die Notizen vergisst, kannst du sie nicht mehr wiederherstellen oder auf den Inhalt der Notizen zugreifen. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 413a3fab..711369f3 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -25,7 +25,7 @@ Κλείδωμα Σημείωσης Ξεκλείδωμα Σημείωσης Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Το περιεχόμενο των σημειώσεων είναι κλειδωμένο. Εμφάνιση περιεχομένου ΠΡΟΣΟΧΗ: Εάν ξεχάσετε τον κωδικό των σημειώσεων, δεν θα μπορείτε πλέον να τον ανακτήσετε ή να αποκτήσετε πρόσβαση στο περιεχόμενό τους. diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index e00e546f..9545f22f 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -25,7 +25,7 @@ Ŝlosi noton Malŝlosi noton Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. The notes\' content is locked. Montri enhavon WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8d5bb70f..b5382e3e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -25,7 +25,7 @@ Bloquear nota Desbloquear nota Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. El contenido de la nota está bloqueado. Mostrar contenido ADVERTENCIA: Si olvidas la contraseña de la nota, ya no podrás recuperarla o acceder a su contenido. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 99ba032e..34ccc92e 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -25,7 +25,7 @@ Lukusta märge Eemalda märkme lukustus Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Märkme sisu on lukustatud. Näita sisu HOIATUS: Kui sa unustad märkme salasõna, siis sa ei saa seda märget avada ega tema sisu lugeda. diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 65e3f15c..4e41d668 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -25,7 +25,7 @@ قفل کردن یادداشت باز کردن قفل یادداشت Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. محتویات یادداشت، قفل است نمایش محتویات هشدار: اگر گذرواژهٔ یادداشت را فراموش کنید، دیگر قادر به بازیابی آن یا دسترسی به محتویات یادداشت نیستید. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b1288571..f70b91e8 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -25,7 +25,7 @@ Lukitse huomautus Avaa muistiinpanon lukitus Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Muistiinpanon sisältö on lukittu. Näytä sisältö VAROITUS: Jos unohdat muistiinpanon salasanan, sitä ei ole mahdollista palauttaa etkä pääse enää käsiksi muistiinpanoon. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cfc3dda8..ca6f83d5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -25,7 +25,7 @@ Verrouiller la note Déverrouiller la note Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Le contenu des notes est verrouillé. Montrer le contenu AVERTISSEMENT : Si vous oubliez le mot de passe des notes, vous ne pourrez plus le récupérer ni accéder au contenu des notes. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 238ad8e9..2fb0da82 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -25,7 +25,7 @@ Lock note Desbloqueala nota Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. O contido das notas está bloqueado. Mostralo contido PERIGO: Se esqueces o contrasinal das notas, xa non poderás recuperalo nin acceder ao contido das notas. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 548c06a3..1231926e 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -25,7 +25,7 @@ Zaključaj bilješku Otključaj bilješku Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Sadržaj bilješke je zaključan. Prikaži sadržaj UPOZORENJE: Ako zaboraviš lozinku bilješke, više je nećeš moći obnoviti niti pristupiti njenom sadržaju. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a90a1661..e3387473 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -25,7 +25,7 @@ Jegyzet zárolása Jegyzet feloldása Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. A jegyzet tartalma zárolva van. Tartalom megjelenítése FIGYELMEZTETÉS: Ha elfelejti a jegyzetek jelszavát, akkor többé nem fogja tudni helyreállítani vagy elérni a jegyzetek tartalmát. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 390ea857..19e084a4 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -25,7 +25,7 @@ Lock note Buka kunci kota Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Konten catatan terkunci. Tampilkan konten PERINGATAN: Jika Anda lupa kata sandi catatan, Anda tidak akan dapat memulihkan atau mengakses konten catatan. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f412d51b..6ca05a6e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -25,7 +25,7 @@ Lock note Sblocca la nota Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Il contenuto delle note è bloccato. Mostra il contenuto ATTENZIONE: Se dimentichi la password delle note, non sarai più in grado di recuperarla o di accedere al contenuto delle note. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 6997cb51..ca40775b 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -25,7 +25,7 @@ נעל פתק בטל נעילת פתק Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. תוכן הפתקים נעול. הראה תוכן אזהרה: אם תשכח את הסיסמה של הפתקים, לא תוכל לשחזר אותה או לגשת לתוכן הפתקים יותר. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 10d993a6..bf4a4384 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -25,7 +25,7 @@ メモをロック メモのロックを解除 Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. メモの内容がロックされています。 内容を表示 警告：メモのパスワードを忘れた場合、そのパスワードを復元したり、メモの内容にアクセスしたりすることはできなくなります。 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 5c1f9db4..e64146e4 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -25,7 +25,7 @@ Lock note Unlock note Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Pastabų turinys yra užrakintas. Show content ĮSPĖJIMAS: jei pamiršite užrašų slaptažodį, nebegalėsite jo atkurti ar pasiekti užrašų turinio. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index f2c59a7c..26275f5e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -25,7 +25,7 @@ Lock note Unlock note Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 5b5aa3f8..afe05eb4 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -25,7 +25,7 @@ Lås notat Lås opp notat Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Notatinnholdet er låst. Vis innhold ADVARSEL: Hvis du glemmer passordet til notatene, kan du ikke gjenopprette det eller få tilgang til notatenes innhold lenger. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 50589092..471c7dbb 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -24,7 +24,7 @@ Notitie vergrendelen Notitie ontgrendelen Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. De inhoud van deze notitie is vergrendeld. Inhoud weergeven WAARSCHUWING: Zonder het wachtwoord kan de inhoud van de notitie niet meer worden hersteld. diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 296d2d6e..bf142f0f 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -24,7 +24,7 @@ نوٹ تالؕا مارنا نوٹ اُگھیڑو Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. ایس نوٹ دی سمگاری تالؕا مارنی اے سمگری ویکھو چیتاونی: جےتسی نوٹ دا پاس‌ورڈ بھُل جاندے او، تاں فیر نوٹ دی سمگری لبھ نہیں سکدیاں۔ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f2fc31c3..35644394 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -25,7 +25,7 @@ Zablokuj notatkę Odblokuj notatkę Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Treść notatki jest zablokowana. Pokaż zawartość OSTRZEŻENIE: Jeśli zapomnisz hasła do notatki, nie będziesz już mógł/mogła jej odzyskać ani uzyskać dostępu do treści notatki. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 810e1244..745d6472 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -25,7 +25,7 @@ Bloquear anotação Desbloquear anotação Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. O conteúdo da nota está bloqueado. Mostrar conteúdo AVISO: Caso você esqueça a senha, não conseguirá recuperá-la ou acessar o conteúdo da nota. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d85f767b..8d6336d7 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -25,7 +25,7 @@ Bloquear nota Desbloquear nota Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. O conteúdo da nota está bloqueado. Mostrar conteúdo AVISO: se esquecer a palavra-passe, não conseguirá aceder à nota nem recuperar o seu conteúdo. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d71422ca..ab7ffa9d 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -25,7 +25,7 @@ Blocaţi notița Deblocaţi notița Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Conținutul notiței este blocat. Afișați conținutul ATENȚIE: Dacă uitați parola notițelor, nu o veți mai putea recupera și nici nu veți mai putea accesa conținutul notițele. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 847a8965..10e97e6b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -25,7 +25,7 @@ Блокировать заметку Разблокировать заметку Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Содержимое заметки заблокировано. Показывать содержание ПРЕДУПРЕЖДЕНИЕ: если вы забудете пароль, то не сможете восстановить его или получить доступ к содержимому заметок. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 8ab0bc73..28029ded 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -25,7 +25,7 @@ Uzamknúť poznámku Odomknúť poznámku Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Obsah poznámky je uzamknutý. Zobraziť obsah UPOZORNENIE: Ak zabudnete heslo poznámky, nebudete ho môcť obnoviť, ani sa už dostať k obsahu poznámky. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 4b58a789..fe3b2558 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -24,7 +24,7 @@ Opomba glede zaklepanja Opomba o odklepanju Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Zaklenjena vsebina opomb. Prikaži vsebino OPOZORILO: Če pozabite geslo za opombe, ga ne bo moč več obnoviti in dostopati do njihove vsebine. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index f4671b9b..fe289b30 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -24,7 +24,7 @@ Закључај белешку Откључај белешку Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Садржај белешки је закључан. Прикажи садржај УПОЗОРЕЊЕ: Ако заборавите лозинку за белешке, више нећете моћи да је повратите нити да приступите садржају белешки. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index c6046b5c..ea7af78f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -25,7 +25,7 @@ Lås Lås upp Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Anteckningens innehåll är låst. Visa innehåll VARNING: Om du glömmer anteckningens lösenord så finns ingen möjlighet att återställa detta och du kommer således förlora åtkomsten till anteckningens innehåll. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 82a8705b..0eeec68a 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -25,7 +25,7 @@ ล็อกโน็ต ปลดล็อกโน็ต Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. ข้อมูลในโน็ตถูกล็อก แสดงข้อมูล คำเตือน: ถ้าคุณลืมรหัสผ่านของโน็ต คุณจะไม่สามารถกู้คืนหรือเข้าถึงโน็ตตัวนั้นได้อีกต่อไป diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e078df4a..e99bb2cf 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -25,7 +25,7 @@ Notu kilitle Notun kilidini aç Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Notların içeriği kilitlendi. İçeriği göster UYARI: Notların parolasını unutursanız, onu kurtaramaz veya notların içeriğine artık erişemezsiniz. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e9f09514..20975e2e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -25,7 +25,7 @@ Заблокувати нотатку Розблокувати нотатку Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Вміст нотатки заблоковано. Показати нотатку ЗАСТЕРЕЖЕННЯ: Якщо ви забудете пароль, то більше не зможете його відновити або отримати доступ до вмісту нотаток. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 09ba14c0..2c73caed 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -24,7 +24,7 @@ Khóa ghi chú Mở khóa ghi chú Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. Nội dung của ghi chú đã bị khóa. Hiển thị nội dung Cảnh Báo: Nếu bạn quên khi chú mật khẩu, bạn sẽ không thể nào lấy lại hay truy cập vào những ghi chú nữa diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0449b2cf..f14d5855 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -25,7 +25,7 @@ 锁定笔记 解锁笔记 Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. 笔记的内容被锁定。 显示内容 警告：如果您忘记了笔记的密码，您将无法恢复或访问笔记的内容。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5c6558ef..a9394fef 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -25,7 +25,7 @@ Lock note 解鎖筆記 Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e09d225e..b9028781 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,7 +24,7 @@ Lock note Unlock note Unlock notes - The following notes are locked. You can either unlock them one by one or tap \"OK\" to skip exporting locked notes. + The following notes are locked. You can either unlock them one by one or skip exporting them. The notes\' content is locked. Show content WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. From 80aada524b172e39cc992c46bc8e4a6cbcfbed20 Mon Sep 17 00:00:00 2001 From: Naveen Date: Wed, 22 Mar 2023 13:55:17 +0530 Subject: [PATCH 7/9] Use "Skip" instead of "Ok" --- .../notes/pro/dialogs/UnlockNotesDialog.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt index f42cbd88..cbb35aff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt @@ -2,6 +2,7 @@ package com.simplemobiletools.notes.pro.dialogs import android.content.DialogInterface import android.view.ViewGroup +import androidx.appcompat.app.AlertDialog import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.notes.pro.R @@ -9,7 +10,8 @@ import com.simplemobiletools.notes.pro.models.Note import kotlinx.android.synthetic.main.dialog_unlock_notes.view.* import kotlinx.android.synthetic.main.item_locked_note.view.* -class UnlockNotesDialog(val activity: BaseSimpleActivity, notes: List, callback: (unlockedNoteIds: List) -> Unit) { +class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List, callback: (unlockedNoteIds: List) -> Unit) { + private var dialog: AlertDialog? = null private val view = activity.layoutInflater.inflate(R.layout.dialog_unlock_notes, null) as ViewGroup private val redColor = activity.getColor(R.color.md_red) private val greenColor = activity.getColor(R.color.md_green) @@ -20,10 +22,11 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, notes: List, cal addLockedNoteView(note) } activity.getAlertDialogBuilder() - .setPositiveButton(R.string.ok, null) + .setPositiveButton(R.string.skip, null) .setNegativeButton(R.string.cancel, null) .apply { activity.setupDialogStuff(view, this, R.string.unlock_notes, cancelOnTouchOutside = false) { alertDialog -> + dialog = alertDialog alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { callback(unlockedNoteIds) alertDialog.dismiss() @@ -49,6 +52,7 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, notes: List, cal setImageResource(R.drawable.ic_lock_open_vector) applyColorFilter(greenColor) } + updatePositiveButton() } ) } else { @@ -57,8 +61,17 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, notes: List, cal setImageResource(R.drawable.ic_lock_vector) applyColorFilter(redColor) } + updatePositiveButton() } } } } + + private fun updatePositiveButton() { + dialog?.getButton(DialogInterface.BUTTON_POSITIVE)?.text = if (unlockedNoteIds.isNotEmpty()) { + activity.getString(R.string.ok) + } else { + activity.getString(R.string.skip) + } + } } From d54424a5b420a87bc4d687a7b8095ff40b76f7f9 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Thu, 23 Mar 2023 10:52:46 +0100 Subject: [PATCH 8/9] adding a newline --- .../com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt index cbb35aff..b9b53d9b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/UnlockNotesDialog.kt @@ -21,6 +21,7 @@ class UnlockNotesDialog(val activity: BaseSimpleActivity, val notes: List, for (note in notes) { addLockedNoteView(note) } + activity.getAlertDialogBuilder() .setPositiveButton(R.string.skip, null) .setNegativeButton(R.string.cancel, null) From 6cc5e072080025e1832dca02482739e41242a70d Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Thu, 23 Mar 2023 10:54:05 +0100 Subject: [PATCH 9/9] updating slovak translation --- app/src/main/res/values-sk/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 28029ded..db462dfa 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -24,8 +24,8 @@ Textová poznámka Uzamknúť poznámku Odomknúť poznámku - Unlock notes - The following notes are locked. You can either unlock them one by one or skip exporting them. + Odomknúť poznámky + Nasledovné poznámky sú uzamknuté. Môžete ich buď odomknúť po jednom, alebo vynechať ich exportovanie. Obsah poznámky je uzamknutý. Zobraziť obsah UPOZORNENIE: Ak zabudnete heslo poznámky, nebudete ho môcť obnoviť, ani sa už dostať k obsahu poznámky.