Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ef7af99 authored by Michael Bestas's avatar Michael Bestas
Browse files

core/Keyguard: Move CAF strings 

Change-Id: Ia341e69e260f1cdd36ca0506e4285278976136fc
parent 62a1dd3d

core/res/res/values/cm_strings.xml

+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2012-2014 The CyanogenMod Project

     Copyright (c) 2013, The Linux Foundation. All rights reserved.



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -261,4 +262,26 @@ 
    <string name="usb_ext_media_safe_unmount_notification_message">You can safely remove USB storage.</string>

    <string name="usb_ext_media_nomedia_notification_title">Removed USB storage</string>

    <string name="usb_ext_media_nomedia_notification_message">USB storage removed. Insert new media.</string>



    <!-- Text for progress dialog while formatting SD card [CHAR LIMIT=NONE] -->

    <string name="progress_nomediapresent" product="default">No removable media present\u2026</string>



    <!-- Shown in the lock screen when there is SIM card IO error. -->

    <string name="lockscreen_sim_error_message_short">Invalid card.</string>



    <!-- Shown in the lock screen to tell the user that phone is in airplane mode-->

    <string name="lockscreen_airplane_mode_on">Airplane mode</string>



    <!-- Shown in the lock screen to tell the user that their SIM/RUIM is locked and they must unlock it. -->

    <string name="lockscreen_sim_locked_message_cm">SIM/RUIM card is locked.</string>



    <!-- Displayed when the USSD/SS request is modified by STK CC to a

         different request. This will be displayed in a toast. -->

    <string name="stk_cc_ussd_to_dial">USSD request is modified to DIAL request.</string>

    <string name="stk_cc_ussd_to_ss">USSD request is modified to SS request.</string>

    <string name="stk_cc_ussd_to_ussd">USSD request is modified to new USSD request.</string>

    <string name="stk_cc_ss_to_dial">SS request is modified to DIAL request.</string>

    <string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string>

    <string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>



</resources>

core/res/res/values/strings.xml

+4 −31
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
<!--

/* //device/apps/common/assets/res/any/strings.xml

**

** Copyright (c) 2013, The Linux Foundation. All rights reserved.

** Not a Contribution.

**

** Copyright 2006, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");
@@ -2282,9 +2279,6 @@ 
         to unlock the keyguard.  Displayed in one line in a large font.  -->

    <string name="keyguard_password_wrong_pin_code">Incorrect PIN code.</string>



    <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->

    <string name="pinpuk_attempts">\nAttempts remaining:</string>



    <!-- Instructions telling the user how to unlock the phone. -->

    <string name="keyguard_label_text">To unlock, press Menu then 0.</string>
@@ -2364,8 +2358,6 @@ 


    <!-- Shown in the lock screen when there is emergency calls only mode. -->

    <string name="emergency_calls_only" msgid="2485604591272668370">Emergency calls only</string>

    <!-- Shown in the lock screen when there is SIM card IO error. -->

    <string name="lockscreen_sim_error_message_short">Invalid card.</string>



    <!-- When the user inserts a sim card from an unsupported network, it becomes network

         locked -->
@@ -2376,19 +2368,16 @@ 
         PUK locked (Pin Unlock Kode) -->

    <string name="lockscreen_sim_puk_locked_message">SIM card is PUK-locked.</string>

    <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->

    <string name="lockscreen_sim_puk_locked_instructions">PIN1 Blocked. Enter PUK1\nor\nPlease see the User Guide or contact Customer Care.</string>

    <string name="lockscreen_sim_puk_locked_instructions">See the User Guide or contact Customer Care.</string>



    <!-- Shown in the lock screen to tell the user that their SIM/RUIM is locked and they must unlock it. -->

    <string name="lockscreen_sim_locked_message">SIM/RUIM card is locked.</string>

    <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->

    <string name="lockscreen_sim_locked_message">SIM card is locked.</string>



    <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check

         whether it is valid, and to unlock the sim if it is valid.  we display a

         progress dialog in the meantime.  this is the emssage. -->

    <string name="lockscreen_sim_unlock_progress_dialog_message">Unlocking SIM card\u2026</string>



    <!-- Shown in the lock screen to tell the user that phone is in airplane mode-->

    <string name="lockscreen_airplane_mode_on">Airplane mode</string>



    <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at

         drawing the unlock pattern -->

    <string name="lockscreen_too_many_failed_attempts_dialog_message">
@@ -3794,8 +3783,6 @@ 
    <string name="progress_unmounting" product="nosdcard">Unmounting USB storage\u2026</string>

    <!-- Text for progress dialog while unmounting SD card [CHAR LIMIT=NONE] -->

    <string name="progress_unmounting" product="default">Unmounting SD card\u2026</string>

    <!-- Text for progress dialog while formatting SD card [CHAR LIMIT=NONE] -->

    <string name="progress_nomediapresent" product="default">No removable media present\u2026</string>

    <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->

    <string name="progress_erasing" product="nosdcard">Erasing USB storage\u2026</string>

    <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
@@ -3993,9 +3980,6 @@ 
    <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->

    <string name="storage_usb">USB storage</string>



    <!-- Storage description for UICC storage. [CHAR LIMIT=NONE] -->

    <string name="storage_uicc">UICC storage</string>



    <!-- Button text for the edit menu in input method extract mode. [CHAR LIMIT=16] -->

    <string name="extract_edit_menu_button">Edit</string>
@@ -4211,7 +4195,7 @@ 
    <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->

    <string name="kg_invalid_sim_pin_hint">Type a PIN that is 4 to 8 numbers.</string>

    <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->

    <string name="kg_invalid_sim_puk_hint">PUK code should be 8 numbers.</string>

    <string name="kg_invalid_sim_puk_hint">PUK code should be 8 numbers or more.</string>

    <!-- Message shown when the user enters an invalid PUK code -->

    <string name="kg_invalid_puk">Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM.</string>

      <!-- String shown in PUK screen when PIN codes don't match -->
@@ -4541,15 +4525,4 @@ 
    <!-- Cling help message when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->

    <string name="immersive_mode_confirmation" msgid="8554991488096662508">Swipe down from the top to exit full screen.</string>



    <add-resource type="bool" name="config_hotswapCapable"></add-resource>



    <!-- Displayed when the USSD/SS request is modified by STK CC to a

    different request. This will be displayed in a toast. -->

    <string name="stk_cc_ussd_to_dial">USSD request is modified to DIAL request.</string>

    <string name="stk_cc_ussd_to_ss">USSD request is modified to SS request.</string>

    <string name="stk_cc_ussd_to_ussd">USSD request is modified to new USSD request.</string>

    <string name="stk_cc_ss_to_dial">SS request is modified to DIAL request.</string>

    <string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string>

    <string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>



</resources>

packages/Keyguard/res/values/cm_strings.xml

+36 −0
Original line number Diff line number Diff line
@@ -16,7 +16,12 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Lockscreen</string>

    <!-- When the lock screen is showing, the phone is not plugged in, and the battery

         is not fully charged, show the current charge %. -->

    <string name="keyguard_discharging">Discharging, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>

    <!-- When the lock screen is showing and the battery is low, warn user to plug

         in the phone soon and show current percentage. -->

    <string name="keyguard_low_battery_cm">Connect your charger, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>

    <string name="keyguard_battery_percent" translatable="false"><xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>

    <plurals name="missed_calls">

        <item quantity="one">%d missed call</item>
@@ -31,4 +36,35 @@ 
    <string name="message_from_person">message from %1$s</string>

    <!-- Skeleton string format for displaying the date. -->

    <string name="full_wday_month_day_no_year">EEEEMMMMd</string>



    <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->

    <string name="kg_invalid_sim_puk_hint_cm">PUK code should be 8 numbers.</string>



    <!-- Instructions telling the user that they entered the wrong puk while trying

         to unlock the keyguard.  Displayed in one line in a large font.  -->

    <string name="keyguard_password_wrong_puk_code">Incorrect PUK code.</string>



    <!-- Instructions telling the user that the operation to unlock the keyguard

         with PIN failed. Displayed in one line in a large font.  -->

    <string name="keyguard_password_pin_failed">PIN operation failed.</string>



    <!-- Instructions telling the user that the operation to unlock the keyguard

         with PUK failed. Displayed in one line in a large font.  -->

    <string name="keyguard_password_puk_failed">PUK operation failed.</string>



    <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->

    <string name="pinpuk_attempts">\nAttempts remaining:</string>



    <!-- Shown in the lock screen when there is SIM card IO error. -->

    <string name="lockscreen_sim_error_message_short">Invalid card.</string>



    <!-- When the user inserts a sim card with some personalization enabled -->

    <string name="keyguard_perso_locked_message">SIM/RUIM is Perso locked</string>



    <!-- Multi SIM related -->

    <!-- Message used in Multi SIM enabled SIM PIN view -->

    <string name="msim_kg_sim_pin_msg_format">SUB: <xliff:g id="number">%d</xliff:g>: <xliff:g id="msg">%s</xliff:g></string>



    <!-- Carrier text used in Multi SIM enabled view -->

    <string name="msim_carrier_text_format" translatable="false"><xliff:g id="text_1">%s</xliff:g>, <xliff:g id="text_2">%s</xliff:g></string>

</resources>

packages/Keyguard/res/values/strings.xml

+2 −34
Original line number Diff line number Diff line
@@ -46,28 +46,6 @@ 
         to unlock the keyguard.  Displayed in one line in a large font.  -->

    <string name="keyguard_password_wrong_pin_code">Incorrect PIN code.</string>



    <!-- Instructions telling the user that they entered the wrong puk while trying

         to unlock the keyguard.  Displayed in one line in a large font.  -->

    <string name="keyguard_password_wrong_puk_code">Incorrect PUK code.</string>



    <!-- Instructions telling the user that the operation to unlock the keyguard

         with PIN failed. Displayed in one line in a large font.  -->

    <string name="keyguard_password_pin_failed">PIN operation failed.</string>



    <!-- Instructions telling the user that the operation to unlock the keyguard

         with PUK failed. Displayed in one line in a large font.  -->

    <string name="keyguard_password_puk_failed">PUK operation failed.</string>





    <!-- Notification telling the user that the PIN1 they entered is valid -->

    <string name="keyguard_pin_accepted">Code accepted.</string>



    <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->

    <string name="pinpuk_attempts">\nAttempts remaining:</string>



    <!-- Shown in the lock screen when there is SIM card IO error. -->

    <string name="lockscreen_sim_error_message_short">Invalid card.</string>



    <!-- Instructions telling the user how to unlock the phone. -->

    <string name="keyguard_label_text">To unlock, press Menu then 0.</string>
@@ -83,8 +61,8 @@ 
    <string name="keyguard_plugged_in">Charging, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>



    <!-- When the lock screen is showing and the battery is low, warn user to plug

         in the phone soon and show current percentage. -->

    <string name="keyguard_low_battery">Connect your charger, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string>

         in the phone soon. -->

    <string name="keyguard_low_battery">Connect your charger.</string>



    <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->

    <string name="keyguard_instructions_when_pattern_disabled">Press Menu to unlock.</string>
@@ -92,10 +70,6 @@ 
    <!-- SIM messages --><skip />

    <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->

    <string name="keyguard_network_locked_message">Network locked</string>



    <!-- When the user inserts a sim card with some personalization enabled -->

    <string name="keyguard_perso_locked_message">SIM/RUIM is Perso locked</string>



    <!-- Shown when there is no SIM card. -->

    <string name="keyguard_missing_sim_message_short">No SIM card</string>

    <!-- Shown when there is no SIM card. -->
@@ -401,10 +375,4 @@ 
        This is displayed if the phone is not connected to a carrier.-->

    <string name="keyguard_carrier_default">No service.</string>



    <!-- Multi SIM related -->

    <!-- Message used in Multi SIM enabled SIM PIN view -->

    <string name="msim_kg_sim_pin_msg_format">SUB: <xliff:g id="number">%d</xliff:g>: <xliff:g id="msg">%s</xliff:g></string>



    <!-- Carrier text used in Multi SIM enabled view -->

    <string name="msim_carrier_text_format" translatable="false"><xliff:g id="text_1">%s</xliff:g>, <xliff:g id="text_2">%s</xliff:g></string>

</resources>

packages/Keyguard/src/com/android/keyguard/KeyguardMessageArea.java

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ class KeyguardMessageArea extends TextView { 
                icon.value = CHARGING_ICON;

            } else if (mBatteryIsLow) {

                // Battery is low

                string = getContext().getString(R.string.keyguard_low_battery, mBatteryLevel);

                string = getContext().getString(R.string.keyguard_low_battery_cm, mBatteryLevel);

                icon.value = BATTERY_LOW_ICON;

            } else if (mAlwaysShowBattery) {

                // Discharging