Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	res/values-et/cm_strings.xml
	res/values-th/cm_arrays.xml
	res/values-th/cm_strings.xml

Change-Id: If66ec311e06bca36268c52b42b61425c3b044556

2 files changed, 36 insertions, 53 deletions

diff --git a/res/values-da/cm_arrays.xml b/res/values-da/cm_arrays.xml
index dcc77c789..038d014d7 100644
--- a/res/values-da/cm_arrays.xml
+++ b/res/values-da/cm_arrays.xml
@@ -16,24 +16,19 @@
      limitations under the License.
 -->
 <resources>
-  <string-array name="preferences_interface_general_icons_text_font_family_entries">
-    <item>Regulær</item>
-    <item>Lys</item>
-    <item>Kondenseret</item>
-  </string-array>
   <string-array name="transition_effect_entries">
     <item>Ingen</item>
     <item>Zoom ind</item>
     <item>Zoom ud</item>
-    <item>Rotér op</item>
-    <item>Rotér ned</item>
-    <item>Terning ind</item>
-    <item>Terning ud</item>
+    <item>Rotere op</item>
+    <item>Rotere ned</item>
+    <item>Indvendig terning</item>
+    <item>Udvendig terning</item>
     <item>Stak</item>
     <item>Harmonika</item>
     <item>Flip</item>
-    <item>Cylinder ind</item>
-    <item>Cylinder ud</item>
+    <item>Indvendig cylinder</item>
+    <item>Udvendig cylinder</item>
     <item>Karrusel</item>
     <item>Overblik</item>
   </string-array>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 0149c9c91..5d584f8d6 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -16,49 +16,37 @@
      limitations under the License.
 -->
 <resources>
-  <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
-  <string name="sort_button_text">Sortér</string>
-  <string name="filter_button_text">Filtrér</string>
-  <string name="default_screen_button_text">Standardskærm</string>
-  <string name="transition_effect_button_text">Rulleeffekt</string>
-  <string name="sort_mode_title">Titel</string>
-  <string name="sort_mode_launch_count">Antal gange brugt</string>
-  <string name="sort_mode_install_time">Installationstidspunkt</string>
+  <string name="launcher_settings">INDSTILLINGER FOR LAUNCHER</string>
+  <string name="home_screen_settings">INDSTILLINGER FOR STARTSKÆRM</string>
+  <string name="drawer_settings">INDSTILLINGER FOR OVERSIGT</string>
+  <string name="app_settings">APP-INDSTILLINGER</string>
+  <string name="setting_state_on">TIL</string>
+  <string name="setting_state_off">FRA</string>
+  <string name="themes_button_text">Temaer</string>
   <string name="scrolling_page_outlines">Sideomrids</string>
   <string name="scrolling_fade_adjacent">Sideovergange</string>
-  <string name="wallpaper_scroll">Rul baggrund</string>
-  <string name="preferences_title">Indstillinger</string>
-  <string name="preferences_application_title">App</string>
-  <string name="preferences_interface_homescreen_title">Startskærm</string>
-  <string name="preferences_interface_homescreen_search_title">Søgelinje</string>
-  <string name="preferences_interface_homescreen_search_summary">Vis permanent søgelinje i toppen af skærmen</string>
-  <string name="preferences_interface_homescreen_general_hide_icon_labels_title">Skjul ikontekster</string>
-  <string name="preferences_interface_homescreen_general_hide_icon_labels_summary">Skjul ikontekster på startskærmen</string>
-  <string name="preferences_interface_drawer_title">Oversigt</string>
-  <string name="preferences_interface_drawer_summary">Oversigt over apps og widgets</string>
-  <string name="preferences_interface_drawer_apps_category">Apps</string>
-  <string name="preferences_interface_drawer_hidden_apps_title">Skjulte apps</string>
-  <string name="preferences_interface_drawer_hidden_apps_summary">Skjul apps fra oversigten</string>
-  <string name="preferences_interface_drawer_hidden_apps_shortcuts_title">Fjern genveje</string>
-  <string name="preferences_interface_drawer_hidden_apps_shortcuts_summary">Fjern genveje til skjulte apps fra startskærmen</string>
-  <string name="preferences_interface_drawer_hidden_apps_widgets_title">Fjern widgets</string>
-  <string name="preferences_interface_drawer_hidden_apps_widgets_summary">Fjern widgets fra skjulte apps fra startskærmen</string>
-  <string name="preferences_interface_drawer_hide_icon_labels_title">Skjul ikontekster</string>
-  <string name="preferences_interface_drawer_hide_icon_labels_summary">Skjul ikontekster i oversigten</string>
-  <string name="preferences_interface_dock_title">Docklinje</string>
-  <string name="preferences_interface_general_title">Generelt</string>
-  <string name="preferences_interface_general_icons_category">Ikoner</string>
-  <string name="preferences_interface_general_icons_large_title">Større ikoner</string>
-  <string name="preferences_interface_general_icons_large_summary">Brug ekstra store app-ikoner på startskærm og i oversigten</string>
-  <string name="preferences_interface_general_icons_text_style_title">Font til tekster</string>
-  <string name="preferences_interface_general_icons_text_style_summary">Fontvariant og -stilart til ikontekster</string>
-  <string name="dialog_pick_iconpack_title">Vælg ikonpakke</string>
-  <string name="default_iconpack_title">Standardikoner</string>
-  <string name="icon_packs_title">Ikonpakker</string>
-  <string name="no_iconpacks_summary">Ingen ikonpakker installeret</string>
-  <string name="clear_keyguard_wallpaper">Ryd</string>
-  <string name="all_apps_cling_cm">Tilpas din oversigt</string>
-  <string name="all_apps_cling_summary">Tryk på sideindikatoren for at vise yderligere konfigurationsindstillinger</string>
-  <string name="menu_hidden_apps_delete">Nulstil</string>
+  <string name="scrolling_wallpaper">Rul baggrund</string>
+  <string name="grid_size_text">Gitterstørrelse</string>
+  <string name="grid_size_comfortable">Behageligt</string>
+  <string name="grid_size_cozy">Hyggeligt</string>
+  <string name="grid_size_condensed">Sammentrængt</string>
+  <string name="grid_size_custom">Brugerdefineret</string>
+  <string name="preferences_interface_homescreen_custom">Vælg brugerdefineret størrelse</string>
+  <string name="preferences_interface_homescreen_rows_title">Antal rækker</string>
+  <string name="preferences_interface_homescreen_columns_title">Antal kolonner</string>
   <string name="hidden_apps_title">Skjulte apps</string>
+  <string name="scroll_effect_text">Rulleeffekt</string>
+  <string name="drawer_sorting_text">Sorteringstilstand</string>
+  <string name="sort_mode_title">Titel</string>
+  <string name="sort_mode_launch_count">Antal gange brugt</string>
+  <string name="sort_mode_install_time">Installationstidspunkt</string>
+  <string name="home_screen_search_text">Søgelinje</string>
+  <string name="larger_icons_text">Større ikoner</string>
+  <string name="icon_labels">Ikontekster</string>
+  <string name="icon_labels_show">Vis</string>
+  <string name="icon_labels_hide">Skjul</string>
+  <string name="protected_app_settings">Beskyttede apps</string>
+  <string name="search_screen_left_text">Søgepanel</string>
+  <string name="search_screen_left_unsupported_toast">Du skal have en understøttet søge-app og CyanogenMod for at anvende denne funktion.</string>
+  <string name="dialog_confirm">Bekræft</string>
 </resources>