summaryrefslogtreecommitdiffstats
path: root/ui/android
diff options
context:
space:
mode:
Diffstat (limited to 'ui/android')
-rw-r--r--ui/android/java/res/values/strings.xml17
-rw-r--r--ui/android/java/strings/android_ui_strings.grd1
2 files changed, 10 insertions, 8 deletions
diff --git a/ui/android/java/res/values/strings.xml b/ui/android/java/res/values/strings.xml
index 0ea768b..850bcc5c 100644
--- a/ui/android/java/res/values/strings.xml
+++ b/ui/android/java/res/values/strings.xml
@@ -5,11 +5,12 @@
found in the LICENSE file.
-->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Error shown when the browser is restarted due to low memory during a
- file picker operation. [CHAR-LIMIT=NONE] -->
- <string name="low_memory_error">Unable to complete previous operation due to low memory</string>
- <!-- Toast when the browser is unable to open a file for upload. [CHAR-LIMIT=32] -->
- <string name="opening_file_error">Failed to open selected file</string>
-</resources>
+<!-- DO NOT ADD STRINGS HERE.
+
+ Android ui strings now live in
+ ui/android/java/strings/android_ui_strings.grd
+
+ See http://www.chromium.org/developers/design-documents/ui-localization
+-->
+
+<resources/>
diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/strings/android_ui_strings.grd
index c235634..b646d58 100644
--- a/ui/android/java/strings/android_ui_strings.grd
+++ b/ui/android/java/strings/android_ui_strings.grd
@@ -61,6 +61,7 @@
<output filename="values-da/strings.xml" lang="da" type="android" />
<output filename="values-de/strings.xml" lang="de" type="android" />
<output filename="values-el/strings.xml" lang="el" type="android" />
+ <output filename="values/strings.xml" lang="en" type="android" />
<output filename="values-en-rGB/strings.xml" lang="en-GB" type="android" />
<output filename="values-es/strings.xml" lang="es" type="android" />
<output filename="values-es-rUS/strings.xml" lang="es-419" type="android" />