summaryrefslogtreecommitdiffstats
path: root/res/values-en-rGB
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-11-26 06:49:26 -0800
committerGeoff Mendal <mendal@google.com>2014-11-26 06:49:26 -0800
commitf9154eef73d404058fd604f77ae3e0396417aa08 (patch)
tree871623cb08e220ea7c47302241ca1af0be893a0e /res/values-en-rGB
parent5de75099278554711c5fd4f51e3b67053568a3e9 (diff)
downloadpackages_apps_Settings-f9154eef73d404058fd604f77ae3e0396417aa08.zip
packages_apps_Settings-f9154eef73d404058fd604f77ae3e0396417aa08.tar.gz
packages_apps_Settings-f9154eef73d404058fd604f77ae3e0396417aa08.tar.bz2
Import translations. DO NOT MERGE
Change-Id: I36312c2e5f3bf38ba107336920aae2083e75d0bb Auto-generated-cl: translation import
Diffstat (limited to 'res/values-en-rGB')
-rw-r--r--res/values-en-rGB/strings.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d744438..c261111 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1435,12 +1435,12 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
- <string name="oem_unlock_enable" msgid="6629321276287913315">"Enable OEM unlock"</string>
- <string name="oem_unlock_enable_summary" msgid="3546686263996628110">"Allow the device to be OEM unlocked"</string>
+ <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM unlocking"</string>
+ <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Allow the bootloader to be unlocked"</string>
<string name="oem_unlock_enable_pin_prompt" msgid="2398518281753145705">"Enter your PIN"</string>
<string name="oem_unlock_enable_pin_description" msgid="1373634087885107329">"Enter your device PIN to enable OEM unlock"</string>
- <string name="confirm_enable_oem_unlock_title" msgid="5704707409461191290">"Warning"</string>
- <string name="confirm_enable_oem_unlock_text" msgid="3613451506484517501">"Enabling OEM unlock disables theft protection features on this device and may render your warranty void. Continue?"</string>
+ <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Allow OEM unlocking?"</string>
+ <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"WARNING: Device protection features will not work on this device while this setting is turned on."</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
<string name="wifi_verbose_logging" msgid="4203729756047242344">"Enable Wi‑Fi verbose logging"</string>
<string name="wifi_aggressive_handover" msgid="9194078645887480917">"Aggressive Wi‑Fi to Mobile handover"</string>
@@ -2002,8 +2002,8 @@
<string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
<string name="simulate_color_space" msgid="6745847141353345872">"Simulate colour space"</string>
<string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
- <string name="use_nuplayer" msgid="5699257393367904387">"Use NuPlayer (experimental)"</string>
- <string name="use_nuplayer_summary" msgid="1991479067478516714">"Use NuPlayer instead of AwesomePlayer"</string>
+ <string name="use_awesomeplayer" msgid="1583337008516364226">"Use AwesomePlayer (deprecated)"</string>
+ <string name="use_awesomeplayer_summary" msgid="6757734070733387140">"Use AwesomePlayer instead of NuPlayer for most media playback"</string>
<string name="usb_audio_disable_routing" msgid="8114498436003102671">"Disable USB audio routing"</string>
<string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Disable automatic routing to USB audio peripherals"</string>
<string name="debug_layout" msgid="5981361776594526155">"Show layout bounds"</string>