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

7 files changed, 169 insertions, 8 deletions

diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
index 97842d1b0..c904b5873 100644
--- a/res/values-az/cm_strings.xml
+++ b/res/values-az/cm_strings.xml
@@ -17,6 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="quick_contact_copied_toast">"Buferə kopyalandı"</string>
   <string name="deleteConfirmation_title">Şəxsi sil?</string>
+  <string name="menu_deleteContacts">Şəxsləri sil</string>
   <string name="contactDeletedToast">Şəxs silindi</string>
   <string name="airplane_mode_on">Uçuş modu açıq olarkən SIM karta giriş mümkün deyil</string>
   <string name="number_anr_too_long">Nömrə çox uzundur</string>
@@ -45,6 +46,10 @@
   <string name="title_add_members">Üzv əlavə et</string>
   <string name="select_all">Hamısı</string>
   <string name="action_done">Bitdi</string>
+  <plurals name="contacts_selected">
+    <item quantity="one">%d seçildi</item>
+    <item quantity="other">%d seçildi</item>
+  </plurals>
   <string name="delete_call_title">Zəng qeydlərini sil</string>
   <string name="delete_call_message">Zəng qeydləri silinir\u2026</string>
   <string name="delete_call_alert">Seçilən zəng qeydləri silinsin?</string>
@@ -63,4 +68,15 @@
   <string name="menu_sync_to_baidu_cloud">Baidu Cloud ilə indi sinxronlaşdır</string>
   <string name="delete_local_group_dialog_message">\'<xliff:g id="name">%s</xliff:g>\' qrupu silinsin?</string>
   <string name="edit_local_group_dialog_title">Qrupu yenidən adlandır</string>
+  <string name="too_many_contacts_add_to_group"><xliff:g id="count">%d</xliff:g> \'dən çox şəxs əlavə etmək olmaz</string>
+  <string name="no_phone_number_or_email">Zəhmət olmasa telefon nömrəsi və ya e-poçt ünvanı daxil edin.</string>
+  <string name="memory_card_full">Şəxsi saxlamaq mümkün olmadı, telefon yaddaşı doludur</string>
+  <string name="menu_memory_status">Yaddaş durumu</string>
+  <string name="memory_status_title">Yaddaş durumu</string>
+  <string name="memory_size">Cəmi:</string>
+  <string name="memory_used">İşlədilən:</string>
+  <string name="button_moveto">Köçür</string>
+  <string name="menu_copyTo"><xliff:g id="destination">%s</xliff:g> yerinə kopyala</string>
+  <string name="select_call_title">Axtarış qeydlərini seç</string>
+  <string name="invalid_number_type">Nömrə növü etibarsızdır</string>
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 5cc9b4fb3..1bc7c775d 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -35,6 +35,7 @@
   <string name="delete_group_dialog_title">Grupp läschen</string>
   <string name="edit_before_call">Nummer virum Uruff änneren</string>
   <string name="description_videocall">Videouruff <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="description_dial_vt">Videouruff <xliff:g id="name">%1$s</xliff:g></string>
   <string name="title_group_name">Gruppennumm</string>
   <string name="title_group_add">Nei Grupp</string>
   <string name="group_selector">Klick fir eng Grupp auszewielen</string>
@@ -51,8 +52,12 @@
     <item quantity="one">%d ausgewielt</item>
     <item quantity="other">%d ausgewielt</item>
   </plurals>
+  <string name="delete_call_title">Uruffprotokoller läschen</string>
+  <string name="delete_call_message">Uruffprotokoller gi geläscht\u2026</string>
+  <string name="delete_call_alert">Déi ausgewielten Uruffprotokoller läschen?</string>
   <string name="title_del_call">Läschen</string>
   <string name="menu_sendViaSMS">Kontakt iwwer SMS schécken</string>
+  <string name="title_switch_group_remote">Remote-Gruppen</string>
   <string name="title_switch_group_local">Lokal Gruppen</string>
   <string name="import_sim_contacts_title">SIM-Kontakter importéieren</string>
   <string name="import_sim_contacts_message">SIM-Kontakter ginn importéiert\u2026</string>
@@ -88,5 +93,6 @@
   <string name="menu_copyTo">Kopéieren op <xliff:g id="destination">%s</xliff:g></string>
   <string name="no_empty_email_in_usim">De Kontakt konnt net kopéiert ginn, well seng E-Mail-Adress ongëlteg ass</string>
   <string name="voicemail">Mailboxopnam</string>
+  <string name="select_call_title">Uruffprotokoller auswielen</string>
   <string name="invalid_number_type">Ongëltegen Nummerentyp</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index a89babcc7..4f721c2b0 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -161,6 +161,10 @@
   <string name="group_edit_field_hint_text">Gruppennumm</string>
   <string name="description_star">Favorit</string>
   <string name="edit_contact">Kontakt änneren</string>
+  <plurals name="merge_info">
+    <item quantity="one">net fusionéiert</item>
+    <item quantity="other">net fusionéiert aus <xliff:g id="count">%0$d</xliff:g>-Quellen</item>
+  </plurals>
   <string name="aggregation_suggestion_join_dialog_message">Den
         aktuelle Kontakt mam ausgewielte verknëppen?</string>
   <string name="aggregation_suggestion_edit_dialog_message">De Kontakt beaarbechten? Déi Informatiounen déi s du bis elo uginn hues gi kopéiert.</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index f53c3389b..602dc2ce2 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -16,4 +16,87 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="quick_contact_copied_toast">"Copiat în clipboard"</string>
+  <string name="deleteConfirmation_title">Ştergeţi contact?</string>
+  <string name="importConfirmation_title">Importare persoană de contact?</string>
+  <string name="menu_deleteContacts">Șterge contacte</string>
+  <string name="contactDeletedToast">Contact șters</string>
+  <string name="contactSavedToSimCardError">Nu s-au putut salva contactele selectate pe cartela SIM</string>
+  <string name="airplane_mode_on">Cartela SIM nu poate fi accesată în timp ce modul avion este activ</string>
+  <string name="number_anr_too_long">Numărul este prea lung</string>
+  <string name="email_address_too_long">Adresa de e-mail este prea lungă</string>
+  <string name="sim_card_full">Cartela SIM este plină</string>
+  <string name="tag_too_long">Numele persoanei de contact este prea lung</string>
+  <string name="invalid_phone_number">Numărul de telefon este incorect</string>
+  <string name="videocall">Apel video</string>
+  <string name="unknown">Necunoscut</string>
+  <string name="copy_to_target_sim">Cartelă SIM</string>
+  <string name="copy_to_target_msim">Card SIM <xliff:g id="index">%d</xliff:g></string>
+  <string name="search_bar_hint">Caută contacte</string>
+  <string name="delete_group_dialog_title">Șterge grup</string>
+  <string name="edit_before_call">Editarea numărului înainte de apel</string>
+  <string name="description_videocall">Apel video <xliff:g id="name"> %1$s </xliff:g></string>
+  <string name="description_dial_vt">Apel VT <xliff:g id="name"> %1$s </xliff:g></string>
+  <string name="title_group_name">Nume de grup</string>
+  <string name="title_group_add">Grup nou</string>
+  <string name="group_selector">Faceţi clic pentru a selecta grup</string>
+  <string name="title_group_picker">Selectaţi Grupul</string>
+  <string name="noGroupsHelpText">"Nu există grupuri locale."</string>
+  <string name="menu_option_delete">Șterge grup</string>
+  <string name="toast_not_add">"Imposibil de adăugat toate persoanele de contact în conturi non-locale"</string>
+  <string name="noMember">Niciun membru în acest grup.</string>
+  <string name="button_delete">Șterge</string>
+  <string name="title_add_members">Adaugă membri</string>
+  <string name="select_all">Toate</string>
+  <string name="action_done">Realizat</string>
+  <plurals name="contacts_selected">
+    <item quantity="one">%d selectat</item>
+    <item quantity="few">%d selectate</item>
+    <item quantity="other">%d selectate</item>
+  </plurals>
+  <string name="delete_call_title">Şterge jurnalele de apel</string>
+  <string name="delete_call_message">Se șterg jurnalele de apel\u2026</string>
+  <string name="delete_call_alert">Ştergeți jurnalele de apel selectate?</string>
+  <string name="title_del_call">Ștergeți</string>
+  <string name="menu_sendViaSMS">Trimite contact prin SMS</string>
+  <string name="title_switch_group_remote">Grupuri de la distanţă</string>
+  <string name="title_switch_group_local">Grupuri locale</string>
+  <string name="import_sim_contacts_title">Import contacte SIM</string>
+  <string name="import_sim_contacts_message">Se importă contacte SIM\u2026</string>
+  <plurals name="ContactMultiImportConfirmation">
+    <item quantity="one">%d contact va fi importat.</item>
+    <item quantity="few">%d contacte vor fi importate.</item>
+    <item quantity="other">%d contacte vor fi importate.</item>
+  </plurals>
+  <string name="import_finish">Importul s-a terminat</string>
+  <plurals name="import_stop">
+    <item quantity="one">Importul a fost anulat, %d element a fost importat</item>
+    <item quantity="few">Importul a fost anulat, %d elemente au fost importate</item>
+    <item quantity="other">Importul a fost anulat, %d elemente au fost importate</item>
+  </plurals>
+  <plurals name="ContactMultiDeleteConfirmation">
+    <item quantity="one">%d contact va fi şters.</item>
+    <item quantity="few">%d contacte vor fi şterse.</item>
+    <item quantity="other">%d contacte vor fi şterse.</item>
+  </plurals>
+  <string name="delete_contacts_title">Şterge contacte</string>
+  <string name="delete_contacts_message">Se șterg contacte\u2026</string>
+  <string name="error_group_exist">Un grup numit \'<xliff:g id="name">%s</xliff:g>\' deja există</string>
+  <string name="menu_auto_sync_to_baidu_cloud">Auto sincronizare Baidu Cloud</string>
+  <string name="menu_sync_to_baidu_cloud">Sincronizare Baidu Cloud acum</string>
+  <string name="delete_local_group_dialog_message">Ştergeți grupul \'<xliff:g id="name">%s</xliff:g>\'?</string>
+  <string name="edit_local_group_dialog_title">Redenumire grup</string>
+  <string name="too_many_contacts_add_to_group">Nu mai mult de <xliff:g id="count">%d</xliff:g> persoane de contact pot fi adăugate</string>
+  <string name="no_phone_number_or_email">Introduceţi un număr de telefon sau adresă de email.</string>
+  <string name="memory_card_full">Persoana de contact nu a putut fi salvată, memoria telefonului este plină</string>
+  <string name="menu_memory_status">Stare memorie</string>
+  <string name="memory_status_title">Stare memorie</string>
+  <string name="memory_size">Total:</string>
+  <string name="memory_used">Utilizat:</string>
+  <string name="calculating_status_now">Se calculează starea\u2026</string>
+  <string name="button_moveto">Mută</string>
+  <string name="menu_copyTo">Copiez la <xliff:g id="destination">%s</xliff:g></string>
+  <string name="no_empty_email_in_usim">Copierea contactului nu a reuşit, adresa de e-mail este incorectă</string>
+  <string name="voicemail">Mesagerie vocală</string>
+  <string name="select_call_title">Selectați jurnalul de apeluri</string>
+  <string name="invalid_number_type">Tipul de număr este incorect</string>
 </resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index ef7381ad7..8450a90e6 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -16,10 +16,10 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="quick_contact_copied_toast">"පසුරු පුවරුවට පිටපත් කෙරුණි"</string>
-  <string name="deleteConfirmation_title">සම්බන්ධතාව මකන්නද?</string>
-  <string name="importConfirmation_title">සම්බන්ධතාව ආයාත කරන්නද?</string>
-  <string name="menu_deleteContacts">සම්බන්ධතා මකන්න</string>
-  <string name="contactDeletedToast">සම්බන්ධතාව මකා දැමුණි</string>
+  <string name="deleteConfirmation_title">සබඳතාව මකනවා ද?</string>
+  <string name="importConfirmation_title">සබඳතාව ආයාත කරනවා ද?</string>
+  <string name="menu_deleteContacts">සබඳතා මකන්න</string>
+  <string name="contactDeletedToast">සබඳතාව මැකිණි</string>
   <string name="contactSavedToSimCardError">තෝරාගත් සම්බන්ධතා සිම් කාඩ් පතට සුරැකීමට නොහැකිවිය</string>
   <string name="airplane_mode_on">අහස්යානා ප්‍රකාරය සබල විට සිම් පත පරිශීලනය කල නොහැක</string>
   <string name="number_anr_too_long">අංකය දිග වැඩිය</string>
@@ -47,7 +47,7 @@
   <string name="button_delete">ඉවත් කරන්න</string>
   <string name="title_add_members">සාමාජිකයන් එක් කරන්න</string>
   <string name="select_all">සියලු</string>
-  <string name="action_done">හරි</string>
+  <string name="action_done">නිමයි</string>
   <plurals name="contacts_selected">
     <item quantity="one">%d තෝරා ඇත</item>
     <item quantity="other">%d තෝරා ඇත</item>
@@ -84,10 +84,10 @@
   <string name="too_many_contacts_add_to_group">සම්බන්ධතා <xliff:g id="count">%d</xliff:g> ට වඩා එක් කල නොහැක</string>
   <string name="no_phone_number_or_email">කරුණාකර දුරකථන අංකයක් හෝ ඊ-තැපැල් ලිපිනයක් ඇතුලත් කරන්න.</string>
   <string name="memory_card_full">සම්බන්ධතාව සුරැකීමට නොහැකි විය, දුරකථනයේ මතකය පිරී ඇත</string>
-  <string name="menu_memory_status">මතකයේ තත්වය</string>
-  <string name="memory_status_title">මතකයේ තත්වය</string>
+  <string name="menu_memory_status">මතකයේ තත්ත්වය</string>
+  <string name="memory_status_title">මතකයේ තත්ත්වය</string>
   <string name="memory_size">එකතුව:</string>
-  <string name="memory_used">භාවිතාවූ:</string>
+  <string name="memory_used">භාවිතය:</string>
   <string name="calculating_status_now">තත්වය ගණනය කරමින්\u2026</string>
   <string name="button_moveto">ගෙනයන්න</string>
   <string name="menu_copyTo"><xliff:g id="destination">%s</xliff:g> වෙත පිටපත් කරන්න</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 9da708a29..1a04e5259 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -17,5 +17,53 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="quick_contact_copied_toast">"Kopierat till urklipp"</string>
   <string name="deleteConfirmation_title">Ta bort kontakt?</string>
+  <string name="importConfirmation_title">Importera kontakt?</string>
+  <string name="menu_deleteContacts">Ta bort kontakter</string>
+  <string name="contactDeletedToast">Kontakt borttagen</string>
+  <string name="number_anr_too_long">Numret är för långt</string>
+  <string name="email_address_too_long">E-postadressen är för lång</string>
+  <string name="sim_card_full">SIM-kortet är fullt</string>
+  <string name="tag_too_long">Kontaktens namn är för långt</string>
+  <string name="invalid_phone_number">Telefonnumret är ogiltigt</string>
+  <string name="videocall">Videosamtal</string>
+  <string name="unknown">Okänd</string>
+  <string name="copy_to_target_sim">SIM-kort</string>
+  <string name="copy_to_target_msim">SIM-kort <xliff:g id="index">%d</xliff:g></string>
+  <string name="delete_group_dialog_title">Ta bort grupp</string>
+  <string name="description_videocall">Videosamtal <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="description_dial_vt">Ring VT <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="title_group_add">Ny grupp</string>
+  <string name="menu_option_delete">Ta bort grupp</string>
+  <string name="button_delete">Ta bort</string>
   <string name="select_all">Alla</string>
+  <string name="action_done">Färdig</string>
+  <string name="delete_call_title">Ta bort samtalslistor</string>
+  <string name="delete_call_message">Tar bort samtalslistor\u2026</string>
+  <string name="delete_call_alert">Ta bort valda samtalslistor?</string>
+  <string name="title_del_call">Ta bort</string>
+  <string name="menu_sendViaSMS">Skicka kontakt via SMS</string>
+  <string name="import_sim_contacts_title">Importera kontakter från SIM-kort</string>
+  <string name="import_sim_contacts_message">Importerar SIM-kontakter\u2026</string>
+  <plurals name="ContactMultiImportConfirmation">
+    <item quantity="one">%d kontakt kommer importeras.</item>
+    <item quantity="other">%d kontakter kommer importeras.</item>
+  </plurals>
+  <string name="import_finish">Import slutförd</string>
+  <plurals name="ContactMultiDeleteConfirmation">
+    <item quantity="one">%d kontakt kommer att tas bort.</item>
+    <item quantity="other">%d kontakter kommer att tas bort.</item>
+  </plurals>
+  <string name="delete_contacts_title">Ta bort kontakter</string>
+  <string name="delete_contacts_message">Tar bort kontakter\u2026</string>
+  <string name="delete_local_group_dialog_message">Ta bort grupp \'<xliff:g id="name">%s</xliff:g>\'?</string>
+  <string name="edit_local_group_dialog_title">Byt namn på grupp</string>
+  <string name="menu_memory_status">Minnesstatus</string>
+  <string name="memory_status_title">Minnesstatus</string>
+  <string name="memory_size">Totalt:</string>
+  <string name="memory_used">Använt:</string>
+  <string name="calculating_status_now">Beräknar status\u2026</string>
+  <string name="button_moveto">Flytta</string>
+  <string name="menu_copyTo">Kopiera till <xliff:g id="destination">%s</xliff:g></string>
+  <string name="voicemail">Telefonsvarare</string>
+  <string name="select_call_title">Välj samtalslistor</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 30ed487fe..ecf19eaab 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -49,6 +49,7 @@
   <string name="select_all">Tümü</string>
   <string name="action_done">Tamamlandı</string>
   <plurals name="contacts_selected">
+    <item quantity="one">%d kişi seçildi</item>
     <item quantity="other">%d kişi seçildi</item>
   </plurals>
   <string name="delete_call_title">Arama kayıtlarını sil</string>
@@ -61,13 +62,16 @@
   <string name="import_sim_contacts_title">SIM kişilerini al</string>
   <string name="import_sim_contacts_message">SIM kişileri alınıyor\u2026</string>
   <plurals name="ContactMultiImportConfirmation">
+    <item quantity="one">%d kişi alınacak.</item>
     <item quantity="other">%d kişi alınacak.</item>
   </plurals>
   <string name="import_finish">Alma işi bitti</string>
   <plurals name="import_stop">
+    <item quantity="one">Alma işlemi iptal edildi, %d öge alındı</item>
     <item quantity="other">Alma işlemi iptal edildi, %d öge alındı</item>
   </plurals>
   <plurals name="ContactMultiDeleteConfirmation">
+    <item quantity="one">%d kişi silinecek.</item>
     <item quantity="other">%d kişi silinecek.</item>
   </plurals>
   <string name="delete_contacts_title">Kişileri sil</string>