diff --git a/app/build.gradle b/app/build.gradle index 47e79aa6..f139c51b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,11 +63,11 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:545b4a62f0' + implementation 'com.github.SimpleMobileTools:Simple-Commons:94b616f462' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.documentfile:documentfile:1.0.1' - kapt 'androidx.room:room-compiler:2.5.0' - implementation 'androidx.room:room-runtime:2.5.0' - annotationProcessor 'androidx.room:room-compiler:2.5.0' + kapt 'androidx.room:room-compiler:2.5.1' + implementation 'androidx.room:room-runtime:2.5.1' + annotationProcessor 'androidx.room:room-compiler:2.5.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 63148606..6fbba142 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,6 +22,7 @@ android:appCategory="productivity" android:icon="@mipmap/ic_launcher" android:label="@string/app_launcher_name" + android:localeConfig="@xml/locale_config" android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/AppTheme"> 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 a31d7157..43252070 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 @@ -43,6 +43,7 @@ import com.simplemobiletools.notes.pro.dialogs.* import com.simplemobiletools.notes.pro.extensions.* import com.simplemobiletools.notes.pro.fragments.TextFragment import com.simplemobiletools.notes.pro.helpers.* +import com.simplemobiletools.notes.pro.helpers.NotesImporter.ImportResult import com.simplemobiletools.notes.pro.models.Note import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.item_checklist.* @@ -119,7 +120,7 @@ class MainActivity : SimpleActivity() { setupSearchButtons() if (isPackageInstalled("com.simplemobiletools.notes")) { - val dialogText = getString(R.string.upgraded_to_pro_notes) + val dialogText = getString(R.string.upgraded_from_free_notes) ConfirmationDialog(this, dialogText, 0, R.string.ok, 0, false) {} } } @@ -291,7 +292,7 @@ class MainActivity : SimpleActivity() { val outputStream = contentResolver.openOutputStream(resultData.data!!) exportNotesTo(outputStream) } else if (requestCode == PICK_IMPORT_NOTES_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null) { - importNotesFrom(resultData.data!!) + tryImportingAsJson(resultData.data!!) } } @@ -730,23 +731,29 @@ class MainActivity : SimpleActivity() { } private fun importUri(uri: Uri) { - when (uri.scheme) { - "file" -> openPath(uri.path!!) - "content" -> { - val realPath = getRealPathFromURI(uri) - if (hasPermission(PERMISSION_READ_STORAGE)) { - if (realPath != null) { - openPath(realPath) + tryImportingAsJson(uri, force = true, showToasts = false) { success -> + if (success) { + return@tryImportingAsJson + } + + when (uri.scheme) { + "file" -> openPath(uri.path!!) + "content" -> { + val realPath = getRealPathFromURI(uri) + if (hasPermission(PERMISSION_READ_STORAGE)) { + if (realPath != null) { + openPath(realPath) + } else { + R.string.unknown_error_occurred + } + } else if (realPath != null && realPath != "") { + checkFile(realPath, false) { + addNoteFromUri(uri, realPath.getFilenameFromPath()) + } } else { - R.string.unknown_error_occurred - } - } else if (realPath != null && realPath != "") { - checkFile(realPath, false) { - addNoteFromUri(uri, realPath.getFilenameFromPath()) - } - } else { - checkUri(uri) { - addNoteFromUri(uri) + checkUri(uri) { + addNoteFromUri(uri) + } } } } @@ -957,43 +964,66 @@ class MainActivity : SimpleActivity() { } } - private fun importNotes(path: String, filename: String) { - toast(R.string.importing) - ensureBackgroundThread { - NotesImporter(this).importNotes(path, filename) { - toast( - when (it) { - NotesImporter.ImportResult.IMPORT_OK -> R.string.importing_successful - NotesImporter.ImportResult.IMPORT_PARTIAL -> R.string.importing_some_entries_failed - else -> R.string.no_new_items - } - ) - initViewPager() - } - } - } - - private fun importNotesFrom(uri: Uri) { + private fun tryImportingAsJson(uri: Uri, force: Boolean = false, showToasts: Boolean = true, callback: ((success: Boolean) -> Unit)? = null) { + val path: String + val filename: String when (uri.scheme) { - "file" -> importNotes(uri.path!!, uri.path!!.getFilenameFromPath()) + "file" -> { + path = uri.path!! + filename = path.getFilenameFromPath() + } "content" -> { val tempFile = getTempFile("messages", "backup.txt") if (tempFile == null) { - toast(R.string.unknown_error_occurred) + maybeToast(R.string.unknown_error_occurred, showToasts) + callback?.invoke(false) return } try { - val filename = getFilenameFromUri(uri) + filename = getFilenameFromUri(uri) val inputStream = contentResolver.openInputStream(uri) val out = FileOutputStream(tempFile) inputStream!!.copyTo(out) - importNotes(tempFile.absolutePath, filename) + path = tempFile.absolutePath } catch (e: Exception) { showErrorToast(e) + callback?.invoke(false) + return } } - else -> toast(R.string.invalid_file_format) + else -> { + maybeToast(R.string.invalid_file_format, showToasts) + callback?.invoke(false) + return + } + } + + maybeToast(R.string.importing, showToasts) + ensureBackgroundThread { + NotesImporter(this).importNotes(path, filename, force) { importResult -> + if (importResult == ImportResult.IMPORT_FAIL) { + maybeToast(R.string.no_new_items, showToasts) + runOnUiThread { callback?.invoke(false) } + return@importNotes + } + + toast( + when (importResult) { + ImportResult.IMPORT_OK -> R.string.importing_successful + ImportResult.IMPORT_PARTIAL -> R.string.importing_some_entries_failed + else -> R.string.no_new_items + } + ) + initViewPager() + runOnUiThread { callback?.invoke(true) } + } + } + } + + private fun maybeToast(id: Int, show: Boolean) { + if (show) { + toast(id) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesImporter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesImporter.kt index 3a3e03e0..8ec4fca0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesImporter.kt @@ -19,8 +19,9 @@ class NotesImporter(private val context: Context) { private val gson = Gson() private var notesImported = 0 private var notesFailed = 0 + private var notesSkipped = 0 - fun importNotes(path: String, filename: String, callback: (result: ImportResult) -> Unit) { + fun importNotes(path: String, filename: String, force: Boolean = false, callback: (result: ImportResult) -> Unit) { ensureBackgroundThread { try { val inputStream = if (path.contains("/")) { @@ -33,9 +34,9 @@ class NotesImporter(private val context: Context) { val json = reader.readText() val type = object : TypeToken>() {}.type val notes = gson.fromJson>(json, type) - val totalNotes = notes.size + val totalNotes = notes?.size ?: 0 if (totalNotes <= 0) { - callback.invoke(ImportResult.IMPORT_NOTHING_NEW) + callback.invoke(ImportResult.IMPORT_FAIL) return@ensureBackgroundThread } @@ -44,10 +45,17 @@ class NotesImporter(private val context: Context) { if (!exists) { context.notesDB.insertOrUpdate(note) notesImported++ + } else { + notesSkipped++ } } } } catch (e: JsonSyntaxException) { + if (force) { + callback(ImportResult.IMPORT_FAIL) + return@ensureBackgroundThread + } + // Import notes expects a json with note name, content etc, but lets be more flexible and accept the basic files with note content only too val inputStream = if (path.contains("/")) { File(path).inputStream() @@ -82,6 +90,7 @@ class NotesImporter(private val context: Context) { callback.invoke( when { + notesSkipped > 0 && notesImported == 0 -> ImportResult.IMPORT_NOTHING_NEW notesImported == 0 -> ImportResult.IMPORT_FAIL notesFailed > 0 -> ImportResult.IMPORT_PARTIAL else -> ImportResult.IMPORT_OK diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 33d46aca..bc6e838b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -31,6 +31,7 @@ تحذير: إذا نسيت كلمة مرور الملاحظات، فلن تتمكن من استعادتها أو الوصول إلى محتوى الملاحظات بعد الآن. ملاحظة نصية جديدة قائمة مرجعية جديدة + The app cannot load files over the internet فتح الملف تصدير كملف diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index acbb66d7..4c1c9522 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -31,6 +31,7 @@ WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. New text note New checklist + The app cannot load files over the internet Faylı Aç Fayl kimi çıxar diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 8d803857..5497c89f 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -24,13 +24,14 @@ Тэкставая нататка Блакаваць нататку Разблакаваць нататку - Unlock notes - The following notes are locked. You can either unlock them one by one or skip exporting them. + Разблакіраваць нататкі + Наступныя нататкі заблакіраваны. Вы можаце альбо разблакіраваць іх адзін за адным, альбо прапусціць іх экспарт. Змесціва нататкі заблакавана. Паказаць змесціва ПАПЯРЭДЖАННЕ: Калі вы забудзеце пароль, вы больш не зможаце аднавіць яго альбо атрымаць доступ да змесціва нататак. Новая тэкставая нататка Новы кантрольны спіс + The app cannot load files over the internet Адкрыць файл Экспарт у файл @@ -85,4 +86,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 b56d13c6..5b993ea5 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -31,6 +31,7 @@ ПРЕДУПРЕЖДЕНИЕ: Ако забравите паролата на бележките, вече няма да можете да я възстановите или да получите достъп до съдържанието на бележките. Нова текстова бележка Нов контролен списък + The app cannot load files over the internet Отвори файл Експортиране като файл diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 0de2390d..81aa30fd 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -31,6 +31,7 @@ AVÍS: Si oblideu la contrasenya de la nota, ja no podreu recuperar-la ni accedir al contingut de les notes. Nota de text nova Llista de comprovació nova + The app cannot load files over the internet Obre un fitxer Exporta com a fitxer diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e4775c0d..b9511d35 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -31,6 +31,7 @@ UPOZORNĚNÍ: Pokud zapomenete heslo k poznámce, už ji nebudete schopni obnovit nebo získat přístup k jejímu obsahu. Nová textová poznámka Nový seznam položek + The app cannot load files over the internet Otevřít soubor Exportovat jako soubor diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 3f8368c9..63056170 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -31,6 +31,7 @@ WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. New text note New checklist + The app cannot load files over the internet Agor ffeil Allforio fel ffeil diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d5d012ee..98cc0bd7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -31,6 +31,7 @@ ADVARSEL: Hvis du glemmer noternes adgangskode, kan du ikke gendanne den eller få adgang til noternes indhold længere. Ny tekstnote Ny tjekliste + The app cannot load files over the internet Åbn fil Eksporter som fil diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3da6358d..bfc32de9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -31,6 +31,7 @@ ACHTUNG: Wenn du das Kennwort für die Notizen vergisst, kannst du sie nicht mehr wiederherstellen oder auf den Inhalt der Notizen zugreifen. Neue Textnotiz Neue Checkliste + The app cannot load files over the internet Datei öffnen Als Datei exportieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 69e88fbe..d5f429e7 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -31,6 +31,7 @@ ΠΡΟΣΟΧΗ: Εάν ξεχάσετε τον κωδικό των σημειώσεων, δεν θα μπορείτε πλέον να τον ανακτήσετε ή να αποκτήσετε πρόσβαση στο περιεχόμενό τους. Νέα σημείωση κειμένου Νέα λίστα ελέγχου + The app cannot load files over the internet Άνοιγμα αρχείου Εξαγωγή ως αρχείο diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 4751a283..f089b842 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -31,6 +31,7 @@ WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. New text note New checklist + The app cannot load files over the internet Malfermi dosieron Export as file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 54581330..055bc284 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -31,6 +31,7 @@ ADVERTENCIA: Si olvidas la contraseña de la nota, ya no podrás recuperarla o acceder a su contenido. Nueva nota de texto Nueva lista de tareas + The app cannot load files over the internet Abrir archivo Exportar como archivo diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 96495039..8a922236 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -31,6 +31,7 @@ HOIATUS: Kui sa unustad märkme salasõna, siis sa ei saa seda märget avada ega tema sisu lugeda. Uus tekstimärge Uus tööde loend + The app cannot load files over the internet Ava fail Ekspordi failina diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 5cd65a33..ac936185 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -31,6 +31,7 @@ هشدار: اگر گذرواژهٔ یادداشت را فراموش کنید، دیگر قادر به بازیابی آن یا دسترسی به محتویات یادداشت نیستید. New text note New checklist + The app cannot load files over the internet بازکردن پرونده برون‌ریزی به عنوان پرونده diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9ba677fe..96fc3be6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -31,6 +31,7 @@ VAROITUS: Jos unohdat muistiinpanon salasanan, sitä ei ole mahdollista palauttaa etkä pääse enää käsiksi muistiinpanoon. Uusi tekstimuistiinpano Uusi tarkistuslista + The app cannot load files over the internet Avaa tiedosto Vie tiedostona diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 09a638d1..b59ba6b4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -31,6 +31,7 @@ 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. Nouvelle note textuelle Nouvelle liste de contrôle + The app cannot load files over the internet Ouvrir le fichier Exporter dans un fichier diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f70ac3ab..6f85c351 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -31,6 +31,7 @@ PERIGO: Se esqueces o contrasinal das notas, xa non poderás recuperalo nin acceder ao contido das notas. Nova nota de texto Nova lista de verificación + The app cannot load files over the internet Abrir ficheiro Exportar como ficheiro diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index f18cab96..ddac9b4c 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -24,13 +24,14 @@ Tekstualna bilješka Zaključaj bilješku Otključaj bilješku - Unlock notes + Otključaj bilješke 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. Nova tekstualna bilješka Novi popis zadataka + The app cannot load files over the internet Otvori datoteku Izvezi kao datoteku @@ -85,4 +86,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 b678f8ad..9f9ed589 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -31,6 +31,7 @@ FIGYELMEZTETÉS: Ha elfelejti a jegyzetek jelszavát, akkor többé nem fogja tudni helyreállítani vagy elérni a jegyzetek tartalmát. Új szöveges jegyzet Új ellenőrzőlista + The app cannot load files over the internet Fájl megnyitása Exportálás fájlként diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d71d444c..1571bb84 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -31,6 +31,7 @@ PERINGATAN: Jika Anda lupa kata sandi catatan, Anda tidak akan dapat memulihkan atau mengakses konten catatan. Catatan teks baru Daftar periksa baru + The app cannot load files over the internet Buka berkas Ekspor sebagai berkas diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 22dd9f18..596778ed 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -31,6 +31,7 @@ ATTENZIONE: Se dimentichi la password delle note, non sarai più in grado di recuperarla o di accedere al contenuto delle note. Nuova nota di testo Nuova lista di controllo + The app cannot load files over the internet Apri file Esporta come file diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 7fdb8a32..0fbcece5 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -31,6 +31,7 @@ אזהרה: אם תשכח את הסיסמה של הפתקים, לא תוכל לשחזר אותה או לגשת לתוכן הפתקים יותר. פתק טקסט חדש רשימת בדיקה חדשה + The app cannot load files over the internet Open file ייצא כקובץ diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 25e7be71..fd4fb9ed 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -31,6 +31,7 @@ 警告:メモのパスワードを忘れた場合、そのパスワードを復元したり、メモの内容にアクセスしたりすることはできなくなります。 新しいテキストメモ 新しいチェックリスト + The app cannot load files over the internet ファイルを開く ファイルとしてエクスポート diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index cca1ed2e..ad4f0f1e 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -31,6 +31,7 @@ ĮSPĖJIMAS: jei pamiršite užrašų slaptažodį, nebegalėsite jo atkurti ar pasiekti užrašų turinio. New text note New checklist + The app cannot load files over the internet Atverti bylą Kurti kopiją diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 6ba7147f..47286de4 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -31,6 +31,7 @@ WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. New text note New checklist + The app cannot load files over the internet Open file Export as file diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index a11beb7b..54901ad1 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -31,6 +31,7 @@ ADVARSEL: Hvis du glemmer passordet til notatene, kan du ikke gjenopprette det eller få tilgang til notatenes innhold lenger. Ny tekstnotat Ny sjekkliste + The app cannot load files over the internet Åpne fil Eksporter som fil diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5745c1d8..c74c55c7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -30,6 +30,7 @@ WAARSCHUWING: Zonder het wachtwoord kan de inhoud van de notitie niet meer worden hersteld. Nieuwe notitie Nieuwe lijst + The app cannot load files over the internet Bestand openen Als bestand exporteren diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 7441299d..cab361e5 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -30,6 +30,7 @@ چیتاونی: جےتسی نوٹ دا پاس‌ورڈ بھُل جاندے او، تاں فیر نوٹ دی سمگری لبھ نہیں سکدیاں۔ نواں لکھت دا نوٹ بݨاؤ نویں چیک‌لِسٹ بݨاؤ + The app cannot load files over the internet فائل کھُلھو فائل ایکسپورٹ کرو diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9348ddca..d7ce016a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -31,6 +31,7 @@ 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. Nowa notatka tekstowa Nowa lista kontrolna + The app cannot load files over the internet Otwórz plik Eksportuj jako plik diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f181e529..c9cf713b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -31,6 +31,7 @@ AVISO: Caso você esqueça a senha, não conseguirá recuperá-la ou acessar o conteúdo da nota. Nova nota de texto Nova lista + The app cannot load files over the internet Abrir arquivo Exportar como arquivo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d1db8647..fc24f59d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -31,6 +31,7 @@ AVISO: se esquecer a palavra-passe, não conseguirá aceder à nota nem recuperar o seu conteúdo. Nova nota de texto Nova lista + The app cannot load files over the internet Abrir ficheiro Exportar como ficheiro diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 47ca63b5..6805c0dd 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -31,6 +31,7 @@ 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. Noua notița de text O nouă listă de verificare + The app cannot load files over the internet Deschideți fișierul Exportați ca fișier diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1cc00122..2bbad49f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -31,6 +31,7 @@ ПРЕДУПРЕЖДЕНИЕ: если вы забудете пароль, то не сможете восстановить его или получить доступ к содержимому заметок. Новая заметка Новый список + The app cannot load files over the internet Открыть файл Экспортировать в файл diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 2c042ed3..22273614 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -31,6 +31,7 @@ UPOZORNENIE: Ak zabudnete heslo poznámky, nebudete ho môcť obnoviť, ani sa už dostať k obsahu poznámky. Nová textová poznámka Nový zoznam položiek + Apka nevie načítať súbory cez internet Otvoriť súbor Exportovať ako súbor diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 6cf7fed7..f4d1308e 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -30,6 +30,7 @@ OPOZORILO: Če pozabite geslo za opombe, ga ne bo moč več obnoviti in dostopati do njihove vsebine. Nova opomba k besedilu Nov seznam za preverjanje + The app cannot load files over the internet Odprite datoteko Izvozite kot datoteko diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 30261053..1e156dfd 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -30,6 +30,7 @@ УПОЗОРЕЊЕ: Ако заборавите лозинку за белешке, више нећете моћи да је повратите нити да приступите садржају белешки. Нова текстуална белешка Нова контролна листа + The app cannot load files over the internet Отворена датотека Извези као датотеку diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fc4173f7..7bbf0e49 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -31,6 +31,7 @@ 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. Ny textanteckning Ny checklista + The app cannot load files over the internet Öppna fil Exportera diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 86352922..cf6fc41e 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -31,6 +31,7 @@ คำเตือน: ถ้าคุณลืมรหัสผ่านของโน็ต คุณจะไม่สามารถกู้คืนหรือเข้าถึงโน็ตตัวนั้นได้อีกต่อไป เพิ่มโน็ตข้อความใหม่ เพิ่มรายการตรวจสอบใหม่ + The app cannot load files over the internet เปิดไฟล์ ส่งออกเป็นไฟล์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 47d77231..bdcf04ca 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -31,6 +31,7 @@ UYARI: Notların parolasını unutursanız, onu kurtaramaz veya notların içeriğine artık erişemezsiniz. Yeni metin notu Yeni yapılacak listesi + The app cannot load files over the internet Dosya aç Dosya olarak aktar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 188658a2..1209d884 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -31,6 +31,7 @@ ЗАСТЕРЕЖЕННЯ: Якщо ви забудете пароль, то більше не зможете його відновити або отримати доступ до вмісту нотаток. Нова текстова нотатка Новий список + The app cannot load files over the internet Відкрити файл Експортувати як файл diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 48b56f2a..618c4920 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -30,6 +30,7 @@ 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 Ghi chú văn bản mới Danh sách kiểm tra mới + The app cannot load files over the internet Mở tệp diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 589f193f..f813e38e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -31,6 +31,7 @@ 警告:如果您忘记了笔记的密码,您将无法恢复或访问笔记的内容。 新建文本笔记 新建清单 + The app cannot load files over the internet 打开文件 以文件的形式导出 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 483f6a0b..067aa487 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -31,6 +31,7 @@ WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. 新文字筆記 New checklist + The app cannot load files over the internet 打開檔案 匯出成檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9dcae5ac..5cedad57 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,6 +30,7 @@ WARNING: If you forget the notes\' password, you won\'t be able to recover it or access the notes\' content anymore. New text note New checklist + The app cannot load files over the internet Open file