Merge remote-tracking branch 'github/cm-11.0' into HEAD

18 files changed, 415 insertions, 115 deletions

diff --git a/res/values-af/cm_arrays.xml b/res/values-af/cm_arrays.xml
new file mode 100644
index 000000000..aa3fda7d0
--- /dev/null
+++ b/res/values-af/cm_arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string-array name="preferences_interface_general_icons_text_font_family_entries">
+        <item>Gereelde</item>
+        <item>Lig</item>
+        <item>Verkorte</item>
+    </string-array>
+    <string-array name="transition_effect_entries">
+        <item>Geen</item>
+        <item>Zoom in</item>
+        <item>Zoom uit</item>
+        <item>Roteer op</item>
+        <item>Roteer af</item>
+        <item>Kubus in</item>
+        <item>Kubus uit</item>
+        <item>Stapel</item>
+        <item>Trek klavier</item>
+        <item>Flip</item>
+        <item>Silinder in</item>
+        <item>Silinder uit</item>
+        <item>Rondomtalie</item>
+        <item>Oorsig</item>
+    </string-array>
+</resources>
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
new file mode 100644
index 000000000..50b93ea39
--- /dev/null
+++ b/res/values-af/cm_strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string name="application_copyright">Kopiereg \u00A9 2014 Die CyanogenMod Projek</string>
+    <string name="sort_button_text">Sorteer</string>
+    <string name="filter_button_text">Filter</string>
+    <string name="default_screen_button_text">Verstek skerm</string>
+    <string name="transition_effect_button_text">Rol effek</string>
+    <string name="sort_mode_title">Titel</string>
+    <string name="sort_mode_launch_count">Begin telling</string>
+    <string name="sort_mode_install_time">Installerings tyd</string>
+    <string name="scrolling_page_outlines">Bladsy buitelyne</string>
+    <string name="scrolling_fade_adjacent">Vervaag kant bladsye</string>
+    <string name="wallpaper_scroll">Rol muurpapier</string>
+    <string name="preferences_title">Instellings</string>
+    <string name="preferences_application_title">Program</string>
+    <string name="preferences_interface_homescreen_title">Tuis skerm</string>
+    <string name="preferences_interface_homescreen_search_title">Soekbalk</string>
+    <string name="preferences_interface_homescreen_search_summary">Wys soekbalk altyd aan die bokant van die skerm</string>
+    <string name="preferences_interface_drawer_title">Laai</string>
+    <string name="preferences_interface_dock_title">Dok</string>
+    <string name="preferences_interface_general_title">Algemeen</string>
+    <string name="preferences_interface_general_icons_category">Ikone</string>
+    <string name="preferences_interface_general_icons_large_title">Groter ikone</string>
+    <string name="preferences_interface_general_icons_large_summary">Gebruik ekstra groot toepassing ikone in tuis skerm en laai</string>
+    <string name="preferences_interface_general_icons_text_style_title">Teksfont styl</string>
+    <string name="preferences_interface_general_icons_text_style_summary">Variant en styl van font om te gebruik vir ikoon teks</string>
+    <string name="dialog_pick_iconpack_title">Kies ikoon stel</string>
+    <string name="default_iconpack_title">Standaard ikone</string>
+    <string name="icon_packs_title">Ikoon stelle</string>
+    <string name="no_iconpacks_summary">Geen ikoon stelle geïnstalleer</string>
+    <string name="all_apps_cling_cm">Verpersoonlik jou laai</string>
+    <string name="all_apps_cling_summary">Tik die bladsy aanwyser vir bykomende konfigurasie-instellings</string>
+</resources>
diff --git a/res/values-de/cm_arrays.xml b/res/values-de/cm_arrays.xml
new file mode 100644
index 000000000..797d70cf3
--- /dev/null
+++ b/res/values-de/cm_arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferences_interface_general_icons_text_font_family_entries">
+    <item>Normal</item>
+    <item>Dünn</item>
+    <item>Schmal</item>
+  </string-array>
+  <string-array name="transition_effect_entries">
+    <item>Keine</item>
+    <item>Hineinzoomen</item>
+    <item>Herauszoomen</item>
+    <item>Rotieren oben</item>
+    <item>Rotieren unten</item>
+    <item>Würfel innen</item>
+    <item>Würfel außen</item>
+    <item>Stapeln</item>
+    <item>Akkordeon</item>
+    <item>Blättern</item>
+    <item>Zylinder innen</item>
+    <item>Zylinder außen</item>
+    <item>Karussell</item>
+    <item>Übersicht</item>
+  </string-array>
+</resources>
diff --git a/res/values-de/cm_translations.xml b/res/values-de/cm_strings.xml
index c82f10c89..e6bb3b747 100644
--- a/res/values-de/cm_translations.xml
+++ b/res/values-de/cm_strings.xml
@@ -45,25 +45,4 @@
   <string name="no_iconpacks_summary">Es sind keine Symbolpakete installiert</string>
   <string name="all_apps_cling_cm">App-Übersicht konfigurieren</string>
   <string name="all_apps_cling_summary">Berühren Sie den Seitenindikator, um die erweiterten Einstellungen zu öffnen.</string>
-  <string-array name="preferences_interface_general_icons_text_font_family_entries">
-    <item>Normal</item>
-    <item>Dünn</item>
-    <item>Schmal</item>
-  </string-array>
-  <string-array name="transition_effect_entries">
-    <item>Keine</item>
-    <item>Hineinzoomen</item>
-    <item>Herauszoomen</item>
-    <item>Rotieren oben</item>
-    <item>Rotieren unten</item>
-    <item>Würfel innen</item>
-    <item>Würfel außen</item>
-    <item>Stapeln</item>
-    <item>Akkordeon</item>
-    <item>Blättern</item>
-    <item>Zylinder innen</item>
-    <item>Zylinder außen</item>
-    <item>Karussell</item>
-    <item>Übersicht</item>
-  </string-array>
 </resources>
diff --git a/res/values-es/cm_arrays.xml b/res/values-es/cm_arrays.xml
new file mode 100644
index 000000000..d6440af38
--- /dev/null
+++ b/res/values-es/cm_arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string-array name="preferences_interface_general_icons_text_font_family_entries">
+        <item>Normal</item>
+        <item>Fina</item>
+        <item>Comprimida</item>
+    </string-array>
+    <string-array name="transition_effect_entries">
+        <item>Ninguno</item>
+        <item>Zoom entrante</item>
+        <item>Zoom saliente</item>
+        <item>Rotar arriba</item>
+        <item>Rotar abajo</item>
+        <item>Cúbico entrante</item>
+        <item>Cúbico saliente</item>
+        <item>Apilar</item>
+        <item>Acordeón</item>
+        <item>Voltear</item>
+        <item>Cilíndrico entrante</item>
+        <item>Cilíndrico saliente</item>
+        <item>Carrusel</item>
+        <item>Perspectiva</item>
+    </string-array>
+</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
new file mode 100644
index 000000000..db17c063d
--- /dev/null
+++ b/res/values-es/cm_strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
+    <string name="sort_button_text">Ordenar</string>
+    <string name="filter_button_text">Filtrar</string>
+    <string name="default_screen_button_text">Pantalla por defecto</string>
+    <string name="transition_effect_button_text">Efecto de desplazamiento</string>
+    <string name="sort_mode_title">Título</string>
+    <string name="sort_mode_launch_count">Veces ejecutado</string>
+    <string name="sort_mode_install_time">Fecha de instalación</string>
+    <string name="scrolling_page_outlines">Bordes de pantalla</string>
+    <string name="scrolling_fade_adjacent">Efecto de fundido</string>
+    <string name="wallpaper_scroll">Desplazar fondo</string>
+    <string name="preferences_title">Ajustes</string>
+    <string name="preferences_application_title">Aplicación</string>
+    <string name="preferences_interface_homescreen_title">Pantalla de inicio</string>
+    <string name="preferences_interface_homescreen_search_title">Barra de búsqueda</string>
+    <string name="preferences_interface_homescreen_search_summary">Habilitar la barra de búsqueda permanentemente</string>
+    <string name="preferences_interface_drawer_title">Aplicaciones</string>
+    <string name="preferences_interface_dock_title">Barra de aplicaciones</string>
+    <string name="preferences_interface_general_title">General</string>
+    <string name="preferences_interface_general_icons_category">Iconos</string>
+    <string name="preferences_interface_general_icons_large_title">Iconos grandes</string>
+    <string name="preferences_interface_general_icons_large_summary">Usar iconos grandes en la pantalla de inicio y de aplicaciones</string>
+    <string name="preferences_interface_general_icons_text_style_title">Estilo del texto</string>
+    <string name="preferences_interface_general_icons_text_style_summary">Cambiar el estilo de texto para las etiquetas de los iconos</string>
+    <string name="dialog_pick_iconpack_title">Escoger paquete de iconos</string>
+    <string name="default_iconpack_title">Iconos por defecto</string>
+    <string name="icon_packs_title">Paquetes de iconos</string>
+    <string name="no_iconpacks_summary">No hay paquetes de iconos instalados</string>
+    <string name="all_apps_cling_cm">Personalizar tus aplicaciones</string>
+    <string name="all_apps_cling_summary">Tocar el indicador de página para mostrar ajustes adicionales</string>
+</resources>
diff --git a/res/values-es/cm_translations.xml b/res/values-es/cm_translations.xml
deleted file mode 100644
index caa1a8f98..000000000
--- a/res/values-es/cm_translations.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="sort_button_text">Ordenar</string>
-  <string name="filter_button_text">Filtrar</string>
-  <string name="default_screen_button_text">Pantalla por defecto</string>
-  <string name="transition_effect_button_text">Efecto de desplazamiento</string>
-  <string name="sort_mode_title">Título</string>
-  <string name="sort_mode_launch_count">Veces ejecutado</string>
-  <string name="sort_mode_install_time">Fecha de instalación</string>
-  <string name="scrolling_page_outlines">Bordes de pantalla</string>
-  <string name="scrolling_fade_adjacent">Efecto de fundido</string>
-  <string name="wallpaper_scroll">Desplazar fondo</string>
-  <string name="preferences_title">Ajustes</string>
-  <string name="preferences_application_title">Aplicación</string>
-  <string name="preferences_interface_homescreen_title">Pantalla de inicio</string>
-  <string name="preferences_interface_homescreen_search_title">Barra de búsqueda</string>
-  <string name="preferences_interface_homescreen_search_summary">Habilitar la barra de búsqueda permanentemente</string>
-  <string name="preferences_interface_drawer_title">Aplicaciones</string>
-  <string name="preferences_interface_dock_title">Barra de aplicaciones</string>
-  <string name="preferences_interface_general_title">General</string>
-  <string name="preferences_interface_general_icons_category">Iconos</string>
-  <string name="preferences_interface_general_icons_large_title">Iconos grandes</string>
-  <string name="preferences_interface_general_icons_large_summary">Usar iconos grandes en la pantalla de inicio y de aplicaciones</string>
-  <string name="preferences_interface_general_icons_text_style_title">Estilo del texto</string>
-  <string name="preferences_interface_general_icons_text_style_summary">Cambiar el estilo de texto para las etiquetas de los iconos</string>
-  <string name="dialog_pick_iconpack_title">Escoger paquete de iconos</string>
-  <string name="default_iconpack_title">Iconos por defecto</string>
-  <string name="icon_packs_title">Paquetes de iconos</string>
-  <string name="no_iconpacks_summary">No hay paquetes de iconos instalados</string>
-  <string name="all_apps_cling_cm">Personalizar tus aplicaciones</string>
-  <string name="all_apps_cling_summary">Tocar el indicador de página para mostrar ajustes adicionales</string>
-  <string-array name="preferences_interface_general_icons_text_font_family_entries">
-    <item>Normal</item>
-    <item>Fina</item>
-    <item>Comprimida</item>
-  </string-array>
-  <string-array name="transition_effect_entries">
-    <item>Ninguno</item>
-    <item>Zoom entrante</item>
-    <item>Zoom saliente</item>
-    <item>Rotar arriba</item>
-    <item>Rotar abajo</item>
-    <item>Cúbico entrante</item>
-    <item>Cúbico saliente</item>
-    <item>Apilar</item>
-    <item>Acordeón</item>
-    <item>Voltear</item>
-    <item>Cilíndrico entrante</item>
-    <item>Cilíndrico saliente</item>
-    <item>Carrusel</item>
-    <item>Perspectiva</item>
-  </string-array>
-</resources>
diff --git a/res/values-it/cm_arrays.xml b/res/values-it/cm_arrays.xml
new file mode 100644
index 000000000..0c659ecef
--- /dev/null
+++ b/res/values-it/cm_arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="preferences_interface_general_icons_text_font_family_entries">
+        <item>Regolare</item>
+        <item>Luminoso</item>
+        <item>Condensato</item>
+    </string-array>
+    <string-array name="transition_effect_entries">
+        <item>Nessuno</item>
+        <item>Riduci</item>
+        <item>Ingrandisci</item>
+        <item>Ruota su</item>
+        <item>Ruota giù</item>
+        <item>Cubo interno</item>
+        <item>Cubo esterno</item>
+        <item>Pila</item>
+    <item>Fisarmonica</item>
+        <item>Specchia</item>
+        <item>Cilindro interno</item>
+        <item>Cilindro esterno</item>
+        <item>Carosello</item>
+        <item>Panoramica</item>
+    </string-array>
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
new file mode 100644
index 000000000..cd5390d14
--- /dev/null
+++ b/res/values-it/cm_strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
+    <string name="sort_button_text">Ordina</string>
+    <string name="filter_button_text">Filtro</string>
+    <string name="default_screen_button_text">Schermata predefinita</string>
+    <string name="transition_effect_button_text">Effetto scorrimento</string>
+    <string name="sort_mode_title">Titolo</string>
+    <string name="sort_mode_launch_count">Conteggio avvio</string>
+    <string name="sort_mode_install_time">Tempo installazione</string>
+    <string name="scrolling_page_outlines">Contorni pagina</string>
+    <string name="scrolling_fade_adjacent">Dissolvenza pagine laterali</string>
+    <string name="wallpaper_scroll">Scorrimento wallpaper</string>
+    <string name="preferences_title">Impostazioni</string>
+    <string name="preferences_application_title">App</string>
+    <string name="preferences_interface_homescreen_title">Schermata Home</string>
+    <string name="preferences_interface_homescreen_search_title">Barra di ricerca</string>
+    <string name="preferences_interface_homescreen_search_summary">Mostra la barra di ricerca persistente nella parte superiore dello schermo</string>
+    <string name="preferences_interface_drawer_title">Drawer</string>
+    <string name="preferences_interface_dock_title">Dock</string>
+    <string name="preferences_interface_general_title">Generale</string>
+    <string name="preferences_interface_general_icons_category">Icone</string>
+    <string name="preferences_interface_general_icons_large_title">Icone grandi</string>
+    <string name="preferences_interface_general_icons_large_summary">Usa le icone grandi delle app nella schermata Home e nel drawer</string>
+    <string name="preferences_interface_general_icons_text_style_title">Stile font testo</string>
+    <string name="preferences_interface_general_icons_text_style_summary">Varianti e stile del font per il testo dell\'icona</string>
+    <string name="dialog_pick_iconpack_title">Scegli pacchetto icone</string>
+    <string name="default_iconpack_title">Icone predefinite</string>
+    <string name="icon_packs_title">Pacchetti icone</string>
+    <string name="no_iconpacks_summary">Nessun pacchetto di icone installato</string>
+    <string name="all_apps_cling_cm">Personalizza il drawer</string>
+    <string name="all_apps_cling_summary">Tocca l\'indicatore della pagina per visualizzare le impostazioni di configurazione aggiuntive</string>
+</resources>
diff --git a/res/values-iw/cm_arrays.xml b/res/values-iw/cm_arrays.xml
new file mode 100644
index 000000000..09286f07e
--- /dev/null
+++ b/res/values-iw/cm_arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferences_interface_general_icons_text_font_family_entries">
+    <item>רגיל</item>
+    <item>לבן</item>
+    <item>מרוכז</item>
+  </string-array>
+  <string-array name="transition_effect_entries">
+    <item>ללא</item>
+    <item>התקרבות</item>
+    <item>התרחקות</item>
+    <item>סובב שמאלה</item>
+    <item>סובב ימינה</item>
+    <item>קוביית פנים</item>
+    <item>קוביית חוץ</item>
+    <item>מחסנית</item>
+    <item>אקורדיון</item>
+    <item>היפוך</item>
+    <item>גליל פנימי</item>
+    <item>גליל חיצוני</item>
+    <item>קרוסלה</item>
+    <item>תקציר</item>
+  </string-array>
+</resources>
diff --git a/res/values-iw/cm_translations.xml b/res/values-iw/cm_strings.xml
index 690e7f2cd..a2ee66b59 100644
--- a/res/values-iw/cm_translations.xml
+++ b/res/values-iw/cm_strings.xml
@@ -41,25 +41,4 @@
   <string name="default_iconpack_title">סמלי ברירת מחדל</string>
   <string name="icon_packs_title">אוסף סמלים</string>
   <string name="no_iconpacks_summary">לא מותקנות ערכות סמל</string>
-  <string-array name="preferences_interface_general_icons_text_font_family_entries">
-    <item>רגיל</item>
-    <item>לבן</item>
-    <item>מרוכז</item>
-  </string-array>
-  <string-array name="transition_effect_entries">
-    <item>ללא</item>
-    <item>התקרבות</item>
-    <item>התרחקות</item>
-    <item>סובב שמאלה</item>
-    <item>סובב ימינה</item>
-    <item>קוביית פנים</item>
-    <item>קוביית חוץ</item>
-    <item>מחסנית</item>
-    <item>אקורדיון</item>
-    <item>היפוך</item>
-    <item>גליל פנימי</item>
-    <item>גליל חיצוני</item>
-    <item>קרוסלה</item>
-    <item>תקציר</item>
-  </string-array>
 </resources>
diff --git a/res/values-ms/cm_arrays.xml b/res/values-ms/cm_arrays.xml
new file mode 100644
index 000000000..51a47e9c3
--- /dev/null
+++ b/res/values-ms/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferences_interface_general_icons_text_font_family_entries">
+    <item>Biasa</item>
+    <item>Nipis</item>
+    <item>Tebal</item>
+  </string-array>
+</resources>
diff --git a/res/values-ms/cm_strings.xml b/res/values-ms/cm_strings.xml
new file mode 100644
index 000000000..f0d619912
--- /dev/null
+++ b/res/values-ms/cm_strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="application_copyright">Hakcipta \u00A9 2014 Projek CyanogenMod</string>
+  <string name="sort_button_text">Susun</string>
+  <string name="filter_button_text">Saring</string>
+  <string name="default_screen_button_text">Skrin Lalai</string>
+  <string name="transition_effect_button_text">Efek skrol</string>
+  <string name="sort_mode_title">Tajuk</string>
+  <string name="sort_mode_launch_count">Kiraan Dibuka</string>
+  <string name="sort_mode_install_time">Masa Dipasang</string>
+  <string name="scrolling_page_outlines">Garisan laman</string>
+  <string name="scrolling_fade_adjacent">Laman sisi pudar</string>
+  <string name="wallpaper_scroll">Latar dinding tatalan</string>
+  <string name="preferences_title">Tetapan</string>
+  <string name="preferences_application_title">Aplikasi</string>
+  <string name="preferences_interface_homescreen_title">Skrin Utama</string>
+  <string name="preferences_interface_homescreen_search_title">Bar carian</string>
+  <string name="preferences_interface_homescreen_search_summary">Papar carian bar tetap di bahagian atas skrin</string>
+  <string name="preferences_interface_drawer_title">Laci</string>
+  <string name="preferences_interface_dock_title">Dok</string>
+  <string name="preferences_interface_general_title">Umum</string>
+  <string name="preferences_interface_general_icons_category">Ikon</string>
+  <string name="preferences_interface_general_icons_large_title">Ikon lebih besar</string>
+  <string name="preferences_interface_general_icons_large_summary">Guna ikon aplikasi ekstra besar di skrin utama dan laci</string>
+  <string name="preferences_interface_general_icons_text_style_title">Gaya font teks</string>
+  <string name="preferences_interface_general_icons_text_style_summary">Variasi dan gaya font untuk diguna pada teks ikon</string>
+  <string name="dialog_pick_iconpack_title">Pilih pek ikon</string>
+  <string name="default_iconpack_title">Ikon lalai</string>
+  <string name="icon_packs_title">Pek ikon</string>
+  <string name="no_iconpacks_summary">Tiada pek ikon dipasang</string>
+  <string name="all_apps_cling_cm">Ubahsuai laci anda</string>
+  <string name="all_apps_cling_summary">Ketik pada penunjuk laman untuk papar tetapan konfigurasi tambahan</string>
+</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 5093b19ef..bb0680fe5 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -15,6 +15,7 @@
      limitations under the License.
 -->
 <resources>
+    <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
     <string name="sort_button_text">Sorteren</string>
     <string name="filter_button_text">Filteren</string>
     <string name="default_screen_button_text">Standaardscherm</string>
diff --git a/res/values-pt/cm_arrays.xml b/res/values-pt-rBR/cm_arrays.xml
index 4f3bd2d10..4f3bd2d10 100644
--- a/res/values-pt/cm_arrays.xml
+++ b/res/values-pt-rBR/cm_arrays.xml
diff --git a/res/values-pt/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 3e60947f0..3e60947f0 100644
--- a/res/values-pt/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
diff --git a/src/com/android/launcher3/HolographicLinearLayout.java b/src/com/android/launcher3/HolographicLinearLayout.java
index 5344a7ee9..96acb03c3 100644
--- a/src/com/android/launcher3/HolographicLinearLayout.java
+++ b/src/com/android/launcher3/HolographicLinearLayout.java
@@ -84,7 +84,6 @@ public class HolographicLinearLayout extends LinearLayout {
         super.drawableStateChanged();
 
         if (mImageView != null) {
-            mHolographicHelper.generatePressedFocusedStates(mImageView);
             Drawable d = mImageView.getDrawable();
             if (d instanceof StateListDrawable) {
                 StateListDrawable sld = (StateListDrawable) d;
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 9b5cbe7eb..282e47516 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -170,16 +170,16 @@ final class Utilities {
             sOldBounds.set(icon.getBounds());
             icon.setBounds(left, top, left+width, top+height);
             canvas.save();
-            if (iconMask != null && iconBack != null) {
-                canvas.scale(scale, scale, width / 2, height/2);
-            }
+            canvas.scale(scale, scale, width / 2, height/2);
             icon.draw(canvas);
             canvas.restore();
-            if (iconBack != null && iconMask != null) {
+            if (iconMask != null) {
                 iconMask.setBounds(icon.getBounds());
                 ((BitmapDrawable) iconMask).getPaint().setXfermode(
                         new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
                 iconMask.draw(canvas);
+            }
+            if (iconBack != null) {
                 canvas.setBitmap(null);
                 Bitmap finalBitmap = Bitmap.createBitmap(textureWidth, textureHeight,
                         Bitmap.Config.ARGB_8888);