Fix migration bug (and merge master branch)

41 files changed, 842 insertions, 36 deletions

diff --git a/app/build.gradle b/app/build.gradle
index ad48e5c4..90a059dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "it.niedermann.owncloud.notes"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 48
-        versionName "1.0.0"
+        versionCode 49
+        versionName "1.0.1"
 //        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java
index 6077f5cc..1139b979 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java
@@ -10,9 +10,6 @@ import android.util.Log;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
-import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
-import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
-import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.yydcdut.markdown.MarkdownProcessor;
 import com.yydcdut.markdown.syntax.text.TextFactory;
 
@@ -57,6 +54,9 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
         long noteID = sp.getLong(SingleNoteWidget.WIDGET_KEY + appWidgetId, -1);
 
         if (noteID >= 0) {
+            Log.v(TAG, "Fetch note for account " + SingleNoteWidget.ACCOUNT_ID_KEY + appWidgetId);
+            Log.v(TAG, "Fetch note for account " + sp.getLong(SingleNoteWidget.ACCOUNT_ID_KEY + appWidgetId, -1));
+            Log.v(TAG, "Fetch note with id " + noteID);
             note = db.getNote(sp.getLong(SingleNoteWidget.ACCOUNT_ID_KEY + appWidgetId, -1), noteID);
 
             if (note == null) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java
index 2309405a..c510ca97 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java
@@ -197,8 +197,8 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper {
                     db.execSQL(String.format("ALTER TABLE %s RENAME TO %s", table_notes, table_temp));
                     createNotesTable(db, table_notes);
 
-                    db.execSQL(String.format("INSERT INTO %s(%s,%s, %s,%s,%s,%s,%s,%s,%s,%s) ", table_notes, key_id, key_account_id, key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag)
-                            + String.format("SELECT %s,%s,%s, %s,%s,strftime('%%s',%s),%s,%s,%s,%s FROM %s", key_id, key_account_id, key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag, table_temp));
+                    db.execSQL(String.format("INSERT INTO %s(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s) ", table_notes, key_id,            key_account_id,  key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag)
+                            + String.format("SELECT %s,%s,%s,%s,%s,strftime('%%s',%s),%s,%s,%s,%s FROM %s", key_id, values.get(key_account_id), key_remote_id, key_status, key_title, key_modified, key_content, key_favorite, key_category, key_etag, table_temp));
                     db.execSQL(String.format("DROP TABLE %s;", table_temp));
 
                     AppWidgetManager awm = AppWidgetManager.getInstance(context);
@@ -220,6 +220,8 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper {
                         }
                     }
 
+                    notifyNotesChanged();
+
                     // Clean up no longer needed SharedPreferences
                     editor.remove("notes_last_etag");
                     editor.remove("notes_last_modified");
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 a5c15525..db782311 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -2,30 +2,37 @@
 <resources>
 
     <string name="app_name">Notes</string>
+    <string name="no_notes">No notes yet</string>
     <string name="label_all_notes">All notes</string>
     <string name="label_favorites">Favourites</string>
     <string name="action_create">New note</string>
     <string name="action_settings">Settings</string>
     <string name="action_trashbin">Deleted notes</string>
     <string name="action_search">Search</string>
+    <string name="action_create_save">Save</string>
     <string name="simple_cancel">Cancel</string>
     <string name="simple_edit">Edit</string>
     <string name="action_edit_save">Save</string>
+    <string name="action_edit_saving">Saving &#8230;</string>
+    <string name="action_edit_saved">Saved</string>
     <string name="simple_about">About</string>
     <string name="simple_bold">Bold</string>
     <string name="simple_link">Link</string>
     <string name="simple_italic">Italic</string>
+    <string name="action_select_note">Select note</string>
     <string name="action_note_deleted">Note deleted</string>
     <string name="action_note_restored">Note restored</string>
     <string name="action_undo">Undo</string>
     <string name="action_drawer_open">open navigation</string>
     <string name="action_drawer_close">close navigation</string>
+    <string name="action_recent">Recent</string>
     <string name="action_uncategorized">Uncategorised</string>
     <string name="menu_delete">Delete</string>
     <string name="menu_change_category">Category</string>
     <string name="menu_favorite">Favourite</string>
     <string name="menu_preview">Preview</string>
     <string name="menu_share">Share</string>
+    <string name="menu_about">About</string>
 
     <string name="change_category_title">Choose a category</string>
 
@@ -33,8 +40,17 @@
     <string name="listview_updated_yesterday">Yesterday</string>
     <string name="listview_updated_this_week">This week</string>
     <string name="listview_updated_this_month">This month</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Account</string>
+    <string name="settings_url">Server address</string>
+    <string name="settings_url_check_description">Shows whether the address can be pinged.</string>
+    <string name="settings_url_warn_http">WARNING: \"http\" is unsafe. Please use \"https\".</string>
+    <string name="settings_username">Username</string>
+    <string name="settings_password">Password</string>
+    <string name="settings_password_unchanged">Password (not changed)</string>
+    <string name="settings_password_check_description">Displays whether the credentials are correct.</string>
+    <string name="settings_submit">Connect</string>
+    <string name="settings_submitting">Connecting &#8230;</string>
     <string name="settings_note_mode">Display mode for notes</string>
     <string name="settings_theme_title">Dark theme</string>
     <string name="settings_font_title">Monospace font</string>
@@ -48,16 +64,26 @@
     <string name="settings_cert_reset_toast">All custom certificates have been cleared</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notes - Connection security</string>
+    <string name="trust_certificate_unknown_certificate_found">Notes has encountered an unknown certificate. Do you want to trust it?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Connecting</string>
+    <string name="network_connected">Connected</string>
+    <string name="network_disconnected">No network available</string>
 
     <!-- Error -->
     <string name="error_sync">Synchronisation failed: %1$s</string>
+    <string name="error_invalid_login">Invalid login: %1$s</string>
     <string name="error_json">is the Notes app activated on the server?</string>
     <string name="error_io">server connection is broken</string>
     <string name="error_no_network">no network connection</string>
+    <string name="error_server">URL/Server has errors</string>
+    <string name="error_url_malformed">Wrong server address</string>
+    <string name="error_username_password_invalid">Wrong username or password</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Settings</string>
 
     <!-- About -->
     <string name="about_version_title">Version</string>
@@ -98,6 +124,7 @@
     <string name="shortcut_create_long">Create a new note</string>
 
     <string name="pref_value_theme_light">Light</string>
+    <string name="pref_value_theme_dark">Dark</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Open in edit mode</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 28bafbff..bf10df63 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -33,7 +33,9 @@
     <string name="listview_updated_today">Avui</string>
     <string name="listview_updated_yesterday">Ahir</string>
     <string name="listview_updated_this_week">Aquesta setmana</string>
+    <string name="listview_updated_last_week">La setmana passada</string>
     <string name="listview_updated_this_month">Aquest mes</string>
+    <string name="listview_updated_last_month">El mes passat</string>
 
     <!-- Settings -->
     <string name="settings_note_mode">Mode de visualització per les notes</string>
@@ -109,6 +111,12 @@
     <string name="copied_to_clipboard">S\'ha copiat al porta-retalls</string>
     <string name="pin_to_homescreen">Fixa-ho a la pantalla d\'inici</string>
     <string name="note_has_been_deleted">S\'ha suprimit aquesta nota</string>
+    <string name="fallback_weblogin_text">Tornar a l\'antic mètode d\'inici de sessió</string>
+    <string name="fallback_weblogin_back">Enrere</string>
+    <string name="sso_announcment_title">Entrada simple</string>
+    <string name="sso_announcment_message">L\'aplicació Notes començarà amb la propera versió principal amb la gran característica de Single-Sign-On-On-Nextcloud. D’aquesta manera augmentareu la seguretat, la fiabilitat i el confort. Assegureu-vos que heu instal·lat almenys la versió 3.8.0 de l\'aplicació de fitxers i seleccioneu a la primera obertura el mateix compte que ja esteu utilitzant.</string>
+    <string name="sso_announcment_more_info">Més informació</string>
+    <string name="sso_announcment_understood">Entès</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 53764307..5ecf05c2 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -32,7 +32,9 @@
     <string name="listview_updated_today">Dnes</string>
     <string name="listview_updated_yesterday">Včera</string>
     <string name="listview_updated_this_week">Tento týden</string>
+    <string name="listview_updated_last_week">Minulý týden</string>
     <string name="listview_updated_this_month">Tento měsíc</string>
+    <string name="listview_updated_last_month">Minulý měsíc</string>
 
     <!-- Settings -->
     <string name="settings_note_mode">Režim zobrazení pro poznámky</string>
@@ -108,7 +110,8 @@
     <string name="copied_to_clipboard">Zkopírováno do schránky</string>
     <string name="pin_to_homescreen">Připnout na domovskou obrazovku</string>
     <string name="note_has_been_deleted">Tato poznámka byla smazána</string>
-
+    <string name="sso_announcment_title">Sjednocené přihlašování</string>
+    <string name="sso_announcment_more_info">Více informací</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Otevřít v režimu úprav</item>
diff --git a/app/src/main/res/values-cy-rGB/strings.xml b/app/src/main/res/values-cy-rGB/strings.xml
index f83258c7..01f74916 100644
--- a/app/src/main/res/values-cy-rGB/strings.xml
+++ b/app/src/main/res/values-cy-rGB/strings.xml
@@ -33,7 +33,6 @@
     <string name="listview_updated_yesterday">Ddoe</string>
     <string name="listview_updated_this_week">Wythnos yma</string>
     <string name="listview_updated_this_month">Mis yma</string>
-
     <!-- Settings -->
     <string name="settings_note_mode">Modd arddangos nodiadau</string>
     <string name="settings_theme_title">Thema tywyll</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a83755ce..95760430 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -33,7 +33,6 @@
     <string name="listview_updated_yesterday">I går</string>
     <string name="listview_updated_this_week">Denne uge</string>
     <string name="listview_updated_this_month">Denne måned</string>
-
     <!-- Settings -->
     <string name="settings_note_mode">Visningstilstand for noter</string>
     <string name="settings_theme_title">Mørk tema</string>
@@ -108,7 +107,6 @@
     <string name="copied_to_clipboard">Kopieret til udklipsholder</string>
     <string name="pin_to_homescreen">Fastgør til hjemmeskærm</string>
     <string name="note_has_been_deleted">Denne note er blevet slettet</string>
-
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Åbn i redigeringstilstand</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 30841f09..8ba6bdee 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -33,7 +33,9 @@
     <string name="listview_updated_today">Heute</string>
     <string name="listview_updated_yesterday">Gestern</string>
     <string name="listview_updated_this_week">Diese Woche</string>
+    <string name="listview_updated_last_week">Letzte Woche</string>
     <string name="listview_updated_this_month">Diesen Monat</string>
+    <string name="listview_updated_last_month">Letzten Monat</string>
 
     <!-- Settings -->
     <string name="settings_note_mode">Anzeigemodus für Notizen</string>
@@ -109,6 +111,12 @@
     <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
     <string name="pin_to_homescreen">An Startbildschirm anheften</string>
     <string name="note_has_been_deleted">Diese Notiz wurde gelöscht</string>
+    <string name="fallback_weblogin_text">Zur alten Anmeldemethode zurückkehren</string>
+    <string name="fallback_weblogin_back">Zurück</string>
+    <string name="sso_announcment_title">Single-Sign-On</string>
+    <string name="sso_announcment_message">Ab der nächsten Version wie die Notes-App die  großartige Single-Sign-On Funktion von Naxtcloud verwenden. Dies wird die Sicherheit, Zuverlässigkeit und den Komfort für Sie erhöhen. Bitte stellen Sie sicher, das Sie Version 3.8.0 oder neuer der Android-Nextcloud-App installliert haben und wählen Sie beim ersten Start das selbe Konto das Sie bereits nutzen.</string>
+    <string name="sso_announcment_more_info">Weitere Informationen</string>
+    <string name="sso_announcment_understood">Verstanden</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index c55909b8..6195ec09 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -30,7 +30,6 @@
     <string name="listview_updated_yesterday">Χθες</string>
     <string name="listview_updated_this_week">Αυτή την εβδομάδα</string>
     <string name="listview_updated_this_month">Αυτό το μήνα</string>
-
     <!-- Settings -->
     <string name="settings_wifi_only">Συγχρονισμός μόνο σε Wi-Fi</string>
     <string name="settings_cert_category">Διαχείριση πιστοποιητικών</string>
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 37e5d5c3..0e6ca040 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -29,7 +29,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml
index 37e5d5c3..0e6ca040 100644
--- a/app/src/main/res/values-es-rCO/strings.xml
+++ b/app/src/main/res/values-es-rCO/strings.xml
@@ -29,7 +29,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml
index 37e5d5c3..0e6ca040 100644
--- a/app/src/main/res/values-es-rCR/strings.xml
+++ b/app/src/main/res/values-es-rCR/strings.xml
@@ -29,7 +29,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml
index 37e5d5c3..0e6ca040 100644
--- a/app/src/main/res/values-es-rDO/strings.xml
+++ b/app/src/main/res/values-es-rDO/strings.xml
@@ -29,7 +29,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index 37e5d5c3..a1795527 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -2,26 +2,33 @@
 <resources>
 
     <string name="app_name">Notas</string>
+    <string name="no_notes">Aún no hay notas</string>
     <string name="label_all_notes">Todas las notas</string>
     <string name="label_favorites">Favoritos</string>
     <string name="action_create">Nota nueva</string>
     <string name="action_settings">Configuraciones</string>
     <string name="action_search">Buscar</string>
+    <string name="action_create_save">Guardar</string>
     <string name="simple_cancel">Cancelar</string>
     <string name="simple_edit">Editar</string>
     <string name="action_edit_save">Guardar</string>
+    <string name="action_edit_saving">Guardando &#8230;</string>
+    <string name="action_edit_saved">Guardado</string>
     <string name="simple_about">Acerca de</string>
+    <string name="action_select_note">Seleccionar nota</string>
     <string name="action_note_deleted">Nota borrada</string>
     <string name="action_note_restored">Nota restaurada</string>
     <string name="action_undo">Deshacer</string>
     <string name="action_drawer_open">abrir navegación</string>
     <string name="action_drawer_close">cerrar navegación</string>
+    <string name="action_recent">Reciente</string>
     <string name="action_uncategorized">Sin categoría</string>
     <string name="menu_delete">Borrar</string>
     <string name="menu_change_category">Categoría</string>
     <string name="menu_favorite">Favorito</string>
     <string name="menu_preview">Vista previa</string>
     <string name="menu_share">Compartir</string>
+    <string name="menu_about">Acerca de</string>
 
     <string name="change_category_title">Elige una categoría</string>
 
@@ -29,7 +36,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
@@ -38,16 +53,26 @@
     <string name="settings_cert_reset_toast">Todos los certificados personalizados han sido borrados</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notas - Seguridad de conexión</string>
+    <string name="trust_certificate_unknown_certificate_found">Notas ha encontrado un certificado desconocido. ¿Deseas confiar en él?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Conectando</string>
+    <string name="network_connected">Conectado</string>
+    <string name="network_disconnected">No hay redes disponibles</string>
 
     <!-- Error -->
     <string name="error_sync">Falló la sincronización: %1$s</string>
+    <string name="error_invalid_login">Inicio de sesión inválido: %1$s</string>
     <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
     <string name="error_io">se ha interrumpido al conexión al servidor</string>
     <string name="error_no_network">no hay conexión a red</string>
+    <string name="error_server">La URL / Servidor tiene errores</string>
+    <string name="error_url_malformed">La dirección del servidor es incorrecta</string>
+    <string name="error_username_password_invalid">Usuario o contraseña incorrecto</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Configuraciones </string>
 
     <!-- About -->
     <string name="about_version_title">Versión</string>
@@ -88,6 +113,7 @@
     <string name="shortcut_create_long">Crear una nota nueva</string>
 
     <string name="pref_value_theme_light">Claro</string>
+    <string name="pref_value_theme_dark">Oscuro</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Abrir en modo edición</item>
diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml
index 37e5d5c3..a1795527 100644
--- a/app/src/main/res/values-es-rGT/strings.xml
+++ b/app/src/main/res/values-es-rGT/strings.xml
@@ -2,26 +2,33 @@
 <resources>
 
     <string name="app_name">Notas</string>
+    <string name="no_notes">Aún no hay notas</string>
     <string name="label_all_notes">Todas las notas</string>
     <string name="label_favorites">Favoritos</string>
     <string name="action_create">Nota nueva</string>
     <string name="action_settings">Configuraciones</string>
     <string name="action_search">Buscar</string>
+    <string name="action_create_save">Guardar</string>
     <string name="simple_cancel">Cancelar</string>
     <string name="simple_edit">Editar</string>
     <string name="action_edit_save">Guardar</string>
+    <string name="action_edit_saving">Guardando &#8230;</string>
+    <string name="action_edit_saved">Guardado</string>
     <string name="simple_about">Acerca de</string>
+    <string name="action_select_note">Seleccionar nota</string>
     <string name="action_note_deleted">Nota borrada</string>
     <string name="action_note_restored">Nota restaurada</string>
     <string name="action_undo">Deshacer</string>
     <string name="action_drawer_open">abrir navegación</string>
     <string name="action_drawer_close">cerrar navegación</string>
+    <string name="action_recent">Reciente</string>
     <string name="action_uncategorized">Sin categoría</string>
     <string name="menu_delete">Borrar</string>
     <string name="menu_change_category">Categoría</string>
     <string name="menu_favorite">Favorito</string>
     <string name="menu_preview">Vista previa</string>
     <string name="menu_share">Compartir</string>
+    <string name="menu_about">Acerca de</string>
 
     <string name="change_category_title">Elige una categoría</string>
 
@@ -29,7 +36,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
@@ -38,16 +53,26 @@
     <string name="settings_cert_reset_toast">Todos los certificados personalizados han sido borrados</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notas - Seguridad de conexión</string>
+    <string name="trust_certificate_unknown_certificate_found">Notas ha encontrado un certificado desconocido. ¿Deseas confiar en él?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Conectando</string>
+    <string name="network_connected">Conectado</string>
+    <string name="network_disconnected">No hay redes disponibles</string>
 
     <!-- Error -->
     <string name="error_sync">Falló la sincronización: %1$s</string>
+    <string name="error_invalid_login">Inicio de sesión inválido: %1$s</string>
     <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
     <string name="error_io">se ha interrumpido al conexión al servidor</string>
     <string name="error_no_network">no hay conexión a red</string>
+    <string name="error_server">La URL / Servidor tiene errores</string>
+    <string name="error_url_malformed">La dirección del servidor es incorrecta</string>
+    <string name="error_username_password_invalid">Usuario o contraseña incorrecto</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Configuraciones </string>
 
     <!-- About -->
     <string name="about_version_title">Versión</string>
@@ -88,6 +113,7 @@
     <string name="shortcut_create_long">Crear una nota nueva</string>
 
     <string name="pref_value_theme_light">Claro</string>
+    <string name="pref_value_theme_dark">Oscuro</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Abrir en modo edición</item>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 37e5d5c3..a1795527 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -2,26 +2,33 @@
 <resources>
 
     <string name="app_name">Notas</string>
+    <string name="no_notes">Aún no hay notas</string>
     <string name="label_all_notes">Todas las notas</string>
     <string name="label_favorites">Favoritos</string>
     <string name="action_create">Nota nueva</string>
     <string name="action_settings">Configuraciones</string>
     <string name="action_search">Buscar</string>
+    <string name="action_create_save">Guardar</string>
     <string name="simple_cancel">Cancelar</string>
     <string name="simple_edit">Editar</string>
     <string name="action_edit_save">Guardar</string>
+    <string name="action_edit_saving">Guardando &#8230;</string>
+    <string name="action_edit_saved">Guardado</string>
     <string name="simple_about">Acerca de</string>
+    <string name="action_select_note">Seleccionar nota</string>
     <string name="action_note_deleted">Nota borrada</string>
     <string name="action_note_restored">Nota restaurada</string>
     <string name="action_undo">Deshacer</string>
     <string name="action_drawer_open">abrir navegación</string>
     <string name="action_drawer_close">cerrar navegación</string>
+    <string name="action_recent">Reciente</string>
     <string name="action_uncategorized">Sin categoría</string>
     <string name="menu_delete">Borrar</string>
     <string name="menu_change_category">Categoría</string>
     <string name="menu_favorite">Favorito</string>
     <string name="menu_preview">Vista previa</string>
     <string name="menu_share">Compartir</string>
+    <string name="menu_about">Acerca de</string>
 
     <string name="change_category_title">Elige una categoría</string>
 
@@ -29,7 +36,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
@@ -38,16 +53,26 @@
     <string name="settings_cert_reset_toast">Todos los certificados personalizados han sido borrados</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notas - Seguridad de conexión</string>
+    <string name="trust_certificate_unknown_certificate_found">Notas ha encontrado un certificado desconocido. ¿Deseas confiar en él?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Conectando</string>
+    <string name="network_connected">Conectado</string>
+    <string name="network_disconnected">No hay redes disponibles</string>
 
     <!-- Error -->
     <string name="error_sync">Falló la sincronización: %1$s</string>
+    <string name="error_invalid_login">Inicio de sesión inválido: %1$s</string>
     <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
     <string name="error_io">se ha interrumpido al conexión al servidor</string>
     <string name="error_no_network">no hay conexión a red</string>
+    <string name="error_server">La URL / Servidor tiene errores</string>
+    <string name="error_url_malformed">La dirección del servidor es incorrecta</string>
+    <string name="error_username_password_invalid">Usuario o contraseña incorrecto</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Configuraciones </string>
 
     <!-- About -->
     <string name="about_version_title">Versión</string>
@@ -88,6 +113,7 @@
     <string name="shortcut_create_long">Crear una nota nueva</string>
 
     <string name="pref_value_theme_light">Claro</string>
+    <string name="pref_value_theme_dark">Oscuro</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Abrir en modo edición</item>
diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml
index 37e5d5c3..a1795527 100644
--- a/app/src/main/res/values-es-rSV/strings.xml
+++ b/app/src/main/res/values-es-rSV/strings.xml
@@ -2,26 +2,33 @@
 <resources>
 
     <string name="app_name">Notas</string>
+    <string name="no_notes">Aún no hay notas</string>
     <string name="label_all_notes">Todas las notas</string>
     <string name="label_favorites">Favoritos</string>
     <string name="action_create">Nota nueva</string>
     <string name="action_settings">Configuraciones</string>
     <string name="action_search">Buscar</string>
+    <string name="action_create_save">Guardar</string>
     <string name="simple_cancel">Cancelar</string>
     <string name="simple_edit">Editar</string>
     <string name="action_edit_save">Guardar</string>
+    <string name="action_edit_saving">Guardando &#8230;</string>
+    <string name="action_edit_saved">Guardado</string>
     <string name="simple_about">Acerca de</string>
+    <string name="action_select_note">Seleccionar nota</string>
     <string name="action_note_deleted">Nota borrada</string>
     <string name="action_note_restored">Nota restaurada</string>
     <string name="action_undo">Deshacer</string>
     <string name="action_drawer_open">abrir navegación</string>
     <string name="action_drawer_close">cerrar navegación</string>
+    <string name="action_recent">Reciente</string>
     <string name="action_uncategorized">Sin categoría</string>
     <string name="menu_delete">Borrar</string>
     <string name="menu_change_category">Categoría</string>
     <string name="menu_favorite">Favorito</string>
     <string name="menu_preview">Vista previa</string>
     <string name="menu_share">Compartir</string>
+    <string name="menu_about">Acerca de</string>
 
     <string name="change_category_title">Elige una categoría</string>
 
@@ -29,7 +36,15 @@
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
     <string name="listview_updated_this_month">Este mes</string>
-
+    <string name="settings_url">Dirección del servidor</string>
+    <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
+    <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
+    <string name="settings_username">Usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
     <string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
     <string name="settings_cert_trust_system_off">Los CAs del sistema y de usuarios no serán de confianza</string>
@@ -38,16 +53,26 @@
     <string name="settings_cert_reset_toast">Todos los certificados personalizados han sido borrados</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notas - Seguridad de conexión</string>
+    <string name="trust_certificate_unknown_certificate_found">Notas ha encontrado un certificado desconocido. ¿Deseas confiar en él?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Conectando</string>
+    <string name="network_connected">Conectado</string>
+    <string name="network_disconnected">No hay redes disponibles</string>
 
     <!-- Error -->
     <string name="error_sync">Falló la sincronización: %1$s</string>
+    <string name="error_invalid_login">Inicio de sesión inválido: %1$s</string>
     <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string>
     <string name="error_io">se ha interrumpido al conexión al servidor</string>
     <string name="error_no_network">no hay conexión a red</string>
+    <string name="error_server">La URL / Servidor tiene errores</string>
+    <string name="error_url_malformed">La dirección del servidor es incorrecta</string>
+    <string name="error_username_password_invalid">Usuario o contraseña incorrecto</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Configuraciones </string>
 
     <!-- About -->
     <string name="about_version_title">Versión</string>
@@ -88,6 +113,7 @@
     <string name="shortcut_create_long">Crear una nota nueva</string>
 
     <string name="pref_value_theme_light">Claro</string>
+    <string name="pref_value_theme_dark">Oscuro</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Abrir en modo edición</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0492cfc2..e11545d9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Notas</string>
     <string name="app_name_long">Nextcloud Notas</string>
+    <string name="no_notes">Aún no hay notas</string>
     <string name="label_all_notes">Todas las notas</string>
     <string name="label_favorites">Favoritos</string>
     <string name="action_create">Nueva nota</string>
     <string name="action_settings">Ajustes</string>
     <string name="action_trashbin">Notas eliminadas</string>
     <string name="action_search">Buscar</string>
+    <string name="action_create_save">Guardar</string>
     <string name="simple_cancel">Cancelar</string>
     <string name="simple_edit">Editar</string>
     <string name="action_edit_save">Guardar</string>
+    <string name="action_edit_saving">Guardando &#8230;</string>
+    <string name="action_edit_saved">Guardado</string>
     <string name="simple_about">Acerca de</string>
     <string name="simple_bold">Negrita</string>
     <string name="simple_link">Enlace</string>
     <string name="simple_italic">Cursiva</string>
+    <string name="action_select_note">Seleccionar nota</string>
     <string name="action_note_deleted">Nota eliminada</string>
     <string name="action_note_restored">Nota restaurada</string>
     <string name="action_undo">Deshacer</string>
     <string name="action_drawer_open">abrir navegación</string>
     <string name="action_drawer_close">cerrar navegación</string>
+    <string name="action_recent">Reciente</string>
     <string name="action_uncategorized">Sin categoría</string>
     <string name="menu_delete">Borrar</string>
     <string name="menu_change_category">Categoría</string>
     <string name="menu_favorite">Favorito</string>
     <string name="menu_preview">Previsualizar</string>
     <string name="menu_share">Compartir</string>
+    <string name="menu_about">Acerca de</string>
 
     <string name="change_category_title">Escoge una categoría</string>
 
     <string name="listview_updated_today">Hoy</string>
     <string name="listview_updated_yesterday">Ayer</string>
     <string name="listview_updated_this_week">Esta semana</string>
+    <string name="listview_updated_last_week">La semana pasada</string>
     <string name="listview_updated_this_month">Este mes</string>
+    <string name="listview_updated_last_month">El mes pasado</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Cuenta</string>
+    <string name="settings_url">Dirección de servidor</string>
+    <string name="settings_url_check_description">Muestra si se puede hacer ping a la dirección.</string>
+    <string name="settings_url_warn_http">AVISO: \"http\" es inseguro. Por favor, use \"https\".</string>
+    <string name="settings_username">Nombre de usuario</string>
+    <string name="settings_password">Contraseña</string>
+    <string name="settings_password_unchanged">Contraseña (no cambiada)</string>
+    <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando &#8230;</string>
     <string name="settings_note_mode">Modo de visualización para notas</string>
     <string name="settings_theme_title">Tema oscuro</string>
     <string name="settings_font_title">Tipo de letra monoespaciado</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Todos los certificados personalizados han sido eliminados</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notas - Seguridad de la conexión</string>
+    <string name="trust_certificate_unknown_certificate_found">Notas ha encontrado un certificado desconocido. ¿Quiere confiar en él?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Conectando</string>
+    <string name="network_connected">Conectado</string>
+    <string name="network_disconnected">No hay redes disponibles</string>
 
     <!-- Error -->
     <string name="error_sync">Fallo en la sincronización: %1$s</string>
+    <string name="error_invalid_login">Acceso inválido: %1$s</string>
     <string name="error_json">¿Está la app de Notas activada en el servidor?</string>
     <string name="error_io">se ha perdido la conexión con el servidor</string>
     <string name="error_no_network">no hay conexión a la red</string>
+    <string name="error_server">La URL o servidor tiene errores</string>
+    <string name="error_url_malformed">Dirección del servidor errónea</string>
+    <string name="error_username_password_invalid">Usuario o contraseña erróneos</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Configuración</string>
 
     <!-- About -->
     <string name="about_version_title">Versión</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Crear una nota nueva</string>
 
     <string name="pref_value_theme_light">Claro</string>
+    <string name="pref_value_theme_dark">Oscuro</string>
     <string name="pref_value_font_normal">Normal</string>
     <string name="pref_value_wifi_and_mobile">Sincronizar sobre Wi-Fi y datos móviles</string>
     <string name="simple_error">Error</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">Copiado al portapapeles</string>
     <string name="pin_to_homescreen">Acoplar a la pantalla de inicio</string>
     <string name="note_has_been_deleted">Esta nota ha sido borrada</string>
+    <string name="fallback_weblogin_text">Volver al método de registro antiguo</string>
+    <string name="fallback_weblogin_back">Volver</string>
+    <string name="sso_announcment_title">Autenticación única</string>
+    <string name="sso_announcment_message">La app de Notas comenzará con la siguiente versión mayor a usar la característica de autenticación única de Nextclodu. Esto incrementará la seguridad, fiabilidad y confort para ti. Por favor, asegúrate tener instalada al menos la versión 3.8,0 de la app de Archivos de Nextcloud y selecciona en la primera ejecución la misma cuenta que ya estás usando.</string>
+    <string name="sso_announcment_more_info">Más información</string>
+    <string name="sso_announcment_understood">Entendido</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index b761b561..6da00b8d 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -2,30 +2,37 @@
 <resources>
 
     <string name="app_name">Oharrak</string>
+    <string name="no_notes">Ez dago oharrik</string>
     <string name="label_all_notes">Ohar guztiak</string>
     <string name="label_favorites">Gogokoak</string>
     <string name="action_create">Ohar berria</string>
     <string name="action_settings">Ezarpenak</string>
     <string name="action_trashbin">Ezabatutako oharrak</string>
     <string name="action_search">Bilatu</string>
+    <string name="action_create_save">Gorde</string>
     <string name="simple_cancel">Utzi</string>
     <string name="simple_edit">Editatu</string>
     <string name="action_edit_save">Gorde</string>
+    <string name="action_edit_saving">Gordetzen &#8230;</string>
+    <string name="action_edit_saved">Gordeta</string>
     <string name="simple_about">Honi buruz</string>
     <string name="simple_bold">Lodia</string>
     <string name="simple_link">Esteka</string>
     <string name="simple_italic">Etzana</string>
+    <string name="action_select_note">Oharra aukeratu </string>
     <string name="action_note_deleted">Oharra ezabatua</string>
     <string name="action_note_restored">Oharra berreskuratuta</string>
     <string name="action_undo">Desegin</string>
     <string name="action_drawer_open">ireki nabigazioa</string>
     <string name="action_drawer_close">itxi nabigazioa</string>
+    <string name="action_recent">Azkenak</string>
     <string name="action_uncategorized">Kategoria gabe</string>
     <string name="menu_delete">Ezabatu</string>
     <string name="menu_change_category">Kategoria</string>
     <string name="menu_favorite">Gogokoa</string>
     <string name="menu_preview">Aurreikusi</string>
     <string name="menu_share">Partekatu</string>
+    <string name="menu_about">Honi buruz</string>
 
     <string name="change_category_title">Hautatu kategoria bat</string>
 
@@ -33,8 +40,17 @@
     <string name="listview_updated_yesterday">Atzo</string>
     <string name="listview_updated_this_week">Aste honetan</string>
     <string name="listview_updated_this_month">Hilabete honetan</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Kontua</string>
+    <string name="settings_url">Zerbitzariaren helbidea</string>
+    <string name="settings_url_check_description">Helbideari ping egin dakiokeen erakusten du.</string>
+    <string name="settings_url_warn_http">ABISUA: \"http\" ez da segurua. Mesedez, erabili \"https\".</string>
+    <string name="settings_username">Erabiltzaile izena</string>
+    <string name="settings_password">Pasahitza</string>
+    <string name="settings_password_unchanged">Pasahitza (aldatu gabea)</string>
+    <string name="settings_password_check_description">Kredentzialak zuzenak diren erakusten du.</string>
+    <string name="settings_submit">Konektatu</string>
+    <string name="settings_submitting">Konektatzen &#8230;</string>
     <string name="settings_note_mode">Erakutsi oharren modua</string>
     <string name="settings_theme_title">Gai iluna</string>
     <string name="settings_wifi_only">Sinkronizatu wifi bidez bakarrik</string>
@@ -47,16 +63,26 @@
     <string name="settings_cert_reset_toast">Ziurtagiri pertsonalizatu guztiak garbitu dira</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Oharrak - Konexioaren segurtasuna</string>
+    <string name="trust_certificate_unknown_certificate_found">Oharrak aplikazioak ziurtagiri ezezagun bat aurkitu du. Honetaz fidatu nahi duzu?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Konektatzen</string>
+    <string name="network_connected">Konektatuta</string>
+    <string name="network_disconnected">Sarea ez dago eskuragarri</string>
 
     <!-- Error -->
     <string name="error_sync">Sinkronizazioa huts egin du: %1$s</string>
+    <string name="error_invalid_login">Login-a ez du balio: %1$s</string>
     <string name="error_json">Oharrak aplikazioa zerbitzariak aktibatuta al dago?</string>
     <string name="error_io">Konexioa zerbitzariarekin ez dabil</string>
     <string name="error_no_network">Ez dago sare-konexiorik</string>
+    <string name="error_server">URL/Zerbitzaria erroreak ditu</string>
+    <string name="error_url_malformed">Zerbitzari helbide okerra</string>
+    <string name="error_username_password_invalid">Erabiltzaile edo pasahitz okerra</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Ezarpenak</string>
 
     <!-- About -->
     <string name="about_version_title">Bertsioa</string>
@@ -97,6 +123,7 @@
     <string name="shortcut_create_long">Sortu ohar berria</string>
 
     <string name="pref_value_theme_light">Argia</string>
+    <string name="pref_value_theme_dark">Iluna</string>
     <string name="pref_value_font_normal">Normala</string>
     <string name="pref_value_wifi_and_mobile">Sinkronizatu wifi eta datu mugikorrekin</string>
     <string name="simple_error">Errorea</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 87c3dd3e..a075b669 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Notes</string>
     <string name="app_name_long">Nextcloud Notes</string>
+    <string name="no_notes">Aucune note pour l\'instant</string>
     <string name="label_all_notes">Toutes les notes</string>
     <string name="label_favorites">Favoris</string>
     <string name="action_create">Nouvelle note</string>
     <string name="action_settings">Paramètres</string>
     <string name="action_trashbin">Notes supprimées</string>
     <string name="action_search">Rechercher</string>
+    <string name="action_create_save">Enregistrer</string>
     <string name="simple_cancel">Annuler</string>
     <string name="simple_edit">Modifier</string>
     <string name="action_edit_save">Enregistrer</string>
+    <string name="action_edit_saving">Enregistrement de &#8230;</string>
+    <string name="action_edit_saved">Enregistré</string>
     <string name="simple_about">À propos</string>
     <string name="simple_bold">Gras</string>
     <string name="simple_link">Lien</string>
     <string name="simple_italic">Italique</string>
+    <string name="action_select_note">Choisir une note</string>
     <string name="action_note_deleted">Note supprimée</string>
     <string name="action_note_restored">Note restaurée</string>
     <string name="action_undo">Annuler</string>
     <string name="action_drawer_open">ouvrir la navigation</string>
     <string name="action_drawer_close">fermer la navigation</string>
+    <string name="action_recent">Récent</string>
     <string name="action_uncategorized">Non catégorisé</string>
     <string name="menu_delete">Supprimer</string>
     <string name="menu_change_category">Catégorie</string>
     <string name="menu_favorite">Favoris</string>
     <string name="menu_preview">Aperçu</string>
     <string name="menu_share">Partager</string>
+    <string name="menu_about">À propos</string>
 
     <string name="change_category_title">Choisir une catégorie</string>
 
     <string name="listview_updated_today">Aujourd\'hui</string>
     <string name="listview_updated_yesterday">Hier</string>
     <string name="listview_updated_this_week">Cette semaine</string>
+    <string name="listview_updated_last_week">Semaine dernière</string>
     <string name="listview_updated_this_month">Ce mois-ci</string>
+    <string name="listview_updated_last_month">Mois dernier</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Compte</string>
+    <string name="settings_url">Adresse du serveur</string>
+    <string name="settings_url_check_description">Visible si l\'adresse répond aux pings.</string>
+    <string name="settings_url_warn_http">ATTENTION : "http" n\'est pas sécurisé. Veuillez utiliser "https".</string>
+    <string name="settings_username">Identifiant</string>
+    <string name="settings_password">Mot de passe</string>
+    <string name="settings_password_unchanged">Mot de passe (non modifié)</string>
+    <string name="settings_password_check_description">Visible si les informations d\'identification sont correctes.</string>
+    <string name="settings_submit">Se connecter</string>
+    <string name="settings_submitting">Connexion en cours&#8230;</string>
     <string name="settings_note_mode">Mode d\'affichage des notes</string>
     <string name="settings_theme_title">Thème sombre</string>
     <string name="settings_font_title">Texte monospace</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Tous les certificats personnalisés ont été effacés</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notes - Sécurité de la connexion</string>
+    <string name="trust_certificate_unknown_certificate_found">Notes a rencontré un certificat inconnu. Voulez-vous lui faire confiance?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Connexion en cours</string>
+    <string name="network_connected">Connecté</string>
+    <string name="network_disconnected">Aucune connexion réseau disponible</string>
 
     <!-- Error -->
     <string name="error_sync">Échec de synchronisation : %1$s</string>
+    <string name="error_invalid_login">Identifiant incorrect : %1$s</string>
     <string name="error_json">Est-ce que l\'application Notes est activée sur le serveur ?</string>
     <string name="error_io">Erreur d\'E/S</string>
     <string name="error_no_network">pas de connexion réseau</string>
+    <string name="error_server">URL/Serveur a des erreurs</string>
+    <string name="error_url_malformed">Adresse du serveur incorrecte</string>
+    <string name="error_username_password_invalid">Identifiant ou mot de passe incorrect</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Paramètres</string>
 
     <!-- About -->
     <string name="about_version_title">Version</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Créer une nouvelle note</string>
 
     <string name="pref_value_theme_light">Clair</string>
+    <string name="pref_value_theme_dark">Sombre</string>
     <string name="pref_value_font_normal">Normal</string>
     <string name="pref_value_wifi_and_mobile">Synchroniser en Wifi et données mobiles</string>
     <string name="simple_error">Erreur</string>
@@ -109,6 +139,11 @@
     <string name="copied_to_clipboard">Copié dans le presse-papier</string>
     <string name="pin_to_homescreen">Épingler sur la page d’accueil</string>
     <string name="note_has_been_deleted">Cette note a été supprimée</string>
+    <string name="fallback_weblogin_text">Revenir à l\'ancienne méthode de connexion</string>
+    <string name="fallback_weblogin_back">Retour</string>
+    <string name="sso_announcment_title">Single-Sign-On</string>
+    <string name="sso_announcment_more_info">Plus d\'informations</string>
+    <string name="sso_announcment_understood">J\'ai compris</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index c9bbd0b6..79610848 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -33,7 +33,9 @@
     <string name="listview_updated_today">Hoxe</string>
     <string name="listview_updated_yesterday">Onte</string>
     <string name="listview_updated_this_week">Esta semana</string>
+    <string name="listview_updated_last_week">A semana pasada</string>
     <string name="listview_updated_this_month">Este mes</string>
+    <string name="listview_updated_last_month">O mes pasado</string>
 
     <!-- Settings -->
     <string name="settings_note_mode">Modo de vista das notas</string>
@@ -109,6 +111,12 @@
     <string name="copied_to_clipboard">Copiado no portapapeis.</string>
     <string name="pin_to_homescreen">Ancorar na pantalla de inicio</string>
     <string name="note_has_been_deleted">Esta nota foi eliminada</string>
+    <string name="fallback_weblogin_text">Volver ao método de acceso antigo</string>
+    <string name="fallback_weblogin_back">Atrás</string>
+    <string name="sso_announcment_title">Inicio de sesión único</string>
+    <string name="sso_announcment_message">A aplicación de Notas comezará coa seguinte versión principal, empregando a magnífica característica de «Inicio de sesión único» do Nextcloud. Isto aumentará a seguridade, a fiabilidade e o confort para vostede. Asegúrese de ter instalado polo menos a versión 3.8.0 da aplicación de ficheiros e seleccione na primeira execución a mesma conta que xa estás a empregar.</string>
+    <string name="sso_announcment_more_info">Máis información</string>
+    <string name="sso_announcment_understood">Entendido</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index fe5e8eab..8d345bf5 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -33,7 +33,6 @@
     <string name="listview_updated_yesterday">אתמול</string>
     <string name="listview_updated_this_week">השבוע</string>
     <string name="listview_updated_this_month">החודש</string>
-
     <!-- Settings -->
     <string name="settings_note_mode">מצב תצוגת פתקים</string>
     <string name="settings_theme_title">ערכת עיצוב כהה</string>
@@ -105,7 +104,6 @@
     <string name="simple_copy">העתק</string>
     <string name="pin_to_homescreen">הוסף למסך הבית</string>
     <string name="note_has_been_deleted">פתק זה נמחק</string>
-
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>פתיחה במצב עריכה</item>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 6010938e..c4d8a00a 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -33,7 +33,6 @@
     <string name="listview_updated_yesterday">Jučer</string>
     <string name="listview_updated_this_week">Ovaj tjedan</string>
     <string name="listview_updated_this_month">Ovaj mjesec</string>
-
     <!-- Settings -->
     <string name="settings_note_mode">Način prikaza bilješki</string>
     <string name="settings_theme_title">Tamna tema</string>
@@ -108,7 +107,6 @@
     <string name="copied_to_clipboard">Kopirano u međuspremnik</string>
     <string name="pin_to_homescreen">Prikvačite na početni zaslon</string>
     <string name="note_has_been_deleted">Bilješka je izbrisana</string>
-
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Otvori u načinu uređivanja</item>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 5d118700..72e2df4a 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -2,27 +2,34 @@
 <resources>
 
     <string name="app_name">Jegyzetek</string>
+    <string name="no_notes">Még nincsenek jegyzetek</string>
     <string name="label_all_notes">Minden jegyzet</string>
     <string name="label_favorites">Kedvencek</string>
     <string name="action_create">Új jegyzet</string>
     <string name="action_settings">Beállítások</string>
     <string name="action_trashbin">Törölt jegyzetek</string>
     <string name="action_search">Keresés</string>
+    <string name="action_create_save">Mentés</string>
     <string name="simple_cancel">Mégsem</string>
     <string name="simple_edit">Szerkesztés</string>
     <string name="action_edit_save">Mentés</string>
+    <string name="action_edit_saving">Mentés &#8230;</string>
+    <string name="action_edit_saved">Elmentve</string>
     <string name="simple_about">Névjegy</string>
+    <string name="action_select_note">Jegyzet választás</string>
     <string name="action_note_deleted">Jegyzet törölve</string>
     <string name="action_note_restored">Jegyzet visszaállítva</string>
     <string name="action_undo">Visszavonás</string>
     <string name="action_drawer_open">navigáció megnyitása</string>
     <string name="action_drawer_close">navigáció bezárása</string>
+    <string name="action_recent">Friss</string>
     <string name="action_uncategorized">Kategorizálatlan</string>
     <string name="menu_delete">Törlés</string>
     <string name="menu_change_category">Kategória</string>
     <string name="menu_favorite">Kedvenc</string>
     <string name="menu_preview">Előnézet</string>
     <string name="menu_share">Megosztás</string>
+    <string name="menu_about">Névjegy</string>
 
     <string name="change_category_title">Válasszon kategóriát</string>
 
@@ -30,8 +37,17 @@
     <string name="listview_updated_yesterday">Tegnap</string>
     <string name="listview_updated_this_week">Ezen a héten</string>
     <string name="listview_updated_this_month">Ebben a hónapban</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Fiók</string>
+    <string name="settings_url">A szerver címe</string>
+    <string name="settings_url_check_description">Mutatja, hogy a cím pingelhető-e.</string>
+    <string name="settings_url_warn_http">Figyelem: a \"http\" nem biztonságos. Kérjük használj \"https\"-t!</string>
+    <string name="settings_username">Felhasználónév</string>
+    <string name="settings_password">Jelszó</string>
+    <string name="settings_password_unchanged">Jelszó (módosítatlan)</string>
+    <string name="settings_password_check_description">Mutatja ha a hitelesítőadatok helyesek.</string>
+    <string name="settings_submit">Kapcsolódás</string>
+    <string name="settings_submitting">Kapcsolódás &#8230;</string>
     <string name="settings_note_mode">Jegyzet módok megjelenítés</string>
     <string name="settings_theme_title">Sötét téma</string>
     <string name="settings_wifi_only">Szinkronizáció csak Wifin keresztül</string>
@@ -44,16 +60,26 @@
     <string name="settings_cert_reset_toast">Minden saját tanúsítvány eltávolítva</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Jegyzetek - kapcsolatbiztonság</string>
+    <string name="trust_certificate_unknown_certificate_found">A jegyzetek ismeretlen tanúsítványba ütközött. Megbízol benne?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Csatlakozás</string>
+    <string name="network_connected">Csatlakozva</string>
+    <string name="network_disconnected">Nincs hálózat</string>
 
     <!-- Error -->
     <string name="error_sync">sikertelen szinkronizálás: %1$s</string>
+    <string name="error_invalid_login">Érvénytelen belépés: %1$s</string>
     <string name="error_json">be van kapcsolva a Jegyzetek app a szerveren?</string>
     <string name="error_io">szerverkapcsolat sérült</string>
     <string name="error_no_network">Nincs hálózati kapcsolat</string>
+    <string name="error_server">URL/Szerver hibákat tartalmaz</string>
+    <string name="error_url_malformed">Hibás szervercím</string>
+    <string name="error_username_password_invalid">Hibás felhasználónév vagy jelszó</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Beállítások</string>
 
     <!-- About -->
     <string name="about_version_title">Verzió</string>
@@ -94,6 +120,7 @@
     <string name="shortcut_create_long">Új jegyzet létrehozása</string>
 
     <string name="pref_value_theme_light">Világos</string>
+    <string name="pref_value_theme_dark">Sötét</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Megnyitás szerkesztésre</item>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 713199c7..a77eae4c 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -33,7 +33,6 @@
     <string name="listview_updated_yesterday">Í gær</string>
     <string name="listview_updated_this_week">Í þessari viku</string>
     <string name="listview_updated_this_month">Í þessum mánuði</string>
-
     <!-- Settings -->
     <string name="settings_note_mode">Birtingarhamur minnispunkta</string>
     <string name="settings_theme_title">Dökkt þema</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 845139ea..f8f8b697 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Note</string>
     <string name="app_name_long">Note di Nextcloud</string>
+    <string name="no_notes">Nessuna nota</string>
     <string name="label_all_notes">Tutte le note</string>
     <string name="label_favorites">Preferite</string>
     <string name="action_create">Nuova nota</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_trashbin">Note eliminate</string>
     <string name="action_search">Cerca</string>
+    <string name="action_create_save">Salva</string>
     <string name="simple_cancel">Annulla</string>
     <string name="simple_edit">Modifica</string>
     <string name="action_edit_save">Salva</string>
+    <string name="action_edit_saving">Salvataggio di &#8230;</string>
+    <string name="action_edit_saved">Salvata</string>
     <string name="simple_about">Informazioni</string>
     <string name="simple_bold">Grassetto</string>
     <string name="simple_link">Collegamento</string>
     <string name="simple_italic">Corsivo</string>
+    <string name="action_select_note">Seleziona nota</string>
     <string name="action_note_deleted">Nota eliminata</string>
     <string name="action_note_restored">Nota ripristinata</string>
     <string name="action_undo">Annulla</string>
     <string name="action_drawer_open">apri navigazione</string>
     <string name="action_drawer_close">chiudi navigazione</string>
+    <string name="action_recent">Recenti</string>
     <string name="action_uncategorized">Senza categoria</string>
     <string name="menu_delete">Elimina</string>
     <string name="menu_change_category">Categoria</string>
     <string name="menu_favorite">Preferito</string>
     <string name="menu_preview">Anteprima</string>
     <string name="menu_share">Condividi</string>
+    <string name="menu_about">Informazioni</string>
 
     <string name="change_category_title">Scegli una categoria</string>
 
     <string name="listview_updated_today">Oggi</string>
     <string name="listview_updated_yesterday">Ieri</string>
     <string name="listview_updated_this_week">Questa settimana</string>
+    <string name="listview_updated_last_week">Ultima settimana</string>
     <string name="listview_updated_this_month">Questo mese</string>
+    <string name="listview_updated_last_month">Ultimo mese</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Account</string>
+    <string name="settings_url">Indirizzo del server</string>
+    <string name="settings_url_check_description">Mostra se l\'indirizzo può rispondere al ping.</string>
+    <string name="settings_url_warn_http">AVVISO: \"http\" non è sicuro. Utlizza \"https\".</string>
+    <string name="settings_username">Nome utente</string>
+    <string name="settings_password">Password</string>
+    <string name="settings_password_unchanged">Password (non cambiata)</string>
+    <string name="settings_password_check_description">Mostra se le credenziali sono corrette.</string>
+    <string name="settings_submit">Connetti</string>
+    <string name="settings_submitting">Connessione a &#8230;</string>
     <string name="settings_note_mode">Modalità di visualizzazione delle note</string>
     <string name="settings_theme_title">Tema scuro</string>
     <string name="settings_font_title">Carattere a spaziatura fissa</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Tutti i certificati personalizzati sono stati cancellati</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Note - Sicurezza della connessione</string>
+    <string name="trust_certificate_unknown_certificate_found">Note ha rilevato un certificato sconosciuto. Vuoi considerarlo affidabile?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Connessione in corso</string>
+    <string name="network_connected">Connesso</string>
+    <string name="network_disconnected">Rete non disponibile</string>
 
     <!-- Error -->
     <string name="error_sync">Sincronizzazione non riuscita: %1$s</string>
+    <string name="error_invalid_login">Accesso non valido: %1$s</string>
     <string name="error_json">L\'applicazione Notes è stata attivata sul server?</string>
     <string name="error_io">la connessione al server è interrotta</string>
     <string name="error_no_network">nessuna connessione di rete</string>
+    <string name="error_server">Errore URL/Server</string>
+    <string name="error_url_malformed">Indirizzo del server errato</string>
+    <string name="error_username_password_invalid">Nome utente o password errati</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Impostazioni</string>
 
     <!-- About -->
     <string name="about_version_title">Versione</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Crea una nuova nota</string>
 
     <string name="pref_value_theme_light">Chiaro</string>
+    <string name="pref_value_theme_dark">Scuro</string>
     <string name="pref_value_font_normal">Normale</string>
     <string name="pref_value_wifi_and_mobile">Sincronizza su Wi-FI e dati mobili</string>
     <string name="simple_error">Errore</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">Copiato negli appunti</string>
     <string name="pin_to_homescreen">Appunta alla schermata iniziale</string>
     <string name="note_has_been_deleted">Questa nota è stata eliminata</string>
+    <string name="fallback_weblogin_text">Torna al vecchio metodo di accesso</string>
+    <string name="fallback_weblogin_back">Indietro</string>
+    <string name="sso_announcment_title">Single-Sign-On</string>
+    <string name="sso_announcment_message">L\'applicazione Note inizierà dalla prossima versione principale a utilzzare la funzionalità di Single-Sign-On di Nextcloud. Questo aumenterà la sicurezza, l\'affidabilità e la comodità di utilizzo. Assicurati di aver installato almeno la versione 3.8.0 dell\'applicazione File e seleziona, alla prima esecuzione, lo stesso account che stai già utilizzando.</string>
+    <string name="sso_announcment_more_info">Altre informazioni</string>
+    <string name="sso_announcment_understood">Ricevuto</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 9777cd61..04b83988 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -2,39 +2,59 @@
 <resources>
 
     <string name="app_name">ノート</string>
+    <string name="app_name_long">Nextcloud ノート</string>
+    <string name="no_notes">まだノートはありません</string>
     <string name="label_all_notes">すべてのノート</string>
     <string name="label_favorites">お気に入り</string>
     <string name="action_create">新しいノート</string>
     <string name="action_settings">設定</string>
     <string name="action_trashbin">ゴミ箱</string>
     <string name="action_search">検索</string>
+    <string name="action_create_save">保存</string>
     <string name="simple_cancel">キャンセル</string>
     <string name="simple_edit">編集</string>
     <string name="action_edit_save">保存</string>
+    <string name="action_edit_saving">保存中&#8230;</string>
+    <string name="action_edit_saved">保存しました</string>
     <string name="simple_about">バージョン情報</string>
     <string name="simple_bold">太字</string>
     <string name="simple_link">リンク</string>
     <string name="simple_italic">斜体</string>
+    <string name="action_select_note">ノートを選択</string>
     <string name="action_note_deleted">ノートが削除されました</string>
     <string name="action_note_restored">ノートが復元されました</string>
     <string name="action_undo">元に戻す</string>
     <string name="action_drawer_open">ナビゲーションを開く</string>
     <string name="action_drawer_close">ナビゲーションを閉じる</string>
+    <string name="action_recent">最新</string>
     <string name="action_uncategorized">未分類</string>
     <string name="menu_delete">削除</string>
     <string name="menu_change_category">カテゴリ</string>
     <string name="menu_favorite">お気に入り</string>
     <string name="menu_preview">プレビュー</string>
     <string name="menu_share">共有</string>
+    <string name="menu_about">アプリについて</string>
 
     <string name="change_category_title">カテゴリを選択</string>
 
     <string name="listview_updated_today">今日</string>
     <string name="listview_updated_yesterday">昨日</string>
     <string name="listview_updated_this_week">今週</string>
+    <string name="listview_updated_last_week">先週</string>
     <string name="listview_updated_this_month">今月</string>
+    <string name="listview_updated_last_month">先月</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">アカウント</string>
+    <string name="settings_url">サーバーアドレス</string>
+    <string name="settings_url_check_description">アドレスにpingを実行できるかどうかを表示します。</string>
+    <string name="settings_url_warn_http">警告: \"http\" は安全ではありません。 \"https\" を使用してください。</string>
+    <string name="settings_username">ユーザー名</string>
+    <string name="settings_password">パスワード</string>
+    <string name="settings_password_unchanged">パスワード (変更されていません)</string>
+    <string name="settings_password_check_description">資格情報が正しいかどうかを表示します。</string>
+    <string name="settings_submit">接続</string>
+    <string name="settings_submitting">接続中&#8230;</string>
     <string name="settings_note_mode">ノートの表示モード</string>
     <string name="settings_theme_title">ダークテーマ</string>
     <string name="settings_font_title">モノスペースフォント</string>
@@ -49,16 +69,26 @@
     <string name="settings_cert_reset_toast">すべてのカスタム証明書がクリアされました</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">ノート - セキュリティ接続</string>
+    <string name="trust_certificate_unknown_certificate_found">ノートで未知の証明書が発見されました。これを信頼しますか？</string>
 
     <!-- Network -->
+    <string name="network_connecting">接続中</string>
+    <string name="network_connected">接続しました</string>
+    <string name="network_disconnected">ネットワークが利用できません</string>
 
     <!-- Error -->
     <string name="error_sync">同期に失敗しました: %1$s</string>
+    <string name="error_invalid_login">ログインが無効: %1$s</string>
     <string name="error_json">ノートアプリはサーバー上で有効になっていますか?</string>
     <string name="error_io">サーバー接続が壊れています</string>
     <string name="error_no_network">ネットワーク接続がありません</string>
+    <string name="error_server">URL/サーバーにエラーがあります</string>
+    <string name="error_url_malformed">サーバーアドレスが間違っています</string>
+    <string name="error_username_password_invalid">ユーザー名またはパスワードが間違っています</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">設定</string>
 
     <!-- About -->
     <string name="about_version_title">バージョン</string>
@@ -99,6 +129,7 @@
     <string name="shortcut_create_long">新しいノートを作成</string>
 
     <string name="pref_value_theme_light">ライト</string>
+    <string name="pref_value_theme_dark">ダーク</string>
     <string name="pref_value_font_normal">ノーマル</string>
     <string name="pref_value_wifi_and_mobile">Wi-Fiおよびモバイル接続時に同期する</string>
     <string name="simple_error">エラー</string>
@@ -108,6 +139,12 @@
     <string name="copied_to_clipboard">クリップボードにコピー</string>
     <string name="pin_to_homescreen">ホームスクリーンにピン留めする</string>
     <string name="note_has_been_deleted">ノートが削除されました</string>
+    <string name="fallback_weblogin_text">古いログイン方法へ戻す</string>
+    <string name="fallback_weblogin_back">戻る</string>
+    <string name="sso_announcment_title">シングルサインオン</string>
+    <string name="sso_announcment_message">Notes アプリは次のメジャーバージョンから Nextcloud の偉大なシングルサインオン機能の使用を開始する予定です。これによりセキュリティ、信頼性、快適さが向上します。バージョン 3.8.0 以上の Nextcloud ファイルアプリがインストールされていることを確認し、初回起動時には現在使用しているアカウントと同じアカウントを選択してください。</string>
+    <string name="sso_announcment_more_info">詳細情報</string>
+    <string name="sso_announcment_understood">理解しました</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index c31a7d14..c49653af 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -2,34 +2,50 @@
 <resources>
 
     <string name="app_name">Užrašai</string>
+    <string name="no_notes">Nėra užrašų</string>
     <string name="label_all_notes">Visos pastabos</string>
     <string name="label_favorites">Svarbiausi</string>
     <string name="action_settings">Nustatymai</string>
     <string name="action_search">Paieška</string>
+    <string name="action_create_save">Įrašyti</string>
     <string name="simple_cancel">Atsisakyti</string>
     <string name="simple_edit">Taisyti</string>
     <string name="action_edit_save">Įrašyti</string>
+    <string name="action_edit_saving">Įrašoma &#8230;</string>
+    <string name="action_edit_saved">Įrašyta</string>
     <string name="simple_about">Apie</string>
     <string name="simple_bold">Pusjuodis</string>
     <string name="simple_italic">Kursyvas</string>
+    <string name="action_select_note">Sukurti</string>
     <string name="action_note_deleted">Pastaba ištrinta</string>
     <string name="action_note_restored">Pastaba atstatyta</string>
     <string name="action_undo">anuliuoti</string>
     <string name="action_drawer_open">Atidaryti naršymą</string>
     <string name="action_drawer_close">Uždaryti naršymą</string>
+    <string name="action_recent">Naujausi</string>
     <string name="action_uncategorized">Nekategorizuotas</string>
     <string name="menu_delete">Ištrinti</string>
     <string name="menu_change_category">Kategorija</string>
     <string name="menu_favorite">Svarbiausias</string>
     <string name="menu_preview">Peržiūra</string>
     <string name="menu_share">Dalintis</string>
+    <string name="menu_about">Apie</string>
 
     <string name="listview_updated_today">Šiandien</string>
     <string name="listview_updated_yesterday">Vakar</string>
     <string name="listview_updated_this_week">Šį savaitė</string>
     <string name="listview_updated_this_month">Šis mėnesis</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Paskyra</string>
+    <string name="settings_url">Serverio adresas</string>
+    <string name="settings_url_check_description">Parodo, ar adresas yra pasiekiamas.</string>
+    <string name="settings_url_warn_http">ĮSPĖJIMAS: \"http\" protokolas yra nesaugus. Prašome naudoti \"https\".</string>
+    <string name="settings_username">Naudotojo vardas</string>
+    <string name="settings_password">Slaptažodis</string>
+    <string name="settings_password_unchanged">Slaptažodis (nepakeistas)</string>
+    <string name="settings_password_check_description">Parodo, ar teisingi prisijungimo duomenys</string>
+    <string name="settings_submit">Prisijungti</string>
+    <string name="settings_submitting">Jungiamasi &#8230;</string>
     <string name="settings_theme_title">Tamsus apipavidalinimas</string>
     <string name="settings_font_title">Lygiaplotis šriftas</string>
     <string name="settings_font_size">Šrifto dydis</string>
@@ -42,16 +58,26 @@
     <string name="settings_cert_reset_toast">Visi nestandartiniai sertifikatai buvo išvalyti</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Užrašai - Prisijungimo saugumas</string>
+    <string name="trust_certificate_unknown_certificate_found">Užrašai susidūrė su nežinomu sertifikatu. Ar laikyti jį patikimu?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Jungiamasi</string>
+    <string name="network_connected">Prisijungta</string>
+    <string name="network_disconnected">Jokie tinklai neprieinami</string>
 
     <!-- Error -->
     <string name="error_sync">Sinchronizacija nepavyko: %1$s</string>
+    <string name="error_invalid_login">Neteisingas prisijungimo vardas: %1$s</string>
     <string name="error_json">Ar užrašų programėlė aktyvuota serveryje?</string>
     <string name="error_io">Ryšys su serveriu neveikia</string>
     <string name="error_no_network">nėra tinklo ryšio</string>
+    <string name="error_server">URL/Serveryje yra klaidų</string>
+    <string name="error_url_malformed">Neteisingas serverio adresas</string>
+    <string name="error_username_password_invalid">Neteisingas naudotojo vardas ar slaptažodis</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Nustatymai</string>
 
     <!-- About -->
     <string name="about_version_title">Versija</string>
@@ -91,6 +117,7 @@
     <string name="shortcut_create_long">Sukurti naują užrašą</string>
 
     <string name="pref_value_theme_light">Šviesi</string>
+    <string name="pref_value_theme_dark">Tamsi</string>
     <string name="simple_error">Klaida</string>
     <string name="simple_close">Užverti</string>
     <string name="simple_copy">Kopijuoti</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c0dca656..cb407ab6 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -2,30 +2,37 @@
 <resources>
 
     <string name="app_name">Notater</string>
+    <string name="no_notes">Ingen notater enda</string>
     <string name="label_all_notes">Alle notater</string>
     <string name="label_favorites">Favoritter</string>
     <string name="action_create">Nytt notat</string>
     <string name="action_settings">Innstillinger</string>
     <string name="action_trashbin">Slettede notat</string>
     <string name="action_search">Søk</string>
+    <string name="action_create_save">Lagre</string>
     <string name="simple_cancel">Avbryt</string>
     <string name="simple_edit">Rediger</string>
     <string name="action_edit_save">Lagre</string>
+    <string name="action_edit_saving">Lagrer &#8230;</string>
+    <string name="action_edit_saved">Lagret</string>
     <string name="simple_about">Om</string>
     <string name="simple_bold">Uthevet</string>
     <string name="simple_link">Lenke</string>
     <string name="simple_italic">Italic</string>
+    <string name="action_select_note">Velg notat</string>
     <string name="action_note_deleted">Notat slettet</string>
     <string name="action_note_restored">Notat gjenopprettet</string>
     <string name="action_undo">Angre</string>
     <string name="action_drawer_open">åpne navigasjon</string>
     <string name="action_drawer_close">lukk navigasjon</string>
+    <string name="action_recent">Nylig</string>
     <string name="action_uncategorized">Ukategorisert</string>
     <string name="menu_delete">Slett</string>
     <string name="menu_change_category">Kategori</string>
     <string name="menu_favorite">Favoritt</string>
     <string name="menu_preview">Forhåndsvis</string>
     <string name="menu_share">Del</string>
+    <string name="menu_about">Om</string>
 
     <string name="change_category_title">Velg kategori</string>
 
@@ -33,8 +40,17 @@
     <string name="listview_updated_yesterday">I går</string>
     <string name="listview_updated_this_week">Denne uken</string>
     <string name="listview_updated_this_month">Denne måneden</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Konto</string>
+    <string name="settings_url">Serveradresse</string>
+    <string name="settings_url_check_description">Viser hvorvidt adressen kan pinges.</string>
+    <string name="settings_url_warn_http">ADVARSEL: \"http\" er usikker. Bruk \"https\".</string>
+    <string name="settings_username">Brukernavn</string>
+    <string name="settings_password">Passord</string>
+    <string name="settings_password_unchanged">Passord (ikke endret)</string>
+    <string name="settings_password_check_description">Viser hvorvidt påloggingsdetaljene er korrekte.</string>
+    <string name="settings_submit">Koble til</string>
+    <string name="settings_submitting">Kobler &#8230;</string>
     <string name="settings_note_mode">Visningsmodus for notater</string>
     <string name="settings_theme_title">Mørkt tema</string>
     <string name="settings_font_title">Monospace font</string>
@@ -48,16 +64,26 @@
     <string name="settings_cert_reset_toast">Alle egendefinerte sertifikater har blitt fjernet</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notater - Tilkoblingssikkerhet</string>
+    <string name="trust_certificate_unknown_certificate_found">Notater har støtt på et ukjent sertifikat. Ønsker du å stole på det?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Kobler til</string>
+    <string name="network_connected">Koblet til</string>
+    <string name="network_disconnected">Ingen nettverk tilgjengelig</string>
 
     <!-- Error -->
     <string name="error_sync">Synkronisering mislyktes: %1$s</string>
+    <string name="error_invalid_login">Ugyldig pålogging: %1$s</string>
     <string name="error_json">er Notat-appen påslått på serveren?</string>
     <string name="error_io">tilkoblingen til server er avbrutt</string>
     <string name="error_no_network">Ingen nettverkstilkobling</string>
+    <string name="error_server">URL/Server har feil</string>
+    <string name="error_url_malformed">Feil på serveradresse</string>
+    <string name="error_username_password_invalid">Feil brukernavn eller passord</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Innstillinger</string>
 
     <!-- About -->
     <string name="about_version_title">Versjon</string>
@@ -98,6 +124,7 @@
     <string name="shortcut_create_long">Opprett et nytt notat</string>
 
     <string name="pref_value_theme_light">Lys</string>
+    <string name="pref_value_theme_dark">Mørk</string>
     <string name="pref_value_font_normal">Normal</string>
     <string name="pref_value_wifi_and_mobile">Synkroniser med WiFi og mobil data</string>
     <!-- Array: note modes -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2ea9445e..7d594533 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -3,30 +3,37 @@
 
     <string name="app_name">Notities</string>
     <string name="app_name_long">Nextcloud Notities</string>
+    <string name="no_notes">Nog geen notities</string>
     <string name="label_all_notes">Alle notities</string>
     <string name="label_favorites">Favorieten</string>
     <string name="action_create">Nieuwe notitie</string>
     <string name="action_settings">Instellingen</string>
     <string name="action_trashbin">Verwijder notities</string>
     <string name="action_search">Zoeken</string>
+    <string name="action_create_save">Opslaan</string>
     <string name="simple_cancel">Annuleren</string>
     <string name="simple_edit">Bewerken</string>
     <string name="action_edit_save">Opslaan</string>
+    <string name="action_edit_saving">Opslaan &#8230;</string>
+    <string name="action_edit_saved">Opgeslagen</string>
     <string name="simple_about">Over</string>
     <string name="simple_bold">Vet</string>
     <string name="simple_link">Link</string>
     <string name="simple_italic">Scheef</string>
+    <string name="action_select_note">Notitie selecteren</string>
     <string name="action_note_deleted">Notitie verwijderd</string>
     <string name="action_note_restored">Notitie hersteld</string>
     <string name="action_undo">Ongedaan maken</string>
     <string name="action_drawer_open">open navigatie</string>
     <string name="action_drawer_close">sluit navigatie</string>
+    <string name="action_recent">Recent</string>
     <string name="action_uncategorized">Niet gecategoriseerd</string>
     <string name="menu_delete">Verwijderen</string>
     <string name="menu_change_category">Categorie</string>
     <string name="menu_favorite">Favoriet</string>
     <string name="menu_preview">Voorbeeldweergave</string>
     <string name="menu_share">Delen</string>
+    <string name="menu_about">Over</string>
 
     <string name="change_category_title">Kies een categorie
 </string>
@@ -34,9 +41,21 @@
     <string name="listview_updated_today">Vandaag</string>
     <string name="listview_updated_yesterday">Gisteren</string>
     <string name="listview_updated_this_week">Deze week</string>
+    <string name="listview_updated_last_week">Vorige week</string>
     <string name="listview_updated_this_month">Deze maand</string>
+    <string name="listview_updated_last_month">Vorige maand</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Account</string>
+    <string name="settings_url">Serveradres</string>
+    <string name="settings_url_check_description">Toont of het adres gepingt kan worden.</string>
+    <string name="settings_url_warn_http">WAARSCHUWING: \"http\" is niet veilig. Gebruik \"https\".</string>
+    <string name="settings_username">Gebruikersnaam</string>
+    <string name="settings_password">Wachtwoord</string>
+    <string name="settings_password_unchanged">Wachtwoord (niet gewijzigd)</string>
+    <string name="settings_password_check_description">Toont of de login-gegevens correct zijn.</string>
+    <string name="settings_submit">Verbinden</string>
+    <string name="settings_submitting">Verbinden&#160;&#8230;</string>
     <string name="settings_note_mode">Weergavemode voor notities</string>
     <string name="settings_theme_title">Donker thema</string>
     <string name="settings_font_title">Monospace lettertype</string>
@@ -51,16 +70,26 @@
     <string name="settings_cert_reset_toast">Alle zelf aangemaakte certificaten zijn verwijderd</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notities -  Connectie veiligheid</string>
+    <string name="trust_certificate_unknown_certificate_found">Notities heeft een onbekend certificaat. Wil je het vertrouwen?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Verbinden</string>
+    <string name="network_connected">Verbonden</string>
+    <string name="network_disconnected">Netwerk niet beschikbaar</string>
 
     <!-- Error -->
     <string name="error_sync">Synchronisatie mislukt: %1$s</string>
+    <string name="error_invalid_login">Ongeldige login: %1$s</string>
     <string name="error_json">is de Notities app op de server geactiveerd?</string>
     <string name="error_io">serververbinding is verbroken</string>
     <string name="error_no_network">geen netwerkverbinding</string>
+    <string name="error_server">URL/server heeft fouten</string>
+    <string name="error_url_malformed">Verkeerd serveradres</string>
+    <string name="error_username_password_invalid">Verkeerde gebruikersnaam of wachtwoord</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Instellingen</string>
 
     <!-- About -->
     <string name="about_version_title">Versie</string>
@@ -101,6 +130,7 @@
     <string name="shortcut_create_long">Maak een nieuwe notitie</string>
 
     <string name="pref_value_theme_light">Licht</string>
+    <string name="pref_value_theme_dark">Donker</string>
     <string name="pref_value_font_normal">Normaal</string>
     <string name="pref_value_wifi_and_mobile">Sync met Wi-Fi en mobiele data</string>
     <string name="simple_error">Fout</string>
@@ -110,6 +140,12 @@
     <string name="copied_to_clipboard">Gekopieerd naar het klembord</string>
     <string name="pin_to_homescreen">Vastmaken op startscherm</string>
     <string name="note_has_been_deleted">Deze notitie is verwijderd</string>
+    <string name="fallback_weblogin_text">Terug naar vorige inlogmethode</string>
+    <string name="fallback_weblogin_back">Terug</string>
+    <string name="sso_announcment_title">Single-Sign-On</string>
+    <string name="sso_announcment_message">De Notes app zal de Single-Sign-On feature van Nextcloud gebruiken in de volgende \'major\' versie. Dit verbetert de beveiliging, betrouwbaarheid en het comfort voor u. U heeft versie 3.8.0 of hoger nodig van de Bestanden app, en selecteer voor het eerste gebruik dezelfde account die u nu gebruikt.</string>
+    <string name="sso_announcment_more_info">Meer informatie</string>
+    <string name="sso_announcment_understood">Begrepen</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b9692219..ef01ef9c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Notatki</string>
     <string name="app_name_long">Nextcloud Notes</string>
+    <string name="no_notes">Nie ma jeszcze notatek</string>
     <string name="label_all_notes">Wszystkie notatki</string>
     <string name="label_favorites">Ulubione</string>
     <string name="action_create">Nowa notatka</string>
     <string name="action_settings">Ustawienia</string>
     <string name="action_trashbin">Usunięte notatki</string>
     <string name="action_search">Szukaj</string>
+    <string name="action_create_save">Zapisz</string>
     <string name="simple_cancel">Anuluj</string>
     <string name="simple_edit">Edytuj</string>
     <string name="action_edit_save">Zapisz</string>
+    <string name="action_edit_saving">Zapisywanie &#8230;</string>
+    <string name="action_edit_saved">Zapisano</string>
     <string name="simple_about">O aplikacji</string>
     <string name="simple_bold">Pogrubienie</string>
     <string name="simple_link">Odnośnik</string>
     <string name="simple_italic">Kursywa</string>
+    <string name="action_select_note">Wybierz notatkę</string>
     <string name="action_note_deleted">Notatka usunięta</string>
     <string name="action_note_restored">Notatka przywrócona</string>
     <string name="action_undo">Cofnij</string>
     <string name="action_drawer_open">Otwórz okno nawigacji</string>
     <string name="action_drawer_close">Zamknij okno nawigacji</string>
+    <string name="action_recent">Ostatnie</string>
     <string name="action_uncategorized">Bez kategorii</string>
     <string name="menu_delete">Usuń</string>
     <string name="menu_change_category">Kategoria</string>
     <string name="menu_favorite">Ulubiona</string>
     <string name="menu_preview">Podgląd</string>
     <string name="menu_share">Udostępnij</string>
+    <string name="menu_about">O aplikacji</string>
 
     <string name="change_category_title">Wybierz kategorię</string>
 
     <string name="listview_updated_today">Dzisiaj</string>
     <string name="listview_updated_yesterday">Wczoraj</string>
     <string name="listview_updated_this_week">W tym tygodniu</string>
+    <string name="listview_updated_last_week">W zeszłym tygodniu</string>
     <string name="listview_updated_this_month">W tym miesiącu</string>
+    <string name="listview_updated_last_month">W zeszłym miesiącu</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Konto</string>
+    <string name="settings_url">Adres serwera</string>
+    <string name="settings_url_check_description">Pokazuje, czy adres można pingować.</string>
+    <string name="settings_url_warn_http">OSTRZEŻENIE: \"http\" jest niebezpieczne. Proszę użyć \"https\". </string>
+    <string name="settings_username">Nazwa użytkownika</string>
+    <string name="settings_password">Hasło</string>
+    <string name="settings_password_unchanged">Hasło (nie zmienione)</string>
+    <string name="settings_password_check_description">Wyświetla, czy dane logowania są poprawne.</string>
+    <string name="settings_submit">Połącz</string>
+    <string name="settings_submitting">Łączenie &#8230;</string>
     <string name="settings_note_mode">Tryb wyświetlania notatek</string>
     <string name="settings_theme_title">Ciemny motyw</string>
     <string name="settings_font_title">Czcionka monospace</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Wszystkie certyfikaty niestandardowe zostały wyczyszczone</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notatki - Bezpieczeństwo połączenia</string>
+    <string name="trust_certificate_unknown_certificate_found">Notes napotkał nieznany certyfikat. Czy chcesz mu zaufać?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Łączenie</string>
+    <string name="network_connected">Połączony</string>
+    <string name="network_disconnected">Brak dostępnych sieci</string>
 
     <!-- Error -->
     <string name="error_sync">Synchronizacja nie powiodła się: %1$s</string>
+    <string name="error_invalid_login">Niepoprawny login: %1$s</string>
     <string name="error_json">czy aplikacja Notes jest aktywowana na serwerze?</string>
     <string name="error_io">połączenie z serwerem jest nieprawidłowe</string>
     <string name="error_no_network">brak połączenia sieciowego</string>
+    <string name="error_server">URL/Serwer zawiera błędy</string>
+    <string name="error_url_malformed">Błędny adres serwera</string>
+    <string name="error_username_password_invalid">Zła nazwa użytkownika lub hasło</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Ustawienia</string>
 
     <!-- About -->
     <string name="about_version_title">Wersja</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Utwórz nową notatkę</string>
 
     <string name="pref_value_theme_light">Jasny</string>
+    <string name="pref_value_theme_dark">Ciemny</string>
     <string name="pref_value_font_normal">Podstawowy</string>
     <string name="pref_value_wifi_and_mobile">Synchronizacja w sieci Wi-Fi i komórkowej transmisji danych</string>
     <string name="simple_error">Błąd</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">Skopiowano do schowka</string>
     <string name="pin_to_homescreen">Przypnij do ekranu głównego</string>
     <string name="note_has_been_deleted">Ta notatka została usunięta</string>
+    <string name="fallback_weblogin_text">Przywróć starą metodę logowania</string>
+    <string name="fallback_weblogin_back">Wstecz</string>
+    <string name="sso_announcment_title">Pojedyncze logowanie (SSO)</string>
+    <string name="sso_announcment_message">Aplikacja Notes będzie korzystać z doskonałej funkcji pojedynczego logowania w Nextcloud, która rozpocznie się od kolejnej głównej wersji. Zwiększy to bezpieczeństwo, niezawodność i komfort. Upewnij się, że masz zainstalowaną aplikację do plików co najmniej wersję 3.8.0, a następnie wybierz przy pierwszym uruchomieniu to samo konto, którego już używasz.</string>
+    <string name="sso_announcment_more_info">Więcej informacji</string>
+    <string name="sso_announcment_understood">Zrozumiano</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d767a2ca..9878a3fb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Notas</string>
     <string name="app_name_long">Notas Nextcloud</string>
+    <string name="no_notes">Nenhuma anotação ainda</string>
     <string name="label_all_notes">Todas notas</string>
     <string name="label_favorites">Favoritos</string>
     <string name="action_create">Nova nota</string>
     <string name="action_settings">Configurações</string>
     <string name="action_trashbin">Anotações excluídas</string>
     <string name="action_search">Pesquisar</string>
+    <string name="action_create_save">Salvar</string>
     <string name="simple_cancel">Cancelar</string>
     <string name="simple_edit">Editar</string>
     <string name="action_edit_save">Salvar</string>
+    <string name="action_edit_saving">Salvando&#8230;</string>
+    <string name="action_edit_saved">Salvo</string>
     <string name="simple_about">Sobre</string>
     <string name="simple_bold">Negrito</string>
     <string name="simple_link">Link</string>
     <string name="simple_italic">Itálico</string>
+    <string name="action_select_note">Selecionar anotação</string>
     <string name="action_note_deleted">Anotação excluída</string>
     <string name="action_note_restored">Anotação restaurada</string>
     <string name="action_undo">Desfazer</string>
     <string name="action_drawer_open">abrir navegação</string>
     <string name="action_drawer_close">fechar navegação</string>
+    <string name="action_recent">Recente</string>
     <string name="action_uncategorized">Sem categoria</string>
     <string name="menu_delete">Excluir</string>
     <string name="menu_change_category">Categoria</string>
     <string name="menu_favorite">Favorito</string>
     <string name="menu_preview">Prever</string>
     <string name="menu_share">Compartilhar</string>
+    <string name="menu_about">Sobre</string>
 
     <string name="change_category_title">Escolher uma categoria</string>
 
     <string name="listview_updated_today">Hoje</string>
     <string name="listview_updated_yesterday">Ontem</string>
     <string name="listview_updated_this_week">Esta semanna</string>
+    <string name="listview_updated_last_week">Última semana</string>
     <string name="listview_updated_this_month">Este mês</string>
+    <string name="listview_updated_last_month">Último mês</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Conta</string>
+    <string name="settings_url">Endereço do servidor</string>
+    <string name="settings_url_check_description">Mostra se o endereço pode ser alcançado.</string>
+    <string name="settings_url_warn_http">AVISO: \"http\" é inseguro. Utilize \"https\".</string>
+    <string name="settings_username">Nome do usuário</string>
+    <string name="settings_password">Senha</string>
+    <string name="settings_password_unchanged">Senha (não alterada)</string>
+    <string name="settings_password_check_description">Mostra se a senha está correta.</string>
+    <string name="settings_submit">Conectar</string>
+    <string name="settings_submitting">Conectando&#8230;</string>
     <string name="settings_note_mode">Modo de exibição de notas</string>
     <string name="settings_theme_title">Tema escuro</string>
     <string name="settings_font_title"> Fonte monospaçada</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Todos os certificados personalizados foram limpos</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Anotações - Segurança da conexão</string>
+    <string name="trust_certificate_unknown_certificate_found">As anotações encontraram um certificado desconhecido. Quer confiar nele?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Conectando</string>
+    <string name="network_connected">Conectado</string>
+    <string name="network_disconnected">Nenhuma rede disponível</string>
 
     <!-- Error -->
     <string name="error_sync">A sincronização falhou: %1$s</string>
+    <string name="error_invalid_login">Login inválido: %1$s</string>
     <string name="error_json">O aplicativo Notes está ativado no servidor?</string>
     <string name="error_io">não existe conexão com o servidor </string>
     <string name="error_no_network">não existe conexão de rede</string>
+    <string name="error_server">URL do servidor tem erros</string>
+    <string name="error_url_malformed">Endereço incorreto do servidor</string>
+    <string name="error_username_password_invalid">Nome de usuário ou senha errados</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Configurações</string>
 
     <!-- About -->
     <string name="about_version_title">Versão</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Criar uma nova anotação</string>
 
     <string name="pref_value_theme_light">Claro</string>
+    <string name="pref_value_theme_dark">Escuro</string>
     <string name="pref_value_font_normal">Normal</string>
     <string name="pref_value_wifi_and_mobile">Sincronizar por Wi-Fi e dados móveis</string>
     <string name="simple_error">Erro</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">Copiado para a área de transferência</string>
     <string name="pin_to_homescreen">Fixar na tela inicial</string>
     <string name="note_has_been_deleted">A anotação foi excluída</string>
+    <string name="fallback_weblogin_text">Reverter ao antigo sistema de login</string>
+    <string name="fallback_weblogin_back">Voltar</string>
+    <string name="sso_announcment_title">Logon único</string>
+    <string name="sso_announcment_message">O aplicativo Notes começará com a próxima versão principal. Use o recurso Logon único do Nextcloud. Isso aumentará a segurança, confiabilidade e conforto para você. Certifique-se de que instalou pelo menos a versão 3.8.0 dos arquivos do aplicativo e selecione na primeira execução a mesma conta que você já está usando.</string>
+    <string name="sso_announcment_more_info">Mais informações</string>
+    <string name="sso_announcment_understood">Entendido</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a8cf5bd4..d8968259 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,30 +2,37 @@
 <resources>
 
     <string name="app_name">Заметки</string>
+    <string name="no_notes">Заметок пока нет</string>
     <string name="label_all_notes">Все заметки</string>
     <string name="label_favorites">Избранные</string>
     <string name="action_create">Новая заметка</string>
     <string name="action_settings">Настройки</string>
     <string name="action_trashbin">Удалённые заметки</string>
     <string name="action_search">Поиск</string>
+    <string name="action_create_save">Сохранить</string>
     <string name="simple_cancel">Отмена</string>
     <string name="simple_edit">Редактировать</string>
     <string name="action_edit_save">Сохранить</string>
+    <string name="action_edit_saving">Сохранение …</string>
+    <string name="action_edit_saved">Сохранено</string>
     <string name="simple_about">О программе</string>
     <string name="simple_bold">Жирный</string>
     <string name="simple_link">Ссылка</string>
     <string name="simple_italic">Курсив</string>
+    <string name="action_select_note">Выбрать заметку</string>
     <string name="action_note_deleted">Заметка удалена</string>
     <string name="action_note_restored">Заметка восстановлена</string>
     <string name="action_undo">Отменить</string>
     <string name="action_drawer_open">открыть навигацию</string>
     <string name="action_drawer_close">закрыть навигацию</string>
+    <string name="action_recent">Недавние</string>
     <string name="action_uncategorized">Без категории</string>
     <string name="menu_delete">Удалить</string>
     <string name="menu_change_category">Категория</string>
     <string name="menu_favorite">Избранное</string>
     <string name="menu_preview">Предварительный просмотр</string>
     <string name="menu_share">Поделиться</string>
+    <string name="menu_about">О программе</string>
 
     <string name="change_category_title">Выберите категорию</string>
 
@@ -33,10 +40,19 @@
     <string name="listview_updated_yesterday">Вчера</string>
     <string name="listview_updated_this_week">Эта неделя</string>
     <string name="listview_updated_this_month">Этот месяц</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Учётная запись</string>
+    <string name="settings_url">Адрес сервера</string>
+    <string name="settings_url_check_description"> Показывает доступность адреса.</string>
+    <string name="settings_url_warn_http">ВНИМАНИЕ: использование «http» небезопасно. Используйте «https».</string>
+    <string name="settings_username">Имя пользователя</string>
+    <string name="settings_password">Пароль</string>
+    <string name="settings_password_unchanged">Пароль (не изменён)</string>
+    <string name="settings_password_check_description">Показывает, верно ли указаны учётные данные.</string>
+    <string name="settings_submit">Соединить</string>
+    <string name="settings_submitting">Соединение&#8230;</string>
     <string name="settings_note_mode">Режим показа заметок</string>
-    <string name="settings_theme_title">Темная тема</string>
+    <string name="settings_theme_title">Тёмное оформление</string>
     <string name="settings_font_title">Моноширинный шрифт</string>
     <string name="settings_font_size">Размер шрифта</string>
     <string name="settings_wifi_only">Синхр. только по Wi-Fi</string>
@@ -49,16 +65,26 @@
     <string name="settings_cert_reset_toast">Все пользовательские сертификаты были удалены</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Заметки — Безопасность подключения</string>
+    <string name="trust_certificate_unknown_certificate_found">Приложению предлагается неизвестный сертификат. Доверять ему?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Соединение</string>
+    <string name="network_connected">Соединено</string>
+    <string name="network_disconnected">Сеть недоступна</string>
 
     <!-- Error -->
     <string name="error_sync">Синхронизация не удалась: %1$s</string>
+    <string name="error_invalid_login">Неверный логин: %1$s</string>
     <string name="error_json">Включено ли приложение «Заметки» на сервере?</string>
     <string name="error_io">Ошибка ввода/вывода</string>
     <string name="error_no_network">нет подключения к сети</string>
+    <string name="error_server">Ошибка в URL или адресе сервера</string>
+    <string name="error_url_malformed">Неверный адрес сервера</string>
+    <string name="error_username_password_invalid">Неправильный логин или пароль</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Параметры</string>
 
     <!-- About -->
     <string name="about_version_title">Версия</string>
@@ -99,6 +125,7 @@
     <string name="shortcut_create_long">Создать новую заметку</string>
 
     <string name="pref_value_theme_light">Светлая</string>
+    <string name="pref_value_theme_dark">Тёмная</string>
     <string name="pref_value_font_normal">Обычный</string>
     <string name="pref_value_wifi_and_mobile">Синхр. по Wi-Fi и мобильной связи</string>
     <string name="simple_error">Ошибка</string>
@@ -108,7 +135,9 @@
     <string name="copied_to_clipboard">Скопировано в буфер обмена</string>
     <string name="pin_to_homescreen">Введите PIN-код для домашнего экрана</string>
     <string name="note_has_been_deleted">Запись была удалена</string>
-
+    <string name="fallback_weblogin_text">Использовать прежний метод авторизации</string>
+    <string name="fallback_weblogin_back">Назад</string>
+    <string name="sso_announcment_more_info">Дополнительные сведения</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Открывать в режиме редактирования</item>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index eb74e926..df6c90df 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -2,30 +2,37 @@
 <resources>
 
     <string name="app_name">Poznámky</string>
+    <string name="no_notes">Zatiaľ nie sú žiadne poznámky</string>
     <string name="label_all_notes">Všetky poznámky</string>
     <string name="label_favorites">Obľúbené</string>
     <string name="action_create">Nová poznámka</string>
     <string name="action_settings">Settings</string>
     <string name="action_trashbin">Zmazané poznámky</string>
     <string name="action_search">Hľadať</string>
+    <string name="action_create_save">Uložiť</string>
     <string name="simple_cancel">Zrušiť</string>
     <string name="simple_edit">Upraviť</string>
     <string name="action_edit_save">Uložiť</string>
+    <string name="action_edit_saving">Ukladám &#8230;</string>
+    <string name="action_edit_saved">Uložené</string>
     <string name="simple_about">O aplikácii</string>
     <string name="simple_bold">Tučné</string>
     <string name="simple_link">Odkaz</string>
     <string name="simple_italic">Kurzíva</string>
+    <string name="action_select_note">Vybrať poznámku</string>
     <string name="action_note_deleted">Poznámka vymazaná</string>
     <string name="action_note_restored">Poznámka obnovená</string>
     <string name="action_undo">Vrátiť</string>
     <string name="action_drawer_open">otvoriť navigáciu</string>
     <string name="action_drawer_close">zavrieť navigáciu</string>
+    <string name="action_recent">Nedávne</string>
     <string name="action_uncategorized">Nezaradené</string>
     <string name="menu_delete">Zmazať</string>
     <string name="menu_change_category">Kategória</string>
     <string name="menu_favorite">Obľúbené</string>
     <string name="menu_preview">Náhľad</string>
     <string name="menu_share">Sprístupniť</string>
+    <string name="menu_about">O</string>
 
     <string name="change_category_title">Vybrať kategóriu</string>
 
@@ -33,8 +40,17 @@
     <string name="listview_updated_yesterday">Včera</string>
     <string name="listview_updated_this_week">Tento týždeň</string>
     <string name="listview_updated_this_month">Tento mesiac</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Účet</string>
+    <string name="settings_url">Adresa servera</string>
+    <string name="settings_url_check_description">Zobrazuje či môže byť adresa pingnutá.</string>
+    <string name="settings_url_warn_http">VAROVANIE: \"http\" nie je bezpečné. Použite prosím \"https\".</string>
+    <string name="settings_username">Meno používateľa</string>
+    <string name="settings_password">Heslo</string>
+    <string name="settings_password_unchanged">Heslo (nezmenené)</string>
+    <string name="settings_password_check_description">Zobrazuje či sú platné overenia.</string>
+    <string name="settings_submit">Pripojiť</string>
+    <string name="settings_submitting">Pripájam &#8230;</string>
     <string name="settings_note_mode">Režim zobrazovania poznámok</string>
     <string name="settings_theme_title">Tmavý motív vzhľadu</string>
     <string name="settings_font_title">Písmo s pevnou šírkou</string>
@@ -49,16 +65,26 @@
     <string name="settings_cert_reset_toast">Všetky vlastné certifikáty boli odstránené</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Poznámky - Zabezpečenie pripojenia</string>
+    <string name="trust_certificate_unknown_certificate_found">Poznámky sa stretli s neznámym certifikátom. Chcete mu dôverovať?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Pripájam</string>
+    <string name="network_connected">Pripojené</string>
+    <string name="network_disconnected">Nie je dostupná žiadna sieť</string>
 
     <!-- Error -->
     <string name="error_sync">Synchronizácia zlyhala: %1$s</string>
+    <string name="error_invalid_login">Neplatné prihlásenie: %1$s</string>
     <string name="error_json">máte povolenú aplikáciu Poznámky na serveri?</string>
     <string name="error_io">pripojenie na server bolo prerušené</string>
     <string name="error_no_network">nie je pripojenie k sieti</string>
+    <string name="error_server">URL/Server obsahuje chyby</string>
+    <string name="error_url_malformed">Nesprávna adresa servera</string>
+    <string name="error_username_password_invalid">Nesprávne meno používateľa alebo heslo</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Nastavenia</string>
 
     <!-- About -->
     <string name="about_version_title">Verzia</string>
@@ -99,6 +125,7 @@
     <string name="shortcut_create_long">Vytvoriť novú poznámku</string>
 
     <string name="pref_value_theme_light">Svetlý</string>
+    <string name="pref_value_theme_dark">Tmavý</string>
     <string name="pref_value_font_normal">Normálne</string>
     <string name="pref_value_wifi_and_mobile">Synchronizovať na Wi-Fi a mobilných dátach</string>
     <string name="simple_error">Chyba</string>
@@ -108,7 +135,6 @@
     <string name="copied_to_clipboard">Skopírované do schránky</string>
     <string name="pin_to_homescreen">Pripnúť na domovskú obrazovku</string>
     <string name="note_has_been_deleted">Táto poznámka bola vymazaná</string>
-
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Otvoriť v režime úprav</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 2f46fe80..b774df25 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Notes</string>
     <string name="app_name_long">Nextcloud Notes</string>
+    <string name="no_notes">Ni še dodane nobene zabeležke</string>
     <string name="label_all_notes">Vse zabeležke</string>
     <string name="label_favorites">Priljubljene</string>
     <string name="action_create">Nova zabeležka</string>
     <string name="action_settings">Nastavitve</string>
     <string name="action_trashbin">Izbrisane zabeležke</string>
     <string name="action_search">Poišči</string>
+    <string name="action_create_save">Shrani</string>
     <string name="simple_cancel">Prekliči</string>
     <string name="simple_edit">Uredi</string>
     <string name="action_edit_save">Shrani</string>
+    <string name="action_edit_saving">Poteka shranjevanje&#8230;</string>
+    <string name="action_edit_saved">Shranjeno</string>
     <string name="simple_about">O programu</string>
     <string name="simple_bold">Krepko</string>
     <string name="simple_link">Povezava</string>
     <string name="simple_italic">Ležeče</string>
+    <string name="action_select_note">Izbor zabeležke</string>
     <string name="action_note_deleted">Zabeležka je izbrisana</string>
     <string name="action_note_restored">Zabeležka je obnovljena</string>
     <string name="action_undo">Razveljavi</string>
     <string name="action_drawer_open">odpri iskalnik</string>
     <string name="action_drawer_close">zapri iskalnik</string>
+    <string name="action_recent">Nedavno</string>
     <string name="action_uncategorized">Neopredeljeno</string>
     <string name="menu_delete">Izbriši</string>
     <string name="menu_change_category">Kategorija</string>
     <string name="menu_favorite">Priljubljena</string>
     <string name="menu_preview">Predogled</string>
     <string name="menu_share">Souporaba</string>
+    <string name="menu_about">O programu</string>
 
     <string name="change_category_title">Izbor kategorije</string>
 
     <string name="listview_updated_today">Danes</string>
     <string name="listview_updated_yesterday">Včeraj</string>
     <string name="listview_updated_this_week">Zadnji teden</string>
+    <string name="listview_updated_last_week">Zadnji teden</string>
     <string name="listview_updated_this_month">Zadnji mesec</string>
+    <string name="listview_updated_last_month">Zadnji mesec</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Račun</string>
+    <string name="settings_url">Naslov strežnika</string>
+    <string name="settings_url_check_description">Pokaže, ali je naslov mogoče pripeti.</string>
+    <string name="settings_url_warn_http">OPOZORILO: protokol »http« ni varen. Priporočljivo je uporabiti protokol »https«.</string>
+    <string name="settings_username">Uporabniško ime</string>
+    <string name="settings_password">Geslo</string>
+    <string name="settings_password_unchanged">Geslo (ni spremenjeno)</string>
+    <string name="settings_password_check_description">Pokaže, ali so poverila pravilna.</string>
+    <string name="settings_submit">Poveži</string>
+    <string name="settings_submitting">Poteka vzpostavljanje povezave z&#8230;</string>
     <string name="settings_note_mode">Način odpiranja zabeležk</string>
     <string name="settings_theme_title">Temna tema</string>
     <string name="settings_font_title">Pisava enotne širine</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Vsa uporabniška potrdila so počiščena.</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Beležka Notes – varnost povezave</string>
+    <string name="trust_certificate_unknown_certificate_found">Program je zaznal uporabo neznanega potrdila. Ali želite potrditi zaupanje v potrdilo?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Poteka vzpostavljanje povezave ...</string>
+    <string name="network_connected">Povezano</string>
+    <string name="network_disconnected">Na voljo ni nobenega omrežja</string>
 
     <!-- Error -->
     <string name="error_sync">Usklajevanje je spodletelo: %1$s</string>
+    <string name="error_invalid_login">Neveljavna prijava: %1$s</string>
     <string name="error_json">Ali je program Beležka Notes nameščen na strežniku?</string>
     <string name="error_io">povezava s strežnikom je okvarjena</string>
     <string name="error_no_network">ni omrežne povezave</string>
+    <string name="error_server">naslov/strežnik je naveden napačno</string>
+    <string name="error_url_malformed">Napačen naslov strežnika</string>
+    <string name="error_username_password_invalid">Napačno uporabniško ime ali geslo</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Nastavitve</string>
 
     <!-- About -->
     <string name="about_version_title">Različica</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Ustvari novo zabeležko</string>
 
     <string name="pref_value_theme_light">Svetla</string>
+    <string name="pref_value_theme_dark">Temna</string>
     <string name="pref_value_font_normal">Običajno</string>
     <string name="pref_value_wifi_and_mobile">Usklajuj na Wi-Fi in mobilni povezavi</string>
     <string name="simple_error">Napaka</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">Kopirano v odložišče</string>
     <string name="pin_to_homescreen">Pripni na osnovni zaslon</string>
     <string name="note_has_been_deleted">Ta zabeležka je bila izbrisana</string>
+    <string name="fallback_weblogin_text">Povrni na star način prijave</string>
+    <string name="fallback_weblogin_back">Nazaj</string>
+    <string name="sso_announcment_title">Enojna prijava (SSO)</string>
+    <string name="sso_announcment_message">Program Notes bo z naslednjo različico uvedel možnost Enojne prijave, ki jo podpira okolje Nextcloud. S tem se bo povečala varnost, zanesljivost in enostavnost uporabe. Prepričajte se, da imate nameščeno vsaj različico datotečnega programa 3.8.0 in pri prvem zagonu izberite račun, ki ga že uporabljate.</string>
+    <string name="sso_announcment_more_info">Več podrobnosti</string>
+    <string name="sso_announcment_understood">Razumem</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index d4928e3c..668184e8 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -2,27 +2,34 @@
 <resources>
 
     <string name="app_name">Shënime</string>
+    <string name="no_notes">Nuk ka shënime</string>
     <string name="label_all_notes">Të gjitha shënimet</string>
     <string name="label_favorites">Të preferuarat</string>
     <string name="action_create">Shënim i ri</string>
     <string name="action_settings">Konfigurimet</string>
     <string name="action_trashbin">Shënimet e fshira</string>
     <string name="action_search">Kërko</string>
+    <string name="action_create_save">Ruaj</string>
     <string name="simple_cancel">Anullo</string>
     <string name="simple_edit">Redakto</string>
     <string name="action_edit_save">Ruaj</string>
+    <string name="action_edit_saving">Duke ruajtur &#8230;</string>
+    <string name="action_edit_saved">U ruajt</string>
     <string name="simple_about">Rreth </string>
+    <string name="action_select_note">Selekto shënimin</string>
     <string name="action_note_deleted">Shënimi u fshi</string>
     <string name="action_note_restored">Shënimi i rivendos</string>
     <string name="action_undo">Zhbëj</string>
     <string name="action_drawer_open">hape lundrimin</string>
     <string name="action_drawer_close">mbylle lundrimin</string>
+    <string name="action_recent">Së fundmi</string>
     <string name="action_uncategorized">Të pakategorizuara</string>
     <string name="menu_delete">Fshij</string>
     <string name="menu_change_category">Kategori</string>
     <string name="menu_favorite">E preferuar</string>
     <string name="menu_preview">Parapamje</string>
     <string name="menu_share">Ndaj</string>
+    <string name="menu_about">Rreth nesh</string>
 
     <string name="change_category_title">Zgjidh një kategori</string>
 
@@ -30,8 +37,17 @@
     <string name="listview_updated_yesterday">Dje</string>
     <string name="listview_updated_this_week">Këtë javë</string>
     <string name="listview_updated_this_month">Këtë muaj</string>
-
     <!-- Settings -->
+    <string name="settings_server_settings">Llogari</string>
+    <string name="settings_url">Adresa e serverit</string>
+    <string name="settings_url_check_description">Tregon nëse adresa mund të bëhet ping.</string>
+    <string name="settings_url_warn_http">PARALAJMËRIM: \"http\" nuk është e sigurt. Ju lutemi përdorni \"https\".</string>
+    <string name="settings_username">Emri i përdoruesit</string>
+    <string name="settings_password">Fjalëkalimi</string>
+    <string name="settings_password_unchanged">Fjalëkalimi (nuk u ndryshua)</string>
+    <string name="settings_password_check_description">Paraqet në qoftë se kredencialet janë të sakta.</string>
+    <string name="settings_submit">Lidhu</string>
+    <string name="settings_submitting">Duke u lidhur &#8230;</string>
     <string name="settings_cert_category">Menaxhoni certifikatat</string>
     <string name="settings_cert_trust_system">Beso tek çertifikatat e sistemit</string>
     <string name="settings_cert_trust_system_on">Sistemi dhe përdoruesit e shtuar CAs do të besohen (rekomandohet)</string>
@@ -41,16 +57,26 @@
     <string name="settings_cert_reset_toast">Të gjitha certifikatat doganore janë pastruar</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Shënime - Siguria e lidhjes</string>
+    <string name="trust_certificate_unknown_certificate_found">Notes ka ndeshur një çertifikatë të panjohur.  Dëshironi ta shënoni si të besuar?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Duke u lidhur</string>
+    <string name="network_connected">Të lidhur</string>
+    <string name="network_disconnected">Asnjë rrjet në gjëndje</string>
 
     <!-- Error -->
     <string name="error_sync">Sinkronizimi dështoi: %1$s</string>
+    <string name="error_invalid_login">Identifikim jo i vlefshëm: %1$s</string>
     <string name="error_json">a është aplikacioni i Notes i aktivizuar në server?</string>
     <string name="error_io">lidhja me serverin u thye</string>
     <string name="error_no_network">asnjë lidhje në rrjet</string>
+    <string name="error_server">URL/Server ka gabime</string>
+    <string name="error_url_malformed">Adres e gabuar e serverit </string>
+    <string name="error_username_password_invalid">Emër përdoruesi ose fjalëkalim i gabuar</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Konfigurimet</string>
 
     <!-- About -->
     <string name="about_version_title">Versioni</string>
@@ -91,6 +117,7 @@
     <string name="shortcut_create_long">Krijo një shënim të ri</string>
 
     <string name="pref_value_theme_light">E çelët</string>
+    <string name="pref_value_theme_dark">E errët</string>
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
         <item>Hapur në modalitetin e redaktimit</item>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index e41da969..cb95559f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -2,39 +2,59 @@
 <resources>
 
     <string name="app_name">Белешке</string>
+    <string name="app_name_long">Некстклауд Белешке</string>
+    <string name="no_notes">Још нема белешки</string>
     <string name="label_all_notes">Све белешке</string>
     <string name="label_favorites">Омиљене</string>
     <string name="action_create">Нова белешка</string>
     <string name="action_settings">Поставке</string>
     <string name="action_trashbin">Обрисане белешке</string>
     <string name="action_search">Тражи</string>
+    <string name="action_create_save">Сачувај</string>
     <string name="simple_cancel">Поништи</string>
     <string name="simple_edit">Измени</string>
     <string name="action_edit_save">Сачувај</string>
+    <string name="action_edit_saving">Чувам &#8230;</string>
+    <string name="action_edit_saved">Сачувано</string>
     <string name="simple_about">О програму</string>
     <string name="simple_bold">Подебљано</string>
     <string name="simple_link">Веза</string>
     <string name="simple_italic">Курзив</string>
+    <string name="action_select_note">Изабери белешку</string>
     <string name="action_note_deleted">Белешка обрисана</string>
     <string name="action_note_restored">Белешка враћена</string>
     <string name="action_undo">Опозови</string>
     <string name="action_drawer_open">отвори навигацију</string>
     <string name="action_drawer_close">затвори навигацију</string>
+    <string name="action_recent">Скорашње</string>
     <string name="action_uncategorized">Некатегоризовано</string>
     <string name="menu_delete">Обриши</string>
     <string name="menu_change_category">Категорија</string>
     <string name="menu_favorite">Омиљене</string>
     <string name="menu_preview">Преглед</string>
     <string name="menu_share">Подели</string>
+    <string name="menu_about">О програму</string>
 
     <string name="change_category_title">Одаберите категорију</string>
 
     <string name="listview_updated_today">Данас</string>
     <string name="listview_updated_yesterday">Јуче</string>
     <string name="listview_updated_this_week">Ове седмице</string>
+    <string name="listview_updated_last_week">Прошле недеље</string>
     <string name="listview_updated_this_month">Овог месеца</string>
+    <string name="listview_updated_last_month">Прошлог месеца</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Налог</string>
+    <string name="settings_url">Адреса сервера</string>
+    <string name="settings_url_check_description">Приказује да ли адреса може да да се пингује.</string>
+    <string name="settings_url_warn_http">УПОЗОРЕЊЕ: „http“ протокол није безбедан. Користите „https“.</string>
+    <string name="settings_username">Корисничко име</string>
+    <string name="settings_password">Лозинка</string>
+    <string name="settings_password_unchanged">Лозинка (није промењено)</string>
+    <string name="settings_password_check_description">Прикзује да ли су акредитиви исправни.</string>
+    <string name="settings_submit">Повежи се</string>
+    <string name="settings_submitting">Повезујем се&#8230;</string>
     <string name="settings_note_mode">Режим приказа белешки</string>
     <string name="settings_theme_title">Тамна тема</string>
     <string name="settings_font_title">Фонт фиксне ширине</string>
@@ -49,16 +69,26 @@
     <string name="settings_cert_reset_toast">Сви кориснички поверљиви сертификати су очишћени</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Белешке - безбедност везе</string>
+    <string name="trust_certificate_unknown_certificate_found">Белешке су наишле на непознати сертификат. Да ли желите да му верујете?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Повезујем се</string>
+    <string name="network_connected">Повезан</string>
+    <string name="network_disconnected">Мрежа није доступна</string>
 
     <!-- Error -->
     <string name="error_sync">Синхронизација није успела%1$s</string>
+    <string name="error_invalid_login">Неисправна пријава:%1$s</string>
     <string name="error_json">Да ли је апликација Белешки активирана на серверу?</string>
     <string name="error_io">веза са сервером је прекинута</string>
     <string name="error_no_network">нема мрежне везе</string>
+    <string name="error_server">УРЛ/сервер имају грешку</string>
+    <string name="error_url_malformed">Погрешна адреса сервера</string>
+    <string name="error_username_password_invalid">Погрешно корисничко име или лозинка</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Поставке</string>
 
     <!-- About -->
     <string name="about_version_title">Верзија</string>
@@ -99,6 +129,7 @@
     <string name="shortcut_create_long">Направи нову белешку</string>
 
     <string name="pref_value_theme_light">Светла</string>
+    <string name="pref_value_theme_dark">Тамна</string>
     <string name="pref_value_font_normal">Нормална</string>
     <string name="pref_value_wifi_and_mobile">Синхронизуј и на бежичној и на мобилној вези</string>
     <string name="simple_error">Грешка</string>
@@ -108,6 +139,12 @@
     <string name="copied_to_clipboard">Копирано у оставу</string>
     <string name="pin_to_homescreen">Закачи на почетни екран</string>
     <string name="note_has_been_deleted">Ова белешка је обрисана</string>
+    <string name="fallback_weblogin_text">Врати се на стари начин пријаве</string>
+    <string name="fallback_weblogin_back">Назад</string>
+    <string name="sso_announcment_title">Једнократно пријављивање</string>
+    <string name="sso_announcment_message">Апликација белешки ће од следеће главне верзије почети да користи сјајну могућност Некстклауда - једнократно пријављивање. Ово ће повећати безбедност, поузданост и Ваш комфор. Проверите да имате бар верзију 3.8.0 апликације Фајлова и при првом покретању одаберите исти налог који сада користите.</string>
+    <string name="sso_announcment_more_info">Још информација</string>
+    <string name="sso_announcment_understood">Разумео</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b73e9227..ee47c287 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Anteckningar</string>
     <string name="app_name_long">Nextcloud anteckningar</string>
+    <string name="no_notes">Inga anteckningar än</string>
     <string name="label_all_notes">Alla anteckningar</string>
     <string name="label_favorites">Favoriter</string>
     <string name="action_create">Ny anteckning</string>
     <string name="action_settings">Inställningar</string>
     <string name="action_trashbin">Borttagna anteckningar</string>
     <string name="action_search">Sök</string>
+    <string name="action_create_save">Spara</string>
     <string name="simple_cancel">Avbryt</string>
     <string name="simple_edit">Redigera</string>
     <string name="action_edit_save">Spara</string>
+    <string name="action_edit_saving">Sparar &#8230;</string>
+    <string name="action_edit_saved">Sparad</string>
     <string name="simple_about">Om</string>
     <string name="simple_bold">Fet</string>
     <string name="simple_link">Länk</string>
     <string name="simple_italic">Kursiv</string>
+    <string name="action_select_note">Välj anteckning</string>
     <string name="action_note_deleted">Anteckningen raderad</string>
     <string name="action_note_restored">Anteckningen återskapad</string>
     <string name="action_undo">Gör om</string>
     <string name="action_drawer_open">Öppen navigering</string>
     <string name="action_drawer_close">stäng navigering</string>
+    <string name="action_recent">Nya</string>
     <string name="action_uncategorized">Okategoriserade</string>
     <string name="menu_delete">Radera</string>
     <string name="menu_change_category">Kategori</string>
     <string name="menu_favorite">Favorit</string>
     <string name="menu_preview">Förhandsvisning</string>
     <string name="menu_share">Dela</string>
+    <string name="menu_about">Om</string>
 
     <string name="change_category_title">Välj en kategori</string>
 
     <string name="listview_updated_today">Idag</string>
     <string name="listview_updated_yesterday">Igår</string>
     <string name="listview_updated_this_week">Denna vecka</string>
+    <string name="listview_updated_last_week">Förra veckan</string>
     <string name="listview_updated_this_month">Denna månad</string>
+    <string name="listview_updated_last_month">Förra månaden</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Konto</string>
+    <string name="settings_url">Serveradress</string>
+    <string name="settings_url_check_description">Visar om adressen kan pingas.</string>
+    <string name="settings_url_warn_http">VARNING: \"http\" är osäkert. Vänligen använd \"https\".</string>
+    <string name="settings_username">Användarnamn</string>
+    <string name="settings_password">Lösenord</string>
+    <string name="settings_password_unchanged">Lösenord (inte ändrat)</string>
+    <string name="settings_password_check_description">Visar huruvida uppgifterna är korrekta.</string>
+    <string name="settings_submit">Anslut</string>
+    <string name="settings_submitting">Ansluter &#8230;</string>
     <string name="settings_note_mode">Visningsläge för anteckningar</string>
     <string name="settings_theme_title">Mörkt tema</string>
     <string name="settings_font_title">Monospace font</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Alla anpassade certifikat har rensats</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Anteckningar - Anslutningssäkerhet</string>
+    <string name="trust_certificate_unknown_certificate_found">Anteckningar har påträffat ett okänt certifikat. Vill du lita på det?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Ansluter</string>
+    <string name="network_connected">Ansluten</string>
+    <string name="network_disconnected">Inget nätverk tillgängligt</string>
 
     <!-- Error -->
     <string name="error_sync">Synkronisering misslyckades: %1$s</string>
+    <string name="error_invalid_login">Ogiltig inloggning: %1$s</string>
     <string name="error_json">är anteckningar-appen aktiverad på servern?</string>
     <string name="error_io">serveranslutningen är trasig</string>
     <string name="error_no_network">ingen nätverksanslutning</string>
+    <string name="error_server">URL/Server har fel</string>
+    <string name="error_url_malformed">Felaktig serveradress</string>
+    <string name="error_username_password_invalid">Fel användarnamn eller lösenord</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Inställningar</string>
 
     <!-- About -->
     <string name="about_version_title">Version</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Skapa en ny anteckning</string>
 
     <string name="pref_value_theme_light">Ljus</string>
+    <string name="pref_value_theme_dark">Mörk</string>
     <string name="pref_value_font_normal">Normal</string>
     <string name="pref_value_wifi_and_mobile">Synkronisera med Wi-Fi och mobil data</string>
     <string name="simple_error">Fel</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">Kopierat till urklipp</string>
     <string name="pin_to_homescreen">Fäst på hemskärmen</string>
     <string name="note_has_been_deleted">Denna anteckning har raderats</string>
+    <string name="fallback_weblogin_text">Återgå till gammal inloggningsmetod</string>
+    <string name="fallback_weblogin_back">Tillbaka</string>
+    <string name="sso_announcment_title">Single-Sign-On</string>
+    <string name="sso_announcment_message">Notes-appen börjar med nästa större version att använda funktionen Single-Sign-On i Nextcloud. Detta kommer att öka säkerheten, tillförlitligheten och komforten för dig. Se till att du har installerat minst version 3.8.0 av fil-appen och välj vid första inloggningen samma konto som du redan använder.</string>
+    <string name="sso_announcment_more_info">Mer information</string>
+    <string name="sso_announcment_understood">Jag förstår</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1e761642..954b8246 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">Notlar</string>
     <string name="app_name_long">Nextcloud Notlar</string>
+    <string name="no_notes">Henüz bir not yok</string>
     <string name="label_all_notes">Tum notlar</string>
     <string name="label_favorites">Sık Kullanılanlar</string>
     <string name="action_create">Not ekle</string>
     <string name="action_settings">Ayarlar</string>
     <string name="action_trashbin">Silinmiş notlar</string>
     <string name="action_search">Arama</string>
+    <string name="action_create_save">Kaydet</string>
     <string name="simple_cancel">İptal</string>
     <string name="simple_edit">Düzenle</string>
     <string name="action_edit_save">Kaydet</string>
+    <string name="action_edit_saving">Kaydediliyor &#8230;</string>
+    <string name="action_edit_saved">Kaydedildi</string>
     <string name="simple_about">Hakkında</string>
     <string name="simple_bold">Koyu</string>
     <string name="simple_link">Bağlantı</string>
     <string name="simple_italic">Yatık</string>
+    <string name="action_select_note">Not seçin</string>
     <string name="action_note_deleted">Not silindi</string>
     <string name="action_note_restored">Not geri yüklendi</string>
     <string name="action_undo">Geri al</string>
     <string name="action_drawer_open">gezinmeyi aç</string>
     <string name="action_drawer_close">gezinmeyi kapat</string>
+    <string name="action_recent">Son</string>
     <string name="action_uncategorized">Kategorisiz</string>
     <string name="menu_delete">Sil</string>
     <string name="menu_change_category">Kategori</string>
     <string name="menu_favorite">Sık Kullanılanlara Ekle</string>
     <string name="menu_preview">Ön izleme</string>
     <string name="menu_share">Paylaş</string>
+    <string name="menu_about">Hakkında</string>
 
     <string name="change_category_title">Bir kategori seçin</string>
 
     <string name="listview_updated_today">Bugün</string>
     <string name="listview_updated_yesterday">Dün</string>
     <string name="listview_updated_this_week">Bu hafta</string>
+    <string name="listview_updated_last_week">Geçen hafta</string>
     <string name="listview_updated_this_month">Bu ay</string>
+    <string name="listview_updated_last_month">Geçen ay</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">Hesap</string>
+    <string name="settings_url">Sunucu adresi</string>
+    <string name="settings_url_check_description">Adresin pinglenebildiğini gösterir.</string>
+    <string name="settings_url_warn_http">UYARI: \"http\" güvenli değildir. Lütfen \"https\" kullanın.</string>
+    <string name="settings_username">Kullanıcı Adı</string>
+    <string name="settings_password">Parola</string>
+    <string name="settings_password_unchanged">Parola (değiştirilmedi)</string>
+    <string name="settings_password_check_description">Oturum açma bilgilerinin doğru olduğunu gösterir.</string>
+    <string name="settings_submit">Bağlan</string>
+    <string name="settings_submitting">Bağlanılıyor &#8230;</string>
     <string name="settings_note_mode">Notların görüntülenme kipi</string>
     <string name="settings_theme_title">Koyu tema</string>
     <string name="settings_font_title">Sabit aralıklı yazı tipi</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">Tüm özel sertifikalar temizlendi</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notlar - Bağlantı güvenliği</string>
+    <string name="trust_certificate_unknown_certificate_found">Notlar bilinmeyen bir sertifika kullanıyor. Bu sertifikaya güvenmek ister misiniz?</string>
 
     <!-- Network -->
+    <string name="network_connecting">Bağlanılıyor</string>
+    <string name="network_connected">Bağlandı</string>
+    <string name="network_disconnected">Kullanılabilecek bir ağ yok</string>
 
     <!-- Error -->
     <string name="error_sync">Eşitlenemedi: %1$s</string>
+    <string name="error_invalid_login">Oturum açılamadı: %1$s</string>
     <string name="error_json">Notlar uygulaması sunucu üzerinde etkinleştirilmiş mi?</string>
     <string name="error_io">sunucu bağlantısı kesildi</string>
     <string name="error_no_network">ağ bağlantısı yok</string>
+    <string name="error_server">Adres/Sunucu sorunu</string>
+    <string name="error_url_malformed">Sunucu adresi yanlış</string>
+    <string name="error_username_password_invalid">Kullanıcı adı ya da parola yanlış</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">Ayarlar</string>
 
     <!-- About -->
     <string name="about_version_title">Sürüm</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">Not ekle</string>
 
     <string name="pref_value_theme_light">Açık</string>
+    <string name="pref_value_theme_dark">Koyu</string>
     <string name="pref_value_font_normal">Normal</string>
     <string name="pref_value_wifi_and_mobile">Wi-Fi ve mobil veri ile eşitlensin</string>
     <string name="simple_error">Hata</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">Panoya kopyalandı</string>
     <string name="pin_to_homescreen">Ana sayfaya sabitle</string>
     <string name="note_has_been_deleted">Bu not silinmiş</string>
+    <string name="fallback_weblogin_text">Eski oturum açma yöntemi kullanılsın</string>
+    <string name="fallback_weblogin_back">Geri</string>
+    <string name="sso_announcment_title">Tek Oturum Açma</string>
+    <string name="sso_announcment_message">Notes uygulamasının gelecek büyük sürümü harika Nextcloud Tek Oturum Açma özelliğini kullanacak. Böylece kullanım kolaylığı sağlamanın yanında güvenlik ve kararlılık da arttırılacak. Lütfen Files uygulamasının son yayınlanmış 3.8.0 sürümünü kullandığınızdan ve ilk çalıştırmada kullandığınız aynı hesabı seçtiğinizden emin olun.</string>
+    <string name="sso_announcment_more_info">Ayrıntılı bilgi alın</string>
+    <string name="sso_announcment_understood">Anladım</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 293279d8..8c0126e4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -3,39 +3,58 @@
 
     <string name="app_name">便签</string>
     <string name="app_name_long">Nextcloud 笔记</string>
+    <string name="no_notes">还没有便签</string>
     <string name="label_all_notes">所有便签</string>
     <string name="label_favorites">收藏</string>
     <string name="action_create">新建便签</string>
     <string name="action_settings">设置</string>
     <string name="action_trashbin">已删除的笔记</string>
     <string name="action_search">搜索</string>
+    <string name="action_create_save">保存</string>
     <string name="simple_cancel">取消</string>
     <string name="simple_edit">编辑</string>
     <string name="action_edit_save">保存</string>
+    <string name="action_edit_saving">正在保存 &#8230;</string>
+    <string name="action_edit_saved">已保存</string>
     <string name="simple_about">关于</string>
     <string name="simple_bold">粗体</string>
     <string name="simple_link">链接</string>
     <string name="simple_italic">斜体</string>
+    <string name="action_select_note">选择便签</string>
     <string name="action_note_deleted">已删除的便签</string>
     <string name="action_note_restored">已恢复便签</string>
     <string name="action_undo">撤销</string>
     <string name="action_drawer_open">打开导航</string>
     <string name="action_drawer_close">关闭导航</string>
+    <string name="action_recent">最近</string>
     <string name="action_uncategorized">未分类</string>
     <string name="menu_delete">删除</string>
     <string name="menu_change_category">类别</string>
     <string name="menu_favorite">收藏</string>
     <string name="menu_preview">预览</string>
     <string name="menu_share">共享</string>
+    <string name="menu_about">关于</string>
 
     <string name="change_category_title">选择一个分类</string>
 
     <string name="listview_updated_today">今天</string>
     <string name="listview_updated_yesterday">昨天</string>
     <string name="listview_updated_this_week">本周</string>
+    <string name="listview_updated_last_week">上周</string>
     <string name="listview_updated_this_month">本月</string>
+    <string name="listview_updated_last_month">上月</string>
 
     <!-- Settings -->
+    <string name="settings_server_settings">账户设置</string>
+    <string name="settings_url">服务器地址</string>
+    <string name="settings_url_check_description">测试服务器是否可Ping通。</string>
+    <string name="settings_url_warn_http">警告：“http”是不安全的，请使用“https”。</string>
+    <string name="settings_username">用户名</string>
+    <string name="settings_password">密码</string>
+    <string name="settings_password_unchanged">密码（未修改）</string>
+    <string name="settings_password_check_description">显示证书是否正确。</string>
+    <string name="settings_submit">连接</string>
+    <string name="settings_submitting">连接 &#8230;</string>
     <string name="settings_note_mode">笔记的显示模式</string>
     <string name="settings_theme_title">深色主题</string>
     <string name="settings_font_title">等宽字体</string>
@@ -50,16 +69,26 @@
     <string name="settings_cert_reset_toast">所有自定义证书已被清理</string>
 
     <!-- Certificates -->
+    <string name="certificate_notification_connection_security">Notes - 安全连接</string>
+    <string name="trust_certificate_unknown_certificate_found">Notes 遇到未知的证书，是否信任它？</string>
 
     <!-- Network -->
+    <string name="network_connecting">正在连接</string>
+    <string name="network_connected">已连接</string>
+    <string name="network_disconnected">网络不可以</string>
 
     <!-- Error -->
     <string name="error_sync">同步失败：%1$s</string>
+    <string name="error_invalid_login">无效的登录：%1$s</string>
     <string name="error_json">服务器上的笔记应用是否启用？</string>
     <string name="error_io">与服务器连接中断</string>
     <string name="error_no_network">没有网络连接</string>
+    <string name="error_server">URL 或服务器错误</string>
+    <string name="error_url_malformed">错误的服务器地址</string>
+    <string name="error_username_password_invalid">用户名或密码错误</string>
 
     <!-- Snackbar Actions -->
+    <string name="snackbar_settings">设置</string>
 
     <!-- About -->
     <string name="about_version_title">版本</string>
@@ -100,6 +129,7 @@
     <string name="shortcut_create_long">创建新便笺</string>
 
     <string name="pref_value_theme_light">浅色主题</string>
+    <string name="pref_value_theme_dark">深色主题</string>
     <string name="pref_value_font_normal">普通</string>
     <string name="pref_value_wifi_and_mobile">在有Wi-Fi和移动数据时同步</string>
     <string name="simple_error">错误</string>
@@ -109,6 +139,12 @@
     <string name="copied_to_clipboard">复制到剪贴板</string>
     <string name="pin_to_homescreen">固定到主屏幕</string>
     <string name="note_has_been_deleted">此便签已被删除</string>
+    <string name="fallback_weblogin_text">回退到旧的登录方式</string>
+    <string name="fallback_weblogin_back">返回</string>
+    <string name="sso_announcment_title">单点登录</string>
+    <string name="sso_announcment_message">笔记应用将在下个大版本中使用Nextcloud很棒的单点登录功能。这将增加安全性、可靠性和易用性。请确认，您已安装版本至少为3.8.0的文件应用并在第一次运行时选择您已在使用的同一个账号。</string>
+    <string name="sso_announcment_more_info">更多信息</string>
+    <string name="sso_announcment_understood">我知道了</string>
 
     <!-- Array: note modes -->
     <string-array name="noteMode_entries">