diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d6c01a4..39aa0f2 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1,163 +1,244 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-* Copyright (c) 2014, Loic Blot <loic.blot@unix-experience.fr>
-* All rights reserved.
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-*/
+ /*
+ * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 -->
-<resources>
-	<!-- Translation version, reference for translators -->
-	<string name="translation_version">2</string>
-	
-	<!-- Translations must begin there -->
-	<!-- Preferences -->
-	<string name="pref_title_sync">SMS - Schnell</string>
-	<string name="pref_title_sync_frequency">Schnelle Sync-Frequenz</string>
-	<string name="pref_title_slow_sync">SMS - Langsam &amp; Sicher</string>
-	<string name="pref_title_slow_sync_frequency">Langsame Sync-Frequenz</string>
-	<string name="action_settings">Einstellungen</string>
-	<string name="sync_now">Jetzt synchronisieren</string>
-	<string name="pref_category_sync">Synchronisierung</string>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingTranslation">
 
-	<string name="title_global_pref_to_general_prefs">Allg. Einstellungen</string>
-	<string name="summary_global_pref_to_general_prefs">Sync-Einstellungen</string>
-	<string name="summary_notif_prefs">Benachrichtigungen</string>
-	
-	<string name="pref_header_data_sync">Daten &amp; Sync</string>
+    <!-- Translation version, reference for translators -->
+    <string name="translation_version">7</string>
 
-	<string name="title_activity_general_settings">Allg. Einstellungen</string>
+    <!-- System strings, do not translate -->
+    <string name="app_name">Nextcloud SMS</string>
+    <string name="account_type">fr.unix_experience.owncloud_sms</string>
+    <string name="account_authority">fr.unix_experience.owncloud_sms.datasync.provider</string>
+    <string name="slowsync_account_authority">fr.unix_experience.owncloud_sms.datasync.slowsync_provider</string>
+    <string name="target_package">fr.unix_experience.owncloud_sms</string>
+    <string name="login_logo">Login Logo</string>
 
-	<string-array name="pref_sync_frequency_titles">
-		<item>5 Minuten</item>
-		<item>15 Minuten</item>
-		<item>30 Minuten</item>
-		<item>1 Stunde</item>
-		<item>3 Stunden</item>
-		<item>6 Stunden</item>
-		<item>12 Stunden</item>
-		<item>24 Stunden</item>
-		<item>Nie</item>
-	</string-array>
-	<string-array name="pref_sync_frequency_values">
-		<item>5</item>
-		<item>15</item>
-		<item>30</item>
-		<item>60</item>
-		<item>180</item>
-		<item>360</item>
-		<item>720</item>
-		<item>1440</item>
-		<item>-1</item>
-	</string-array>
+    <!-- Translations must begin there -->
+    <!-- Preferences -->
+    <string name="pref_title_sync">SMS - Schnell</string>
+    <string name="pref_title_sync_frequency">Schnelle Sync-Frequenz</string>
+    <string name="pref_title_slow_sync">SMS - Langsam und sicher</string>
+    <string name="pref_title_slow_sync_frequency">Langsame Sync-Frequenz</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="sync_now">Jetzt synchronisieren</string>
+    <string name="pref_category_sync">Synchronisierung</string>
+    <string name="title_global_pref_to_general_prefs">Allg. Einstellungen</string>
+    <string name="summary_global_pref_to_general_prefs">Sync-Einstellungen</string>
+    <string name="summary_notif_prefs">Benachrichtigungen</string>
+    <string name="pref_header_data_sync">Daten &amp; Sync</string>
+    <string name="title_activity_general_settings">Allg. Einstellungen</string>
 
-	<string-array name="pref_slow_sync_frequency_titles">
-		<item>1 Stunde</item>
-		<item>3 Stunden</item>
-		<item>6 Stunden</item>
-		<item>12 Stunden</item>
-		<item>24 Stunden</item>
-		<item>Nie</item>
-	</string-array>
-	
-	<string-array name="pref_slow_sync_frequency_values">
-		<item>60</item>
-		<item>180</item>
-		<item>360</item>
-		<item>720</item>
-		<item>1440</item>
-		<item>-1</item>
-	</string-array>
-	
-	<string name="title_activity_login">Einloggen</string>
+    <string-array name="pref_sync_frequency_titles">
+        <item>5 Minuten</item>
+        <item>15 Minuten</item>
+        <item>30 Minuten</item>
+        <item>1 Stunde</item>
+        <item>3 Stunden</item>
+        <item>6 Stunden</item>
+        <item>12 Stunden</item>
+        <item>24 Stunden</item>
+        <item>Nie</item>
+    </string-array>
+    <string-array name="pref_sync_frequency_values">
+        <item>5</item>
+        <item>15</item>
+        <item>30</item>
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>720</item>
+        <item>1440</item>
+        <item>-1</item>
+    </string-array>
+    <string-array name="pref_sync_bulk_max_messages_titles">
+        <item>100 SMS</item>
+        <item>1000 SMS</item>
+        <item>2000 SMS</item>
+        <item>5000 SMS</item>
+        <item>10000 SMS</item>
+        <item>25000 SMS</item>
+    </string-array>
+    <string-array name="pref_sync_bulk_max_messages">
+        <item>100</item>
+        <item>1000</item>
+        <item>2000</item>
+        <item>5000</item>
+        <item>10000</item>
+        <item>25000</item>
+        <item>-1</item>
+    </string-array>
+    <string-array name="pref_slow_sync_frequency_titles">
+        <item>1 Stunde</item>
+        <item>3 Stunden</item>
+        <item>6 Stunden</item>
+        <item>12 Stunden</item>
+        <item>24 Stunden</item>
+        <item>Nie</item>
+    </string-array>
+    <string-array name="pref_slow_sync_frequency_values">
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>720</item>
+        <item>1440</item>
+        <item>-1</item>
+    </string-array>
 
-	<!-- Login -->
-	<string name="prompt_login">Login</string>
-	<string name="prompt_password">Passwort</string>
-	<string name="action_sign_in">Einloggen oder Registrieren</string>
-	<string name="action_sign_in_short">Einloggen</string>
-	<string name="error_invalid_login">Falscher Benutzername oder Passwort</string>
-	<string name="error_invalid_password">Dieses Passwort ist zu kurz</string>
-	<string name="error_field_required">Pflichtfeld</string>
-	<string name="prompt_serverURI">Server-Adresse</string>
-	<string name="error_invalid_server_address">Ungültige Serveradresse</string>
-	<string name="error_connection_failed">Verbindung fehlgeschlagen, ist dies der richtige Server?</string>
-	<string name="error_http_connection_failed">Kann keine HTTP-Verbindung aufbauen. Läuft der Webserver unter dieser Adresse?</string>
-	
-	<string-array name="protocol_array">
-		<item>https://</item>
-		<item>http://</item>
-	</string-array>
-	
-	<!-- Notifications -->
-	<string name="sync_title">Synchronisation</string>
-	<string name="sync_inprogress">Sychronisation läuft...</string>
-	<string name="fatal_error">Kritischer Fehler!</string>
-	
-	
-	<!-- Errors -->
-	<string name="err_sync_get_smslist">Fehler #1: Bei vorherigen Nachrichten ungültige Serverdaten empfangen</string>
-	<string name="err_sync_craft_http_request">Fehler #2: Fehler bei der Erstellung des HTTP-Requests</string>
-	<string name="err_sync_push_request">Fehler #3: Push-Request fehlgeschlagen</string>
-	<string name="err_sync_push_request_resp">Fehler #4: Beim Pushen von Daten ungültige Serverdaten empfangen</string>
-	<string name="err_sync_create_json_null_smslist">Fehler #5: SMS-Liste gab NULL zurück</string>
-	<string name="err_sync_create_json_put_smslist">Fehler #6: Fehler bei der Erstellung des Push-Requests</string>
-	<string name="err_sync_create_json_request_encoding">Fehler #7: Ungültige Zeichenkodierung bei der Erstellung des Requests</string>
-	<string name="err_sync_auth_failed">Fehler #8: Anmeldung fehlgeschlagen</string>
-	<string name="err_sync_http_request_returncode_unhandled">Fehler #9: Unbekannter HTTP-Antwortcode vom Server</string>
-	<string name="err_sync_http_request_connect">Fehler #11: Konnte nicht mit der Nextcloud-Instanz verbinden (HTTP-Request)</string>
-	<string name="err_sync_http_request_httpexception">Fehler #12: Konnte nicht mit der Nextcloud-Instanz verbinden (HTTP-Ausnahme)</string>
-	<string name="err_sync_http_request_ioexception">Fehler #13: Konnte nicht mit der Nextcloud-Instanz verbinden (IO-Fehler)</string>
-	<string name="err_sync_http_request_resp">Fehler #14: Konnte Server-Antwort nicht parsen</string>
-	<string name="err_sync_http_request_parse_resp">Fehler #15: Konnte Server-Antwort nicht parsen</string>
-	<string name="app_name">Nextcloud SMS</string>
-	<string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Fehler #18: Nextcloud SMS App ist niht installiert oder Nextcloud führt gerade ein Uprade durch</string>
-	<string name="err_sync_no_connection_available">Fehler #16: Keine Datenverbindung verfügbar</string>
-	<string name="error_connection_failed_not_found">Verbindung fehlgeschlagen, der Server hat 404 NICHT GEFUNDEN geantworet. Stellen Sie sicher, dass der Pfad zur Nextcloud-Instanz korrekt gesetzt ist.</string>
-	<string name="error_make_default_sms_app"></string>
-	<string name="ma_content_swipeaction">Wisch von links nach rechts um auf das Action-Menü zuzugreifen</string>
-	<string name="ma_content_welcome">Willkommen bei Nextcloud SMS. Diese Anwendung ermöglicht dir die Synchronisation deiner SMS mit deiner Nextcloud-Instanz</string>
-	<string name="ma_title_add_account">Account hinzufügen</string>
-	<string name="ma_title_my_accounts">Meine Accounts</string>
-	<string name="ma_title_rate_us">Bewerte uns!</string>
-	<string name="ma_title_remote_account">Entfernter Account</string>
-	<string name="ma_title_welcome">Willkommen</string>
-	<string name="navigation_drawer_close">Navigationsleiste schließen</string>
-	<string name="navigation_drawer_open">Navigationsleiste öffnen</string>
-	<string name="no_account_configured">Kein Account konfiguriert</string>
-	<string name="nothing_to_sync">Es gibt nichts zu synchronisieren.</string>
-	<string name="notif_permission_required">Berechtigungen benötigt</string>
-	<string name="please_fix_it">Bitte behebe es.</string>
-	<string name="understood">Verstanden</string>
-	<string name="title_activity_select_account">Account auswählen</string>
-	<string name="title_activity_select_contact">Kontakt auswählen</string>
-	<string name="err_cannot_read_contacts">Wir können deine Kontakte nicht lesen.</string>
-	<string name="err_cannot_read_sms">Wir können deine SMS nicht lesen.</string>
-	<string name="cancel">Abbrchen</string>
-	<string name="choose_account">Account auswählen</string>
-	<string name="communicate">Kommunizieren</string>
-	<string name="contactinfos_list">Kontaktliste</string>
-	<string name="contactinfos_title">Kontaktinformationen</string>
-	<string name="action_appinfo_perms">App Infos und Berechtigungen</string>
-	<string name="account_actions">Account-Aktionen</string>
+    <string-array name="pref_minimum_sync_chars_titles">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+    </string-array>
+    <string-array name="pref_minimum_sync_chars">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+    </string-array>
 
+    <string name="pref_sync_wifi">Synchronisiere über WLAN</string>
+    <string name="pref_sync_4g">Synchronisiere über LTE</string>
+    <string name="pref_sync_3g">Synchronisiere über UMTS</string>
+    <string name="pref_sync_gprs">Synchronisiere über GPRS</string>
+    <string name="pref_sync_2g">Synchronisiere über GSM</string>
+    <string name="pref_sync_others">Synchronisiere über anderen Modus</string>
+    <string name="title_activity_login">Einloggen</string>
+
+    <!-- Login -->
+    <string name="prompt_login">Login</string>
+    <string name="prompt_password">Passwort</string>
+    <string name="action_sign_in">Einloggen oder Registrieren</string>
+    <string name="action_sign_in_short">Einloggen</string>
+    <string name="error_invalid_login">Falscher Benutzername oder Passwort</string>
+    <string name="error_invalid_password">Dieses Passwort ist zu kurz</string>
+    <string name="error_field_required">Pflichtfeld</string>
+    <string name="prompt_serverURI">Serveradresse</string>
+    <string name="error_invalid_server_address">Ungültige Serveradresse</string>
+    <string name="error_connection_failed">Verbindung fehlgeschlagen, ist dies der richtige Server?</string>
+    <string name="error_http_connection_failed">Kann keine HTTP-Verbindung aufbauen. Läuft der Webserver unter dieser Adresse?</string>
+
+    <string-array name="protocol_array">
+        <item>https://</item>
+        <item>http://</item>
+    </string-array>
+
+    <!-- Main activity -->
+    <string name="ma_title_rate_us">Bewerte uns!</string>
+    <string name="ma_title_add_account">Account hinzufügen</string>
+    <string name="ma_title_welcome">Willkommen</string>
+    <string name="ma_content_welcome">Willkommen bei Nextcloud SMS. Diese Anwendung ermöglicht dir die Synchronisation deiner SMS mit deiner Nextcloud-Instanz.</string>
+    <string name="ma_title_remote_account">Entfernter Account</string>
+    <string name="choose_account">Account auswählen</string>
+
+    <!-- Restauration -->
+    <string name="title_activity_select_account">Account auswählen</string>
+    <string name="title_activity_select_contact">Kontakt auswählen</string>
+    <string name="no_account_configured">Kein Account konfiguriert.</string>
+
+    <!-- Notifications -->
+    <string name="sync_title">Synchronisation</string>
+    <string name="sync_inprogress">Sychronisation läuft...</string>
+    <string name="fatal_error">Kritischer Fehler!</string>
+
+    <!-- Errors -->
+    <string name="err_sync_get_smslist">Fehler #1: Bei vorherigen Nachrichten ungültige Serverdaten empfangen</string>
+    <string name="err_sync_craft_http_request">Fehler #2: Fehler bei der Erstellung des HTTP-Requests</string>
+    <string name="err_sync_push_request">Fehler #3: Push-Request fehlgeschlagen</string>
+    <string name="err_sync_push_request_resp">Fehler #4: Beim Pushen von Daten ungültige Serverdaten empfangen</string>
+    <string name="err_sync_create_json_null_smslist">Fehler #5: SMS-Liste gab NULL zurück</string>
+    <string name="err_sync_create_json_put_smslist">Fehler #6: Fehler bei der Erstellung des Push-Requests</string>
+    <string name="err_sync_create_json_request_encoding">Fehler #7: Ungültige Zeichenkodierung bei der Erstellung des Requests</string>
+    <string name="err_sync_auth_failed">Fehler #8: Anmeldung fehlgeschlagen</string>
+    <string name="err_sync_http_request_returncode_unhandled">Fehler #9: Unbekannter HTTP-Antwortcode vom Server</string>
+    <string name="err_sync_http_request_connect">Fehler #11: Konnte nicht mit der Nextcloud-Instanz verbinden (HTTP-Request)</string>
+    <string name="err_sync_http_request_httpexception">Fehler #12: Konnte nicht mit der Nextcloud-Instanz verbinden (HTTP-Ausnahme)</string>
+    <string name="err_sync_http_request_ioexception">Fehler #13: Konnte nicht mit der Nextcloud-Instanz verbinden (IO-Fehler)</string>
+    <string name="err_sync_http_request_resp">Fehler #14: Konnte Server-Antwort nicht parsen</string>
+    <string name="err_sync_http_request_parse_resp">Fehler #15: Konnte Server-Antwort nicht parsen</string>
+    <string name="err_sync_no_connection_available">Fehler #16: Keine Datenverbindung verfügbar</string>
+    <string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Fehler #18: Nextcloud SMS App ist niht installiert oder Nextcloud führt gerade ein Uprade durch</string>
+    <string name="err_fetch_phonelist">Nicht valide Telefonliste vom Server empfangen.</string>
+    <string name="err_proto_v2">Der Server unterstützt diese Funktion nicht. Stellen Sie sicher, dass die Serverversion mindestens 1.6 ist.</string>
+    <string name="contactinfos_title">Kontaktinformationen</string>
+    <string name="pref_title_bulk_messages">Maximale Anzahl von Nachrichten, die pro Synchronisieren gesendet werden</string>
+    <string name="contactinfos_list">Kontaktliste</string>
+    <string name="function_not_available">Diese Funktion ist noch nicht verfügbar.</string>
+
+    <string name="ui_notification_title_template">Nextcloud SMS: %1$s</string>
+    <string name="communicate">Kommunizieren</string>
+    <string name="navigation_drawer_open">Navigationsleiste öffnen</string>
+    <string name="navigation_drawer_close">Navigationsleiste schließen</string>
+    <string name="ma_title_my_accounts">Meine Accounts</string>
+    <string name="ma_content_swipeaction">Wisch von links nach rechts um auf das Action-Menü zuzugreifen</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="understood">Verstanden</string>
+    <string name="notif_permission_required">Berechtigungen benötigt</string>
+    <string name="please_fix_it">Bitte behebe es.</string>
+    <string name="err_cannot_read_contacts">Wir können deine Kontakte nicht lesen.</string>
+    <string name="err_cannot_read_sms">Wir können deine SMS nicht lesen.</string>
+    <string name="action_appinfo_perms">App Infos und Berechtigungen</string>
+    <string name="restore_all_messages">Alle Nachrichten wiederherstellen</string>
+    <string name="account_actions">Account-Aktionen</string>
+    <string name="error_connection_failed_not_found">Verbindung fehlgeschlagen, der Server hat 404 NICHT GEFUNDEN geantworet. Stellen Sie sicher, dass der Pfad zur Nextcloud-Instanz korrekt gesetzt ist.</string>
+    <string name="nothing_to_sync">Es gibt nichts zu synchronisieren.</string>
+    <string name="feature_not_already_implemented">Diese Funktion ist noch nicht implementiert aber wird in Kürze verfügbar sein.</string>
+    <string name="pref_title_minimum_sync_chars">Minimale Telefonnummernlänge</string>
+    <string name="err_didnt_find_account_restore">Wir haben deinen Account nicht gefunden, um deine Nachricht wiederherstellen. Dieses ist eine sehr seltsame Situation.</string>
+    <string name="launch_restore">Meine SMS wiederherstellen</string>
+    <string name="err_kitkat_required">Android 4.4 oder höher ist erforderlich, um diese Funktion zu verwenden.</string>
+    <string name="restore_finished">SMS-Wiederherstellung ist nun abgeschlossen.</string>
+    <string name="x_messages_restored">Nachrichten wiederhergestellt&#8230;</string>
+    <string name="err_no_connection">Keine Verbindung verfügbar, bitte stellen Sie sicher, dass Sie eine stabile Datenverbindung haben.</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index fc69ded..edf7176 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
  /*
- * Copyright (c) 2014, Loic Blot <loic.blot@unix-experience.fr>
+ * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,30 +25,33 @@
  * SUCH DAMAGE.
  */
 -->
-<resources>
-	<!-- Translation version, reference for translators -->
-	<string name="translation_version">7</string>
-	
-    <!-- Translations must begin there -->
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingTranslation">
 
+    <!-- Translation version, reference for translators -->
+    <string name="translation_version">7</string>
+
+    <!-- System strings, do not translate -->
     <string name="app_name">Nextcloud SMS</string>
+    <string name="login_logo">Logo de connexion</string>
+
+    <string name="pref_lastmsgdate">date_du_dernier_message</string>
+
+    <!-- Translations must begin there -->
+    <!-- Preferences -->
+    <string name="pref_title_sync">SMS - Méthode rapide</string>
+    <string name="pref_title_sync_frequency">Fréquence de synchronisation</string>
+    <string name="pref_title_slow_sync">SMS - Méthode lente (sécurisée)</string>
+    <string name="pref_title_slow_sync_frequency">Fréquence de la synchronisation lente</string>
     <string name="action_settings">Paramètres</string>
     <string name="sync_now">Synchroniser maintenant</string>
-    
-    <!-- Preferences -->
     <string name="pref_category_sync">Synchronisation</string>
-
-	<string name="title_global_pref_to_general_prefs">Préférences générales</string>
-	<string name="summary_global_pref_to_general_prefs">Options de synchronisation</string>
-	<string name="summary_notif_prefs">Notifications</string>
-	
-	<string name="pref_header_data_sync">Données &amp; synchronisation</string>
-	<string name="pref_title_sync_frequency">Fréquence de synchronisation</string>
-	<string name="pref_title_sync">SMS - Méthode rapide</string>
-	<string name="pref_title_slow_sync">SMS - Méthode lente (sécurisée)</string>
-	<string name="pref_title_slow_sync_frequency">Fréquence de la synchronisation lente</string>
-
-	<string name="title_activity_general_settings">Préférences générales</string>
+    <string name="title_global_pref_to_general_prefs">Préférences générales</string>
+    <string name="summary_global_pref_to_general_prefs">Options de synchronisation</string>
+    <string name="summary_notif_prefs">Notifications</string>
+    <string name="pref_header_data_sync">Données &amp; synchronisation</string>
+    <string name="title_activity_general_settings">Préférences générales</string>
 
     <string-array name="pref_sync_frequency_titles">
         <item>5 minutes</item>
@@ -81,7 +84,69 @@
         <item>25000 SMS</item>
         <item>Tous les SMS non synchronisés</item>
     </string-array>
-    
+    <string-array name="pref_sync_bulk_max_messages">
+        <item>100</item>
+        <item>1000</item>
+        <item>2000</item>
+        <item>5000</item>
+        <item>10000</item>
+        <item>25000</item>
+        <item>-1</item>
+    </string-array>
+    <string-array name="pref_slow_sync_frequency_titles">
+        <item>1 heure</item>
+        <item>3 heures</item>
+        <item>6 heures</item>
+        <item>12 heures</item>
+        <item>24 heures</item>
+        <item>Jamais</item>
+    </string-array>
+    <string-array name="pref_slow_sync_frequency_values">
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>720</item>
+        <item>1440</item>
+        <item>-1</item>
+    </string-array>
+
+    <string-array name="pref_minimum_sync_chars_titles">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+    </string-array>
+    <string-array name="pref_minimum_sync_chars">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+    </string-array>
+
     <string name="pref_push_on_receive">Pousser le SMS à la réception</string>
     <string name="pref_sync_wifi">Synchroniser en Wi-Fi</string>
     <string name="pref_sync_4g">Synchroniser en 4G</string>
@@ -89,7 +154,6 @@
     <string name="pref_sync_gprs">Synchroniser en 2.5G (GPRS)</string>
     <string name="pref_sync_2g">Synchroniser en 2G</string>
     <string name="pref_sync_others">Synchroniser dans les autres modes</string>
-    
     <string name="title_activity_login">Connexion</string>
 
     <!-- Login -->
@@ -104,46 +168,56 @@
     <string name="error_invalid_server_address">Adresse invalide</string>
     <string name="error_connection_failed">Echec de connexion, assurer vous qu\'il s\'agit du bon serveur</string>
     <string name="error_http_connection_failed">Impossible d\'effectuer la connexion HTTP. Assurez vous qu\'il s\'agit d\'un serveur HTTP</string>
-    
+
+    <string-array name="protocol_array">
+        <item>https://</item>
+        <item>http://</item>
+    </string-array>
+
     <!-- Main activity -->
     <string name="ma_title_rate_us">Notez nous !</string>
     <string name="ma_title_add_account">Ajouter un compte</string>
     <string name="ma_title_welcome">Bienvenue</string>
     <string name="ma_content_welcome">Bienvenue sur l\'application ownCloud SMS. Cette application va vous permettre de synchroniser vos SMS au sein de votre instance ownCloud en utilisant l\'application dédiée.</string>
+    <string name="ma_title_remote_account">Compte distant</string>
+    <string name="choose_account">Choisissez un compte</string>
+
+    <!-- Restauration -->
+    <string name="title_activity_select_account">Chosissez un compte</string>
+    <string name="title_activity_select_contact">Choisissez un contact</string>
+    <string name="no_account_configured">Vous n\'avez pas configuré de compte.</string>
 
     <!-- Notifications -->
     <string name="sync_title">Processus de synchronisation</string>
     <string name="sync_inprogress">Synchonisation en cours...</string>
     <string name="fatal_error">Erreur fatale ! </string>
-    
+
+    <!-- Errors -->
+    <string name="err_sync_get_smslist">Erreur #1: Données invalides reçues lors de l\'obtention des messages précédents.</string>
+    <string name="err_sync_craft_http_request">Erreur #2: Echec de la création de la requête</string>
+    <string name="err_sync_push_request">Erreur #3: Echec du push de la requête</string>
+    <string name="err_sync_push_request_resp">Erreur #4: Données invalides reçues lors de la synchronisation.</string>
+    <string name="err_sync_create_json_null_smslist">Erreur #6: Liste SMS Nulle</string>
+    <string name="err_sync_create_json_put_smslist">Erreur #6: Echec de la création de la requête PUSH</string>
+    <string name="err_sync_create_json_request_encoding">Erreur #7: Encodage inconnu à la conversion</string>
+    <string name="err_sync_auth_failed">Erreur #8: Echec de l\'authentification</string>
+    <string name="err_sync_http_request_returncode_unhandled">Erreur #9: Le serveur a renvoyé un code de retour HTTP non géré</string>
+    <string name="err_sync_http_request_connect">Erreur #11: Impossible de se connecter à l\'instance Nextcloud</string>
+    <string name="err_sync_http_request_httpexception">Erreur #12: Impossible de se connecter à l\'instance Nextcloud</string>
+    <string name="err_sync_http_request_ioexception">Erreur #13: Impossible de se connecter à l\'instance Nextcloud</string>
+    <string name="err_sync_http_request_resp">Erreur #14: Impossible d\'interpréter la réponse du serveur</string>
+    <string name="err_sync_http_request_parse_resp">Erreur #15: Impossible d\'interpréter la réponse du serveur</string>
     <string name="err_sync_no_connection_available">Erreur #16: Aucune connexion data disponible</string>
     <string name="err_sync_account_unparsable">Error #17: Compte mal configuré. Merci de bien vouloir le reconfigurer.</string>
     <string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Error #18: L\'application Nextcloud SMS n\'est pas installée ou Nextcloud attend d\'être mis à niveau.</string>
     <string name="err_fetch_phonelist">La liste de numéros reçue depuis le serveur est invalide.</string>
     <string name="err_proto_v2">Le serveur ne supporte pas cette fonctionnalité. Assurez vous que le serveur est au moins en version 1.6.</string>
     <string name="contactinfos_title">Informations sur le contact</string>
-    <string name="err_sync_create_json_null_smslist">Erreur #6: Liste SMS Nulle</string>
-    <string name="err_sync_create_json_put_smslist">Erreur #6: Echec de la création de la requête PUSH</string>
-    <string name="err_sync_http_request_connect">Erreur #11: Impossible de se connecter à l\'instance Nextcloud</string>
-    <string name="err_sync_auth_failed">Erreur #8: Echec de l\'authentification</string>
-    <string name="err_sync_push_request">Erreur #3: Echec du push de la requête</string>
-    <string name="err_sync_http_request_returncode_unhandled">Erreur #9: Le serveur a renvoyé un code de retour HTTP non géré</string>
-    <string name="err_sync_http_request_resp">Erreur #14: Impossible d\'interpréter la réponse du serveur</string>
-    <string name="err_sync_http_request_parse_resp">Erreur #15: Impossible d\'interpréter la réponse du serveur</string>
-    <string name="err_sync_http_request_httpexception">Erreur #12: Impossible de se connecter à l\'instance Nextcloud</string>
-    <string name="err_sync_http_request_ioexception">Erreur #13: Impossible de se connecter à l\'instance Nextcloud</string>
     <string name="subtitle_contact_phones">- Numéros de téléphone associés</string>
-    <string name="choose_account">Choisissez un compte</string>
-    <string name="ma_title_remote_account">Compte distant</string>
-    <string name="title_activity_select_account">Chosissez un compte</string>
-    <string name="title_activity_select_contact">Choisissez un contact</string>
-    <string name="err_sync_push_request_resp">Erreur #4: Données invalides reçues lors de la synchronisation.</string>
-    <string name="err_sync_create_json_request_encoding">Erreur #7: Encodage inconnu à la conversion</string>
-    <string name="err_sync_craft_http_request">Erreur #2: Echec de la création de la requête</string>
     <string name="pref_title_bulk_messages">Nombre maximum de messages à envoyer par synchronisation</string>
     <string name="contactinfos_list">Liste des contacts</string>
     <string name="function_not_available">Cette fonctionnalité n\'est pas encore disponibleeems.</string>
-    <string name="no_account_configured">Vous n\'avez pas configuré de compte.</string>
+
     <string name="communicate">Parlez de nous</string>
     <string name="ma_title_my_accounts">Mes comptes</string>
     <string name="ma_content_swipeaction">Glissez votre doigt de gauche à droite pour afficher le menu.</string>
@@ -162,9 +236,8 @@
     <string name="feature_not_already_implemented">Cette fonctionnalité n\'est pas implémentée mais elle sera disponible bientôt.</string>
     <string name="pref_title_minimum_sync_chars">Longueur minimale du numéro de téléphone</string>
     <string name="err_didnt_find_account_restore">Nous n\'avons pas retrouvé le compte que nous souhaitions utiliser pour la restauration. Cette situation est vraiment étrange.</string>
-    <string name="err_kitkat_required">Android 4.4 ou plus est requis pour utiliser cette fonctionnalité.</string>
-    <string name="err_sync_get_smslist">Erreur #1: Données invalides reçues lors de l\'obtention des messages précédents.</string>
     <string name="error_make_default_sms_app">Merci de bien vouloir mettre cette application en application SMS par défaut le temps de restaurer les messages. Cette limitation a été ajoutée depuis Android 4.4.</string>
+    <string name="err_kitkat_required">Android 4.4 ou plus est requis pour utiliser cette fonctionnalité.</string>
     <string name="x_messages_restored">messages restaurés...</string>
     <string name="err_no_connection">Aucune connexion disponible, assurez voir d\'avoir une connection de données valide.</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
new file mode 100644
index 0000000..78d938d
--- /dev/null
+++ b/src/main/res/values-pl/strings.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /*
+ * Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+-->
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingTranslation">
+
+    <!-- Translation version, reference for translators -->
+    <string name="translation_version">7</string>
+
+    <!-- System strings, do not translate -->
+    <string name="app_name">Nextcloud SMS</string>
+    <string name="account_type">fr.unix_experience.owncloud_sms</string>
+    <string name="account_authority">fr.unix_experience.owncloud_sms.datasync.provider</string>
+    <string name="slowsync_account_authority">fr.unix_experience.owncloud_sms.datasync.slowsync_provider</string>
+    <string name="target_package">fr.unix_experience.owncloud_sms</string>
+    <string name="login_logo">Logo loginu</string>
+
+    <string name="pref_lastmsgdate">last_message_date</string>
+
+    <!-- Translations must begin there -->
+    <!-- Preferences -->
+    <string name="pref_title_sync">SMS - Szybki</string>
+    <string name="pref_title_sync_frequency">Częstotliwość szybkiej synchronizacji</string>
+    <string name="pref_title_slow_sync">SMS - Powolny i bezpieczny</string>
+    <string name="pref_title_slow_sync_frequency">Częstotliwość zabezpieczonej powolnej synchronizacji</string>
+    <string name="action_settings">Ustawienia</string>
+    <string name="sync_now">Synchronizuj teraz</string>
+    <string name="pref_category_sync">Synchronizacja</string>
+    <string name="title_global_pref_to_general_prefs">Ogólne preferencje</string>
+    <string name="summary_global_pref_to_general_prefs">Opcje synchronizacji</string>
+    <string name="summary_notif_prefs">Powiadomienia</string>
+    <string name="title_activity_general_settings">Ogólne ustawienia</string>
+
+    <string-array name="pref_sync_frequency_titles">
+        <item>5 minut</item>
+        <item>15 minut</item>
+        <item>30 minut</item>
+        <item>1 godzina</item>
+        <item>3 godziny</item>
+        <item>6 godzin</item>
+        <item>12 godzin</item>
+        <item>24 godziny</item>
+        <item>Nigdy</item>
+    </string-array>
+    <string-array name="pref_sync_frequency_values">
+        <item>5</item>
+        <item>15</item>
+        <item>30</item>
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>720</item>
+        <item>1440</item>
+        <item>-1</item>
+    </string-array>
+    <string-array name="pref_sync_bulk_max_messages_titles">
+        <item>100 SMSów</item>
+        <item>1000 SMSów</item>
+        <item>2000 SMSów</item>
+        <item>5000 SMSów</item>
+        <item>10000 SMSów</item>
+        <item>25000 SMSów</item>
+        <item>Żaden SMS nie zschynchronizowany</item>
+    </string-array>
+    <string-array name="pref_sync_bulk_max_messages">
+        <item>100</item>
+        <item>1000</item>
+        <item>2000</item>
+        <item>5000</item>
+        <item>10000</item>
+        <item>25000</item>
+        <item>-1</item>
+    </string-array>
+    <string-array name="pref_slow_sync_frequency_titles">
+        <item>1 godzina</item>
+        <item>3 godziny</item>
+        <item>6 godzin</item>
+        <item>12 godzin</item>
+        <item>24 godziny</item>
+        <item>Nigdy</item>
+    </string-array>
+    <string-array name="pref_slow_sync_frequency_values">
+        <item>60</item>
+        <item>180</item>
+        <item>360</item>
+        <item>720</item>
+        <item>1440</item>
+        <item>-1</item>
+    </string-array>
+
+    <string-array name="pref_minimum_sync_chars_titles">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+    </string-array>
+    <string-array name="pref_minimum_sync_chars">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+    </string-array>
+
+    <string name="pref_sync_wifi">Synchronizuj przez Wi-Fi</string>
+    <string name="pref_sync_4g">Synchronizuj przez 4G</string>
+    <string name="pref_sync_3g">Synchronizuj przez 3G</string>
+    <string name="pref_sync_gprs">Synchronizuj przez 2.5G (GPRS)</string>
+    <string name="pref_sync_2g">Synchronizuj przez 2G</string>
+    <string name="pref_sync_others">Synchronizuj w innych trybach</string>
+    <string name="title_activity_login">Zaloguj się</string>
+
+    <!-- Login -->
+    <string name="prompt_login">Login</string>
+    <string name="prompt_password">Hasło</string>
+    <string name="action_sign_in">Zaloguj lub zarejestruj się</string>
+    <string name="action_sign_in_short">Zaloguj się</string>
+    <string name="error_invalid_login">Niepoprawny login lub hasło</string>
+    <string name="error_invalid_password">To hasło jest za krótkie</string>
+    <string name="error_field_required">To pole jest wymagane</string>
+    <string name="prompt_serverURI">Adres serwera</string>
+    <string name="error_invalid_server_address">Błędny adres serwera</string>
+    <string name="error_connection_failed">Połączenie nie udało się, upewnij się, że to właściwy serwer</string>
+    <string name="error_http_connection_failed">Nie można zestawić połączenia HTTP. Proszę upewnić się, że jest tam serwer webowy</string>
+
+    <string-array name="protocol_array">
+        <item>https://</item>
+        <item>http://</item>
+    </string-array>
+
+    <!-- Main activity -->
+    <string name="ma_title_rate_us">Oceń nas!</string>
+    <string name="ma_title_add_account">Dodaj konto</string>
+    <string name="ma_title_welcome">Witaj</string>
+    <string name="ma_content_welcome">Witaj w aplikacji Nextcloud SMS. Ta aplikacja umożliwia ci synchronizację twoich SMSów do twojej instancji Nextcloud.</string>
+    <string name="ma_title_remote_account">Zdalne konto</string>
+    <string name="choose_account">Wybierz konto</string>
+
+    <!-- Restauration -->
+    <string name="title_activity_select_account">Wybierz konto</string>
+    <string name="title_activity_select_contact">Wybierz kontakt</string>
+    <string name="no_account_configured">Brak skonfigurowanych kont.</string>
+
+    <!-- Notifications -->
+    <string name="sync_title">Proces synchronizacji</string>
+    <string name="sync_inprogress">Synchronizacja w trakcie...</string>
+    <string name="fatal_error">Krytyczny błąd !</string>
+
+    <!-- Errors -->
+    <string name="err_sync_get_smslist">Błąd #1: Błędne dane otrzymane z serwera podczas odbierania poprzedniej wiadomości</string>
+    <string name="err_sync_craft_http_request">Błąd #2: Błąd podczas tworzenia żądania HTTP</string>
+    <string name="err_sync_create_json_request_encoding">Błąd #7: Niewspierane kodowanie podczas generowania żądania</string>
+    <string name="err_sync_auth_failed">Błąd #8: Uwierzytelnianie nie powiodło się</string>
+    <string name="err_sync_http_request_returncode_unhandled">Błąd #9: Serwer ustawił nieobsługiwany kod powrotu HTTP</string>
+    <string name="err_sync_http_request_connect">Błąd #11: Nie udało się zestawić połączenia z instancją Nextcloud</string>
+    <string name="err_sync_http_request_httpexception">Błąd #12: Nie udało się zestawić połączenia z instancją Nextcloud</string>
+    <string name="err_sync_http_request_ioexception">Błąd #13: Nie udało się zestawić połączenia z instancją Nextcloud</string>
+    <string name="err_sync_http_request_resp">Błąd #14: Nie udało się przetworzyć odpowiedzi serwera</string>
+    <string name="err_sync_http_request_parse_resp">Błąd #15: Nie udało się przetworzyć odpowiedzi serwera</string>
+    <string name="err_sync_no_connection_available">Błąd #16: Brak dostępnego połączenia</string>
+    <string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Błąd #18: Aplikacja Nextcloud SMS jest niezainstalowana lub Nextcloud czeka na aktualizację</string>
+    <string name="err_proto_v2">Serwer nie wspiera tej funkcjonalności. Upewnij się, że wersja serwera to co najmniej 1.6</string>
+    <string name="pref_title_bulk_messages">Maksymalna ilość wiadomości do wysłania podczas synchronizacji</string>
+    <string name="contactinfos_list">Lista kontaktów</string>
+    <string name="function_not_available">Ta funkcja nie jest jeszcze dostępna.</string>
+
+    <string name="ui_notification_title_template">Nextcloud SMS: %1$s</string>
+    <string name="ma_title_my_accounts">Moje konta</string>
+    <string name="ma_content_swipeaction">Przesuń palcem od lewej do prawej aby otworzyć menu działań.</string>
+    <string name="cancel">Anuluj</string>
+    <string name="understood">Zrozumiano</string>
+    <string name="notif_permission_required">Wymagane uprawnienia</string>
+    <string name="notif_permission_required_content">Brakuje jakichś uprawnień aby wykonać synchronizację. Proszę naprawić to w ustawieniach aplikacji</string>
+    <string name="please_fix_it">Proszę to naprawić.</string>
+    <string name="err_cannot_read_contacts">Nie możemy odczytać Twoich kontaktów.</string>
+    <string name="err_cannot_read_sms">Nie możemy odczytać twoich SMSów.</string>
+    <string name="action_appinfo_perms">Informacje o aplikacji i uprawnienia</string>
+    <string name="restore_all_messages">Przywróć wszystkie wiadomości</string>
+    <string name="account_actions">Działania konta</string>
+    <string name="error_connection_failed_not_found">Połączenie nie udane. Serwer zwraca 404 NIE ZNALEZIONO. Upewnij się, że ustawiona jest prawidłowa ścieżka do twojej instancji Nextcloud.</string>
+    <string name="nothing_to_sync">Nie ma czegokolwiek do synchronizacji.</string>
+    <string name="feature_not_already_implemented">Ta funkcjonalność nie jest jeszcze zaimplementowana ale będzie dostępna niedługo.</string>
+    <string name="pref_title_minimum_sync_chars">Minimalna długość numeru telefonu</string>
+    <string name="err_didnt_find_account_restore">Nie udało nam się odnaleźć twojego konta aby odzyskać Twoje wiadomości. To bardzo dziwna sytuacja.</string>
+    <string name="launch_restore">Przywróć moje SMSy</string>
+    <string name="error_make_default_sms_app">Ustaw tę aplikację jako domyślną aplikację do obsługi SMSów aby zezwolić na odtworzenie twoich SMSów. To ograniczenie zostało wprowadzone w Androidzie 4.4. </string>
+    <string name="fix_permissions">Napraw uprawnienia</string>
+    <string name="err_kitkat_required">Android w wersji 4.4 lub wyższej jest wymagany do obsługi tej funkcjonalności.</string>
+    <string name="restore_finished">Przywracanie SMSów zostało zakończone.</string>
+    <string name="x_messages_restored">przywróconych wiadomości&#8230;</string>
+    <string name="err_no_connection">Brak dostępnego połączenia. Proszę się upewnić że masz odpowiednie połączenie dla danych.</string>
+</resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 78c3c90..ea4d24e 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -35,6 +35,8 @@
     <!-- System strings, do not translate -->
     <string name="app_name">Nextcloud SMS</string>
     <string name="account_type">fr.unix_experience.owncloud_sms</string>
+    <string name="account_authority">fr.unix_experience.owncloud_sms.datasync.provider</string>
+    <string name="slowsync_account_authority">fr.unix_experience.owncloud_sms.datasync.slowsync_provider</string>
     <string name="target_package">fr.unix_experience.owncloud_sms</string>
     <string name="login_logo">Login logo</string>
 
@@ -194,26 +196,8 @@
     <string name="sync_inprogress">Synkronisering pågår...</string>
     <string name="fatal_error">Allvarligt fel! </string>
 
-    <!-- Errors -->
-    <string name="err_sync_get_smslist">Error #1: Invalid data received from server when getting previous messages</string>
-    <string name="err_sync_craft_http_request">Error #2: Error while crafting HTTP request</string>
-    <string name="err_sync_push_request">Error #3: Push request failed</string>
-    <string name="err_sync_push_request_resp">Error #4: Invalid data received from server when pushing data</string>
-    <string name="err_sync_create_json_null_smslist">Error #5: NULL SMS List</string>
-    <string name="err_sync_create_json_put_smslist">Error #6: Error while crafting push request</string>
-    <string name="err_sync_create_json_request_encoding">Error #7: Unsupported encoding when generating request</string>
-    <string name="err_sync_auth_failed">Error #8: Authentication failed</string>
-    <string name="err_sync_http_request_returncode_unhandled">Error #9: Server set unhandled HTTP return code</string>
-    <string name="err_sync_http_request_connect">Error #11: Unable to perform a connection to Nextcloud instance</string>
-    <string name="err_sync_http_request_httpexception">Error #12: Unable to perform a connection to Nextcloud instance</string>
-    <string name="err_sync_http_request_ioexception">Error #13: Unable to perform a connection to Nextcloud instance</string>
-    <string name="err_sync_http_request_resp">Error #14: Unable to parse server response</string>
-    <string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
-    <string name="err_sync_no_connection_available">Error #16: No data connection available</string>
-    <string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
-    <string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Error #18: Nextcloud SMS app is not installed or Nextcloud awaiting for an upgrade</string>
-    <string name="err_fetch_phonelist">Invalid phonelist received from server.</string>
-    <string name="err_proto_v2">Server doesn\'t support this feature. Ensure server version is at least 1.6.</string>
+    <string name="err_sync_create_json_null_smslist">Error #5: NULL SMS Lista</string>
+    <string name="err_sync_auth_failed">Error #8: Autentisering misslyckades</string>
     <string name="contactinfos_title">Kontaktinformation</string>
     <string name="subtitle_contact_phones">- Kontakttelefoner</string>
     <string name="pref_title_bulk_messages">Maximalt antal meddelanden att skicka per synk</string>