Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0

3 files changed, 35 insertions, 0 deletions

diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index ac03c3854..2aa7782c8 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -16,9 +16,23 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="account_settings_notify_every_message_label">Notifikatioun fir all Message</string>
+  <string name="account_setup_options_mail_check_frequency_2hour">All 2 Stonnen</string>
+  <string name="account_setup_options_mail_check_frequency_4hour">All 4 Stonnen</string>
+  <string name="account_setup_options_mail_check_frequency_1day">All Dag</string>
+  <string name="account_settings">Kontenastellungen</string>
+  <string name="delete_account_title">Kont läschen</string>
+  <string name="deleting_account_msg">Kont gëtt geläscht\u2026</string>
+  <string name="delete_account_failed">Kont konnt net geläscht ginn</string>
+  <string name="account_auto_fetch_attachments_entries_never">Ni</string>
+  <string name="account_auto_fetch_attachments_entries_wifi">Just iwwer WLAN</string>
+  <string name="account_auto_fetch_attachments_entries_always">Ëmmer</string>
+  <string name="account_setup_options_mail_sync_size_all">Keng Limitt</string>
   <string name="account_setup_options_mail_sync_size_20k">20 kB</string>
   <string name="account_setup_options_mail_sync_size_100k">100 kB</string>
   <string name="account_setup_options_mail_sync_size_200k">200 kB</string>
   <string name="account_setup_options_mail_sync_size_500k">500 kB</string>
   <string name="account_setup_options_mail_sync_size_1M">1 MB</string>
+  <string name="category_label_general_settings">Allgemeng Astellungen</string>
+  <string name="general_preference_confirm_forward_label">Virun der Weiderleedung bestätegen</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 5048cade7..9e7efab82 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -30,4 +30,17 @@
   <string name="account_auto_fetch_attachments_entries_never">Niciodată</string>
   <string name="account_auto_fetch_attachments_entries_wifi">Numai prin Wi-Fi</string>
   <string name="account_auto_fetch_attachments_entries_always">Întotdeauna</string>
+  <string name="account_settings_sync_size_label">Dimensiune maximă e-mail pentru sincronizare</string>
+  <string name="account_setup_options_mail_sync_size_all">Nicio limită</string>
+  <string name="account_setup_options_mail_sync_size_20k">20KO</string>
+  <string name="account_setup_options_mail_sync_size_100k">100KO</string>
+  <string name="account_setup_options_mail_sync_size_200k">200KO</string>
+  <string name="account_setup_options_mail_sync_size_500k">500KO</string>
+  <string name="account_setup_options_mail_sync_size_1M">1MO</string>
+  <string name="category_label_general_settings">Setări generale</string>
+  <string name="category_label_attachment_settings">Setări de atașament</string>
+  <string name="general_preference_add_attachment_label">Adăugați alt tip de fişier</string>
+  <string name="general_preference_select_recipients_label">Selectaţi destinatarii din contacte</string>
+  <string name="general_preference_confirm_forward_label">Confirmare înainte de expediere</string>
+  <string name="general_preference_confirm_forward_summary">Alegeţi dacă să se utilizeze ataşamente de la serverul de e-mail, sau de la dispozitiv înainte de expediere</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 8d8fb344a..71a03fb27 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -30,4 +30,12 @@
   <string name="account_auto_fetch_attachments_entries_never">Aldrig</string>
   <string name="account_auto_fetch_attachments_entries_wifi">Endast över Wi-Fi</string>
   <string name="account_auto_fetch_attachments_entries_always">Alltid</string>
+  <string name="account_settings_sync_size_label">Maximal e-poststorlek att synkronisera</string>
+  <string name="account_setup_options_mail_sync_size_all">Ingen gräns</string>
+  <string name="account_setup_options_mail_sync_size_20k">20KB</string>
+  <string name="account_setup_options_mail_sync_size_100k">100KB</string>
+  <string name="account_setup_options_mail_sync_size_200k">200KB</string>
+  <string name="account_setup_options_mail_sync_size_500k">500KB</string>
+  <string name="account_setup_options_mail_sync_size_1M">1MB</string>
+  <string name="category_label_general_settings">Allmänna inställningar</string>
 </resources>