summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarun Nainani <tnainani@codeaurora.org>2015-09-14 11:34:02 -0700
committerjrizzoli <joey@cyanogenmoditalia.it>2015-09-26 21:51:24 +0200
commit13860ef0ca21fdcc7b1565f89b627583495fe07d (patch)
tree8b5f2c908f7d76c7e2e3af34b651faf34b5cf0ce
parentf825bc68bf7b647012b92923cd66fafa2c96d164 (diff)
downloadandroid_packages_apps_Gello-13860ef0ca21fdcc7b1565f89b627583495fe07d.tar.gz
android_packages_apps_Gello-13860ef0ca21fdcc7b1565f89b627583495fe07d.tar.bz2
android_packages_apps_Gello-13860ef0ca21fdcc7b1565f89b627583495fe07d.zip
Add chromium's grd strings to local xml
Add grd strings in 'chrome/android/java/strings/android_chrome_strings.grd' to strings.xml. Ensure we keep localization for all strings added to chromium's grd file. Change-Id: Ife299b0f78788cff842d2eb4ddb4435700577111
-rw-r--r--src/res/values/strings.xml16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/res/values/strings.xml b/src/res/values/strings.xml
index 333b15c1..a11d4464 100644
--- a/src/res/values/strings.xml
+++ b/src/res/values/strings.xml
@@ -613,12 +613,10 @@
<string name="loading_video">Loading video\u2026</string>
<!-- Geolocation -->
- <!-- Permissions prompt -->
- <string name="geolocation_permissions_prompt_share_for_limited_time">Allow for 24 hours</string>
<!-- Settings page dialog -->
<string-array name="geolocation_settings_choices">
<item>Deny forever</item>
- <item>Allow for 24 hours</item>
+ <item>@string/geolocation_permissions_prompt_share_for_limited_time</item>
<item>Allow forever</item>
</string-array>
@@ -795,4 +793,16 @@
<string name="mdm_managed_alert">Managed by your administrator</string>
<!-- My Navigation - Bookmarks + History + Saved -->
<string name="mystuffs">My Navigation</string>
+
+
+ <!-- Place holder for SWE engine strings added to
+ 'chrome/android/java/strings/android_chrome_strings.grd'. Follow
+ chromium android grd naming convention. Follow exact mapping rules from
+ grd to xml. All grd strings maps to xml name in lowercase with 'IDS_'
+ prefix being stripped. For more info check out chromium's
+ UI-localization page. -->
+ <!-- Geolocation infobar promt-->
+ <string name="geolocation_permissions_prompt_remember">Remember Preference</string>
+ <string name="geolocation_permissions_prompt_share_for_limited_time">Allow for 24 hours</string>
+
</resources>