From 9fa8570d88d9135a8e05f848f4ed1b2c36765041 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 23 Jun 2014 12:21:13 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: Ibffff92fd92f0666f14db1c9f2542950796e783c
Auto-generated-cl: translation import
---
 res/values-en-rGB/arrays.xml  | 22 ++++++++++++++++++++++
 res/values-en-rGB/strings.xml | 15 +++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

(limited to 'res/values-en-rGB')

diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 50cea30..89561b9 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -498,4 +498,26 @@
     <item msgid="5656544177755411222">"Limited interruptions"</item>
     <item msgid="8735337502532332056">"Zero interruptions"</item>
   </string-array>
+  <string-array name="proc_stats_memory_states">
+    <item msgid="8845855295876909468">"Normal"</item>
+    <item msgid="866544120205026771">"Moderate"</item>
+    <item msgid="7851902244436886890">"Low"</item>
+    <item msgid="3022922196817563960">"Critical"</item>
+  </string-array>
+  <string-array name="proc_stats_process_states">
+    <item msgid="5069825997142785829">"Persistent"</item>
+    <item msgid="5779398140277006695">"Top activity"</item>
+    <item msgid="1439598363694578255">"Important (foreground)"</item>
+    <item msgid="3396458970745718652">"Important (background)"</item>
+    <item msgid="5214825238247511992">"Backup"</item>
+    <item msgid="311372689168254967">"Heavy weight"</item>
+    <item msgid="7438189122367820362">"Service (running)"</item>
+    <item msgid="918687422516982498">"Service (restarting)"</item>
+    <item msgid="6807727069641853029">"Receiver"</item>
+    <item msgid="6782857406100845127">"Home"</item>
+    <item msgid="2860945127596974299">"Last activity"</item>
+    <item msgid="8610560843693675830">"Cached (activity)"</item>
+    <item msgid="4338089220026248848">"Cached (activity client)"</item>
+    <item msgid="6652164677254579050">"Cached (empty)"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 53fdd65..2f6af8f 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -995,8 +995,6 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your SMS app?"</string>
-    <string name="phone_application_title" msgid="8232758172983316224">"Default phone app"</string>
-    <string name="phone_change_default_dialog_title" msgid="4972594589432598468">"Change default phone app?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Unknown SIM operator"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s has no known provisioning website"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
@@ -1343,8 +1341,12 @@
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reboot to change runtime from <xliff:g id="OLD">%1$s</xliff:g> to <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
     <string name="wifi_verbose_logging" msgid="4770164061102202747">"Enable Wi-Fi Verbose Logging"</string>
+    <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressive Wi-Fi to Mobile handover"</string>
+    <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Always allow Wi-Fi Roam Scans"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
     <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Increase Wi-Fi logging level, show per SSID RSSI in Wi-Fi Picker"</string>
+    <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"When enabled, Wi-Fi will be more aggressive in handing over the data connection to Mobile, when Wi-Fi signal is low"</string>
+    <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Allow/Disallow Wi-Fi Roam Scans based on the amount of data traffic present at the interface"</string>
     <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
     <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
@@ -1598,6 +1600,15 @@
     <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+    <string name="mem_details_title" msgid="6548392825497290498">"Memory details"</string>
+    <string name="mem_state_subtitle" msgid="2407238869781011933">"Memory states"</string>
+    <string name="mem_use_subtitle" msgid="7319468770222422412">"Memory use"</string>
+    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+    <string name="mem_use_native_type" msgid="5976704902328347400">"Native"</string>
+    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel caches"</string>
+    <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Free"</string>
+    <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
-- 
cgit v1.1