Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

sgt7 · Nov 6, 2013 · 00d9b6d · 00d9b6d
2 parents 43080b8 + 26f3ce3
commit 00d9b6d
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 2 deletions.
diff --git a/core/res/res/values-ca/cm_strings.xml b/core/res/res/values-ca/cm_strings.xml
@@ -124,4 +124,21 @@
     <string name="policydesc_enforceSelinux">Commuta la política SELinux entre el mode imposat o permissiu.</string>
     <string name="policylab_enforceMmac">Imposa MMAC</string>
     <string name="policydesc_enforceMmac">Commuta la política MMAC entre el mode imposat o permissiu.</string>
+    <string name="enablePin">Ha fallat. Activa el bloqueig SIM/RUIM.</string>
+    <string name="keyguard_password_wrong_puk_code">Codi PUK incorrecte!</string>
+    <string name="keyguard_password_pin_failed">El PIN ha fallat!</string>
+    <string name="keyguard_password_puk_failed">El PUK ha fallat!</string>
+    <string name="keyguard_pin_accepted">Codi Acceptat!</string>
+    <string name="pinpuk_attempts">\nIntents restants :</string>
+    <string name="lockscreen_sim_error_message_short">Targeta invàlida.</string>
+    <string name="lockscreen_sim_error_message">La targeta SIM és invàlida.</string>
+    <string name="lockscreen_perso_locked_message">La SIM/RUIM té un bloqueig personalitzat</string>
+    <string name="stk_cc_ussd_to_dial">La petició USSD està modificada a una nova petició DIAL.</string>
+    <string name="stk_cc_ussd_to_ss">La petició USSD està modificada a una nova petició SS.</string>
+    <string name="stk_cc_ussd_to_ussd">La petició USSD està modificada a una nova petició USSD.</string>
+    <string name="stk_cc_ss_to_dial">La petició SS està modificada a una nova petició DIAL.</string>
+    <string name="stk_cc_ss_to_ussd">La petició SS està modificada a una nova petició USSD.</string>
+    <string name="stk_cc_ss_to_ss">La petició SS està modificada a una nova petició SS.</string>
+    <string name="msim_kg_sim_pin_msg_format">SUB:<xliff:g id="number">%d</xliff:g> : <xliff:g id="msg">%s</xliff:g>.</string>
+    <string name="msim_carrier_text_format"><xliff:g id="text_1">%s</xliff:g>, <xliff:g id="text_2">%s</xliff:g></string>
 </resources>
diff --git a/core/res/res/values-da/cm_strings.xml b/core/res/res/values-da/cm_strings.xml
@@ -46,6 +46,8 @@
     <string name="permdesc_fm_radio_receiver">Tillader app\'en at kontrollere FM-modtageren.</string>
     <string name="permlab_fm_radio_transmitter">kontrollér FM-modtager</string>
     <string name="permdesc_fm_radio_transmitter">Tillader app\'en at kontrollere FM-senderen.</string>
+    <string name="permlab_sendMockSms">send imiterede SMS-beskeder</string>
+    <string name="permdesc_sendMockSms">Tillader at appen sender imiterede SMS-beskeder. Dette tillader en app at sende SMS-beskeder til betroede apps. Ondsindede apps kan sende beskeder hele tiden, hvilket blokerer enhedens meddelelsessystem og forstyrrer brugeren.</string>
     <string name="lockscreen_discharging">Aflader, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>
     <string name="storage_sd_dock_card">Dock SD-kort</string>
     <string name="app_killed_message">App lukket</string>
@@ -123,4 +125,22 @@
     <string name="policydesc_enforceSelinux">Slå håndhævning af SELinux-politikker eller tolerant tilstand til og fra.</string>
     <string name="policylab_enforceMmac">Håndhæv MMAC</string>
     <string name="policydesc_enforceMmac">Slå håndhævning af MMAC-politikker eller tolerant tilstand til og fra.</string>
+    <string name="enablePin">Mislykkedes. Aktivér SIM/RUIM-Lås.</string>
+    <string name="keyguard_password_wrong_puk_code">Forkert PUK-kode!</string>
+    <string name="keyguard_password_pin_failed">PIN-betjening mislykkedes!</string>
+    <string name="keyguard_password_puk_failed">PUK-betjening mislykkedes!</string>
+    <string name="keyguard_pin_accepted">Kode Accepteret!</string>
+    <string name="pinpuk_attempts">\nResterende Forsøg :</string>
+    <string name="lockscreen_sim_error_message_short">Ugyldigt kort.</string>
+    <string name="lockscreen_sim_error_message">SIM-kortet er ugyldigt.</string>
+    <string name="lockscreen_perso_locked_message">SIM/RUIM er Perso-låst</string>
+    <string name="progress_nomediapresent" product="default">Intet flytbart medie tilgængeligt\u2026</string>
+    <string name="stk_cc_ussd_to_dial">USSD-anmodning er ændret til en DIAL-anmodning.</string>
+    <string name="stk_cc_ussd_to_ss">USSD-anmodning er ændret til en SS-anmodning.</string>
+    <string name="stk_cc_ussd_to_ussd">USSD-anmodning er ændret til en ny USSD-anmodning.</string>
+    <string name="stk_cc_ss_to_dial">SS-anmodning er ændret til en DIAL-anmodning.</string>
+    <string name="stk_cc_ss_to_ussd">SS-anmodning er ændret til en USSD-anmodning.</string>
+    <string name="stk_cc_ss_to_ss">SS-anmodning er ændret til en ny SS-anmodning.</string>
+    <string name="msim_kg_sim_pin_msg_format">SUB:<xliff:g id="number">%d</xliff:g> : <xliff:g id="msg">%s</xliff:g>.</string>
+    <string name="msim_carrier_text_format"><xliff:g id="text_1">%s</xliff:g>, <xliff:g id="text_2">%s</xliff:g></string>
 </resources>
diff --git a/packages/InputDevices/res/values-da/cm_strings.xml b/packages/InputDevices/res/values-da/cm_strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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="app_label">Inputenheder</string>
+    <string name="keyboard_layouts_label">Android-Tastatur</string>
+    <string name="keyboard_layout_english_uk_label">Engelsk (UK)</string>
+    <string name="keyboard_layout_english_us_label">Engelsk (USA)</string>
+    <string name="keyboard_layout_english_us_colemak_label">Engelsk (USA), Colemak</string>
+    <string name="keyboard_layout_english_us_dvorak_label">Engelsk (USA), Dvorak</string>
+    <string name="keyboard_layout_german_label">Tysk</string>
+    <string name="keyboard_layout_french_label">Fransk</string>
+    <string name="keyboard_layout_french_ca_label">Fransk (Canada)</string>
+    <string name="keyboard_layout_russian_label">Russisk</string>
+    <string name="keyboard_layout_russian_mac_label">Russisk, Mac</string>
+    <string name="keyboard_layout_spanish_label">Spansk</string>
+    <string name="keyboard_layout_swiss_french_label">Fransk (Schweiz)</string>
+    <string name="keyboard_layout_swiss_german_label">Tysk (Schweiz)</string>
+    <string name="keyboard_layout_belgian">Belgisk</string>
+    <string name="keyboard_layout_bulgarian">Bulgarsk</string>
+    <string name="keyboard_layout_italian">Italiensk</string>
+    <string name="keyboard_layout_danish">Dansk</string>
+    <string name="keyboard_layout_norwegian">Norsk</string>
+    <string name="keyboard_layout_swedish">Svensk</string>
+    <string name="keyboard_layout_finnish">Finsk</string>
+    <string name="keyboard_layout_croatian">Kroatisk</string>
+    <string name="keyboard_layout_czech">Tjekkisk</string>
+    <string name="keyboard_layout_estonian">Estisk</string>
+    <string name="keyboard_layout_hungarian">Ungarsk</string>
+    <string name="keyboard_layout_icelandic">Islandsk</string>
+    <string name="keyboard_layout_portuguese">Portugisisk</string>
+    <string name="keyboard_layout_slovak">Slovakisk</string>
+    <string name="keyboard_layout_slovenian">Slovensk</string>
+    <string name="keyboard_layout_turkish">Tyrkisk</string>
+    <string name="keyboard_layout_ukrainian">Ukrainsk</string>
+    <string name="keyboard_layout_armenian_eastern_label">Østarmensk</string>
+</resources>
diff --git a/packages/SystemUI/res/values-ca/cm_strings.xml b/packages/SystemUI/res/values-ca/cm_strings.xml
@@ -55,6 +55,8 @@
     <string name="quick_settings_lte_off">LTE apagat</string>
     <string name="quick_settings_volume">Volum</string>
     <string name="quick_settings_camera_label">Càmera</string>
+    <string name="quick_settings_network_adb_disabled_label">Desactivat</string>
+    <string name="quick_settings_network_adb_enabled_label">Activat</string>
     <string name="quick_settings_expanded_desktop">Extés</string>
     <string name="quick_settings_expanded_desktop_off">Normal</string>
     <string name="quick_settings_camera_error_connect">No es pot connectar a la càmera</string>

diff --git a/packages/SystemUI/res/values-da/cm_strings.xml b/packages/SystemUI/res/values-da/cm_strings.xml
@@ -53,6 +53,8 @@
     <string name="quick_settings_lte_off">LTE fra</string>
     <string name="quick_settings_volume">Lydstyrke</string>
     <string name="quick_settings_camera_label">Kamera</string>
+    <string name="quick_settings_network_adb_disabled_label">Deaktiveret</string>
+    <string name="quick_settings_network_adb_enabled_label">Aktiveret</string>
     <string name="quick_settings_expanded_desktop">Udvidet</string>
     <string name="quick_settings_expanded_desktop_off">Normal</string>
     <string name="quick_settings_camera_error_connect">Kan ikke forbinde til kameraet</string>

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -4587,8 +4587,9 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags, boolean i
             }
 
             case KeyEvent.KEYCODE_POWER: {
-                if ((mTopFullscreenOpaqueWindowState.getAttrs().flags
-                        & WindowManager.LayoutParams.PREVENT_POWER_KEY) != 0){
+                if ((mTopFullscreenOpaqueWindowState != null &&
+                        (mTopFullscreenOpaqueWindowState.getAttrs().flags
+                        & WindowManager.LayoutParams.PREVENT_POWER_KEY) != 0)) {
                     return result;
                 }
                 result &= ~ACTION_PASS_TO_USER;