diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:45:01 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:45:01 +0100 |
commit | c65088b68e9bb0aa97768c536822c6b82cc86b6f (patch) | |
tree | 6f1f1189764a238d417ed7d2f742a56f78507ad9 /core | |
parent | a57394a0be5e601c447a07786487bd4c34b0d899 (diff) | |
parent | 4ba10939b7c05e4cf44d053ee8fa37a703c19e9b (diff) | |
download | frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.zip frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.tar.gz frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.tar.bz2 |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0
Diffstat (limited to 'core')
34 files changed, 249 insertions, 162 deletions
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index efe88ff..2595fe0 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -1,6 +1,5 @@ /* * Copyright (C) 2010 The Android Open Source Project - * Copyright (C) 2014-2015 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. @@ -58,13 +57,10 @@ public class PlatLogoActivity extends Activity { int mKeyCount; PathInterpolator mInterpolator = new PathInterpolator(0f, 0f, 0.5f, 1f); - private boolean mIsCM; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mIsCM = getIntent().hasExtra("is_cm"); mLayout = new FrameLayout(this); setContentView(mLayout); } @@ -157,7 +153,6 @@ public class PlatLogoActivity extends Activity { .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) - .putExtra("is_cm", mIsCM) .addCategory("com.android.internal.category.PLATLOGO")); } catch (ActivityNotFoundException ex) { Log.e("PlatLogoActivity", "No more eggs."); @@ -207,9 +202,7 @@ public class PlatLogoActivity extends Activity { } public void showMarshmallow(View im) { - final Drawable fg = getDrawable(mIsCM - ? com.android.internal.R.drawable.platlogo_cm - : com.android.internal.R.drawable.platlogo); + final Drawable fg = getDrawable(com.android.internal.R.drawable.platlogo); fg.setBounds(0, 0, im.getWidth(), im.getHeight()); fg.setAlpha(0); im.getOverlay().add(fg); diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 4f90bd9..8686444 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -465,6 +465,20 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra SetForkLoad(true); #endif + sigset_t sigchld; + sigemptyset(&sigchld); + sigaddset(&sigchld, SIGCHLD); + + // Temporarily block SIGCHLD during forks. The SIGCHLD handler might + // log, which would result in the logging FDs we close being reopened. + // This would cause failures because the FDs are not whitelisted. + // + // Note that the zygote process is single threaded at this point. + if (sigprocmask(SIG_BLOCK, &sigchld, NULL) == -1) { + ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno)); + RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_BLOCK, { SIGCHLD }) failed."); + } + // Close any logging related FDs before we start evaluating the list of // file descriptors. __android_log_close(); @@ -496,6 +510,11 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra RuntimeAbort(env, __LINE__, "Unable to reopen whitelisted descriptors."); } + if (sigprocmask(SIG_UNBLOCK, &sigchld, NULL) == -1) { + ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno)); + RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_UNBLOCK, { SIGCHLD }) failed."); + } + // Keep capabilities across UID change, unless we're staying root. if (uid != 0) { EnableKeepCapabilities(env); @@ -628,11 +647,11 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra } else if (pid > 0) { // the parent process -#ifdef ENABLE_SCHED_BOOST - // unset scheduler knob - SetForkLoad(false); -#endif - + // We blocked SIGCHLD prior to a fork, we unblock it here. + if (sigprocmask(SIG_UNBLOCK, &sigchld, NULL) == -1) { + ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno)); + RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_UNBLOCK, { SIGCHLD }) failed."); + } } return pid; } diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h index f245a7f..6c4ca6b 100644 --- a/core/jni/fd_utils-inl.h +++ b/core/jni/fd_utils-inl.h @@ -248,9 +248,22 @@ class FileDescriptorInfo { is_sock(false) { } + static bool StartsWith(const std::string& str, const std::string& prefix) { + return str.compare(0, prefix.size(), prefix) == 0; + } + + static bool EndsWith(const std::string& str, const std::string& suffix) { + if (suffix.size() > str.size()) { + return false; + } + + return str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0; + } + // Returns true iff. a given path is whitelisted. A path is whitelisted // if it belongs to the whitelist (see kPathWhitelist) or if it's a path - // under /system/framework that ends with ".jar". + // under /system/framework that ends with ".jar" or if it is a system + // framework overlay. static bool IsWhitelisted(const std::string& path) { for (size_t i = 0; i < (sizeof(kPathWhitelist) / sizeof(kPathWhitelist[0])); ++i) { if (kPathWhitelist[i] == path) { @@ -260,10 +273,41 @@ class FileDescriptorInfo { static const std::string kFrameworksPrefix = "/system/framework/"; static const std::string kJarSuffix = ".jar"; - if (path.compare(0, kFrameworksPrefix.size(), kFrameworksPrefix) == 0 && - path.compare(path.size() - kJarSuffix.size(), kJarSuffix.size(), kJarSuffix) == 0) { + if (StartsWith(path, kFrameworksPrefix) && EndsWith(path, kJarSuffix)) { return true; } + + // Whitelist files needed for Runtime Resource Overlay, like these: + // /system/vendor/overlay/framework-res.apk + // /system/vendor/overlay-subdir/pg/framework-res.apk + // /data/resource-cache/system@vendor@overlay@framework-res.apk@idmap + // /data/resource-cache/system@vendor@overlay-subdir@pg@framework-res.apk@idmap + // See AssetManager.cpp for more details on overlay-subdir. + static const std::string kOverlayDir = "/system/vendor/overlay/"; + static const std::string kVendorOverlayDir = "/vendor/overlay"; + static const std::string kOverlaySubdir = "/system/vendor/overlay-subdir/"; + static const std::string kApkSuffix = ".apk"; + + if ((StartsWith(path, kOverlayDir) || StartsWith(path, kOverlaySubdir) + || StartsWith(path, kVendorOverlayDir)) + && EndsWith(path, kApkSuffix) + && path.find("/../") == std::string::npos) { + return true; + } + + static const std::string kOverlayIdmapPrefix = "/data/resource-cache/"; + static const std::string kOverlayIdmapSuffix = ".apk@idmap"; + if (StartsWith(path, kOverlayIdmapPrefix) && EndsWith(path, kOverlayIdmapSuffix) + && path.find("/../") == std::string::npos) { + return true; + } + + // All regular files that are placed under this path are whitelisted automatically. + static const std::string kZygoteWhitelistPath = "/vendor/zygote_whitelist/"; + if (StartsWith(path, kZygoteWhitelistPath) && path.find("/../") == std::string::npos) { + return true; + } + return false; } diff --git a/core/res/res/drawable-nodpi/platlogo_cm.xml b/core/res/res/drawable-nodpi/platlogo_cm.xml deleted file mode 100644 index b863c27..0000000 --- a/core/res/res/drawable-nodpi/platlogo_cm.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (c) 2015 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. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="48dp" - android:height="48dp" - android:viewportWidth="48.0" - android:viewportHeight="48.0"> - - <path - android:name="body" - android:fillColor="#FFFFFF" - android:pathData="M24,12L24,12L24,12L24,12L24,12c7.7,0,14,1.2,14.9,2.6c0,0,0,0,0,0c1,1.5,1.1,6.5,1.1,9.4s-0.1,7.8-1.1,9.4 -c0,0,0,0,0,0C38,34.8,31.7,36,24,36l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c-7.7,0-14-1.2-14.9-2.6c0,0,0,0,0,0C8.1,31.8,8,26.9,8,24 -s0.1-7.8,1.1-9.4c0,0,0,0,0,0C10,13.2,16.3,12,24,12L24,12L24,12L24,12L24,12z" /> - <path - android:name="top" - android:fillColor="#EBEBEB" - android:pathData="M39,15c0,1.7-6.7,3-15,3S9,16.7,9,15s6.7-3,15-3S39,13.3,39,15z" /> - <path - android:name="r_ant" - android:fillColor="#FFFFFF" - android:pathData="M35,15c-0.1,0-0.3,0-0.4-0.1c-0.5-0.2-0.8-0.8-0.5-1.3l2-5c0.2-0.5,0.8-0.8,1.3-0.5 -c0.5,0.2,0.8,0.8,0.5,1.3l-2,5C35.7,14.8,35.3,15,35,15z" /> - <path - android:name="l_ant" - android:fillColor="#FFFFFF" - android:pathData="M13,15c0.1,0,0.3,0,0.4-0.1c0.5-0.2,0.8-0.8,0.5-1.3l-2-5c-0.2-0.5-0.8-0.8-1.3-0.5 -c-0.5,0.2-0.8,0.8-0.5,1.3l2,5C12.3,14.8,12.7,15,13,15z" /> - <path - android:name="smile" - android:fillColor="#EBEBEB" - android:pathData="M22,32C22,32,22,32.1,22,32c0,0.9,0.6,1.5,1.4,1.5h1.1c0.8,0,1.5-0.7,1.5-1.5c0,0,0-0.1,0-0.1H22z" /> - <path - android:name="l_eye" - android:fillColor="#EBEBEB" - android:pathData="M16,20c-2.8,0-5,2.2-5,5c0,2.8,2.2,5,5,5c2.8,0,5-2.2,5-5C21,22.2,18.8,20,16,20z" /> - <path - android:name="r_eye" - android:fillColor="#EBEBEB" - android:pathData="M32,20c-2.8,0-5,2.2-5,5c0,2.8,2.2,5,5,5c2.8,0,5-2.2,5-5C37,22.2,34.8,20,32,20z" /> -</vector> diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml index 9dd9497..d72d801 100644 --- a/core/res/res/drawable-nodpi/stat_sys_adb.xml +++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml @@ -1,11 +1,11 @@ <!-- - Copyright (c) 2015 The CyanogenMod Project +Copyright (C) 2017 The LineageOS Project - Licensed under the Apache License, Version 2.0 (the "License"); + 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 + 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, @@ -14,26 +14,13 @@ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - - <path - android:fillColor="#FFFFFF" - android:pathData="M21.3,6.6L21,6.9c0,1-3.8,1.7-9,1.7S3,7.9,3,6.9L2.7,6.6C2.1,7.6,2,10.7,2,12.5 -c0,1.8,0.1,4.9,0.7,5.8l0,0C3.2,19.3,7.2,20,12,20c4.8,0,8.8-0.7,9.3-1.7l0,0c0.6-1,0.7-4.1,0.7-5.8C22,10.7,21.9,7.6,21.3,6.6z -M7,17c-1.7,0-3-1.3-3-3s1.3-3,3-3c1.7,0,3,1.3,3,3S8.7,17,7,17z -M17,17c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3 C20,15.7,18.7,17,17,17z" /> - <path - android:fillColor="#BBFFFFFF" - android:pathData="M21.4,6.9c0,1-4.2,1.9-9.4,1.9S2.6,7.9,2.6,6.9S6.8,5,12,5S21.4,5.8,21.4,6.9z" /> - <path - android:fillColor="#FFFFFF" - android:pathData="M19.7,6.5c-0.1,0.3-0.5,0.5-0.8,0.3c-0.3-0.1-0.5-0.5-0.3-0.8l1.3-3.1c0.1-0.3,0.5-0.5,0.8-0.3 -C20.9,2.7,21.1,3,21,3.4L19.7,6.5z" /> + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> <path - android:fillColor="#FFFFFF" - android:pathData="M4.3,6.5C4.5,6.8,4.8,7,5.1,6.8C5.5,6.7,5.6,6.3,5.5,6L4.2,2.9C4.1,2.6,3.7,2.4,3.4,2.5 -C3.1,2.7,2.9,3,3,3.4L4.3,6.5z" /> + android:fillColor="#FFFFFFFF" + android:pathData="M12,6 C15.3,6,18,8.7,18,12 S15.3,18,12,18 S6,15.3,6,12 S8.7,6,12,6 M12,4 +C7.6,4,4,7.6,4,12 S7.6,20,12,20 S20,16.4,20,12 S16.4,4,12,4 Z M12,9 +C10.3,9,9,10.3,9,12 S10.3,15,12,15 S15,13.7,15,12 S13.7,9,12,9 Z" /> </vector> diff --git a/core/res/res/values-as-rIN/strings.xml b/core/res/res/values-as-rIN/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-as-rIN/strings.xml +++ b/core/res/res/values-as-rIN/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-ast-rES/strings.xml b/core/res/res/values-ast-rES/strings.xml index 65cdade..f2abe83 100644 --- a/core/res/res/values-ast-rES/strings.xml +++ b/core/res/res/values-ast-rES/strings.xml @@ -850,6 +850,8 @@ <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <string name="fingerprint_acquired_too_slow">Movisti\'l deu mui lento. Vuelvi intentalo.</string> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <string name="fingerprint_error_hw_not_available">El hardware pa buelgues dixitales nun ta disponible.</string> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> @@ -865,6 +867,8 @@ <!-- Template to be used to name enrolled fingerprints by default. --> <string name="fingerprint_name_template">Deu <xliff:g id="fingerId" example="1">%d</xliff:g></string> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <string name="fingerprint_icon_content_description">Iconu de buelga</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-be/cm_strings.xml b/core/res/res/values-be/cm_strings.xml index 5e73c39..9053cf0 100644 --- a/core/res/res/values-be/cm_strings.xml +++ b/core/res/res/values-be/cm_strings.xml @@ -102,7 +102,7 @@ <!-- App ops requests --> <string name="app_ops_access_camera">атрымаць доступ да камеры</string> <string name="app_ops_access_location">атрымаць доступ да месцазнаходжання прылады</string> - <string name="app_ops_access_notifications">атрымаць доступ да апавяшчэнняў</string> + <string name="app_ops_access_notifications">чытаньне паведамленьняў</string> <string name="app_ops_activate_vpn">актываваць VPN</string> <string name="app_ops_auto_start">прызначыць запуск пры ўлучэнні прылады</string> <string name="app_ops_delete_call_log">выдаліць часопіс званкоў</string> diff --git a/core/res/res/values-bg/cm_strings.xml b/core/res/res/values-bg/cm_strings.xml index 8b94d24..212ba59 100644 --- a/core/res/res/values-bg/cm_strings.xml +++ b/core/res/res/values-bg/cm_strings.xml @@ -34,7 +34,7 @@ <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readPhoneBlacklist">Прочетете списъка с блокирани контакти</string> <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readPhoneBlacklist">Разрешава на приложението да прочетете информацията за телефонни номера, които са блокирани за входящи повиквания или съобщения.</string> + <string name="permdesc_readPhoneBlacklist">Разрешава на приложението да чете информацията от списъка с контакти, които са блокирани за входящи повиквания или съобщения.</string> <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_changePhoneBlacklist">Промяна на списъка с блокирани контакти</string> <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> @@ -42,7 +42,7 @@ <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. --> <string name="permlab_setKeyguardWallpaper">Задаване на тапет за заключен екран</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_setKeyguardWallpaper">Разрешава на едно приложение да променя тапета на заключения екран.</string> + <string name="permdesc_setKeyguardWallpaper">Разрешава на приложението да променя тапета на екрана за заключване.</string> <!-- label for item that reboots the phone in phone options dialog --> <string name="global_action_reboot">Рестартиране</string> <!-- label for current user in phone options dialog --> @@ -87,25 +87,25 @@ <string name="silent_mode_priority">Приоритет</string> <string name="silent_mode_none">Без</string> <!-- Wifi Hotspot disabled due to subscription change --> - <string name="subscription_change_disabled_wifi_ap">Изключена Wi-Fi точка за достъп, поради промяна в абонаментна на СИМ</string> + <string name="subscription_change_disabled_wifi_ap">Изключена Wi-Fi точка за достъп, поради промяна в СИМ абонамента</string> <!-- WiFi turn off notification action text --> <string name="notify_turn_wifi_off_title">Изключете Wi-Fi</string> <!-- Privacy Guard --> <string name="permlab_changePrivacyGuardState">Активира или деактивира Защитен режим</string> <string name="permdesc_changePrivacyGuardState">Разрешава на приложението да променя статута на поверителност на друго приложение. Когато едно приложение се използва с защита на поверителността, не може да има достъп до персонални данни, като контакти, регистри с повиквания или съобщения.</string> - <string name="privacy_guard_notification">Защитен режим e активен</string> - <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s </xliff:g> няма да можете да получите достъп до лични данни</string> + <string name="privacy_guard_notification">Активиран е защитен режим</string> + <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s </xliff:g> няма достъп до лични данни</string> <string name="privacy_guard_dialog_title">Защитен режим</string> - <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s </xliff:g> бих искал да <xliff:g id="op">%2$s </xliff:g>.</string> + <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s </xliff:g> иска да <xliff:g id="op">%2$s </xliff:g>.</string> <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] --> <string name="permission_remember_choice">Запомни избора ми</string> <!-- App ops requests --> <string name="app_ops_access_camera">достъп до камерата</string> <string name="app_ops_access_location">достъп до вашето местоположение</string> - <string name="app_ops_access_notifications">прочети своите известия</string> + <string name="app_ops_access_notifications">прочети известията</string> <string name="app_ops_activate_vpn">активиране на VPN</string> <string name="app_ops_auto_start">изпълнение при включване</string> - <string name="app_ops_delete_call_log">изтриване на дневника за повиквания</string> + <string name="app_ops_delete_call_log">изтриване на списъка с обаждания</string> <string name="app_ops_delete_contacts">Изтриване на контакти</string> <string name="app_ops_delete_mms">Изтриване на MMS съобщенията</string> <string name="app_ops_delete_sms">Изтриване на SMS съобщенията</string> @@ -114,7 +114,7 @@ <string name="app_ops_keep_device_awake">Задръж устройството будно</string> <string name="app_ops_make_phone_call">осъществете телефонно повикване</string> <string name="app_ops_modify_calendar">актуализиране на вашият календар</string> - <string name="app_ops_modify_call_log">актуализация на дневника за повиквания</string> + <string name="app_ops_modify_call_log">актуализация на списъка с обаждания</string> <string name="app_ops_modify_clipboard">промяна на клипборда</string> <string name="app_ops_modify_contacts">актуализиране на вашите контакти</string> <string name="app_ops_modify_settings">актуализиране на системните настройки</string> @@ -134,13 +134,13 @@ <string name="app_ops_send_sms">Изпращане на SMS съобщение</string> <string name="app_ops_start_at_bootup">изпълнение при включване</string> <string name="app_ops_toast_window">показвай изкачащи уведомления</string> - <string name="app_ops_toggle_bluetooth">активиране/деактивиране Bluetooth</string> - <string name="app_ops_toggle_mobile_data">Превключване клетъчен данни</string> + <string name="app_ops_toggle_bluetooth">активиране/деактивиране Блутуут</string> + <string name="app_ops_toggle_mobile_data">Включване / Изключване на мобилни данни</string> <string name="app_ops_toggle_nfc">активиране/деактивиране NFC</string> <string name="app_ops_toggle_wifi">активирай/деактивирай Wi-Fi</string> <string name="app_ops_use_alarm_volume">контрол на силата на алармата</string> <string name="app_ops_use_audio_focus">контрол на силата на звука</string> - <string name="app_ops_use_bluetooth_volume">контрол на силата на Bluetooth</string> + <string name="app_ops_use_bluetooth_volume">контрол на силата на Блутуут</string> <string name="app_ops_use_master_volume">главен контрол на звука</string> <string name="app_ops_use_media_buttons">Използвайте мултимедийните бутони</string> <string name="app_ops_use_media_volume">контрол на звука за мултимедия</string> @@ -176,7 +176,7 @@ <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line with spaces on either side. [CHAR LIMIT=3] --> <!-- Protected Apps Notification --> - <string name="notify_package_component_protected_title">Старта на приложението блокиран</string> + <string name="notify_package_component_protected_title">Старта на приложението е блокиран</string> <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> е блокиран. Докосни за да потвърдиш старта на приложението.</string> <!-- Battery fully charged notification --> <string name="notify_battery_fully_charged_title">Батерията е напълно заредена</string> diff --git a/core/res/res/values-br-rFR/strings.xml b/core/res/res/values-br-rFR/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-br-rFR/strings.xml +++ b/core/res/res/values-br-rFR/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-csb-rPL/strings.xml b/core/res/res/values-csb-rPL/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-csb-rPL/strings.xml +++ b/core/res/res/values-csb-rPL/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-cy/strings.xml b/core/res/res/values-cy/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-cy/strings.xml +++ b/core/res/res/values-cy/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-en-rPT/strings.xml b/core/res/res/values-en-rPT/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-en-rPT/strings.xml +++ b/core/res/res/values-en-rPT/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-eo/strings.xml b/core/res/res/values-eo/strings.xml index f58ee6e..e4a6a8c 100644 --- a/core/res/res/values-eo/strings.xml +++ b/core/res/res/values-eo/strings.xml @@ -485,6 +485,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -493,6 +495,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-es-rCO/strings.xml b/core/res/res/values-es-rCO/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-es-rCO/strings.xml +++ b/core/res/res/values-es-rCO/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-es-rMX/strings.xml b/core/res/res/values-es-rMX/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-es-rMX/strings.xml +++ b/core/res/res/values-es-rMX/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-es-rUS/cm_strings.xml b/core/res/res/values-es-rUS/cm_strings.xml index 74e70ab..45762b1 100644 --- a/core/res/res/values-es-rUS/cm_strings.xml +++ b/core/res/res/values-es-rUS/cm_strings.xml @@ -117,7 +117,7 @@ <string name="app_ops_modify_call_log">actualizar el registro de llamadas</string> <string name="app_ops_modify_clipboard">modificar el portapapeles</string> <string name="app_ops_modify_contacts">actualizar tus contactos</string> - <string name="app_ops_modify_settings">actualizar configuración del sistema</string> + <string name="app_ops_modify_settings">actualizar ajustes del sistema</string> <string name="app_ops_mute_unmute_microphone">silenciar / activar el micrófono</string> <string name="app_ops_play_audio">reproducir el audio</string> <string name="app_ops_post_notification">publicar una notificación</string> diff --git a/core/res/res/values-frp-rIT/strings.xml b/core/res/res/values-frp-rIT/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-frp-rIT/strings.xml +++ b/core/res/res/values-frp-rIT/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-fy-rNL/strings.xml b/core/res/res/values-fy-rNL/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-fy-rNL/strings.xml +++ b/core/res/res/values-fy-rNL/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-ga-rIE/strings.xml b/core/res/res/values-ga-rIE/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-ga-rIE/strings.xml +++ b/core/res/res/values-ga-rIE/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-gd-rGB/strings.xml b/core/res/res/values-gd-rGB/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-gd-rGB/strings.xml +++ b/core/res/res/values-gd-rGB/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-ja/cm_strings.xml b/core/res/res/values-ja/cm_strings.xml index 7157ab2..8902282 100644 --- a/core/res/res/values-ja/cm_strings.xml +++ b/core/res/res/values-ja/cm_strings.xml @@ -65,7 +65,7 @@ <string name="reboot_confirm" product="tablet">タブレットは再起動します。</string> <string name="reboot_confirm" product="default">携帯電話は再起動します。</string> <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. --> - <string name="reboot_progress">再起動中\u2026</string> + <string name="reboot_progress">再起動中...</string> <!-- Long-press back kill application --> <string name="app_killed_message">アプリを終了しました。</string> <!-- ADB over network notification --> diff --git a/core/res/res/values-ku/strings.xml b/core/res/res/values-ku/strings.xml index d4c50e2..3837084 100644 --- a/core/res/res/values-ku/strings.xml +++ b/core/res/res/values-ku/strings.xml @@ -805,6 +805,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -813,6 +815,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readSyncSettings">خوێندنەوەی زانیاریەکەنی هاوتاکردن</string> diff --git a/core/res/res/values-lb/strings.xml b/core/res/res/values-lb/strings.xml index f89fc67..1224366 100644 --- a/core/res/res/values-lb/strings.xml +++ b/core/res/res/values-lb/strings.xml @@ -211,6 +211,7 @@ <string name="roamingText12">Roaming-Banner Aus</string> <string name="roamingTextSearching">E Service gëtt gesicht</string> <!-- Displayed when WFC registration fails --> + <string name="wfcRegErrorTitle">WLAN-Uriff</string> <!-- WFC Operator Error Codes --> <!-- WFC Operator Error Messages showed as alerts --> <!-- WFC Operator Error Messages showed as notifications --> @@ -800,6 +801,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -808,6 +811,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readSyncSettings">Synchroniséierungsastellunge liesen</string> diff --git a/core/res/res/values-nb/cm_strings.xml b/core/res/res/values-nb/cm_strings.xml index d1cfdaf..d531a6a 100644 --- a/core/res/res/values-nb/cm_strings.xml +++ b/core/res/res/values-nb/cm_strings.xml @@ -120,7 +120,7 @@ <string name="app_ops_modify_settings">oppdatere systeminnstillinger</string> <string name="app_ops_mute_unmute_microphone">Demp/fjern demping av mikrofonen</string> <string name="app_ops_play_audio">spille av lyd</string> - <string name="app_ops_post_notification">legge inn en melding</string> + <string name="app_ops_post_notification">legge inn en varsel</string> <string name="app_ops_project_media">Prosjekt media</string> <string name="app_ops_read_calendar">lese kalenderen</string> <string name="app_ops_read_call_log">lese i samtaleloggen</string> diff --git a/core/res/res/values-nl/cm_strings.xml b/core/res/res/values-nl/cm_strings.xml index 9ef6871..0dcc2aa 100644 --- a/core/res/res/values-nl/cm_strings.xml +++ b/core/res/res/values-nl/cm_strings.xml @@ -57,7 +57,7 @@ <!-- Button to reboot the phone into download, within the Reboot Options dialog --> <string name="reboot_download">Download</string> <!-- Button to soft reboot the device, within the Reboot Options dialog --> - <string name="reboot_soft">Soft reboot</string> + <string name="reboot_soft">Snelle herstart</string> <!-- Title of dialog to confirm rebooting. --> <string name="reboot_title">Herstarten</string> <!-- Reboot Confirmation Dialog. When the user chooses to reboot the device, there will diff --git a/core/res/res/values-oc-rFR/strings.xml b/core/res/res/values-oc-rFR/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-oc-rFR/strings.xml +++ b/core/res/res/values-oc-rFR/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-or-rIN/strings.xml b/core/res/res/values-or-rIN/strings.xml index 58b884b..3acd9fd 100644 --- a/core/res/res/values-or-rIN/strings.xml +++ b/core/res/res/values-or-rIN/strings.xml @@ -453,6 +453,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -461,6 +463,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> diff --git a/core/res/res/values-ro/cm_strings.xml b/core/res/res/values-ro/cm_strings.xml index 1587713..57a3f1b 100644 --- a/core/res/res/values-ro/cm_strings.xml +++ b/core/res/res/values-ro/cm_strings.xml @@ -87,6 +87,7 @@ <string name="silent_mode_priority">Prioritate</string> <string name="silent_mode_none">Nimic</string> <!-- Wifi Hotspot disabled due to subscription change --> + <string name="subscription_change_disabled_wifi_ap">Hotspot-ul Wi-Fi a fost dezactivat din cauza schimbării abonării SIM</string> <!-- WiFi turn off notification action text --> <string name="notify_turn_wifi_off_title">Oprește Wi-Fi</string> <!-- Privacy Guard --> @@ -176,6 +177,7 @@ with spaces on either side. [CHAR LIMIT=3] --> <!-- Protected Apps Notification --> <string name="notify_package_component_protected_title">Lansarea activității blocată</string> + <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> este protejat de la lansare. Atingeți pentru a vă autentifica și pentru a lansa aplicația.</string> <!-- Battery fully charged notification --> <string name="notify_battery_fully_charged_title">Acumulator încărcat complet</string> <string name="notify_battery_fully_charged_text">Deconectați aparatul de la încărcător pentru a îmbunătăți longevitatea bateriei.</string> @@ -186,4 +188,6 @@ whether they want to allow the application to do this. --> <string name="permdesc_resetBatteryStats">Permite unei aplicații să reseteze datele curente de utilizare a bateriei.</string> <!-- Uicc hotswapped event configuration needed notification --> + <string name="uicc_hot_swapped_event_title">Cardurile SIM s-au modificat</string> + <string name="uicc_hot_swapped_event_text">Atingeți pentru a seta preferințele implicite ale cardului SIM</string> </resources> diff --git a/core/res/res/values-sk/cm_strings.xml b/core/res/res/values-sk/cm_strings.xml index 31eb96b..6748dbb 100644 --- a/core/res/res/values-sk/cm_strings.xml +++ b/core/res/res/values-sk/cm_strings.xml @@ -132,10 +132,12 @@ <string name="app_ops_record_audio">nahrať zvuk</string> <string name="app_ops_send_mms">odoslať správu MMS</string> <string name="app_ops_send_sms">odoslať správu SMS</string> - <string name="app_ops_start_at_bootup">spustiť pri štaťte</string> + <string name="app_ops_start_at_bootup">spustiť pri štarte</string> <string name="app_ops_toast_window">zobraziť vyskakovacie oznámenia</string> <string name="app_ops_toggle_bluetooth">prepnúť bluetooth</string> + <string name="app_ops_toggle_mobile_data">prepnúť mobilné dáta</string> <string name="app_ops_toggle_nfc">prepnúť NFC</string> + <string name="app_ops_toggle_wifi">prepnúť Wi-Fi</string> <string name="app_ops_use_alarm_volume">ovládať hlasitosť budíka</string> <string name="app_ops_use_audio_focus">ovládať zvukové zdroje</string> <string name="app_ops_use_bluetooth_volume">ovládať hlasitosť bluetooh</string> @@ -148,6 +150,21 @@ <string name="app_ops_use_voice_volume">ovládať hlasitosť hovoru</string> <string name="app_ops_write_mms">napísať správu MMS</string> <string name="app_ops_write_sms">napísať správu SMS</string> + <string name="app_ops_use_fingerprint">použiť odtlačok prsta</string> + <string name="app_ops_add_voicemail">pridať hlasovú poštu</string> + <string name="app_ops_read_phone_state">pristupovať k stavu telefónu</string> + <string name="app_ops_scan_wifi">prehľadať Wi-Fi siete</string> + <string name="app_ops_change_wallpaper">zmeniť tapetu</string> + <string name="app_ops_assist_structure">použiť asistovanú štruktúru</string> + <string name="app_ops_assist_screenshot">urobiť snímok obrazovky</string> + <string name="app_ops_use_body_sensors">použiť telové senzory</string> + <string name="app_ops_read_cell_broadcasts">čítať bunkové vysielanie</string> + <string name="app_ops_mock_location">falšovať vašu polohu</string> + <string name="app_ops_read_external_storage">čítať externé úložisko</string> + <string name="app_ops_write_external_storage">zapisovať do externého úložiska</string> + <string name="app_ops_turn_on_screen">zapnúť obrazovku</string> + <string name="app_ops_get_accounts">získať účty zariadenia</string> + <string name="app_ops_wifi_change">zmeniť stav Wi-Fi</string> <string name="app_ops_su">získať root prístup</string> <!-- Notify user that they are in Lock-to-app (for devices without navbar) --> <string name="lock_to_app_toast_no_navbar">Na odopnutie tejto obrazovky stlačte a podržte tlačidlo Späť.</string> @@ -159,7 +176,11 @@ <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line with spaces on either side. [CHAR LIMIT=3] --> <!-- Protected Apps Notification --> + <string name="notify_package_component_protected_title">Spustenie aktivity zablokované</string> + <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> je chránená proti spusteniu. Kliknite na overenie a spustenie aplikácie.</string> <!-- Battery fully charged notification --> + <string name="notify_battery_fully_charged_title">Batéria plne nabitá</string> + <string name="notify_battery_fully_charged_text">Odpojte zariadenie od nabíjačky pre zlepšenie životnosti batérie.</string> <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_resetBatteryStats">obnoviť štatistiky batérie</string> @@ -167,4 +188,6 @@ whether they want to allow the application to do this. --> <string name="permdesc_resetBatteryStats">Umožňuje aplikácii obnoviť aktuálne nízkoúrovňové údaje o využití batérie.</string> <!-- Uicc hotswapped event configuration needed notification --> + <string name="uicc_hot_swapped_event_title">SIM karty sa zmenili</string> + <string name="uicc_hot_swapped_event_text">Kliknite na nastavenie redvolieb SIM karty</string> </resources> diff --git a/core/res/res/values-ug/strings.xml b/core/res/res/values-ug/strings.xml index a5d9d1e..b6dee8c 100644 --- a/core/res/res/values-ug/strings.xml +++ b/core/res/res/values-ug/strings.xml @@ -741,6 +741,8 @@ <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly --> <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly --> <!-- Array containing custom messages shown during fingerprint acquisision from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_acquired_vendor"> + </string-array> <!-- Error message shown when the fingerprint hardware can't be accessed --> <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints --> <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. --> @@ -749,6 +751,8 @@ <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint --> <!-- Template to be used to name enrolled fingerprints by default. --> <!-- Array containing custom error messages from vendor. Vendor is expected to add and translate these strings --> + <string-array name="fingerprint_error_vendor"> + </string-array> <!-- Content description which should be used for the fingerprint icon. --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readSyncSettings">قەدەمداش تەڭشىكىنى ئوقۇيدۇ</string> diff --git a/core/res/res/values-zh-rCN/cm_strings.xml b/core/res/res/values-zh-rCN/cm_strings.xml index 6f522d1..ec8af28 100644 --- a/core/res/res/values-zh-rCN/cm_strings.xml +++ b/core/res/res/values-zh-rCN/cm_strings.xml @@ -32,13 +32,13 @@ <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <string name="permgroupdesc_security">与设备安全信息相关的权限。</string> <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permlab_readPhoneBlacklist">读取手机黑名单</string> + <string name="permlab_readPhoneBlacklist">读取号码黑名单</string> <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readPhoneBlacklist">允许应用读取有关被阻止来电或信息的电话号码的信息。</string> + <string name="permdesc_readPhoneBlacklist">允许应用读取有关已阻止来电或信息的电话号码信息。</string> <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permlab_changePhoneBlacklist">更改手机黑名单</string> + <string name="permlab_changePhoneBlacklist">更改号码黑名单</string> <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_changePhoneBlacklist">允许应用更改被阻止来电或信息的电话号码。</string> + <string name="permdesc_changePhoneBlacklist">允许应用更改阻止来电或信息的电话号码。</string> <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. --> <string name="permlab_setKeyguardWallpaper">设置锁屏壁纸</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> @@ -76,13 +76,13 @@ <string name="adb_active_generic_notification_message">触摸以禁用调试。</string> <!-- ADB custom tile --> <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string> - <string name="adb_active_custom_tile_both">USB & 网络</string> + <string name="adb_active_custom_tile_both">USB 和网络</string> <string name="adb_active_custom_tile_usb">USB</string> <string name="adb_active_custom_tile_net">网络</string> <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. --> <string name="permlab_interceptPackageLaunch">拦截应用启动</string> <!-- stylus gestures support --> - <string name="stylus_app_not_installed">%s 尚未被安装</string> + <string name="stylus_app_not_installed">%s 尚未安装</string> <!-- Zen mode buttons --> <string name="silent_mode_priority">优先级</string> <string name="silent_mode_none">无</string> @@ -92,7 +92,7 @@ <string name="notify_turn_wifi_off_title">关闭 Wi-Fi</string> <!-- Privacy Guard --> <string name="permlab_changePrivacyGuardState">启用或禁用隐私防护</string> - <string name="permdesc_changePrivacyGuardState">允许应用更改其他应用是否启用隐私防护。当一个应用运行时启用了隐私防护,它将不能访问个人数据,如联系人、通话记录、短信。</string> + <string name="permdesc_changePrivacyGuardState">允许应用更改其他应用是否启用隐私防护。当一个应用以启用隐私防护运行时,它将不能访问如联系人、通话记录、短信等个人数据。</string> <string name="privacy_guard_notification">隐私防护激活</string> <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> 将不能访问个人数据</string> <string name="privacy_guard_dialog_title">隐私防护</string> @@ -101,7 +101,7 @@ <string name="permission_remember_choice">记住我的选择</string> <!-- App ops requests --> <string name="app_ops_access_camera">存取相机</string> - <string name="app_ops_access_location">访问你的地理位置信息</string> + <string name="app_ops_access_location">访问您的位置信息</string> <string name="app_ops_access_notifications">读取通知</string> <string name="app_ops_activate_vpn">激活一个 VPN</string> <string name="app_ops_auto_start">开机自启动</string> @@ -113,21 +113,21 @@ <string name="app_ops_get_usage_stats">获取应用使用情况统计</string> <string name="app_ops_keep_device_awake">保持设备唤醒</string> <string name="app_ops_make_phone_call">拨打电话</string> - <string name="app_ops_modify_calendar">更新你的日历</string> + <string name="app_ops_modify_calendar">更新您的日历</string> <string name="app_ops_modify_call_log">更新通话记录</string> <string name="app_ops_modify_clipboard">修改剪贴板</string> - <string name="app_ops_modify_contacts">更新你的联系人</string> + <string name="app_ops_modify_contacts">更新您的联系人</string> <string name="app_ops_modify_settings">更新系统设置</string> <string name="app_ops_mute_unmute_microphone">麦克风静音 / 解除静音</string> <string name="app_ops_play_audio">播放音频</string> <string name="app_ops_post_notification">发出通知</string> <string name="app_ops_project_media">放映媒体</string> - <string name="app_ops_read_calendar">读取你的日历</string> - <string name="app_ops_read_call_log">读取你的通话记录</string> - <string name="app_ops_read_clipboard">读取你的剪贴板</string> - <string name="app_ops_read_contacts">读取你的联系人</string> - <string name="app_ops_read_mms">读取你的彩信</string> - <string name="app_ops_read_sms">读取你的短信</string> + <string name="app_ops_read_calendar">读取您的日历</string> + <string name="app_ops_read_call_log">读取您的通话记录</string> + <string name="app_ops_read_clipboard">读取您的剪贴板</string> + <string name="app_ops_read_contacts">读取您的联系人</string> + <string name="app_ops_read_mms">读取您的彩信</string> + <string name="app_ops_read_sms">读取您的短信</string> <string name="app_ops_receive_sms">接收短信</string> <string name="app_ops_record_audio">录音</string> <string name="app_ops_send_mms">发送彩信</string> diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml index 950c435..2edcb8a 100644 --- a/core/res/res/values-zh-rTW/cm_strings.xml +++ b/core/res/res/values-zh-rTW/cm_strings.xml @@ -40,13 +40,13 @@ <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_changePhoneBlacklist">允許應用程式變更被封鎖來電或訊息的電話號碼。</string> <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. --> - <string name="permlab_setKeyguardWallpaper">設定鎖定畫面桌布</string> + <string name="permlab_setKeyguardWallpaper">設定鎖定螢幕桌布</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_setKeyguardWallpaper">允許應用程式變更鎖定畫面桌布。</string> <!-- label for item that reboots the phone in phone options dialog --> <string name="global_action_reboot">重新啟動</string> <!-- label for current user in phone options dialog --> - <string name="global_action_current_user">現在</string> + <string name="global_action_current_user">目前</string> <!-- Reboot menu --> <!-- Button to reboot the phone, within the Reboot Options dialog --> <string name="reboot_reboot">重新啟動</string> @@ -55,9 +55,9 @@ <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog --> <string name="reboot_bootloader">Bootloader</string> <!-- Button to reboot the phone into download, within the Reboot Options dialog --> - <string name="reboot_download">Download</string> + <string name="reboot_download">下載</string> <!-- Button to soft reboot the device, within the Reboot Options dialog --> - <string name="reboot_soft">軟件重新啟動</string> + <string name="reboot_soft">軟體重新啟動</string> <!-- Title of dialog to confirm rebooting. --> <string name="reboot_title">重新啟動</string> <!-- Reboot Confirmation Dialog. When the user chooses to reboot the device, there will @@ -65,18 +65,18 @@ <string name="reboot_confirm" product="tablet">您的平板電腦將會重新啟動。</string> <string name="reboot_confirm" product="default">您的手機將會重新啟動。</string> <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. --> - <string name="reboot_progress">正在重新啟動\u2026</string> + <string name="reboot_progress">重新啟動中\u2026</string> <!-- Long-press back kill application --> <string name="app_killed_message">已終止應用程式</string> <!-- ADB over network notification --> <string name="adb_net_active_notification_title">已啟用網路 ADB</string> <!-- ADB over USB and network notification --> - <string name="adb_both_active_notification_title">已啟用 USB 及網路 ADB</string> + <string name="adb_both_active_notification_title">ADB 透過 USB 和網路已啟用</string> <!-- ADB notification message--> <string name="adb_active_generic_notification_message">輕觸即可停用偵錯。</string> <!-- ADB custom tile --> <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string> - <string name="adb_active_custom_tile_both">USB和網路</string> + <string name="adb_active_custom_tile_both">USB 和網路</string> <string name="adb_active_custom_tile_usb">USB</string> <string name="adb_active_custom_tile_net">網路</string> <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. --> @@ -84,13 +84,15 @@ <!-- stylus gestures support --> <string name="stylus_app_not_installed">未安裝 %s</string> <!-- Zen mode buttons --> - <string name="silent_mode_priority">優先度</string> + <string name="silent_mode_priority">優先權</string> <string name="silent_mode_none">無</string> <!-- Wifi Hotspot disabled due to subscription change --> + <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊變更,已停用 Wi-Fi 熱點</string> <!-- WiFi turn off notification action text --> + <string name="notify_turn_wifi_off_title">關閉 Wi-Fi</string> <!-- Privacy Guard --> <string name="permlab_changePrivacyGuardState">啟用或停用隱私守衛</string> - <string name="permdesc_changePrivacyGuardState">允許應用程式變更其他應用程式執行時是否啟用隱私守衛。當應用程式執行時啟用了隱私守衛,它將無法存取個人資料,例如聯絡人、通話記錄或訊息。</string> + <string name="permdesc_changePrivacyGuardState">允許應用程式更改其他應用程式執行時是否啟用隱私守衛。當應用程式執行時啟用了隱私守衛,它將無法存取個人資料,例如聯絡人、通話記錄或訊息。</string> <string name="privacy_guard_notification">隱私守衛正在運作</string> <string name="privacy_guard_notification_detail">「<xliff:g id="app">%1$s</xliff:g>」將無法存取個人資料</string> <string name="privacy_guard_dialog_title">隱私守衛</string> @@ -101,10 +103,10 @@ <string name="app_ops_access_camera">存取相機</string> <string name="app_ops_access_location">存取您的位置</string> <string name="app_ops_access_notifications">讀取您的通知</string> - <string name="app_ops_activate_vpn">啟動 VPN</string> + <string name="app_ops_activate_vpn">啟用一個 VPN</string> <string name="app_ops_auto_start">開機時啟動</string> <string name="app_ops_delete_call_log">刪除您的通話紀錄</string> - <string name="app_ops_delete_contacts">刪除您的連絡人</string> + <string name="app_ops_delete_contacts">刪除您的聯絡人</string> <string name="app_ops_delete_mms">刪除您的多媒體訊息</string> <string name="app_ops_delete_sms">刪除您的簡訊</string> <string name="app_ops_draw_on_top">在頂層繪製視窗</string> @@ -125,36 +127,36 @@ <string name="app_ops_read_clipboard">讀取剪貼簿</string> <string name="app_ops_read_contacts">讀取您的聯絡人資料</string> <string name="app_ops_read_mms">讀取您的多媒體簡訊</string> - <string name="app_ops_read_sms">讀取您的簡訊</string> - <string name="app_ops_receive_sms">接收簡訊</string> + <string name="app_ops_read_sms">讀取您的簡訊訊息</string> + <string name="app_ops_receive_sms">接收簡訊訊息</string> <string name="app_ops_record_audio">錄製音訊</string> <string name="app_ops_send_mms">傳送多媒體訊息</string> - <string name="app_ops_send_sms">傳送簡訊</string> + <string name="app_ops_send_sms">傳送簡訊訊息</string> <string name="app_ops_start_at_bootup">開機時啟動</string> - <string name="app_ops_toast_window">顯示彈出信息</string> - <string name="app_ops_toggle_bluetooth">開關藍牙</string> - <string name="app_ops_toggle_mobile_data">切換數據用量</string> - <string name="app_ops_toggle_nfc">開關 NFC</string> - <string name="app_ops_toggle_wifi">切換 Wi-Fi</string> + <string name="app_ops_toast_window">顯示提示訊息</string> + <string name="app_ops_toggle_bluetooth">切換至藍牙</string> + <string name="app_ops_toggle_mobile_data">切換至行動數據</string> + <string name="app_ops_toggle_nfc">切換至 NFC</string> + <string name="app_ops_toggle_wifi">切換至 Wi-Fi</string> <string name="app_ops_use_alarm_volume">控制鬧鐘音量</string> <string name="app_ops_use_audio_focus">控制音訊焦點</string> <string name="app_ops_use_bluetooth_volume">控制藍牙音量</string> <string name="app_ops_use_master_volume">控制主音量</string> - <string name="app_ops_use_media_buttons">使用媒體按鈕</string> + <string name="app_ops_use_media_buttons">使用媒體鍵</string> <string name="app_ops_use_media_volume">控制媒體音量</string> <string name="app_ops_use_notification_volume">控制通知音量</string> <string name="app_ops_use_ring_volume">控制鈴聲音量</string> - <string name="app_ops_use_vibrate">使用觸控震動</string> + <string name="app_ops_use_vibrate">使用觸覺回饋</string> <string name="app_ops_use_voice_volume">控制語音通話音量</string> <string name="app_ops_write_mms">撰寫多媒體訊息</string> - <string name="app_ops_write_sms">撰寫簡訊</string> + <string name="app_ops_write_sms">撰寫簡訊訊息</string> <string name="app_ops_use_fingerprint">使用指紋</string> - <string name="app_ops_add_voicemail">新增語音訊息</string> + <string name="app_ops_add_voicemail">新增語音信箱</string> <string name="app_ops_read_phone_state">存取電話狀態</string> <string name="app_ops_scan_wifi">掃描 Wi-Fi 網路</string> <string name="app_ops_change_wallpaper">變更桌布</string> <string name="app_ops_assist_structure">使用協助工具</string> - <string name="app_ops_assist_screenshot">擷取螢幕畫面</string> + <string name="app_ops_assist_screenshot">螢幕擷取畫面</string> <string name="app_ops_use_body_sensors">使用人體感應器</string> <string name="app_ops_read_cell_broadcasts">讀取區域廣播</string> <string name="app_ops_mock_location">模擬所在位置</string> @@ -165,7 +167,7 @@ <string name="app_ops_wifi_change">變更 Wi-Fi 狀態</string> <string name="app_ops_su">取得 Root 權限</string> <!-- Notify user that they are in Lock-to-app (for devices without navbar) --> - <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕,觸摸並按住返回鍵。</string> + <string name="lock_to_app_toast_no_navbar">要解鎖此畫面,請輕觸並按住 [返回] 鍵。</string> <!-- Template for showing cellular network operator name while LTE calling is enabled --> <string name="tethered_notification_no_device_message">沒有已連接的裝置</string> <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> 個已連接裝置</string> @@ -174,11 +176,11 @@ <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line with spaces on either side. [CHAR LIMIT=3] --> <!-- Protected Apps Notification --> - <string name="notify_package_component_protected_title">已阻止啟動活動</string> - <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> 正被防止啟動。按一下以進行身份驗證並啟動應用程式。</string> + <string name="notify_package_component_protected_title">已封鎖啟動活動</string> + <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> 正被防止啟動。按一下即可進行身份驗證並啟動應用程式。</string> <!-- Battery fully charged notification --> <string name="notify_battery_fully_charged_title">電池完全充滿</string> - <string name="notify_battery_fully_charged_text">請將設備與充電線拔除,以提高電池壽命。</string> + <string name="notify_battery_fully_charged_text">請將裝置與充電線拔除即可提高電池壽命。</string> <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_resetBatteryStats">重設電池統計資訊</string> @@ -187,5 +189,5 @@ <string name="permdesc_resetBatteryStats">允許應用程式重設目前低電量的電池使用資料。</string> <!-- Uicc hotswapped event configuration needed notification --> <string name="uicc_hot_swapped_event_title">SIM 卡已變更</string> - <string name="uicc_hot_swapped_event_text">點按以設定SIM卡預設選項</string> + <string name="uicc_hot_swapped_event_text">輕觸即可設定 SIM卡 預設偏好</string> </resources> diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml index a56e5ac..19a4672 100644 --- a/core/res/res/values/cm_symbols.xml +++ b/core/res/res/values/cm_symbols.xml @@ -101,9 +101,6 @@ <!-- Advanced settings switch --> <java-symbol type="string" name="lock_to_app_toast_no_navbar" /> - <!-- PlatLogo --> - <java-symbol type="drawable" name="platlogo_cm" /> - <!-- Automatic brightness enhancements --> <java-symbol type="integer" name="config_autoBrightnessBrighteningLightFastDebounce"/> |