Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

39 files changed, 469 insertions, 264 deletions

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c0d35a64..5de41490 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -153,11 +153,8 @@
     <string name="manage_accounts">إدارة الحسابات</string>
     <string name="action_formatting_help">التنسيق</string>
 
-    <string-array name="noteMode_entries">
-        <item>فتح في وضع التحرير</item>
-        <item>فتح في وضع المعاينة</item>
-        <item>تذكر آخر ما أخترته</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">تذكر آخر ما أخترته</string>
 
     <string-array name="fontSize_entries">
         <item>صغير</item>
@@ -235,4 +232,5 @@
     <string name="simple_next">التالي</string>
     <string name="simple_prev">السابق</string>
     <string name="simple_backup">النسخ الاحتياطي</string>
+    <string name="action_back">العودة</string>
     </resources>
diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index 76db2177..f1830550 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Last month</string>
 
     <string name="settings_note_mode">Display mode for notes</string>
+    <string name="settings_note_mode_new">Notes opening behaviour</string>
     <string name="settings_theme_title">Theme</string>
     <string name="settings_font_title">Monospace font</string>
     <string name="settings_font_size">Font size</string>
@@ -63,6 +64,7 @@
     <string name="about_version">You are currently using %1$s</string>
     <string name="about_maintainer_title">Maintainer</string>
     <string name="about_developers_title">Developers</string>
+    <string name="about_developers_original_author">original author</string>
     <string name="about_translators_title">Translators</string>
     <string name="about_translators_transifex">Nextcloud community on %1$s</string>
     <string name="about_testers_title">Testers</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Manage accounts</string>
     <string name="action_formatting_help">Formatting</string>
 
-    <string-array name="noteMode_entries">
-        <item>Open in edit mode</item>
-        <item>Open in preview mode</item>
-        <item>Remember my last selection</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Plain edit mode</string>
+    <string name="noteMode_plain_preview">Plain preview</string>
+    <string name="noteMode_rich_edit">Rich edit mode</string>
+    <string name="noteMode_remember_last">Remember my last selection</string>
 
     <string-array name="fontSize_entries">
         <item>Small</item>
@@ -302,4 +304,7 @@
     <string name="progress_import_indeterminate">Importing notes…</string>
     <string name="progress_import">Importing note %1$d of %2$d…</string>
     <string name="account_imported">Account imported.</string>
-</resources>
+    <string name="direct_editing_error">Error while loading rich editing</string>
+    <string name="switch_to_plain_editing">Switch to plain editing</string>
+    <string name="action_back">Back</string>
+    </resources>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index c3887342..3515961f 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Миналия месец</string>
 
     <string name="settings_note_mode">Режим на показване на бележки</string>
+    <string name="settings_note_mode_new">Поведение при отваряне на бележките</string>
     <string name="settings_theme_title">Тема</string>
     <string name="settings_font_title">Monospace/Монопространствен/ шрифт</string>
     <string name="settings_font_size">Размер на шрифта</string>
@@ -63,6 +64,7 @@
     <string name="about_version">В момента използвате%1$s</string>
     <string name="about_maintainer_title">Отговорник</string>
     <string name="about_developers_title">Разработчици</string>
+    <string name="about_developers_original_author">оригинален автор</string>
     <string name="about_translators_title">Преводачи</string>
     <string name="about_translators_transifex">Nextcloud общност на %1$s</string>
     <string name="about_testers_title">Тестери</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Управление на профилите</string>
     <string name="action_formatting_help">Форматиране</string>
 
-    <string-array name="noteMode_entries">
-        <item>Отваряне в режим за редактиране</item>
-        <item>Отваряне в режим на визуализация</item>
-        <item>Запаметяване на последният ми избор</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Режим на обикновено редактиране</string>
+    <string name="noteMode_plain_preview">Обикновен преглед</string>
+    <string name="noteMode_rich_edit">Режим на богато редактиране</string>
+    <string name="noteMode_remember_last">Запаметяване на последният ми избор</string>
 
     <string-array name="fontSize_entries">
         <item>Малък</item>
@@ -302,4 +304,7 @@
     <string name="progress_import_indeterminate">Импортиране на бележки...</string>
     <string name="progress_import">Импортиране на бележка%1$d от %2$d...</string>
     <string name="account_imported">Профилът е импортиран.</string>
-</resources>
+    <string name="direct_editing_error">Грешка при зареждане на богато редактиране</string>
+    <string name="switch_to_plain_editing">Превключване към обикновено редактиране</string>
+    <string name="action_back">Назад</string>
+    </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 7a1a01a2..491b49ba 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -177,11 +177,8 @@
     <string name="manage_accounts">Gestiona els comptes</string>
     <string name="action_formatting_help">Format</string>
 
-    <string-array name="noteMode_entries">
-        <item>Obre en mode d\'edició</item>
-        <item>Obre en mode de previsualització</item>
-        <item>Recorda la darrera selecció</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Recorda la darrera selecció</string>
 
     <string-array name="fontSize_entries">
         <item>Petita</item>
@@ -302,4 +299,5 @@
     <string name="progress_import_indeterminate">S\'estan important les notes...</string>
     <string name="progress_import">S\'està important la nota %1$d/%2$d...</string>
     <string name="account_imported">S\'ha importat el compte.</string>
-</resources>
+    <string name="action_back">Torna</string>
+    </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index b713fdfd..7dfe70f4 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Minulý měsíc</string>
 
     <string name="settings_note_mode">Režim zobrazení poznámek</string>
+    <string name="settings_note_mode_new">Chování Poznámek při otevírání</string>
     <string name="settings_theme_title">Motiv vzhledu</string>
     <string name="settings_font_title">Písmo se všemi znaky stejně širokými</string>
     <string name="settings_font_size">Velikost písmen</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Nyní používáte %1$s</string>
     <string name="about_maintainer_title">Vývoj spravuje</string>
     <string name="about_developers_title">Vývojáři</string>
+    <string name="about_developers_original_author">původní autor</string>
     <string name="about_translators_title">Překladatelé</string>
     <string name="about_translators_transifex">Nextcloud komunita na portálu %1$s</string>
     <string name="about_testers_title">Testeři</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Spravovat účty</string>
     <string name="action_formatting_help">Formátování</string>
 
-    <string-array name="noteMode_entries">
-        <item>Otevřít v režimu úprav</item>
-        <item>Otevřít v náhledovém režimu</item>
-        <item>Zapamatovat si můj poslední výběr</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Režim upravování neformátovaného textu</string>
+    <string name="noteMode_plain_preview">Náhled neformátovaného textu</string>
+    <string name="noteMode_rich_edit">Režim upravování formátovaného textu</string>
+    <string name="noteMode_remember_last">Zapamatovat si můj poslední výběr</string>
 
     <string-array name="fontSize_entries">
         <item>Malé</item>
@@ -312,4 +314,7 @@
     <string name="progress_import_indeterminate">Importují se poznámky…</string>
     <string name="progress_import">Importuje se poznámka %1$d z %2$d…</string>
     <string name="account_imported">Účet naimportován.</string>
-</resources>
+    <string name="direct_editing_error">Chyba při načítání upravování formátovaného textu</string>
+    <string name="switch_to_plain_editing">Přepnout do upravování neformátovaného textu</string>
+    <string name="action_back">Zpět</string>
+    </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 322be1ef..56c49e54 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -11,7 +11,7 @@
     <string name="action_trashbin">Slettede noter</string>
     <string name="action_search">Søg</string>
     <string name="action_sorting_method">Sorteringsmetode</string>
-    <string name="simple_cancel">Annuller</string>
+    <string name="simple_cancel">Annullér</string>
     <string name="simple_switch">Byt rundt</string>
     <string name="simple_edit">Rediger</string>
     <string name="simple_remove">Fjern</string>
@@ -41,13 +41,18 @@
     <string name="listview_updated_last_month">Seneste måned</string>
 
     <string name="settings_note_mode">Visningstilstand for noter</string>
+    <string name="settings_note_mode_new">Ved åbning af note</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_font_title">Monospace font</string>
     <string name="settings_font_size">Skriftstørrelse</string>
-    <string name="settings_wifi_only">Synk kun på Wi-Fi</string>
+    <string name="settings_wifi_only">Synkronisér kun på Wi-Fi</string>
     <string name="settings_lock_summary">Enheds legitimationsoplysninger</string>
     <string name="settings_background_sync">Synkronisering i baggrunden</string>
+    <string name="settings_prevent_screen_capture">Forhindr skærmoptagelse</string>
     <string name="settings_gridview">Grid visning</string>
+    <string name="settings_keep_screen_on">Hold skærmen tændt</string>
+    <string name="settings_keep_screen_on_summary">Mens du læser eller redigerer en note</string>
+
     <string name="error_sync">Synkronisering fejlede: %1$s</string>
     <string name="error_synchronization">Synkroniseringen mislykkedes</string>
     <string name="error_no_network">Ingen netværksforbindelse</string>
@@ -88,12 +93,12 @@
     <string name="shortcut_create_long">Opret en ny note</string>
 
     <string name="pref_value_font_normal">Normal</string>
-    <string name="pref_value_wifi_and_mobile">Synk på Wi-Fi og mobil data</string>
+    <string name="pref_value_wifi_and_mobile">Synkronisér på Wi-Fi og mobil data</string>
     <string name="pref_value_lock">Password protection</string>
 
     <string name="simple_error">Fejl</string>
     <string name="simple_close">Luk</string>
-    <string name="simple_copy">Kopier</string>
+    <string name="simple_copy">Kopiér</string>
     <string name="simple_exception">Undtagelse</string>
     <string name="pin_to_homescreen">Fastgør til hjemmeskærm</string>
     <string name="note_has_been_deleted">Denne note er blevet slettet</string>
@@ -103,7 +108,9 @@
     <string name="category_movies">Film</string>
     <string name="category_movie">Film</string>
     <string name="category_work">Arbejde</string>
+    <string name="category_checklists">Tjeklister</string>
     <string name="category_tasks">Opgaver</string>
+    <string name="category_recipe">Opskrift</string>
     <string name="category_recipes">Opskrifter</string>
     <string name="category_password">Adgangskode</string>
     <string name="category_passwords">Adgangskoder</string>
@@ -118,7 +125,7 @@
     <string name="category_readonly">Skrivebeskyttet</string>
     <string name="no_category">Ingen kategori</string>
     <string name="add_category">Tilføj %1$s</string>
-    <string name="simple_checkbox">Afkrydsningsfeldt</string>
+    <string name="simple_checkbox">Afkrydsningsfelt</string>
     <string name="unlock_notes">Lås noter op</string>
     <string name="error_dialog_title">Åh nej - hvad nu? 🙁</string>
     <string name="error_dialog_tip_token_mismatch_retry">Forsøg venligst at tvinge app\'en til at lukke og start den påny igen. Der kan have været en ukorrekt forbindelse til Nextcloud-app\'en.</string>
@@ -139,17 +146,15 @@
     <string name="shared_text_empty">Den delte tekst var tom</string>
     <string name="append_to_note">Tilføj til note</string>
     <string name="change_note_title">Skift titel på note</string>
-    <string name="menu_edit_title">Rediger titel</string>
+    <string name="menu_edit_title">Redigér titel</string>
     <string name="simple_security">Sikkerhed</string>
-    <string name="simple_synchronization">Synchronization</string>
-    <string name="manage_accounts">Administrer konti</string>
+    <string name="appearance_and_behavior">Udseende og adfærd</string>
+    <string name="simple_synchronization">Synkronisering</string>
+    <string name="manage_accounts">Administrér konti</string>
     <string name="action_formatting_help">Formatering</string>
 
-    <string-array name="noteMode_entries">
-        <item>Åbn i redigeringstilstand</item>
-        <item>Åbn forhåndsvisning</item>
-        <item>Husk mine sidste selektion</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Husk mit sidste valg</string>
 
     <string-array name="fontSize_entries">
         <item>Lille</item>
@@ -190,6 +195,7 @@
     <string name="formatting_help_lists_body_4">Tre</string>
     <string name="formatting_help_checkboxes_title">Afkrydsningsfelter</string>
     <string name="formatting_help_code_title">Kode</string>
+    <string name="formatting_help_tables_title">Tabeller</string>
     <string name="formatting_help_images_title">Billeder</string>
     <string name="simple_other">Andet</string>
     <string name="sort_last_modified">Sortér efter dato ændret</string>
@@ -197,10 +203,18 @@
     <string name="error_action_open_battery_settings">Batteriindstillinger</string>
     <string name="error_action_open_deck_info">Åbn App info</string>
     <string name="error_action_open_network">Netværksindstillinger</string>
-    <string name="error_action_update_files_app">Opdater</string>
+    <string name="error_action_update_files_app">Opdatér</string>
     <string name="choose_account">Vælg konto</string>
+    <string name="remove_account">Fjern %1$s</string>
+
     <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Du skal være koblet på en internetforbindelse for at tilføje en konto.</string>
+    <string name="settings_notes_path">Sæt mappe</string>
+
     <string name="simple_next">Næste</string>
     <string name="simple_prev">Tidligere</string>
     <string name="simple_backup">Backup</string>
+    <string name="settings_notes_path_success">Mappe for nye noter: %1$s</string>
+    <string name="settings_file_suffix">Fil-endelse</string>
+    <string name="settings_file_suffix_description">Fil-endelse for nye noter i Nextcloud</string>
+    <string name="action_back">Tilbage</string>
     </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bf3414ad..d55684fa 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Letzten Monat</string>
 
     <string name="settings_note_mode">Anzeigemodus für Notizen</string>
+    <string name="settings_note_mode_new">Verhalten beim Öffnen von Notizen</string>
     <string name="settings_theme_title">Design</string>
     <string name="settings_font_title">Nichtproportionale Schriftart</string>
     <string name="settings_font_size">Schriftgröße</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Sie benutzen aktuell %1$s</string>
     <string name="about_maintainer_title">Maintainer</string>
     <string name="about_developers_title">Entwickler</string>
+    <string name="about_developers_original_author">Ursprünglicher Autor</string>
     <string name="about_translators_title">Übersetzer</string>
     <string name="about_translators_transifex">Nextcloud-Gemeinschaft auf %1$s</string>
     <string name="about_testers_title">Tester</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Konten verwalten</string>
     <string name="action_formatting_help">Formatierung</string>
 
-    <string-array name="noteMode_entries">
-        <item>Im Bearbeitungsmodus öffnen</item>
-        <item>Im Vorschaumodus öffnen</item>
-        <item>Letzte Auswahl merken</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Einfacher Bearbeitungsmodus</string>
+    <string name="noteMode_plain_preview">Einfache Vorschau</string>
+    <string name="noteMode_rich_edit">Rich-Bearbeitungsmodus</string>
+    <string name="noteMode_remember_last">Letzte Auswahl merken</string>
 
     <string-array name="fontSize_entries">
         <item>Klein</item>
@@ -302,4 +304,7 @@
     <string name="progress_import_indeterminate">Importiere Notizen…</string>
     <string name="progress_import">Importiere Notiz %1$d von %2$d…</string>
     <string name="account_imported">Konto importiert.</string>
-</resources>
+    <string name="direct_editing_error">Fehler beim Laden des Rich-Bearbeitungsmodus</string>
+    <string name="switch_to_plain_editing">Zum einfachen Bearbeitungsmodus wechseln</string>
+    <string name="action_back">Zurück</string>
+    </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 457940c2..ca7cbc84 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -159,11 +159,8 @@
     <string name="manage_accounts">Διαχείριση λογαριασμών</string>
     <string name="action_formatting_help">Διαμόρφωση σε εξέλιξη</string>
 
-    <string-array name="noteMode_entries">
-        <item>Άνοιγμα σε λειτουργία τροποποίησης</item>
-        <item>Άνοιγμα σε λειτουργία προεπισκόπισης</item>
-        <item>Να θυμάσαι την τελευταία μου επιλογή</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Να θυμάσαι την τελευταία μου επιλογή</string>
 
     <string-array name="fontSize_entries">
         <item>Μικρό</item>
@@ -260,4 +257,5 @@
     <string name="simple_next">Επόμενο</string>
     <string name="simple_prev">Προηγούμενο</string>
     <string name="simple_backup">Αντίγραφο ασφαλείας</string>
+    <string name="action_back">Πίσω</string>
     </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fb47cad1..2cce5af8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">El mes pasado</string>
 
     <string name="settings_note_mode">Modo de visualización para notas</string>
+    <string name="settings_note_mode_new">Comportamiento de apertura de las notas</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_font_title">Tipo de letra monoespaciado</string>
     <string name="settings_font_size">Tamaño de fuente</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Actualmente está utilizando %1$s</string>
     <string name="about_maintainer_title">Mantenedor</string>
     <string name="about_developers_title">Desarrolladores</string>
+    <string name="about_developers_original_author">autor original</string>
     <string name="about_translators_title">Traductores</string>
     <string name="about_translators_transifex">Comunidad Nextcloud en %1$s</string>
     <string name="about_testers_title">Testers</string>
@@ -165,7 +167,7 @@
     <string name="error_dialog_server_app_enabled">Por favor, asegúrate de que has instalado y activado la app «Notas» en tu servidor.</string>
     <string name="error_dialog_redirect">Tu servidor respondió con el código de estado HTTP 302, lo que implica que no está instalada la aplicación Notas en su servidor o que algo está mal configurado. Esto puede estar causado por anulaciones personalizadas en un archivo .htaccess o por aplicaciones de Nextcloud como OID Client. </string>
     <string name="error_dialog_tip_disable_battery_optimizations">Por favor, desactiva todas las optimizaciones de la batería para Nextcloud y la app de Notas.</string>
-    <string name="error_dialog_min_version">La aplicación de Android Notas necesita la versión 3.18 o superior de la aplicación Android Nextcloud</string>
+    <string name="error_dialog_min_version">La aplicación de Notas de Android requiere que la la aplicación Nextcloud de Android sea al menos la versión 3.18.</string>
     <string name="added_content">Se ha añadido «%1$s»</string>
     <string name="shared_text_empty">El texto compartido estaba vacío</string>
     <string name="append_to_note">Añadir a la nota</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Gestionar cuentas</string>
     <string name="action_formatting_help">Formato</string>
 
-    <string-array name="noteMode_entries">
-        <item>Abrir en modo edición</item>
-        <item>Abrir en modo visualización</item>
-        <item>Recordar mi última selección</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Modo de edición plano</string>
+    <string name="noteMode_plain_preview">Vista previa en plano</string>
+    <string name="noteMode_rich_edit">Modo de edición enriquecido</string>
+    <string name="noteMode_remember_last">Recordar mi última selección</string>
 
     <string-array name="fontSize_entries">
         <item>Pequeña</item>
@@ -307,4 +309,7 @@
     <string name="progress_import_indeterminate">Importando notas…</string>
     <string name="progress_import">Importando nota %1$d de %2$d…</string>
     <string name="account_imported">Cuenta importada.</string>
-</resources>
+    <string name="direct_editing_error">Error al cargar el modo de edición enriquecido</string>
+    <string name="switch_to_plain_editing">Cambiar a edición plana</string>
+    <string name="action_back">Atrás</string>
+    </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 38861b35..91cd8238 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Joan den hilabetean</string>
 
     <string name="settings_note_mode">Erakutsi oharren modua</string>
+    <string name="settings_note_mode_new">Oharrak irekitzeko portaera</string>
     <string name="settings_theme_title">Gaia</string>
     <string name="settings_font_title">Zabalera bakarreko letra mota</string>
     <string name="settings_font_size">Letra tamaina</string>
@@ -63,6 +64,7 @@
     <string name="about_version">%1$s erabiltzen ari zara</string>
     <string name="about_maintainer_title">Mantentzailea</string>
     <string name="about_developers_title">Garatzaileak</string>
+    <string name="about_developers_original_author">jatorrizko egilea</string>
     <string name="about_translators_title">Itzultzaileak</string>
     <string name="about_translators_transifex">%1$s Nextcloud komunitatea</string>
     <string name="about_testers_title">Probatzaileak</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Kudeatu kontuak</string>
     <string name="action_formatting_help">Formatua</string>
 
-    <string-array name="noteMode_entries">
-        <item>Ireki edizio moduan</item>
-        <item>Ireki aurrebista moduan</item>
-        <item>Gogoratu nire azken hautaketa</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Edizio modu arrunta</string>
+    <string name="noteMode_plain_preview">Aurrebista arrunta</string>
+    <string name="noteMode_rich_edit">Edizio modu aberatsa</string>
+    <string name="noteMode_remember_last">Gogoratu nire azken hautaketa</string>
 
     <string-array name="fontSize_entries">
         <item>Txikia</item>
@@ -302,4 +304,7 @@
     <string name="progress_import_indeterminate">Oharrak inportatzen...</string>
     <string name="progress_import">%2$dtik %1$doharra inportatzen...</string>
     <string name="account_imported">Kontua inportatuta.</string>
-</resources>
+    <string name="direct_editing_error">Errore bat gertatu da edizio aberatsa kargatzean</string>
+    <string name="switch_to_plain_editing">Aldatu edizio arruntera</string>
+    <string name="action_back">Atzera</string>
+    </resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index e77333c6..4286174d 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -149,11 +149,8 @@
     <string name="manage_accounts">مدیریت حساب‌ها</string>
     <string name="action_formatting_help">قالب‌بندی</string>
 
-    <string-array name="noteMode_entries">
-        <item> یادداشت را در حالت «ویرایش» باز کنید</item>
-        <item>یادداشت را در حالت پیش نمایش باز کنید</item>
-        <item>آخرین انتخاب من را به خاطر بسپار</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">آخرین انتخاب من را به خاطر بسپار</string>
 
     <string-array name="fontSize_entries">
         <item>کوچک</item>
@@ -225,4 +222,5 @@
     <string name="simple_next">بعدی</string>
     <string name="simple_prev">قبلی</string>
     <string name="simple_backup">پشتیبان‌گیری</string>
+    <string name="action_back">بازگشت</string>
     </resources>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index ebc99b24..b0e3a3ae 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -173,11 +173,8 @@
     <string name="manage_accounts">Tilien hallinta</string>
     <string name="action_formatting_help">Muotoilu</string>
 
-    <string-array name="noteMode_entries">
-        <item>Avaa muokkaustilassa</item>
-        <item>Avaa esikatselutilassa</item>
-        <item>Muista viimeisin valintani</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Muista viimeisin valintani</string>
 
     <string-array name="fontSize_entries">
         <item>Pieni</item>
@@ -295,4 +292,5 @@
     <string name="progress_import_indeterminate">Tuodaan muistiinpanoja...</string>
     <string name="progress_import">Tuodaan muistiinpanoa %1$d/%2$d…</string>
     <string name="account_imported">Tili tuotu.</string>
-</resources>
+    <string name="action_back">Takaisin</string>
+    </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2ebed326..97fd77e7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Mois dernier</string>
 
     <string name="settings_note_mode">Mode d\'affichage des notes</string>
+    <string name="settings_note_mode_new">Comportement à l\'ouverture de Notes</string>
     <string name="settings_theme_title">Thème</string>
     <string name="settings_font_title">Texte monospace</string>
     <string name="settings_font_size">Taille des caractères</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Vous utilisez actuellement %1$s</string>
     <string name="about_maintainer_title">Responsable</string>
     <string name="about_developers_title">Développeurs</string>
+    <string name="about_developers_original_author">auteur original</string>
     <string name="about_translators_title">Traducteurs</string>
     <string name="about_translators_transifex">Communauté Nextcloud sur %1$s</string>
     <string name="about_testers_title">Testeurs</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Gérer les comptes</string>
     <string name="action_formatting_help">Formatage</string>
 
-    <string-array name="noteMode_entries">
-        <item>Ouvrir en mode édition</item>
-        <item>Ouvrir en mode aperçu</item>
-        <item>Mémoriser ma dernière sélection</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Édition simple</string>
+    <string name="noteMode_plain_preview">Prévisualization simple</string>
+    <string name="noteMode_rich_edit">Édition texte enrichi</string>
+    <string name="noteMode_remember_last">Mémoriser ma dernière sélection</string>
 
     <string-array name="fontSize_entries">
         <item>Petit</item>
@@ -305,6 +307,9 @@
     <string name="settings_file_suffix_success">Nouveau suffixe de fichier : %1$s</string>
     <string name="http_status_code">État HTTP : %1$d</string>
     <string name="progress_import_indeterminate">Importation des notes...</string>
-    <string name="progress_import">Importation de la note %1$dsur %2$d...</string>
+    <string name="progress_import">Importation de la note %1$d sur %2$d...</string>
     <string name="account_imported">Compte importé.</string>
-</resources>
+    <string name="direct_editing_error">Erreur lors du chargement de l\'édition enrichie</string>
+    <string name="switch_to_plain_editing">Bascule vers l\'édition simple</string>
+    <string name="action_back">Retour</string>
+    </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 1bd89f0f..8d67935f 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">O mes pasado</string>
 
     <string name="settings_note_mode">Modo de vista das notas</string>
+    <string name="settings_note_mode_new">Comportamento de apertura das notas</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_font_title">Letra monoespazada</string>
     <string name="settings_font_size">Tamaño da letra</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Agora está a empregar %1$s</string>
     <string name="about_maintainer_title">Mantedor</string>
     <string name="about_developers_title">Desenvolvedores</string>
+    <string name="about_developers_original_author">autor orixinal</string>
     <string name="about_translators_title">Tradutores</string>
     <string name="about_translators_transifex">Comunidade Nextcloud en %1$s</string>
     <string name="about_testers_title">Probadores</string>
@@ -73,11 +75,11 @@
     <string name="about_translate_title">Traducir</string>
     <string name="about_translate">Únase ao equipo Nextcloud en Transifex e axúdenos a traducir esta aplicación: %1$s</string>
     <string name="about_app_license_title">Licenza da apli</string>
-    <string name="about_app_license">Esta apli está licenciada baixo a LICENZA XERAL PUBLICA GNU v3+.</string>
+    <string name="about_app_license">Esta aplicación está licenciada baixo a LICENZA XERAL PUBLICA GNU v3+.</string>
     <string name="about_app_license_button">Ver a licenza</string>
     <string name="about_icons_disclaimer_title">Iconas</string>
     <string name="about_icons_disclaimer_app_icon">Para a icona orixinal, vexa %1$s.</string>
-    <string name="about_icons_disclaimer_mdi_icons">Todas as iconas usadas nesta aplicación son %1$s feitas por Google Inc. e licenciadas baixo unha Licenza Apache 2.0.</string>
+    <string name="about_icons_disclaimer_mdi_icons">Todas as iconas usadas nesta aplicación %1$sforon feitas por Google Inc. e licenciadas baixo unha Licenza Apache 2.0.</string>
     <string name="about_icons_disclaimer_mdi">Iconas Material Desig</string>
     <string name="about_credits_tab_title">Recoñecementos</string>
     <string name="about_contribution_tab_title">Colaboración</string>
@@ -102,7 +104,7 @@
     <string name="simple_close">Pechar</string>
     <string name="simple_copy">Copiar</string>
     <string name="simple_exception">Excepción</string>
-    <string name="pin_to_homescreen">Ancorar na pantalla de inicio</string>
+    <string name="pin_to_homescreen">Fixar na pantalla de Inicio</string>
     <string name="note_has_been_deleted">Esta nota foi eliminada</string>
     <string name="add_account">Engadir unha conta</string>
 
@@ -110,8 +112,8 @@
     <string name="category_movies">Filmes</string>
     <string name="category_movie">Filme</string>
     <string name="category_work">Traballo</string>
-    <string name="category_todo">Tarefa</string>
-    <string name="category_todos">Tarefas</string>
+    <string name="category_todo">Tarefa pendente</string>
+    <string name="category_todos">Tarefas pendentes</string>
     <string name="category_checklists">Listas de verificación</string>
     <string name="category_tasks">Tarefas</string>
     <string name="category_recipe">Receita</string>
@@ -121,9 +123,9 @@
     <string name="category_food">Comida</string>
     <string name="category_bake">Enfornar</string>
     <!-- This represents a category where one can place passwords and credentials -->
-    <string name="category_key">Chave</string>
+    <string name="category_key">Clave</string>
     <!-- This represents a category where one can place passwords and credentials -->
-    <string name="category_keys">Chaves</string>
+    <string name="category_keys">Claves</string>
     <string name="category_password">Contrasinal</string>
     <string name="category_passwords">Contrasinais</string>
     <string name="category_credentials">Credencial</string>
@@ -134,9 +136,9 @@
     <string name="category_gift">Agasallo</string>
     <string name="category_gifts">Agasallos</string>
     <!-- Like a gift -->
-    <string name="category_present">Presentar</string>
+    <string name="category_present">Presente</string>
     <!-- Like a gift -->
-    <string name="category_presents">Agasallos</string>
+    <string name="category_presents">Presentes</string>
 
     <string name="account_already_imported">A conta xa foi importada</string>
     <string name="no_notes_yet">Aínda non hai notas</string>
@@ -165,7 +167,7 @@
     <string name="error_dialog_server_app_enabled">Asegúrese de ter instalada e activada a aplicación «Notas» no seu servidor.</string>
     <string name="error_dialog_redirect">O seu servidor respondeu cun código de estado HTTP 302, o que implica que non ten instalada a aplicación Notas no servidor ou que algo está mal configurado. Isto pode ser causado por substitucións personalizadas nun ficheiro .htaccess ou por aplicacións Nextcloud como Client OID.</string>
     <string name="error_dialog_tip_disable_battery_optimizations">Desactive todas as optimizacións de batería para Nextcloud e a apli Notas.</string>
-    <string name="error_dialog_min_version">A aplicación de Android Notes require que a aplicación de Android Nextcloud teña como mínimo a versión 3.18.</string>
+    <string name="error_dialog_min_version">A aplicación de Notas para Android require que a aplicación de Android Nextcloud teña como mínimo a versión 3.18.</string>
     <string name="added_content">Engadido «%1$s»</string>
     <string name="shared_text_empty">O texto compartido estaba baleiro</string>
     <string name="append_to_note">Anexo á nota</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Xestionar contas</string>
     <string name="action_formatting_help">Formatado</string>
 
-    <string-array name="noteMode_entries">
-        <item>Abrir en modo de edición</item>
-        <item>Abrir en modo de vista previa</item>
-        <item>Lembrar a miña última selección</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Modo de edición simple</string>
+    <string name="noteMode_plain_preview">Vista previa simple</string>
+    <string name="noteMode_rich_edit">Modo de edición enriquecido</string>
+    <string name="noteMode_remember_last">Lembrar a miña última selección</string>
 
     <string-array name="fontSize_entries">
         <item>Pequena</item>
@@ -276,26 +278,33 @@
     <string name="no_other_accounts">Aínda non ten configurada ningunha outra conta.</string>
     <string name="choose_account">Escolla unha conta</string>
     <string name="context_based_formatting">Xanela emerxente de formato baseado no contexto</string>
-    <string name="remove_account">Eliminar %1$s</string>
+    <plurals name="remove_account_message">
+        <item quantity="one">Retirar a conta %1$s tamén eliminará de xeito irrecuperábel un cambio non sincronizado.</item>
+        <item quantity="other">Retirar a conta %1$s tamén eliminará de xeito irrecuperábel %2$d cambios non sincronizados.</item>
+    </plurals>
+    <string name="remove_account">Retirar %1$s</string>
 
-    <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Para engadir unha conta tes que estar conectado a internet.</string>
-    <string name="settings_notes_path">Establecer cartafol</string>
+    <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Para engadir unha conta ten que estar conectado a Internet.</string>
+    <string name="settings_notes_path">Estabelecer cartafol</string>
 
     <string name="simple_next">Seguinte</string>
     <string name="simple_prev">Anterior</string>
     <string name="simple_backup">Copia de seguridade</string>
-    <string name="backup">Detectamos un estado irrecuperable da aplicación. Fai unha copia de seguranza dos cambios non sincronizados e limpa o almacenamento da aplicación Notes.</string>
-    <string name="settings_notes_path_description">Cartafol para almacenar as túas notas no teu Nextcloud</string>
+    <string name="backup">Detectamos un estado irrecuperábel da aplicación. Faga unha copia de seguridade dos cambios non sincronizados e limpe o almacenamento da apli de Notas.</string>
+    <string name="settings_notes_path_description">Cartafol para almacenar as súas notas no seu Nextcloud</string>
     <string-array name="settings_file_suffixes">
         <item translatable="false">.txt</item>
         <item translatable="false">.md</item>
     </string-array>
     <string name="settings_notes_path_success">Novo cartafol de notas: %1$s</string>
     <string name="settings_file_suffix">Extensión de ficheiro</string>
-    <string name="settings_file_suffix_description">Extensión de ficheiro para novas notas no teu Nextcloud</string>
+    <string name="settings_file_suffix_description">Extensión de ficheiro para novas notas no seu Nextcloud</string>
     <string name="settings_file_suffix_success">Novo sufixo de ficheiro: %1$s</string>
     <string name="http_status_code">Código de estado HTTP: %1$d</string>
-    <string name="progress_import_indeterminate">A importar notas...</string>
-    <string name="progress_import">A importar a nota %1$d de %2$d...</string>
+    <string name="progress_import_indeterminate">Importando notas…</string>
+    <string name="progress_import">Importando a nota %1$d de %2$d…</string>
     <string name="account_imported">Conta importada.</string>
-</resources>
+    <string name="direct_editing_error">Produciuse un erro ao cargar a edición mellorada</string>
+    <string name="switch_to_plain_editing">Cambiar á edición simple</string>
+    <string name="action_back">Atrás</string>
+    </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index bee675e2..50ed248c 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -138,11 +138,8 @@
     <string name="manage_accounts">ניהול חשבונות</string>
     <string name="action_formatting_help">עיצוב</string>
 
-    <string-array name="noteMode_entries">
-        <item>פתיחה במצב עריכה</item>
-        <item>פתיחה במצב תצוגה מקדימה</item>
-        <item>שמירת הבחירה האחרונה שלי</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">שמירת הבחירה האחרונה שלי</string>
 
     <string-array name="fontSize_entries">
         <item>קטן</item>
@@ -202,4 +199,5 @@
     <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">על המכשיר שלך להיות מחובר לאינטרנט כדי שיתאפשר לך להוסיף חשבון.</string>
     <string name="simple_next">הבא</string>
     <string name="simple_prev">הקודם</string>
+    <string name="action_back">חזרה</string>
     </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 5c89d7a1..e3ccfd79 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -173,11 +173,8 @@
     <string name="manage_accounts">Upravljaj računima</string>
     <string name="action_formatting_help">Oblikovanje</string>
 
-    <string-array name="noteMode_entries">
-        <item>Otvori u načinu uređivanja</item>
-        <item>Otvori u načinu pregleda</item>
-        <item>Zapamti moj posljednji izbor</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Zapamti moj posljednji izbor</string>
 
     <string-array name="fontSize_entries">
         <item>Mali</item>
@@ -303,4 +300,5 @@
     <string name="progress_import_indeterminate">Uvoz bilješki...</string>
     <string name="progress_import">Uvoz bilješke %1$d od %2$d...</string>
     <string name="account_imported">Račun je uvezen.</string>
-</resources>
+    <string name="action_back">Natrag</string>
+    </resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 2c5c1b75..99180105 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Előző hónap</string>
 
     <string name="settings_note_mode">Jegyzet módok megjelenítés</string>
+    <string name="settings_note_mode_new">Jegyzetek megnyitási viselkedése</string>
     <string name="settings_theme_title">Téma</string>
     <string name="settings_font_title">Fix szélességű betűkészlet</string>
     <string name="settings_font_size">Betűméret</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Jelenleg ezt a verziót használja: %1$s</string>
     <string name="about_maintainer_title">Karbantartó</string>
     <string name="about_developers_title">Fejlesztők</string>
+    <string name="about_developers_original_author">eredeti szerző</string>
     <string name="about_translators_title">Fordítók</string>
     <string name="about_translators_transifex">Nextcloud közösség a %1$s</string>
     <string name="about_testers_title">Tesztelők</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Fiókok kezelése</string>
     <string name="action_formatting_help">Formázás</string>
 
-    <string-array name="noteMode_entries">
-        <item>Megnyitás szerkesztésre</item>
-        <item>Megnyitás előnézetre</item>
-        <item>A legutóbbi döntés megjegyzése</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Egyszerű szerkesztési mód</string>
+    <string name="noteMode_plain_preview">Egyszerű előnézet</string>
+    <string name="noteMode_rich_edit">Formázott szöveges mód</string>
+    <string name="noteMode_remember_last">A legutóbbi döntés megjegyzése</string>
 
     <string-array name="fontSize_entries">
         <item>Kicsi</item>
@@ -302,4 +304,7 @@
     <string name="progress_import_indeterminate">Jegyzetek importálása…</string>
     <string name="progress_import">%1$d. / %2$d jegyzet importálása…</string>
     <string name="account_imported">Fiók importálva.</string>
-</resources>
+    <string name="direct_editing_error">Hiba a formázott szöveges szerkesztő betöltése során</string>
+    <string name="switch_to_plain_editing">Átváltás az egyszerű szerkesztésre</string>
+    <string name="action_back">Vissza</string>
+    </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c72b045e..e8386a65 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -174,11 +174,8 @@
     <string name="manage_accounts">Gestisci account</string>
     <string name="action_formatting_help">Formattazione</string>
 
-    <string-array name="noteMode_entries">
-        <item>Apri in modalità modifica</item>
-        <item>Apri in modalità anteprima</item>
-        <item>Ricorda la mia ultima selezione</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Ricorda la mia ultima selezione</string>
 
     <string-array name="fontSize_entries">
         <item>Piccola</item>
@@ -304,4 +301,5 @@
     <string name="progress_import_indeterminate">Importazione note in corso...</string>
     <string name="progress_import">Importazione nota %1$d di %2$d ...</string>
     <string name="account_imported">Account importato</string>
-</resources>
+    <string name="action_back">Indietro</string>
+    </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index f81c6886..24fcbf30 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -174,11 +174,8 @@
     <string name="manage_accounts">アカウント管理</string>
     <string name="action_formatting_help">フォーマット</string>
 
-    <string-array name="noteMode_entries">
-        <item>編集モードで開く</item>
-        <item>プレビューモードで開く</item>
-        <item>最後に使用したモードで開く</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">最後に使用したモードで開く</string>
 
     <string-array name="fontSize_entries">
         <item>小</item>
@@ -294,4 +291,5 @@
     <string name="progress_import_indeterminate">ノートを導入しています…</string>
     <string name="progress_import">%2$d中%1$dのノートをインポート中...</string>
     <string name="account_imported">アカウントを導入しました。</string>
-</resources>
+    <string name="action_back">戻る</string>
+    </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ab67024e..b56ab207 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -176,11 +176,8 @@
     <string name="manage_accounts">계정 관리</string>
     <string name="action_formatting_help">서식</string>
 
-    <string-array name="noteMode_entries">
-        <item>편집 모드로 열기</item>
-        <item>미리 보기 모드로 열기</item>
-        <item>마지막 선택 기억하기</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">마지막 선택 기억하기</string>
 
     <string-array name="fontSize_entries">
         <item>작게</item>
@@ -291,4 +288,5 @@
     <string name="progress_import_indeterminate">노트 불러오는 중...</string>
     <string name="progress_import">%2$d의 노트 %1$d 불러오는 중...</string>
     <string name="account_imported">계정을 불러왔습니다.</string>
-</resources>
+    <string name="action_back">뒤로</string>
+    </resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index d4e8a7e1..70ae063a 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -144,11 +144,8 @@
     <string name="manage_accounts">Tvarkyti paskyras</string>
     <string name="action_formatting_help">Formatavimas</string>
 
-    <string-array name="noteMode_entries">
-        <item>Atverti redagavimo veiksenoje</item>
-        <item>Atverti peržiūros veiksenoje</item>
-        <item>Prisiminti paskutinį pasirinkimą</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Prisiminti paskutinį pasirinkimą</string>
 
     <string-array name="fontSize_entries">
         <item>Mažas</item>
@@ -224,4 +221,5 @@
     <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Norėdami pridėti paskyrą, turite būti prisijungę prie interneto.</string>
     <string name="simple_next">Kitas</string>
     <string name="simple_prev">Ankstesnis</string>
+    <string name="action_back">Atgal</string>
     </resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index df8d92bd..db0a02c5 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <string name="app_name">Notater</string>
-    <string name="app_name_long">Nextcloud Notes</string>
+    <string name="app_name_long">Nextcloud Notater</string>
     <string name="label_all_notes">Alle notater</string>
     <string name="label_favorites">Favoritter</string>
     <string name="action_create">Nytt notat</string>
@@ -45,19 +45,25 @@
     <string name="settings_font_title">Monospace font</string>
     <string name="settings_font_size">Skriftstørrelse</string>
     <string name="settings_wifi_only">Synkroniser kun med WiFi</string>
+    <string name="settings_lock">Applås (beta)</string>
     <string name="settings_lock_summary">Enhetens legitimasjon</string>
     <string name="settings_background_sync">Synkronisering i bakgrunnen</string>
+    <string name="settings_prevent_screen_capture">Forhindre skjermopptak</string>
     <string name="settings_gridview">Rutenett-visning</string>
+    <string name="settings_keep_screen_on">Hold skjermen på</string>
+    <string name="settings_keep_screen_on_summary">Når du viser eller redigerer et notat</string>
+
     <string name="error_sync">Synkronisering mislyktes: %1$s</string>
     <string name="error_synchronization">Synkronisering mislyktes</string>
     <string name="error_no_network">Ingen nettverkstilkobling</string>
     <string name="error_maintenance_mode">Server i vedlikeholdsmodus</string>
-    <string name="error_unknown">En ukjent feil oppstod.</string>
+    <string name="error_unknown">En ukjent feil oppsto.</string>
 
     <string name="about_version_title">Versjon</string>
     <string name="about_version">Du bruker forøyeblikket %1$s</string>
     <string name="about_maintainer_title">Vedlikeholder</string>
     <string name="about_developers_title">Utviklere</string>
+    <string name="about_developers_original_author">original forfatter</string>
     <string name="about_translators_title">Oversettere</string>
     <string name="about_translators_transifex">Nextcloud-fellesskapet på %1$s</string>
     <string name="about_testers_title">Testere</string>
@@ -105,16 +111,34 @@
     <string name="category_movies">Filmer</string>
     <string name="category_movie">Film</string>
     <string name="category_work">Arbeid</string>
+    <string name="category_todo">Gjøremål</string>
+    <string name="category_todos">Gjøremål</string>
+    <string name="category_checklists">Sjekklister</string>
     <string name="category_tasks">Oppgaver</string>
+    <string name="category_recipe">Oppskrift</string>
     <string name="category_recipes">Oppskrifter</string>
     <string name="category_restaurant">Restaurant</string>
-    <string name="category_password">PassordP</string>
+    <string name="category_restaurants">Restauranter</string>
+    <string name="category_food">Mat</string>
+    <string name="category_bake">Bake</string>
+    <!-- This represents a category where one can place passwords and credentials -->
+    <string name="category_key">Nøkkel</string>
+    <!-- This represents a category where one can place passwords and credentials -->
+    <string name="category_keys">Nøkler</string>
+    <string name="category_password">Passord</string>
     <string name="category_passwords">Passord</string>
+    <string name="category_credentials">Påloggingsdetalj</string>
+    <string name="category_game">Spill</string>
     <string name="category_games">Spill</string>
     <!-- This is a noun, analogue to "game", like "theatre" or "drama" -->
     <string name="category_play">Spill</string>
+    <string name="category_gift">Gave</string>
+    <string name="category_gifts">Gaver</string>
     <!-- Like a gift -->
     <string name="category_present">Gave</string>
+    <!-- Like a gift -->
+    <string name="category_presents">Gavepakker</string>
+
     <string name="account_already_imported">Kontoen har allerede blitt importert</string>
     <string name="no_notes_yet">Ingen notater enda</string>
     <string name="no_notes_yet_description">Trykk + knappen for å opprette et nytt notat</string>
@@ -127,9 +151,10 @@
     <string name="unlock_notes">Lås opp notater</string>
     <string name="error_dialog_title">Å nei - Hva nå? 🙁</string>
     <string name="error_dialog_tip_token_mismatch_retry">Prøv å tvinge avslutning av appen og start den på nytt. Det kan ha vært en feiltilkobling til Nextcloud-appen.</string>
-    <string name="error_dialog_tip_token_mismatch_clear_storage">Hvis problemet vedvarer, prøv å tømme lageret for begge disse appene for å løse problemet: Nextcloud og Nextcloud Notes.</string>
+    <string name="error_dialog_tip_token_mismatch_clear_storage">Hvis problemet vedvarer, prøv å tømme lageret for begge disse appene for å løse problemet: Nextcloud og Nextcloud Notater.</string>
+    <string name="error_dialog_tip_clear_storage">Du kan tømme lagringen ved å åpne appinformasjonen og velge Lagring → Tøm lagring. ⚠️ Advarsel: Dette vil slette notater som ikke er synkronisert ennå!</string>
     <string name="error_dialog_tip_files_outdated">Det virker som Nextcloud appen er utdatert. Venligst besøk Play Sore eller F-Droid for å finne siste versjon.</string>
-    <string name="error_dialog_tip_files_force_stop">Det virker som noe er galt med Nextcloud appen. Vennligst prøv å tvinge avslutning av Nextcloud appen og Nextcloud Notes appen.</string>
+    <string name="error_dialog_tip_files_force_stop">Det virker som noe er galt med Nextcloud-appen. Vennligst prøv å tvinge avslutning av Nextcloud-appen og Nextcloud Notater-appen.</string>
     <string name="error_dialog_tip_files_delete_storage">Hvis det ikke hjelper med tving avslutt, så kan du prøve å tømme lageret for begge appene.</string>
     <string name="error_dialog_timeout_instance">Serveren svarer ikke innen en gitt tid. Vennligst påse at serveren er tilgjengelig.</string>
     <string name="error_dialog_timeout_toggle">Sjekk nettverkstilkoblingen. Noen ganger hjelper det å skru av og på mobil data eller WI-FI tilkoblingen.</string>
@@ -138,9 +163,10 @@
     <string name="error_dialog_check_maintenance">Vennligst sjekk at Nextcloud instansen ikke er i vedlikeholdsmodus for øyeblikket.</string>
     <string name="error_dialog_insufficient_storage">Nextcloud instansen har ikke mer ledig lagringsplass. Vennligst slett noen filer for å synkronisere de lokale endringen til skyen din.</string>
     <string name="error_dialog_we_need_info">Vi trenger følgende teknisk informasjon for å kunne hjelpe deg:</string>
-    <string name="error_dialog_server_app_enabled">Vennligst påse at du har installert og aktivert \"Notes\" appen på serveren.</string>
-    <string name="error_dialog_redirect">Serveren din svarte med en HTTP 302-statuskode, noe som antyder at du ikke har installert Notes-appen på serveren din, eller at noe er feilkonfigurert. Dette kan være forårsaket av tilpassede overstyringer i en .htaccess-fil eller av Nextcloud-apper som OID Client.</string>
-    <string name="error_dialog_tip_disable_battery_optimizations">Deaktiver alle batterioptimaliseringer for Nextcloud og Notes-appen.</string>
+    <string name="error_dialog_server_app_enabled">Vennligst påse at du har installert og aktivert \"Notes\"-appen på serveren.</string>
+    <string name="error_dialog_redirect">Serveren din svarte med en HTTP 302-statuskode, noe som antyder at du ikke har installert Notater-appen på serveren din, eller at noe er feilkonfigurert. Dette kan være forårsaket av tilpassede overstyringer i en .htaccess-fil eller av Nextcloud-apper som OID Client.</string>
+    <string name="error_dialog_tip_disable_battery_optimizations">Deaktiver alle batterioptimaliseringer for Nextcloud og Notater-appen.</string>
+    <string name="error_dialog_min_version">Notater-androidappen krever at Nextcloud-androidappen er minst versjon 3.18.</string>
     <string name="added_content">Lagt til \"%1$s\"</string>
     <string name="shared_text_empty">Delt tekst var tom</string>
     <string name="append_to_note">Legg til i notat</string>
@@ -152,11 +178,8 @@
     <string name="manage_accounts">Håndter kontoer</string>
     <string name="action_formatting_help">Formatering</string>
 
-    <string-array name="noteMode_entries">
-        <item>Åpne i redigeringsmodus</item>
-        <item>Åpne i forhåndsvisningsmodus</item>
-        <item>Husk mitt siste valg</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Husk mitt siste valg</string>
 
     <string-array name="fontSize_entries">
         <item>Liten</item>
@@ -174,13 +197,27 @@
         <item quantity="one">%d er valgt</item>
         <item quantity="other">%d valgt</item>
     </plurals>
+    <plurals name="bulk_notes_deleted">
+        <item quantity="one">Slettet ett notat</item>
+        <item quantity="other">Slettet %1$d notater</item>
+    </plurals>
+    <plurals name="bulk_notes_restored">
+        <item quantity="one">Gjenopprettet ett notat</item>
+        <item quantity="other">Gjenopprettet %1$d notater</item>
+    </plurals>
+    <plurals name="share_multiple">
+        <item quantity="one">Del innhold i %1$d notat</item>
+        <item quantity="other">Del innhold av %1$d notater</item>
+    </plurals>
+
     <string name="formatting_help_divider" translateable="false">---</string>
     <string name="formatting_help_codefence_inline" translateable="false">`%1$s`</string>
     <string name="formatting_help_codefence_inline_escaped" translateable="false">\\`%1$s\\`</string>
     <string name="formatting_help_codefence" translateable="false">```</string>
+    <string name="formatting_help_codefence_outer" translateable="false">````</string>
     <string name="formatting_help_codefence_javascript" translateable="false">```javascript</string>
     <string name="formatting_help_cbf_title">Kontekstbasert formatering</string>
-    <string name="formatting_help_cbf_body_1">Et viktig designmål for Notes-appen er å tilby et distraksjonsfritt verktøy. Selv om du vil kunne formatere tekstene dine med Markdown. For de forskjellige eksemplene nedenfor, kan du bruke snarveier slik at du kan formatere notatene dine uten å skrive inn kodene nedenfor.</string>
+    <string name="formatting_help_cbf_body_1">Et viktig designmål for Notater-appen er å tilby et distraksjonsfritt verktøy. Selv om du vil kunne formatere tekstene dine med Markdown. For de forskjellige eksemplene nedenfor, kan du bruke snarveier slik at du kan formatere notatene dine uten å skrive inn kodene nedenfor.</string>
     <string name="formatting_help_cbf_body_2">Bare velg et tekstområde eller trykk på markøren når som helst, så får du en popup-meny som inneholder ved siden av standardoppføringene %1$s, %2$s, %3$s oppføringer som %4$s eller %5$s.</string>
 
     <string name="formatting_help_text_title">Tekst</string>
@@ -221,7 +258,11 @@
     <!-- Table cell value of a sample table -->
     <string name="formatting_help_tables_value">Verdi %1d</string>
 
+    <string name="formatting_help_images_body_1">Koblinger må enten være komplette URL-er som starter med en protokoll og domene eller absolutte stier som starter med et %1$s-tegn.</string>
+    <string name="formatting_help_images_body_2">For å samsvare med Markdown-formatet, vennligst bruk escape-tegn i bildets URL. Dette betyr for eksempel å erstatte mellomrom med %1$s i URL-en.</string>
     <string name="formatting_help_images_title">Bilder</string>
+    <string name="formatting_help_images_alt">Fancy bilde</string>
+
     <string name="simple_other">Annet</string>
     <string name="sort_last_modified">Sorter etter dato endret</string>
     <string name="sort_alphabetically">Sorter alfabetisk</string>
@@ -232,8 +273,32 @@
     <string name="no_account_configured_yet">Ingen konto er konfigurert</string>
     <string name="no_other_accounts">Du har ikke konfigurert noen konto enda.</string>
     <string name="choose_account">Velg konto</string>
+    <string name="context_based_formatting">Popover for kontekstbasert formatering</string>
+    <plurals name="remove_account_message">
+        <item quantity="one">Fjerning av kontoen %1$s vil også uopprettelig slette en usynkronisert endring.</item>
+        <item quantity="other">Fjerning av kontoen %1$s vil også uopprettelig slette %2$d usynkroniserte endringer.</item>
+    </plurals>
+    <string name="remove_account">Fjern %1$s</string>
+
     <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Du må være koblet til internett for å kunne legge til en konto.</string>
+    <string name="settings_notes_path">Sett mappe</string>
+
     <string name="simple_next">Neste</string>
     <string name="simple_prev">Forrige</string>
     <string name="simple_backup">Sikkerhetskopi</string>
+    <string name="backup">Vi oppdaget en uopprettelig tilstand i appen. Ta sikkerhetskopi av usynkroniserte endringer og tøm lagringen av Notater-appen.</string>
+    <string name="settings_notes_path_description">Mappe for å lagre notatene dine i Nextcloud</string>
+    <string-array name="settings_file_suffixes">
+        <item translatable="false">.txt</item>
+        <item translatable="false">.md</item>
+    </string-array>
+    <string name="settings_notes_path_success">Ny notatmappe: %1$s</string>
+    <string name="settings_file_suffix">Filetternavn</string>
+    <string name="settings_file_suffix_description">Filetternavn for nye notater i Nextcloud</string>
+    <string name="settings_file_suffix_success">Nytt filsuffiks: %1$s</string>
+    <string name="http_status_code">HTTP-statuskode: %1$d</string>
+    <string name="progress_import_indeterminate">Importerer notater…</string>
+    <string name="progress_import">Importerer notat %1$d av %2$d…</string>
+    <string name="account_imported">Konto importert.</string>
+    <string name="action_back">Tilbake</string>
     </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 55d16934..3c2db5d1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -63,6 +63,7 @@
     <string name="about_version">Je gebruikt nu %1$s</string>
     <string name="about_maintainer_title">Projectleider</string>
     <string name="about_developers_title">Ontwikkelaars</string>
+    <string name="about_developers_original_author">oorspronkelijke ontwikkelaar</string>
     <string name="about_translators_title">Vertalers</string>
     <string name="about_translators_transifex">Nextcloud-gemeenschap op %1$s</string>
     <string name="about_testers_title">Testers</string>
@@ -177,11 +178,8 @@
     <string name="manage_accounts">Accounts beheren </string>
     <string name="action_formatting_help">Opmaak</string>
 
-    <string-array name="noteMode_entries">
-        <item>Open in bewerkingsmodus</item>
-        <item>Open in voorbeeldmodus</item>
-        <item>Onthoud je laatste selectie</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Onthoud je laatste selectie</string>
 
     <string-array name="fontSize_entries">
         <item>Klein</item>
@@ -300,6 +298,7 @@
     <string name="settings_file_suffix_success">Nieuwe bestandsachtervoegsel: %1$s</string>
     <string name="http_status_code">HTTP status code: %1$d</string>
     <string name="progress_import_indeterminate">Notities importeren...</string>
-    <string name="progress_import">Notitie %1$dvan %2$dimporteren</string>
+    <string name="progress_import">Notitie %1$d van %2$d importeren</string>
     <string name="account_imported">Account geïmporteerd</string>
-</resources>
+    <string name="action_back">Terug</string>
+    </resources>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index a82cde21..da8bd129 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -151,4 +151,5 @@
     <string name="simple_next">Seguent</string>
     <string name="simple_prev">Precedent</string>
     <string name="simple_backup">Salvagarda</string>
+    <string name="action_back">Retorn</string>
     </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 283f44a2..658aa1e2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">W zeszłym miesiącu</string>
 
     <string name="settings_note_mode">Tryb wyświetlania notatek</string>
+    <string name="settings_note_mode_new">Zachowanie otwierania notatek</string>
     <string name="settings_theme_title">Motyw</string>
     <string name="settings_font_title">Czcionka monospace</string>
     <string name="settings_font_size">Rozmiar czcionki</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Aktualnie używasz %1$s</string>
     <string name="about_maintainer_title">Opiekun</string>
     <string name="about_developers_title">Deweloperzy</string>
+    <string name="about_developers_original_author">oryginalny autor</string>
     <string name="about_translators_title">Tłumacze</string>
     <string name="about_translators_transifex">Społeczność Nextcloud na %1$s</string>
     <string name="about_testers_title">Testerzy</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Zarządzaj kontami</string>
     <string name="action_formatting_help">Formatowanie</string>
 
-    <string-array name="noteMode_entries">
-        <item>Otwórz w trybie edycji</item>
-        <item>Otwórz w trybie podglądu</item>
-        <item>Zapamiętaj ostatni wybór</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Prosta modyfikacja</string>
+    <string name="noteMode_plain_preview">Prosty podgląd</string>
+    <string name="noteMode_rich_edit">Bogata modyfikacja</string>
+    <string name="noteMode_remember_last">Zapamiętaj ostatni wybór</string>
 
     <string-array name="fontSize_entries">
         <item>Mała</item>
@@ -312,4 +314,7 @@
     <string name="progress_import_indeterminate">Importuję notatki…</string>
     <string name="progress_import">Importuję notatkę %1$d z %2$d…</string>
     <string name="account_imported">Konto zaimportowane.</string>
-</resources>
+    <string name="direct_editing_error">Błąd podczas ładowania bogatej modyfikacji</string>
+    <string name="switch_to_plain_editing">Przełącz na prostą modyfikację</string>
+    <string name="action_back">Poprzednia</string>
+    </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6882a296..b5aca4d8 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Último mês</string>
 
     <string name="settings_note_mode">Modo de exibição de notas</string>
+    <string name="settings_note_mode_new">Notes opening behaviour</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_font_title"> Fonte monospaçada</string>
     <string name="settings_font_size">Tamanho da fonte</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Você  está atualmente usando %1$s</string>
     <string name="about_maintainer_title">Mantenedor</string>
     <string name="about_developers_title">Desenvolvedores</string>
+    <string name="about_developers_original_author">autor original</string>
     <string name="about_translators_title">Tradutores </string>
     <string name="about_translators_transifex">Comunidade Nextcloud em %1$s</string>
     <string name="about_testers_title">Testadores</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Gerenciar contas</string>
     <string name="action_formatting_help">Formatação</string>
 
-    <string-array name="noteMode_entries">
-        <item>Abrir em modo de edição</item>
-        <item>Abrir em modo de visualização</item>
-        <item>Lembrar minha última escolha</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Plain edit mode</string>
+    <string name="noteMode_plain_preview">Plain preview</string>
+    <string name="noteMode_rich_edit">Rich edit mode</string>
+    <string name="noteMode_remember_last">Lembrar minha última escolha</string>
 
     <string-array name="fontSize_entries">
         <item>Pequena</item>
@@ -307,4 +309,7 @@
     <string name="progress_import_indeterminate">Importando notas… </string>
     <string name="progress_import">Importando notas %1$d de %2$d…</string>
     <string name="account_imported">Conta importada.</string>
-</resources>
+    <string name="direct_editing_error">Error while loading rich editing</string>
+    <string name="switch_to_plain_editing">Switch to plain editing</string>
+    <string name="action_back">Voltar</string>
+    </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 4a214153..fb532cea 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -177,11 +177,8 @@
     <string name="manage_accounts">Administrare conturi</string>
     <string name="action_formatting_help">Formatare</string>
 
-    <string-array name="noteMode_entries">
-        <item>Deschide în modul editare</item>
-        <item>Deschide în modul de previzualizare </item>
-        <item>Amintește-ți ultima mea selecție </item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Amintește-ți ultima mea selecție </string>
 
     <string-array name="fontSize_entries">
         <item>Mic</item>
@@ -307,4 +304,5 @@
     <string name="progress_import_indeterminate">Se importă notiţe...</string>
     <string name="progress_import">Se importă notiţele %1$d din %2$d ...</string>
     <string name="account_imported">Cont importat.</string>
-</resources>
+    <string name="action_back">Înapoi</string>
+    </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9a7d05e8..49c12b17 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">За последний месяц</string>
 
     <string name="settings_note_mode">Режим показа заметок</string>
+    <string name="settings_note_mode_new">Поведение при открытии приложения Заметки</string>
     <string name="settings_theme_title">Тема</string>
     <string name="settings_font_title">Моноширинный шрифт</string>
     <string name="settings_font_size">Размер шрифта</string>
@@ -63,6 +64,7 @@
     <string name="about_version">В данный момент вы используете %1$s</string>
     <string name="about_maintainer_title">Сопроводитель</string>
     <string name="about_developers_title">Разработчики</string>
+    <string name="about_developers_original_author">первый автор</string>
     <string name="about_translators_title">Переводчики</string>
     <string name="about_translators_transifex">Сообщество Nextcloud на сайте %1$s</string>
     <string name="about_testers_title">Тестировщики</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Управление аккаунтами</string>
     <string name="action_formatting_help">Форматирование</string>
 
-    <string-array name="noteMode_entries">
-        <item>Открывать в режиме правки</item>
-        <item>Открывать в режиме просмотра</item>
-        <item>Запоминать выбранный режим</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Режим простого редактирования</string>
+    <string name="noteMode_plain_preview">Режим простого просмотра</string>
+    <string name="noteMode_rich_edit">Режим форматированного редактирования</string>
+    <string name="noteMode_remember_last">Запоминать выбранный режим</string>
 
     <string-array name="fontSize_entries">
         <item>Маленький</item>
@@ -312,4 +314,7 @@
     <string name="progress_import_indeterminate">Импорт заметок...</string>
     <string name="progress_import">Импортировано заметок %1$d из %2$d...</string>
     <string name="account_imported">Учетная запись импортирована.</string>
-</resources>
+    <string name="direct_editing_error">Ошибка при загрузке форматированного редактирования</string>
+    <string name="switch_to_plain_editing">Переключиться на простое редактирование</string>
+    <string name="action_back">Назад</string>
+    </resources>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index a4872cc3..bad18c59 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -151,11 +151,8 @@
     <string name="manage_accounts">Gesti contos</string>
     <string name="action_formatting_help">Formatatzione</string>
 
-    <string-array name="noteMode_entries">
-        <item>Aberi in modalidade modìfica</item>
-        <item>Aberi in modalidade anteprima</item>
-        <item>Regorda s\'ùrtimu sèberu</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Regorda s\'ùrtimu sèberu</string>
 
     <string-array name="fontSize_entries">
         <item>Piticu</item>
@@ -271,4 +268,5 @@
     <string name="settings_file_suffix_description">Estensione de archìviu pro notas noas in su Nextcloud tuo</string>
     <string name="settings_file_suffix_success">Sufissu de archìviu nou: %1$s</string>
     <string name="http_status_code">Còdighe de istadu HTTP: %1$d</string>
+    <string name="action_back">In segus</string>
     </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index cf820fb6..8e59ef99 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -177,11 +177,8 @@
     <string name="manage_accounts">Spravovať účty</string>
     <string name="action_formatting_help">Formátovanie</string>
 
-    <string-array name="noteMode_entries">
-        <item>Otvoriť v režime úprav</item>
-        <item>Otvoriť v režime ukážky</item>
-        <item>Zapamätať si môj posledný výber</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Zapamätať si môj posledný výber</string>
 
     <string-array name="fontSize_entries">
         <item>Malá</item>
@@ -312,4 +309,5 @@
     <string name="progress_import_indeterminate">Import poznámok…</string>
     <string name="progress_import">Importuje sa poznámka %1$d of %2$d…</string>
     <string name="account_imported">Účet bol importovaný.</string>
-</resources>
+    <string name="action_back">Späť</string>
+    </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 691fcf7a..ba464faf 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -50,6 +50,9 @@
     <string name="settings_background_sync"> Usklajevanje v ozadju</string>
     <string name="settings_prevent_screen_capture">Prepreči zajem zaslona</string>
     <string name="settings_gridview">Mrežni pogled</string>
+    <string name="settings_keep_screen_on">Ohrani zaslon prižgan</string>
+    <string name="settings_keep_screen_on_summary">Med pregledovanjem in urejanjem zabeležk</string>
+
     <string name="error_sync">Usklajevanje je spodletelo: %1$s</string>
     <string name="error_synchronization">Usklajevanje je spodletelo</string>
     <string name="error_no_network">Ni omrežne povezave</string>
@@ -60,6 +63,7 @@
     <string name="about_version">Trenutno je v uporabi %1$s</string>
     <string name="about_maintainer_title">Vzdrževalec</string>
     <string name="about_developers_title">Razvijalci</string>
+    <string name="about_developers_original_author">izvorni avtor</string>
     <string name="about_translators_title">Prevajalci</string>
     <string name="about_translators_transifex">Skupnost Nextcloud na %1$s</string>
     <string name="about_testers_title">Preizkuševalci</string>
@@ -174,11 +178,8 @@
     <string name="manage_accounts">Upravljanje z računi</string>
     <string name="action_formatting_help">Oblikovanje</string>
 
-    <string-array name="noteMode_entries">
-        <item>Zabeležka se odpre v urejevalnem načinu</item>
-        <item>Zabeležka se odpre v predogledu</item>
-        <item>Zapomni si zadnjo izbiro</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Zapomni si zadnjo izbiro</string>
 
     <string-array name="fontSize_entries">
         <item>Majhna</item>
@@ -309,4 +310,5 @@
     <string name="progress_import_indeterminate">Poteka uvažanje sporočilc ...</string>
     <string name="progress_import">Poteka uvažanje sporočilca %1$d od %2$d…</string>
     <string name="account_imported">Račun je uspešno uvožen.</string>
-</resources>
+    <string name="action_back">Nazaj</string>
+    </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b008f86e..294671ff 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -41,13 +41,19 @@
     <string name="listview_updated_last_month">Прошлог месеца</string>
 
     <string name="settings_note_mode">Режим приказа белешки</string>
+    <string name="settings_note_mode_new">Понашање отварања белешке</string>
     <string name="settings_theme_title">Тема</string>
     <string name="settings_font_title">Фонт фиксне ширине</string>
     <string name="settings_font_size">Величина фонта</string>
     <string name="settings_wifi_only">Синхронизуј само преко бежичне везе</string>
+    <string name="settings_lock">Закључавање апликације (бета)</string>
     <string name="settings_lock_summary">Акредитиве уређаја</string>
     <string name="settings_background_sync">Позадинска синхронизација</string>
+    <string name="settings_prevent_screen_capture">Спречи снимак екрана</string>
     <string name="settings_gridview">Приказ мреже</string>
+    <string name="settings_keep_screen_on">Задржи укључен екран</string>
+    <string name="settings_keep_screen_on_summary">Када се прегледа или уређује белешка</string>
+
     <string name="error_sync">Синхронизација није успела%1$s</string>
     <string name="error_synchronization">Синхронизација није успела</string>
     <string name="error_no_network">Нема мрежне везе</string>
@@ -58,6 +64,7 @@
     <string name="about_version">Тренутно користите %1$s</string>
     <string name="about_maintainer_title">Одржаваоц</string>
     <string name="about_developers_title">Програмери</string>
+    <string name="about_developers_original_author">оригинални аутор</string>
     <string name="about_translators_title">Преводиоци</string>
     <string name="about_translators_transifex">Некстклауд заједница на %1$s</string>
     <string name="about_testers_title">Тестери</string>
@@ -105,14 +112,34 @@
     <string name="category_movies">Филмови</string>
     <string name="category_movie">Филм</string>
     <string name="category_work">Посао</string>
+    <string name="category_todo">Обавеза</string>
+    <string name="category_todos">Обавезе</string>
+    <string name="category_checklists">Листе за потврду</string>
     <string name="category_tasks">Задаци</string>
+    <string name="category_recipe">Рецепт</string>
     <string name="category_recipes">Рецепти</string>
     <string name="category_restaurant">Ресторан</string>
+    <string name="category_restaurants">Ресторани</string>
+    <string name="category_food">Храна</string>
+    <string name="category_bake">Пекара</string>
+    <!-- This represents a category where one can place passwords and credentials -->
+    <string name="category_key">Кључ</string>
+    <!-- This represents a category where one can place passwords and credentials -->
+    <string name="category_keys">Кључеви</string>
     <string name="category_password">Лозинка</string>
     <string name="category_passwords">Лозинке</string>
+    <string name="category_credentials">Креденцијал</string>
+    <string name="category_game">Игра</string>
     <string name="category_games">Игрице</string>
     <!-- This is a noun, analogue to "game", like "theatre" or "drama" -->
     <string name="category_play">Пусти</string>
+    <string name="category_gift">Поклон</string>
+    <string name="category_gifts">Поклони</string>
+    <!-- Like a gift -->
+    <string name="category_present">Дар</string>
+    <!-- Like a gift -->
+    <string name="category_presents">Дарови</string>
+
     <string name="account_already_imported">Налог је већ увезен</string>
     <string name="no_notes_yet">Још нема белешки</string>
     <string name="no_notes_yet_description">Притисните + дугме да направите нову белешку</string>
@@ -126,6 +153,7 @@
     <string name="error_dialog_title">О, не - шта сад? 🙁</string>
     <string name="error_dialog_tip_token_mismatch_retry">Покушајте да форсирано затворите апликацију и стартујете је поново. Можда је била неисправна конекција ка Некстклауд апликацији.</string>
     <string name="error_dialog_tip_token_mismatch_clear_storage">Ако проблем настави да се дешава, пробајте да очистите податке од обе апликације: и Некстклауд и Некстклауд Белешки да бисте решили проблем.</string>
+    <string name="error_dialog_tip_clear_storage">Складиште можете да обришете тако што отворите информације о апликацији и изаберете Storage → Clear storage. ⚠️ Упозорење: Ово ће да обрише белешке које још увек нису синхронизоване!</string>
     <string name="error_dialog_tip_files_outdated">Изгледа да је верзија Некстклауд апликације стара. Посетите Play Store или Ф-дроид да скинете најновију верзију.</string>
     <string name="error_dialog_tip_files_force_stop">Нешто није у реду да Вашом Некстклауд апликацијом. Пробајте да форсирано зауставите обе, и Некстклауд апликацију и апликацију Некстклауд Белешки.</string>
     <string name="error_dialog_tip_files_delete_storage">Ако ово заустављање не помогне, очистите податке за обе апликације.</string>
@@ -139,21 +167,23 @@
     <string name="error_dialog_server_app_enabled">Проверите да ли сте инсталирали и укључили апликацију „Белешке” на Вашем серверу.</string>
     <string name="error_dialog_redirect">Сервер је одговорио са HTTP 302 кодом, што значи да немате инсталирану апликацију Белешке или да Вам сервер није правилно конфигурисан. Ово може да буде проузорковано произвољним додавањима у .htaccess фајлу или другим Некстклауд апликацијама као што је OID Client.</string>
     <string name="error_dialog_tip_disable_battery_optimizations">Искључите све оптимизације батерије за Некстаклауд и Белешке апликације.</string>
+    <string name="error_dialog_min_version">The Андроид апликација Белешке захтева да је верзија Nextcloud Андроид апликације барем 3.18.</string>
     <string name="added_content">Додата „%1$s”</string>
     <string name="shared_text_empty">Дељени текст је празан</string>
     <string name="append_to_note">Додај на белешку</string>
     <string name="change_note_title">Промени назив белешке</string>
     <string name="menu_edit_title">Измени наслов</string>
     <string name="simple_security">Безбедност</string>
+    <string name="appearance_and_behavior">Изглед и понашање</string>
     <string name="simple_synchronization">Синхронизација</string>
     <string name="manage_accounts">Управљање налозима</string>
     <string name="action_formatting_help">Форматирање</string>
 
-    <string-array name="noteMode_entries">
-        <item>Отвори у режиму уређивања</item>
-        <item>Отвори у режиму прегледа</item>
-        <item>Запамти мој последњи избор</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Режим простог уређивања</string>
+    <string name="noteMode_plain_preview">Прости преглед</string>
+    <string name="noteMode_rich_edit">Режим детаљног уређивања</string>
+    <string name="noteMode_remember_last">Запамти мој последњи избор</string>
 
     <string-array name="fontSize_entries">
         <item>Мали</item>
@@ -192,6 +222,7 @@
     <string name="formatting_help_codefence_inline" translateable="false">`%1$s`</string>
     <string name="formatting_help_codefence_inline_escaped" translateable="false">\\`%1$s\\`</string>
     <string name="formatting_help_codefence" translateable="false">```</string>
+    <string name="formatting_help_codefence_outer" translateable="false">````</string>
     <string name="formatting_help_codefence_javascript" translateable="false">```javascript</string>
     <string name="formatting_help_cbf_title">Форматирање у зависности од контекста</string>
     <string name="formatting_help_cbf_body_1">Главни циљ дизајна апликације Белешки је био да пружи алат који не стаје на пут. А моћи ћете и да форматирате текст Markdown синтактом. За разне од долепоменутих примера можете да користите и пречице, па можете форматирати белешке без куцања кодова испод.</string>
@@ -230,7 +261,16 @@
     <string name="formatting_help_code_body_3">А ако желите бојење синтакте, додајте и језик:</string>
 
     <string name="formatting_help_tables_title">Табеле</string>
+    <!-- Column header of a sample table -->
+    <string name="formatting_help_tables_column">Колона %1d</string>
+    <!-- Table cell value of a sample table -->
+    <string name="formatting_help_tables_value">Вредност %1d</string>
+
+    <string name="formatting_help_images_body_1">Линкови морају бити или комплетне URL адресе које почињу протоколом и доменом или апсолутне путање које почињу карактером %1$s.</string>
+    <string name="formatting_help_images_body_2">Да би сте били сагласни са Markdown форматом, молимо вас да користите означавајуће карактере у URL слика. Ово значи, на пример, да се размаци у URL замењују са %1$s.</string>
     <string name="formatting_help_images_title">Слике</string>
+    <string name="formatting_help_images_alt">Фенси слика</string>
+
     <string name="simple_other">Остало</string>
     <string name="sort_last_modified">Сортирај по времену измене</string>
     <string name="sort_alphabetically">Сортирај абецедно</string>
@@ -238,9 +278,38 @@
     <string name="error_action_open_deck_info">Отвори инфо о апликацији</string>
     <string name="error_action_open_network">Поставке мреже</string>
     <string name="error_action_update_files_app">Ажурирај</string>
+    <string name="no_account_configured_yet">Још увек није подешен ниједан налог</string>
     <string name="no_other_accounts">Нисте подесили ниједан други налог.</string>
     <string name="choose_account">Одаберите налог</string>
+    <string name="context_based_formatting">Искачући облачић форматирања у зависности од контекста</string>
+    <plurals name="remove_account_message">
+        <item quantity="one">Уклањање налога %1$s ће такође неповратно да обрише једну несинхронизовану измену.</item>
+        <item quantity="few">Уклањање налога %1$s ће такође неповратно да обрише %2$d несинхронизоване измене.</item>
+        <item quantity="other">Уклањање налога %1$s ће такође неповратно да обрише %2$d несинхронизованих измена.</item>
+    </plurals>
+    <string name="remove_account">Уклони %1$s</string>
+
     <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Морате бити повезани на интернет да бисте додали налог.</string>
+    <string name="settings_notes_path">Постави фолдер</string>
+
     <string name="simple_next">Следећа</string>
     <string name="simple_prev">Претходно</string>
+    <string name="simple_backup">Резервна копија</string>
+    <string name="backup">Открили смо стање апликације које не може да се опорави. Молимо вас да направите резервну копију ваших несихронизованих измена и очистите складиште Notes апликације.</string>
+    <string name="settings_notes_path_description">Фолдер у којем се на вашем Nextcloud серверу чувају белешке</string>
+    <string-array name="settings_file_suffixes">
+        <item translatable="false">.txt</item>
+        <item translatable="false">.md</item>
+    </string-array>
+    <string name="settings_notes_path_success">Нови фолдер за белешке: %1$s</string>
+    <string name="settings_file_suffix">Екстензија фајла</string>
+    <string name="settings_file_suffix_description">Екстензија фајла за нове белешке на вашем Nextcloud серверу</string>
+    <string name="settings_file_suffix_success">Суфикс новог фајла: %1$s</string>
+    <string name="http_status_code">HTTP статусни кôд: %1$d</string>
+    <string name="progress_import_indeterminate">Белешке се увозе...</string>
+    <string name="progress_import">Увози се белешка %1$d од укупно %2$d…</string>
+    <string name="account_imported">Налог је увезен.</string>
+    <string name="direct_editing_error">Грешка приликом учитавања детаљног уређивања</string>
+    <string name="switch_to_plain_editing">Пређи на просто уређивање</string>
+    <string name="action_back">Назад</string>
     </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c0425071..e3cb4df7 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Förra månaden</string>
 
     <string name="settings_note_mode">Visningsläge för anteckningar</string>
+    <string name="settings_note_mode_new">Notes startfunktion</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_font_title">Monospace font</string>
     <string name="settings_font_size">Teckenstorlek</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Du använder %1$s för närvarande</string>
     <string name="about_maintainer_title">Underhållare</string>
     <string name="about_developers_title">Utvecklare</string>
+    <string name="about_developers_original_author">Ursprungsskribent</string>
     <string name="about_translators_title">Översättare</string>
     <string name="about_translators_transifex">Nextcloud community på %1$s</string>
     <string name="about_testers_title">Testare</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Hantera konton</string>
     <string name="action_formatting_help">Formatering</string>
 
-    <string-array name="noteMode_entries">
-        <item>Öppna i redigera-läge</item>
-        <item>Öppna i förhandsvisningsläge</item>
-        <item>Kom ihåg mitt sista val</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Enkel redigeringsfunktion</string>
+    <string name="noteMode_plain_preview">Enkel förhandsvisning</string>
+    <string name="noteMode_rich_edit">Rich redigeringsfunktion</string>
+    <string name="noteMode_remember_last">Kom ihåg mitt sista val</string>
 
     <string-array name="fontSize_entries">
         <item>Liten</item>
@@ -223,6 +225,8 @@
     <string name="formatting_help_cbf_body_2">Markera bara ett stycke text eller tryck på din markör vid valfri position och du kommer få en popup-meny som utöver standardposterna såsom %1$s, %2$s, %3$s även innehåller poster som %4$s eller %5$s.</string>
 
     <string name="formatting_help_text_title">Text</string>
+    <string name="formatting_help_text_body">Med Markdown är det enkelt att sätta en del ord i %1$sfetstil%1$s och andra %2$skursiva%2$s. Du kan %3$söverstyka%3$s ord och även [länka till Nextcloud](https://nextcloud.com).</string>
+
     <string name="formatting_help_lists_title">Listor</string>
     <string name="formatting_help_lists_body_1">Ibland vill du ha en numrerad lista:</string>
     <string name="formatting_help_lists_body_2">En</string>
@@ -294,4 +298,5 @@
     <string name="progress_import_indeterminate">Importerar anteckningar...</string>
     <string name="progress_import">Importerar anteckning %1$d av %2$d... </string>
     <string name="account_imported">Konto importerat.</string>
-</resources>
+    <string name="action_back">Tillbaka</string>
+    </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1878de2a..1fcc6a8c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Geçen ay</string>
 
     <string name="settings_note_mode">Notların görüntülenme kipi</string>
+    <string name="settings_note_mode_new">Not açılma davranışı</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_font_title">Sabit aralıklı yazı türü</string>
     <string name="settings_font_size">Yazı boyutu</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Şu anda %1$s kullanıyorsunuz</string>
     <string name="about_maintainer_title">Sorumlu</string>
     <string name="about_developers_title">Geliştiriciler</string>
+    <string name="about_developers_original_author">özgün yazar</string>
     <string name="about_translators_title">Çevirmenler</string>
     <string name="about_translators_transifex">%1$s üzerindeki Nextcloud topluluğu</string>
     <string name="about_testers_title">Deneyenler</string>
@@ -157,7 +159,7 @@
     <string name="error_dialog_tip_files_delete_storage">Zorla durdurmak sorunu çözmediyse iki uygulamanın da depolamalarını temizlemeyi deneyebilirsiniz.</string>
     <string name="error_dialog_timeout_instance">Belirtilen sürede sunucunuzdan bir yanıt alınamadı. Lütfen kopyanızın düzgün çalıştığından emin olun.</string>
     <string name="error_dialog_timeout_toggle">Ağ bağlantınızı denetleyin. Mobil veriye geçmek ya da Wi-Fi bağlantısını kapatıp açmak yardımcı olabilir.</string>
-    <string name="error_dialog_check_server">Sunucunuz doğru şekilde yanıt vermedi. Lütfen notlarınıza web arayüzü üzerinden erişebiliyor musunuz diye bakın.</string>
+    <string name="error_dialog_check_server">Sunucunuz doğru şekilde yanıt vermedi. Lütfen notlarınıza site arayüzü üzerinden erişebiliyor musunuz diye bakın.</string>
     <string name="error_dialog_check_server_logs">Nextcloud kurulumunuz ile ilgili bir sorun var. Lütfen sunucu günlük dosyalarını inceleyin.</string>
     <string name="error_dialog_check_maintenance">Nextcloud kopyanızın bakım kipinde olmadığından emin olun.</string>
     <string name="error_dialog_insufficient_storage">Nextcloud kopyanızda boş depolama alanı kalmamış. Lütfen yerel değişikliklerinizi bulut ile eşitlemek için bazı dosyaları silerek yer açın.</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">Hesap yönetimi</string>
     <string name="action_formatting_help">Biçimlendirme</string>
 
-    <string-array name="noteMode_entries">
-        <item>Düzenleme kipinde aç</item>
-        <item>Ön izleme kipinde aç</item>
-        <item>Son seçimim hatırlansın</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Yalın düzenleme kipi</string>
+    <string name="noteMode_plain_preview">Yalın ön izleme</string>
+    <string name="noteMode_rich_edit">Zengin metin düzenleme kipi</string>
+    <string name="noteMode_remember_last">Son seçimim hatırlansın</string>
 
     <string-array name="fontSize_entries">
         <item>Küçük</item>
@@ -302,4 +304,7 @@
     <string name="progress_import_indeterminate">Notlar içe aktarılıyor…</string>
     <string name="progress_import">Not %1$d / %2$d içe aktarılıyor…</string>
     <string name="account_imported">Hesap içe aktarıldı.</string>
-</resources>
+    <string name="direct_editing_error">Zengin düzenleme yüklenirken sorun çıktı</string>
+    <string name="switch_to_plain_editing">Yalın düzenlemeye geç</string>
+    <string name="action_back">Geri</string>
+    </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2d72afd8..fa946d53 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">Минулого місяця</string>
 
     <string name="settings_note_mode">Показувати нотатки</string>
+    <string name="settings_note_mode_new">Поведінка під час відкриття застосунку Нотатки</string>
     <string name="settings_theme_title">Тема</string>
     <string name="settings_font_title">Моноширинний шрифт</string>
     <string name="settings_font_size">Розмір шрифту</string>
@@ -63,6 +64,7 @@
     <string name="about_version">Ви використовуєте %1$s</string>
     <string name="about_maintainer_title">Утримувач</string>
     <string name="about_developers_title">Розробники</string>
+    <string name="about_developers_original_author">перший автор</string>
     <string name="about_translators_title">Перекладачі</string>
     <string name="about_translators_transifex">Спільнота Nextcloud на %1$s</string>
     <string name="about_testers_title">Тестувальники</string>
@@ -110,8 +112,8 @@
     <string name="category_movies">Відео</string>
     <string name="category_movie">Фільм</string>
     <string name="category_work">Робочий</string>
-    <string name="category_todo">До роботи</string>
-    <string name="category_todos">До роботи</string>
+    <string name="category_todo">Завдання</string>
+    <string name="category_todos">Завдання</string>
     <string name="category_checklists">Контрольні списки</string>
     <string name="category_tasks">Завдання</string>
     <string name="category_recipe">Рецепт</string>
@@ -157,7 +159,7 @@
     <string name="error_dialog_tip_files_delete_storage">Якщо примусове їх завершення не допомагає, спробуйте очистити сховище обох застосунків.</string>
     <string name="error_dialog_timeout_instance">За відведений час відповіді від вашого сервера не надійшло. Переконайтесь, що ваш сервер працює добре.</string>
     <string name="error_dialog_timeout_toggle">Перевірте підключення до мережі. Іноді може допомогти вимкнення та ввімкнення мобільного передавання даних або Wi-Fi.</string>
-    <string name="error_dialog_check_server">Відповідь вашого сервера була неправильною. Перевірте, чи можете ви отримати доступ до своїх нотаток через веб-інтерфейс.</string>
+    <string name="error_dialog_check_server">Отримано неправильну відповідь від сервера. Перевірте, чи ви маєте доступ до вашіх нотаток через вебінтерфейс.</string>
     <string name="error_dialog_check_server_logs">Виникла проблема з налаштуванням Nextcloud. Будь ласка, подивіться файли журналу сервера.</string>
     <string name="error_dialog_check_maintenance">Будь ласка, перевірте, чи ваш сервер Nextcloud наразі не перебуває в режимі обслуговування.</string>
     <string name="error_dialog_insufficient_storage">Ваш сервер Nextcloud не має вільного місця. Будь ласка, вилучіть непотрібні файлі, щоби можна було виконувати синхронізацію змін на пристрої з хмарою.</string>
@@ -167,21 +169,21 @@
     <string name="error_dialog_tip_disable_battery_optimizations">Вимкніть усі оптимізації батареї для застосунків Nextcloud та Нотатки Nextcloud.</string>
     <string name="error_dialog_min_version">Застосунок \"Нотатки\" для Android вимагає версію не менше 3.18 застосунку Nextcloud для Android.</string>
     <string name="added_content">Додано \"%1$s\"</string>
-    <string name="shared_text_empty">Поширений текст був порожнім</string>
+    <string name="shared_text_empty">Поширений текст порожній</string>
     <string name="append_to_note">Доповнити нотатку</string>
     <string name="change_note_title">Змінити заголовок нотатки</string>
-    <string name="menu_edit_title">Редагувати нотатку</string>
+    <string name="menu_edit_title">Редагувати</string>
     <string name="simple_security">Безпека</string>
     <string name="appearance_and_behavior">Вигляд і поведінка</string>
     <string name="simple_synchronization">Синхронізація</string>
     <string name="manage_accounts">Облікові записи</string>
     <string name="action_formatting_help">Форматування</string>
 
-    <string-array name="noteMode_entries">
-        <item>Відкривати у режимі редагування</item>
-        <item>Відкривати у режимі перегляду</item>
-        <item>Запам\'ятовувати останній вибір</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">Режим простого редагування</string>
+    <string name="noteMode_plain_preview">Режим простого перегляду</string>
+    <string name="noteMode_rich_edit">Режим форматованого редагування</string>
+    <string name="noteMode_remember_last">Запам\'ятовувати останній вибір</string>
 
     <string-array name="fontSize_entries">
         <item>Малий</item>
@@ -312,4 +314,7 @@
     <string name="progress_import_indeterminate">Імпортування нотаток...</string>
     <string name="progress_import">Імпортування нотатки %1$d з %2$d...</string>
     <string name="account_imported">Обліковий запис імпортовано.</string>
-</resources>
+    <string name="direct_editing_error">Помилка під час завантаження форматованого редагування</string>
+    <string name="switch_to_plain_editing">Перемкнутися до простого редагування</string>
+    <string name="action_back">Назад</string>
+    </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 9aa6bee4..65078d7d 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -50,6 +50,9 @@
     <string name="settings_background_sync">Đồng bộ hoá trong nền</string>
     <string name="settings_prevent_screen_capture">Ngăn chặn chụp màn hình</string>
     <string name="settings_gridview">Hiển thị dạng lưới</string>
+    <string name="settings_keep_screen_on">Giữ màn hình luôn mở</string>
+    <string name="settings_keep_screen_on_summary">Khi đang xem hoặc sửa ghi chú</string>
+
     <string name="error_sync">Đồng bộ hoá thất bại: %1$s</string>
     <string name="error_synchronization">Đồng bộ hoá thất bại</string>
     <string name="error_no_network">Không có kết nối mạng</string>
@@ -85,6 +88,8 @@
     <string name="widget_single_note_title">Ghi chú đơn</string>
     <string name="widget_single_note_placeholder_tv">Không tìm thấy ghi chú</string>
     <string name="widget_not_logged_in">Vui lòng đăng nhập vào Ghi chú trước khi sử dụng tiện ích này</string>
+    <string name="widget_entry_fav_contentDescription">Biểu tượng ngôi sao thể hiện mục được yêu thích</string>
+
     <string name="activity_select_single_note">Chọn ghi chú</string>
 
     <string name="shortcut_create_long">Tạo một ghi chú mới</string>
@@ -154,11 +159,8 @@
     <string name="manage_accounts">Quản lý tài khoản</string>
     <string name="action_formatting_help">Định dạng</string>
 
-    <string-array name="noteMode_entries">
-        <item>Mở trong chế độ chỉnh sửa</item>
-        <item>Mở trong chế độ xem trước</item>
-        <item>Nhớ sự lựa chọn cuối của tôi</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">Nhớ sự lựa chọn cuối của tôi</string>
 
     <string-array name="fontSize_entries">
         <item>Nhỏ</item>
@@ -269,4 +271,5 @@
     <string name="progress_import_indeterminate">Đang nhập các ghi chú...</string>
     <string name="progress_import">Đang nhập ghi chú %1$d trong số %2$d...</string>
     <string name="account_imported">Đã nhập tài khoản.</string>
-</resources>
+    <string name="action_back">Quay lại</string>
+    </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b95c1b56..6121dee7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -177,11 +177,8 @@
     <string name="manage_accounts">管理账号</string>
     <string name="action_formatting_help">格式</string>
 
-    <string-array name="noteMode_entries">
-        <item>以编辑模式打开</item>
-        <item>以预览模式打开</item>
-        <item>记住我上一次的选择</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">记住我上一次的选择</string>
 
     <string-array name="fontSize_entries">
         <item>小</item>
@@ -297,4 +294,5 @@
     <string name="progress_import_indeterminate">导入笔记中…</string>
     <string name="progress_import">正导入 %2$d 中的笔记 %1$d …</string>
     <string name="account_imported">账号已导入</string>
-</resources>
+    <string name="action_back">返回</string>
+    </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 66a4877a..c28db228 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -41,6 +41,7 @@
     <string name="listview_updated_last_month">上個月</string>
 
     <string name="settings_note_mode">筆記顯示模式</string>
+    <string name="settings_note_mode_new">Notes 打開行為</string>
     <string name="settings_theme_title">佈景主題</string>
     <string name="settings_font_title">等寬字體</string>
     <string name="settings_font_size">字體大小</string>
@@ -63,6 +64,7 @@
     <string name="about_version">你目前使用 %1$s</string>
     <string name="about_maintainer_title">保養員</string>
     <string name="about_developers_title">開發員</string>
+    <string name="about_developers_original_author">原作者</string>
     <string name="about_translators_title">翻譯員</string>
     <string name="about_translators_transifex">%1$s 上的 Nextcloud 社群</string>
     <string name="about_testers_title">測試員</string>
@@ -177,11 +179,11 @@
     <string name="manage_accounts">賬戶管理</string>
     <string name="action_formatting_help">正在格式化</string>
 
-    <string-array name="noteMode_entries">
-        <item>以編輯模式開啟</item>
-        <item>以預覽模式開啟</item>
-        <item>記住上次選擇</item>
-    </string-array>
+
+    <string name="noteMode_plain_edit">普通編輯模式</string>
+    <string name="noteMode_plain_preview">普通預覽</string>
+    <string name="noteMode_rich_edit">增強編輯模式</string>
+    <string name="noteMode_remember_last">記住上次選擇</string>
 
     <string-array name="fontSize_entries">
         <item>小</item>
@@ -297,4 +299,7 @@
     <string name="progress_import_indeterminate">正在導入筆記...</string>
     <string name="progress_import">正導入筆記 %2$d 之 %1$d ...</string>
     <string name="account_imported">已導入賬戶。</string>
-</resources>
+    <string name="direct_editing_error">載入增強編輯模式時發生錯誤</string>
+    <string name="switch_to_plain_editing">切換到普通編輯模式</string>
+    <string name="action_back">返回</string>
+    </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 61a77c0b..b6c48a56 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -177,11 +177,8 @@
     <string name="manage_accounts">帳戶管理</string>
     <string name="action_formatting_help">文字樣式</string>
 
-    <string-array name="noteMode_entries">
-        <item>以編輯模式開啟</item>
-        <item>以預覽模式開啟</item>
-        <item>記住上次選擇</item>
-    </string-array>
+
+    <string name="noteMode_remember_last">記住上次選擇</string>
 
     <string-array name="fontSize_entries">
         <item>小</item>
@@ -297,4 +294,5 @@
     <string name="progress_import_indeterminate">匯入筆記中...</string>
     <string name="progress_import">匯入筆記 %2$d 之 %1$d 中...</string>
     <string name="account_imported">已匯入賬戶。</string>
-</resources>
+    <string name="action_back">返回</string>
+    </resources>