From 61ab32fdc6e1597668ed3545355e00d47810f868 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Wed, 27 May 2015 08:54:34 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I0a30eee2e063e7246c04a289202d22a9f00dc94e
Auto-generated-cl: translation import
---
 res/values-en-rGB/arrays.xml  | 11 +++++------
 res/values-en-rGB/strings.xml | 32 +++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 9 deletions(-)

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

diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 7542a3a..2ba0f15 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -519,12 +519,11 @@
     <item msgid="5077768429488260031">"Never allow"</item>
     <item msgid="1417929597727989746">"Always allow"</item>
   </string-array>
-  <string-array name="ram_states">
-    <item msgid="92486906983576802">"Good performance"</item>
-    <item msgid="6109227419356114359">"OK performance"</item>
-    <item msgid="4521713447723292873">"Poor performance"</item>
-    <item msgid="339053949670886603">"Very poor performance"</item>
-  </string-array>
+    <!-- no translation found for ram_states:0 (3944681673818150669) -->
+    <!-- no translation found for ram_states:1 (3256987280393708586) -->
+    <!-- no translation found for ram_states:2 (4662917179231875995) -->
+    <!-- no translation found for ram_states:3 (5264929699714647509) -->
+    <!-- no translation found for ram_states:4 (5606155978847838966) -->
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"Normal"</item>
     <item msgid="866544120205026771">"Moderate"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c02885c..04d83f9 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2712,9 +2712,12 @@
     <string name="usage_access_description" msgid="1352111094596416795">"Usage access allows an app to track what other apps that you\'re using and how often, as well as your operator, language settings and other details."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memory"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Memory details"</string>
-    <string name="always_running" msgid="756962671086985529">"Always running"</string>
-    <string name="sometimes_running" msgid="4029856112252925332">"Sometimes running"</string>
-    <string name="rarely_running" msgid="5858601167598124445">"Rarely running"</string>
+    <!-- no translation found for always_running (6042448320077429656) -->
+    <skip />
+    <!-- no translation found for sometimes_running (6611250683037700864) -->
+    <skip />
+    <!-- no translation found for rarely_running (348413460168817458) -->
+    <skip />
     <string name="memory_max_use" msgid="6874803757715963097">"Maximum"</string>
     <string name="memory_avg_use" msgid="7382015389130622870">"Average"</string>
     <string name="memory_max_desc" msgid="2861832149718335864">"Maximum <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
@@ -2747,4 +2750,27 @@
     <string name="assist_access_context_title" msgid="2047105711005856521">"Use current context"</string>
     <string name="assist_access_context_summary" msgid="8365837347256022203">"When you open the assist app, let it see what you\'ve been doing on your screen"</string>
     <string name="assist_footer" msgid="2283187001990543739">"Assist apps help you identify and act on useful information without having to ask. Some apps support both launcher and voice input services to give you integrated assistance."</string>
+    <!-- no translation found for average_memory_use (829566450150198512) -->
+    <skip />
+    <!-- no translation found for maximum_memory_use (7493720799710132496) -->
+    <skip />
+    <!-- no translation found for sort_avg_use (3998036180505143129) -->
+    <skip />
+    <!-- no translation found for sort_max_use (4629247978290075124) -->
+    <skip />
+    <!-- no translation found for memory_performance (5661005192284103281) -->
+    <skip />
+    <!-- no translation found for total_memory (2017287600738630165) -->
+    <skip />
+    <!-- no translation found for average_used (5338339266517245782) -->
+    <skip />
+    <!-- no translation found for free_memory (4003936141603549746) -->
+    <skip />
+    <!-- no translation found for memory_usage_apps (5650192998273294098) -->
+    <skip />
+    <!-- no translation found for memory_usage_apps_summary (6089210945574265774) -->
+    <!-- no translation found for running_frequency (6622624669948277693) -->
+    <skip />
+    <!-- no translation found for memory_maximum_usage (6513785462055278341) -->
+    <skip />
 </resources>
-- 
cgit v1.1