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

2 files changed, 32 insertions, 22 deletions

diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 75c062146..61b0861fe 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -26,6 +26,8 @@
   <string name="call_stats_outgoing">Erausgoend: <xliff:g id="percent">%d</xliff:g>%%</string>
   <string name="call_stats_missed">Verpasst</string>
   <string name="call_stats_missed_percent">Verpasst: <xliff:g id="percent">%d</xliff:g>%%</string>
+  <string name="call_stats_header_total">Total: <xliff:g id="call_count">%s</xliff:g>, <xliff:g id="duration">%s</xliff:g></string>
+  <string name="call_stats_header_total_callsonly">Total: <xliff:g id="call_count">%s</xliff:g></string>
   <string name="call_stats_filter_from">Startdatum</string>
   <string name="call_stats_filter_to">Schlussdatum</string>
   <string name="call_stats_filter_picker_title">Zäitfënster</string>
@@ -38,5 +40,35 @@
   <string name="date_qs_lastquarter">Lescht Trimester</string>
   <string name="date_qs_lastyear">Lescht Joer</string>
   <string name="call_stats_date_filter">Zäitfënster ajustéieren</string>
+  <string name="call_stats_reset_filter">Zäitfënster zrécksetzen</string>
+  <string name="call_stats_sort_by_duration">No Gespréichsdauer zortéieren</string>
+  <string name="call_stats_sort_by_count">No Unzuel vun Uriff zortéieren</string>
   <string name="menu_add_to_blacklist">Op d\'schwaarz Lëscht setzen</string>
+  <string name="toast_added_to_blacklist"><xliff:g id="number">%s</xliff:g> op d\'schwaarz Lëscht gesat</string>
+  <string name="menu_delete_from_blacklist">Vun der schwaarzer Lëscht läschen</string>
+  <string name="toast_deleted_from_blacklist"><xliff:g id="number">%s</xliff:g> vun der schwaarzer Lëscht geläscht</string>
+  <string name="nearby_places">No Plazen</string>
+  <string name="people">Persounen</string>
+  <string name="start_call_playback">Opnam ofspillen</string>
+  <string name="stop_call_playback">Stopp</string>
+  <string name="call_playback_error_message">Konnt d\'Opnam net ofspillen</string>
+  <string name="calllog_search_hint">Uruffprotokoll duerchsichen</string>
+  <string name="video_call">Videouruff</string>
+  <string name="video_call_settings">Astellunge vum Videouruff</string>
+  <string name="description_videocall">Videouruff <xliff:g id="name">%1$s</xliff:g></string>
+  <string name="speed_dial_settings">Astellunge fir d\'séiert Wielen</string>
+  <string name="speed_dial_not_set">(net gesat)</string>
+  <string name="speed_dial_replace">Ersetzen</string>
+  <string name="speed_dial_delete">Läschen</string>
+  <string name="speed_dial_unassigned_dialog_title">Net zougewisen Tast</string>
+  <string name="speed_dial_unassigned_dialog_message">Keng Kontakter fir d\'séiert Wiele mat der Nummerentast \'<xliff:g id="number">%s</xliff:g>\' definéiert. Wëlls du elo e Kontakt zouweisen?</string>
+  <string name="dialog_speed_dial_airplane_mode_message">"Fir d'séiert Wielen ze benotze muss de fir d'éischt de Fligermodus ausschalten."</string>
+  <string name="msim_ime_dialog_title">Apparat-Identifikatioun</string>
+  <string name="multi_sim_slot_name">SIM <xliff:g id="index">%d</xliff:g></string>
+  <string name="call_log_show_all_slots">All SIMen</string>
+  <string name="yes">Jo</string>
+  <string name="no">Nee</string>
+  <string name="call_duration_active">Aktiv Dauer:</string>
+  <string name="call_duration_call_out">Gespréichsdauer:</string>
+  <string name="call_log_all_calls_header">All Uriff</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 4965f96ad..689ea1903 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -142,7 +142,6 @@
   <string name="dialog_voicemail_not_ready_message">Konfiguréier deng Mailbox ënner Menü &gt; Astellungen.</string>
   <string name="dialog_voicemail_airplane_mode_message">Schalt de Fligermodus aus fir d\'Mailbox unzeruffen.</string>
   <string name="contact_list_loading">Gëtt gelueden\u2026</string>
-  <string name="imei">IMEI</string>
   <string name="meid">MEID</string>
   <string name="simContacts_emptyLoading">Gëtt vun der SIM-Kaart gelueden\u2026</string>
   <string name="simContacts_title">Kontakter vun der SIM-Kaart</string>
@@ -151,8 +150,6 @@
   <string name="dialer_hint_find_contact">Tipp en Numm oder eng Telefonsnummer</string>
   <string name="call_log_all_title">All</string>
   <string name="call_log_missed_title">Verpasst</string>
-  <string name="call_log_activity_title_font_family">sans-serif-light</string>
-  <string name="show_all_contacts_title_font_family">sans-serif-light</string>
   <string name="recentMissed_empty">Keng rezent verpasst Uriff.</string>
   <string name="recentVoicemails_empty">Keng rezent Mailbox-Opnamen.</string>
   <string name="show_all_contacts">All d\'Kontakter uweisen</string>
@@ -164,21 +161,6 @@
   <string name="dialpad_3_number">3</string>
   <string name="dialpad_4_number">4</string>
   <string name="dialpad_5_number">5</string>
-  <string name="dialpad_6_number">6</string>
-  <string name="dialpad_7_number">7</string>
-  <string name="dialpad_8_number">8</string>
-  <string name="dialpad_9_number">9</string>
-  <string name="dialpad_star_number">*</string>
-  <string name="dialpad_pound_number">#</string>
-  <string name="dialpad_0_letters">+</string>
-  <string name="dialpad_2_letters">ABC</string>
-  <string name="dialpad_3_letters">DEF</string>
-  <string name="dialpad_4_letters">GHI</string>
-  <string name="dialpad_5_letters">JKL</string>
-  <string name="dialpad_6_letters">MNO</string>
-  <string name="dialpad_7_letters">PQRS</string>
-  <string name="dialpad_8_letters">TUV</string>
-  <string name="dialpad_9_letters">WXYZ</string>
   <string name="show_all_contacts_title">All d\'Kontakter</string>
   <string name="show_all_contacts_button_text">All d\'Kontakter</string>
   <string name="favorite_hidden">Aus de Favoritte läschen</string>
@@ -194,8 +176,4 @@
   <string name="remove_contact">Ewechhuelen</string>
   <string name="favorites_menu_speed_dial">Séiert Wielen</string>
   <string name="favorites_menu_all_contacts">ALL D\'KONTAKTER</string>
-  <string name="favorites_menu_speed_dial_font_family">sans-serif-light</string>
-  <string name="favorites_menu_all_contacts_font_family">sans-serif</string>
-  <string name="search_font_family">sans-serif</string>
-  <string name="tab_font_family">sans-serif</string>
 </resources>