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

Commit 77d00e35 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Translate prompt msg into Chinese"

parents 48953af4 9b67cb16

res/values-zh-rCN/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2657,4 +2657,6 @@ 
    <string name="hotspot_settings_indication_step3_all">"3. 选择“<xliff:g id="ssid_name">%s</xliff:g>”并输入密码“<xliff:g id="ssid_pwd">%s</xliff:g>”"</string>

    <string name="hotspot_settings_indication_step4">"4. 开始在电脑/移动设备上使用网络"</string>

    <string name="hotspot_turn_on_hint">"要使用 WLAN 热点，请先将其打开。"</string>

    <string name="sim_pin_disable_failed">无法关闭PIN锁。</string>

    <string name="sim_pin_attempts">\n您还有%s次尝试机会</string>

</resources>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2169,7 +2169,7 @@ 
    <!-- SIM lock can't be changed - not supported -->

    <string name="sim_enable_disable_lock_not_supported">Unable to Change SIM/RUIM Lock.\n SIM/RUIM doesn\'t support it.</string>

    <!-- SIM card lock settings screen, toast displayed on wrong PIN1: -->

    <string name="sim_pin_attempts">\nAttempts Remaining :</string>

    <string name="sim_pin_attempts">\nAttempts Remaining: %s</string>

    <!-- SIM card lock settings screen, toast displayed on PIN1 enable: -->

    <string name="sim_pin_enabled">PIN1 Enabled!</string>

    <!-- SIM card lock settings screen, toast displayed on PIN1 disable: -->

src/com/android/settings/IccLockSettings.java

+1 −2
Original line number Diff line number Diff line
@@ -486,8 +486,7 @@ public class IccLockSettings extends PreferenceActivity 


    private void displayRetryCounter(String s, int attemptsRemaining) {

        if (attemptsRemaining >= 0) {

            String displayMsg = s + mRes.getString(R.string.sim_pin_attempts)

                + attemptsRemaining;

            String displayMsg = s + mRes.getString(R.string.sim_pin_attempts, attemptsRemaining);

            Toast.makeText(this, displayMsg, Toast.LENGTH_SHORT).show();

        } else {

            Toast.makeText(this, mRes.getString(R.string.sim_lock_failed),