From e10333fdcc3d010e343be5c8b6b0fb24062b3e2b Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 16 Mar 2012 16:07:34 -0700
Subject: Move map center resources out of arrays.xml.

Having them in the same file means that the translation importer
will in some cases try to override the files that were manually
added for each locale.

Change-Id: Ie34106d08aacdbddb0c1005fb511f2018db93800
---
 core/res/res/values-af-rZA/arrays.xml              | 32 ----------------------
 core/res/res/values-af-rZA/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-am-rET/arrays.xml              | 32 ----------------------
 core/res/res/values-am-rET/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ar-rEG/arrays.xml              | 32 ----------------------
 core/res/res/values-ar-rEG/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ar-rIL/arrays.xml              | 32 ----------------------
 core/res/res/values-ar-rIL/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-bg-rBG/arrays.xml              | 32 ----------------------
 core/res/res/values-bg-rBG/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ca-rES/arrays.xml              | 32 ----------------------
 core/res/res/values-ca-rES/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-cs-rCZ/arrays.xml              | 32 ----------------------
 core/res/res/values-cs-rCZ/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-da-rDK/arrays.xml              | 32 ----------------------
 core/res/res/values-da-rDK/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-de-rAT/arrays.xml              | 32 ----------------------
 core/res/res/values-de-rAT/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-de-rCH/arrays.xml              | 32 ----------------------
 core/res/res/values-de-rCH/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-de-rDE/arrays.xml              | 32 ----------------------
 core/res/res/values-de-rDE/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-de-rLI/arrays.xml              | 32 ----------------------
 core/res/res/values-de-rLI/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-el-rGR/arrays.xml              | 32 ----------------------
 core/res/res/values-el-rGR/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rAU/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rAU/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rCA/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rCA/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rGB/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rGB/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rIE/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rIE/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rIN/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rIN/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rNZ/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rNZ/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rSG/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rSG/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-en-rZA/arrays.xml              | 32 ----------------------
 core/res/res/values-en-rZA/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-es-rES/arrays.xml              | 32 ----------------------
 core/res/res/values-es-rES/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-fa-rIR/arrays.xml              | 32 ----------------------
 core/res/res/values-fa-rIR/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-fi-rFI/arrays.xml              | 32 ----------------------
 core/res/res/values-fi-rFI/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-fr-rBE/arrays.xml              | 32 ----------------------
 core/res/res/values-fr-rBE/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-fr-rCA/arrays.xml              | 32 ----------------------
 core/res/res/values-fr-rCA/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-fr-rCH/arrays.xml              | 32 ----------------------
 core/res/res/values-fr-rCH/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-fr-rFR/arrays.xml              | 32 ----------------------
 core/res/res/values-fr-rFR/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-hi-rIN/arrays.xml              | 32 ----------------------
 core/res/res/values-hi-rIN/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-hu-rHU/arrays.xml              | 32 ----------------------
 core/res/res/values-hu-rHU/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-in-rID/arrays.xml              | 32 ----------------------
 core/res/res/values-in-rID/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-it-rCH/arrays.xml              | 32 ----------------------
 core/res/res/values-it-rCH/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-it-rIT/arrays.xml              | 32 ----------------------
 core/res/res/values-it-rIT/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-iw-rIL/arrays.xml              | 32 ----------------------
 core/res/res/values-iw-rIL/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ja-rJP/arrays.xml              | 32 ----------------------
 core/res/res/values-ja-rJP/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ko-rKR/arrays.xml              | 32 ----------------------
 core/res/res/values-ko-rKR/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-lt-rLT/arrays.xml              | 32 ----------------------
 core/res/res/values-lt-rLT/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-lv-rLV/arrays.xml              | 32 ----------------------
 core/res/res/values-lv-rLV/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-mcc204/arrays.xml              | 32 ----------------------
 core/res/res/values-mcc204/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-mcc230/arrays.xml              | 32 ----------------------
 core/res/res/values-mcc230/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-mcc232/arrays.xml              | 32 ----------------------
 core/res/res/values-mcc232/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-mcc260/arrays.xml              | 32 ----------------------
 core/res/res/values-mcc260/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-mcc262/arrays.xml              | 32 ----------------------
 core/res/res/values-mcc262/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ms-rMY/arrays.xml              | 32 ----------------------
 core/res/res/values-ms-rMY/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-nb-rNO/arrays.xml              | 32 ----------------------
 core/res/res/values-nb-rNO/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-nl-rBE/arrays.xml              | 32 ----------------------
 core/res/res/values-nl-rBE/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-nl-rNL/arrays.xml              | 32 ----------------------
 core/res/res/values-nl-rNL/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-pl-rPL/arrays.xml              | 32 ----------------------
 core/res/res/values-pl-rPL/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-pt-rBR/arrays.xml              | 32 ----------------------
 core/res/res/values-pt-rBR/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-pt-rPT/arrays.xml              | 32 ----------------------
 core/res/res/values-pt-rPT/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-rm-rCH/arrays.xml              | 32 ----------------------
 core/res/res/values-rm-rCH/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ro-rRO/arrays.xml              | 32 ----------------------
 core/res/res/values-ro-rRO/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-ru-rRU/arrays.xml              | 32 ----------------------
 core/res/res/values-ru-rRU/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-sk-rSK/arrays.xml              | 32 ----------------------
 core/res/res/values-sk-rSK/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-sl-rSI/arrays.xml              | 32 ----------------------
 core/res/res/values-sl-rSI/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-sr-rRS/arrays.xml              | 32 ----------------------
 core/res/res/values-sr-rRS/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-sv-rSE/arrays.xml              | 32 ----------------------
 core/res/res/values-sv-rSE/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-sw-rTZ/arrays.xml              | 32 ----------------------
 core/res/res/values-sw-rTZ/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-th-rTH/arrays.xml              | 32 ----------------------
 core/res/res/values-th-rTH/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-tl-rPH/arrays.xml              | 32 ----------------------
 core/res/res/values-tl-rPH/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-tr-rTR/arrays.xml              | 32 ----------------------
 core/res/res/values-tr-rTR/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-uk-rUA/arrays.xml              | 32 ----------------------
 core/res/res/values-uk-rUA/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-vi-rVN/arrays.xml              | 32 ----------------------
 core/res/res/values-vi-rVN/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-zh-rCN/arrays.xml              | 32 ----------------------
 core/res/res/values-zh-rCN/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-zh-rTW/arrays.xml              | 32 ----------------------
 core/res/res/values-zh-rTW/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values-zu-rZA/arrays.xml              | 32 ----------------------
 core/res/res/values-zu-rZA/donottranslate-maps.xml | 32 ++++++++++++++++++++++
 core/res/res/values/arrays.xml                     | 10 -------
 core/res/res/values/donottranslate-maps.xml        | 32 ++++++++++++++++++++++
 134 files changed, 2144 insertions(+), 2122 deletions(-)
 delete mode 100644 core/res/res/values-af-rZA/arrays.xml
 create mode 100644 core/res/res/values-af-rZA/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-am-rET/arrays.xml
 create mode 100644 core/res/res/values-am-rET/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ar-rEG/arrays.xml
 create mode 100644 core/res/res/values-ar-rEG/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ar-rIL/arrays.xml
 create mode 100644 core/res/res/values-ar-rIL/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-bg-rBG/arrays.xml
 create mode 100644 core/res/res/values-bg-rBG/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ca-rES/arrays.xml
 create mode 100644 core/res/res/values-ca-rES/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-cs-rCZ/arrays.xml
 create mode 100644 core/res/res/values-cs-rCZ/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-da-rDK/arrays.xml
 create mode 100644 core/res/res/values-da-rDK/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-de-rAT/arrays.xml
 create mode 100644 core/res/res/values-de-rAT/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-de-rCH/arrays.xml
 create mode 100644 core/res/res/values-de-rCH/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-de-rDE/arrays.xml
 create mode 100644 core/res/res/values-de-rDE/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-de-rLI/arrays.xml
 create mode 100644 core/res/res/values-de-rLI/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-el-rGR/arrays.xml
 create mode 100644 core/res/res/values-el-rGR/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rAU/arrays.xml
 create mode 100644 core/res/res/values-en-rAU/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rCA/arrays.xml
 create mode 100644 core/res/res/values-en-rCA/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rGB/arrays.xml
 create mode 100644 core/res/res/values-en-rGB/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rIE/arrays.xml
 create mode 100644 core/res/res/values-en-rIE/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rIN/arrays.xml
 create mode 100644 core/res/res/values-en-rIN/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rNZ/arrays.xml
 create mode 100644 core/res/res/values-en-rNZ/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rSG/arrays.xml
 create mode 100644 core/res/res/values-en-rSG/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-en-rZA/arrays.xml
 create mode 100644 core/res/res/values-en-rZA/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-es-rES/arrays.xml
 create mode 100644 core/res/res/values-es-rES/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-fa-rIR/arrays.xml
 create mode 100644 core/res/res/values-fa-rIR/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-fi-rFI/arrays.xml
 create mode 100644 core/res/res/values-fi-rFI/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-fr-rBE/arrays.xml
 create mode 100644 core/res/res/values-fr-rBE/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-fr-rCA/arrays.xml
 create mode 100644 core/res/res/values-fr-rCA/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-fr-rCH/arrays.xml
 create mode 100644 core/res/res/values-fr-rCH/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-fr-rFR/arrays.xml
 create mode 100644 core/res/res/values-fr-rFR/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-hi-rIN/arrays.xml
 create mode 100644 core/res/res/values-hi-rIN/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-hu-rHU/arrays.xml
 create mode 100644 core/res/res/values-hu-rHU/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-in-rID/arrays.xml
 create mode 100644 core/res/res/values-in-rID/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-it-rCH/arrays.xml
 create mode 100644 core/res/res/values-it-rCH/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-it-rIT/arrays.xml
 create mode 100644 core/res/res/values-it-rIT/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-iw-rIL/arrays.xml
 create mode 100644 core/res/res/values-iw-rIL/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ja-rJP/arrays.xml
 create mode 100644 core/res/res/values-ja-rJP/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ko-rKR/arrays.xml
 create mode 100644 core/res/res/values-ko-rKR/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-lt-rLT/arrays.xml
 create mode 100644 core/res/res/values-lt-rLT/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-lv-rLV/arrays.xml
 create mode 100644 core/res/res/values-lv-rLV/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-mcc204/arrays.xml
 create mode 100644 core/res/res/values-mcc204/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-mcc230/arrays.xml
 create mode 100644 core/res/res/values-mcc230/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-mcc232/arrays.xml
 create mode 100644 core/res/res/values-mcc232/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-mcc260/arrays.xml
 create mode 100644 core/res/res/values-mcc260/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-mcc262/arrays.xml
 create mode 100644 core/res/res/values-mcc262/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ms-rMY/arrays.xml
 create mode 100644 core/res/res/values-ms-rMY/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-nb-rNO/arrays.xml
 create mode 100644 core/res/res/values-nb-rNO/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-nl-rBE/arrays.xml
 create mode 100644 core/res/res/values-nl-rBE/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-nl-rNL/arrays.xml
 create mode 100644 core/res/res/values-nl-rNL/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-pl-rPL/arrays.xml
 create mode 100644 core/res/res/values-pl-rPL/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-pt-rBR/arrays.xml
 create mode 100644 core/res/res/values-pt-rBR/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-pt-rPT/arrays.xml
 create mode 100644 core/res/res/values-pt-rPT/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-rm-rCH/arrays.xml
 create mode 100644 core/res/res/values-rm-rCH/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ro-rRO/arrays.xml
 create mode 100644 core/res/res/values-ro-rRO/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-ru-rRU/arrays.xml
 create mode 100644 core/res/res/values-ru-rRU/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-sk-rSK/arrays.xml
 create mode 100644 core/res/res/values-sk-rSK/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-sl-rSI/arrays.xml
 create mode 100644 core/res/res/values-sl-rSI/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-sr-rRS/arrays.xml
 create mode 100644 core/res/res/values-sr-rRS/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-sv-rSE/arrays.xml
 create mode 100644 core/res/res/values-sv-rSE/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-sw-rTZ/arrays.xml
 create mode 100644 core/res/res/values-sw-rTZ/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-th-rTH/arrays.xml
 create mode 100644 core/res/res/values-th-rTH/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-tl-rPH/arrays.xml
 create mode 100644 core/res/res/values-tl-rPH/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-tr-rTR/arrays.xml
 create mode 100644 core/res/res/values-tr-rTR/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-uk-rUA/arrays.xml
 create mode 100644 core/res/res/values-uk-rUA/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-vi-rVN/arrays.xml
 create mode 100644 core/res/res/values-vi-rVN/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-zh-rCN/arrays.xml
 create mode 100644 core/res/res/values-zh-rCN/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-zh-rTW/arrays.xml
 create mode 100644 core/res/res/values-zh-rTW/donottranslate-maps.xml
 delete mode 100644 core/res/res/values-zu-rZA/arrays.xml
 create mode 100644 core/res/res/values-zu-rZA/donottranslate-maps.xml
 create mode 100644 core/res/res/values/donottranslate-maps.xml

diff --git a/core/res/res/values-af-rZA/arrays.xml b/core/res/res/values-af-rZA/arrays.xml
deleted file mode 100644
index 5bff0f489ca3..000000000000
--- a/core/res/res/values-af-rZA/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-30559482</item>
-        <item>22937506</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-af-rZA/donottranslate-maps.xml b/core/res/res/values-af-rZA/donottranslate-maps.xml
new file mode 100644
index 000000000000..5bff0f489ca3
--- /dev/null
+++ b/core/res/res/values-af-rZA/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-30559482</item>
+        <item>22937506</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-am-rET/arrays.xml b/core/res/res/values-am-rET/arrays.xml
deleted file mode 100644
index 67e8b08ab275..000000000000
--- a/core/res/res/values-am-rET/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>9145000</item>
-        <item>40489673</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-am-rET/donottranslate-maps.xml b/core/res/res/values-am-rET/donottranslate-maps.xml
new file mode 100644
index 000000000000..67e8b08ab275
--- /dev/null
+++ b/core/res/res/values-am-rET/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>9145000</item>
+        <item>40489673</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ar-rEG/arrays.xml b/core/res/res/values-ar-rEG/arrays.xml
deleted file mode 100644
index 1180cb31697e..000000000000
--- a/core/res/res/values-ar-rEG/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>26820553</item>
-        <item>30802498</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ar-rEG/donottranslate-maps.xml b/core/res/res/values-ar-rEG/donottranslate-maps.xml
new file mode 100644
index 000000000000..1180cb31697e
--- /dev/null
+++ b/core/res/res/values-ar-rEG/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>26820553</item>
+        <item>30802498</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ar-rIL/arrays.xml b/core/res/res/values-ar-rIL/arrays.xml
deleted file mode 100644
index 87c1231cf5dd..000000000000
--- a/core/res/res/values-ar-rIL/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>31046051</item>
-        <item>34851612</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ar-rIL/donottranslate-maps.xml b/core/res/res/values-ar-rIL/donottranslate-maps.xml
new file mode 100644
index 000000000000..87c1231cf5dd
--- /dev/null
+++ b/core/res/res/values-ar-rIL/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>31046051</item>
+        <item>34851612</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-bg-rBG/arrays.xml b/core/res/res/values-bg-rBG/arrays.xml
deleted file mode 100644
index 3cfcbfde237b..000000000000
--- a/core/res/res/values-bg-rBG/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>42733883</item>
-        <item>25485830</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-bg-rBG/donottranslate-maps.xml b/core/res/res/values-bg-rBG/donottranslate-maps.xml
new file mode 100644
index 000000000000..3cfcbfde237b
--- /dev/null
+++ b/core/res/res/values-bg-rBG/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>42733883</item>
+        <item>25485830</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ca-rES/arrays.xml b/core/res/res/values-ca-rES/arrays.xml
deleted file mode 100644
index 7f5667cb966e..000000000000
--- a/core/res/res/values-ca-rES/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>40413496</item>
-        <item>-3713379</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>6</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ca-rES/donottranslate-maps.xml b/core/res/res/values-ca-rES/donottranslate-maps.xml
new file mode 100644
index 000000000000..7f5667cb966e
--- /dev/null
+++ b/core/res/res/values-ca-rES/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>40413496</item>
+        <item>-3713379</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>6</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-cs-rCZ/arrays.xml b/core/res/res/values-cs-rCZ/arrays.xml
deleted file mode 100644
index 484c9b34dcfd..000000000000
--- a/core/res/res/values-cs-rCZ/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>50083333</item>
-        <item>14416667</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-cs-rCZ/donottranslate-maps.xml b/core/res/res/values-cs-rCZ/donottranslate-maps.xml
new file mode 100644
index 000000000000..484c9b34dcfd
--- /dev/null
+++ b/core/res/res/values-cs-rCZ/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>50083333</item>
+        <item>14416667</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-da-rDK/arrays.xml b/core/res/res/values-da-rDK/arrays.xml
deleted file mode 100644
index 4d0abd033ea0..000000000000
--- a/core/res/res/values-da-rDK/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>55679423</item>
-        <item>12577114</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-da-rDK/donottranslate-maps.xml b/core/res/res/values-da-rDK/donottranslate-maps.xml
new file mode 100644
index 000000000000..4d0abd033ea0
--- /dev/null
+++ b/core/res/res/values-da-rDK/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>55679423</item>
+        <item>12577114</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-de-rAT/arrays.xml b/core/res/res/values-de-rAT/arrays.xml
deleted file mode 100644
index e8855cf652e1..000000000000
--- a/core/res/res/values-de-rAT/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>48209206</item>
-        <item>16372778</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-de-rAT/donottranslate-maps.xml b/core/res/res/values-de-rAT/donottranslate-maps.xml
new file mode 100644
index 000000000000..e8855cf652e1
--- /dev/null
+++ b/core/res/res/values-de-rAT/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>48209206</item>
+        <item>16372778</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-de-rCH/arrays.xml b/core/res/res/values-de-rCH/arrays.xml
deleted file mode 100644
index f2982e9f54d9..000000000000
--- a/core/res/res/values-de-rCH/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>46948020</item>
-        <item>7448206</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-de-rCH/donottranslate-maps.xml b/core/res/res/values-de-rCH/donottranslate-maps.xml
new file mode 100644
index 000000000000..f2982e9f54d9
--- /dev/null
+++ b/core/res/res/values-de-rCH/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>46948020</item>
+        <item>7448206</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-de-rDE/arrays.xml b/core/res/res/values-de-rDE/arrays.xml
deleted file mode 100644
index 3680fd33f21c..000000000000
--- a/core/res/res/values-de-rDE/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>55679423</item>
-        <item>9735672</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-de-rDE/donottranslate-maps.xml b/core/res/res/values-de-rDE/donottranslate-maps.xml
new file mode 100644
index 000000000000..3680fd33f21c
--- /dev/null
+++ b/core/res/res/values-de-rDE/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>55679423</item>
+        <item>9735672</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-de-rLI/arrays.xml b/core/res/res/values-de-rLI/arrays.xml
deleted file mode 100644
index 0481b764b798..000000000000
--- a/core/res/res/values-de-rLI/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>47141076</item>
-        <item>9521482</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-de-rLI/donottranslate-maps.xml b/core/res/res/values-de-rLI/donottranslate-maps.xml
new file mode 100644
index 000000000000..0481b764b798
--- /dev/null
+++ b/core/res/res/values-de-rLI/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>47141076</item>
+        <item>9521482</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-el-rGR/arrays.xml b/core/res/res/values-el-rGR/arrays.xml
deleted file mode 100644
index 0329ca3d55df..000000000000
--- a/core/res/res/values-el-rGR/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>39074208</item>
-        <item>21824312</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-el-rGR/donottranslate-maps.xml b/core/res/res/values-el-rGR/donottranslate-maps.xml
new file mode 100644
index 000000000000..0329ca3d55df
--- /dev/null
+++ b/core/res/res/values-el-rGR/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>39074208</item>
+        <item>21824312</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rAU/arrays.xml b/core/res/res/values-en-rAU/arrays.xml
deleted file mode 100644
index 46351e65df39..000000000000
--- a/core/res/res/values-en-rAU/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-26037042</item>
-        <item>137197266</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rAU/donottranslate-maps.xml b/core/res/res/values-en-rAU/donottranslate-maps.xml
new file mode 100644
index 000000000000..46351e65df39
--- /dev/null
+++ b/core/res/res/values-en-rAU/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-26037042</item>
+        <item>137197266</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rCA/arrays.xml b/core/res/res/values-en-rCA/arrays.xml
deleted file mode 100644
index 00c7ca421f98..000000000000
--- a/core/res/res/values-en-rCA/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>49875832</item>
-        <item>-97150726</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rCA/donottranslate-maps.xml b/core/res/res/values-en-rCA/donottranslate-maps.xml
new file mode 100644
index 000000000000..00c7ca421f98
--- /dev/null
+++ b/core/res/res/values-en-rCA/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>49875832</item>
+        <item>-97150726</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rGB/arrays.xml b/core/res/res/values-en-rGB/arrays.xml
deleted file mode 100644
index 02a0e0fe85f9..000000000000
--- a/core/res/res/values-en-rGB/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>51500208</item>
-        <item>-126729</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>5</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rGB/donottranslate-maps.xml b/core/res/res/values-en-rGB/donottranslate-maps.xml
new file mode 100644
index 000000000000..02a0e0fe85f9
--- /dev/null
+++ b/core/res/res/values-en-rGB/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>51500208</item>
+        <item>-126729</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rIE/arrays.xml b/core/res/res/values-en-rIE/arrays.xml
deleted file mode 100644
index 51cc537de006..000000000000
--- a/core/res/res/values-en-rIE/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>53366667</item>
-        <item>-8000000</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>7</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rIE/donottranslate-maps.xml b/core/res/res/values-en-rIE/donottranslate-maps.xml
new file mode 100644
index 000000000000..51cc537de006
--- /dev/null
+++ b/core/res/res/values-en-rIE/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>53366667</item>
+        <item>-8000000</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>7</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rIN/arrays.xml b/core/res/res/values-en-rIN/arrays.xml
deleted file mode 100644
index d5b2889c59f2..000000000000
--- a/core/res/res/values-en-rIN/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>20593684</item>
-        <item>78962880</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rIN/donottranslate-maps.xml b/core/res/res/values-en-rIN/donottranslate-maps.xml
new file mode 100644
index 000000000000..d5b2889c59f2
--- /dev/null
+++ b/core/res/res/values-en-rIN/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>20593684</item>
+        <item>78962880</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rNZ/arrays.xml b/core/res/res/values-en-rNZ/arrays.xml
deleted file mode 100644
index 26f00d94ce1e..000000000000
--- a/core/res/res/values-en-rNZ/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-41283333</item>
-        <item>174766667</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>5</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rNZ/donottranslate-maps.xml b/core/res/res/values-en-rNZ/donottranslate-maps.xml
new file mode 100644
index 000000000000..26f00d94ce1e
--- /dev/null
+++ b/core/res/res/values-en-rNZ/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-41283333</item>
+        <item>174766667</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rSG/arrays.xml b/core/res/res/values-en-rSG/arrays.xml
deleted file mode 100644
index ee1e64ba073f..000000000000
--- a/core/res/res/values-en-rSG/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>1333333</item>
-        <item>103875000</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rSG/donottranslate-maps.xml b/core/res/res/values-en-rSG/donottranslate-maps.xml
new file mode 100644
index 000000000000..ee1e64ba073f
--- /dev/null
+++ b/core/res/res/values-en-rSG/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>1333333</item>
+        <item>103875000</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-en-rZA/arrays.xml b/core/res/res/values-en-rZA/arrays.xml
deleted file mode 100644
index 259b2b15af5d..000000000000
--- a/core/res/res/values-en-rZA/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-26183333</item>
-        <item>28050000</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>5</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-en-rZA/donottranslate-maps.xml b/core/res/res/values-en-rZA/donottranslate-maps.xml
new file mode 100644
index 000000000000..259b2b15af5d
--- /dev/null
+++ b/core/res/res/values-en-rZA/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-26183333</item>
+        <item>28050000</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-es-rES/arrays.xml b/core/res/res/values-es-rES/arrays.xml
deleted file mode 100644
index 7f5667cb966e..000000000000
--- a/core/res/res/values-es-rES/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>40413496</item>
-        <item>-3713379</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>6</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-es-rES/donottranslate-maps.xml b/core/res/res/values-es-rES/donottranslate-maps.xml
new file mode 100644
index 000000000000..7f5667cb966e
--- /dev/null
+++ b/core/res/res/values-es-rES/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>40413496</item>
+        <item>-3713379</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>6</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-fa-rIR/arrays.xml b/core/res/res/values-fa-rIR/arrays.xml
deleted file mode 100644
index de0f368e2831..000000000000
--- a/core/res/res/values-fa-rIR/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>32427908</item>
-        <item>53688046</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-fa-rIR/donottranslate-maps.xml b/core/res/res/values-fa-rIR/donottranslate-maps.xml
new file mode 100644
index 000000000000..de0f368e2831
--- /dev/null
+++ b/core/res/res/values-fa-rIR/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>32427908</item>
+        <item>53688046</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-fi-rFI/arrays.xml b/core/res/res/values-fi-rFI/arrays.xml
deleted file mode 100644
index 2e2395376f61..000000000000
--- a/core/res/res/values-fi-rFI/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>60169653</item>
-        <item>24939480</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-fi-rFI/donottranslate-maps.xml b/core/res/res/values-fi-rFI/donottranslate-maps.xml
new file mode 100644
index 000000000000..2e2395376f61
--- /dev/null
+++ b/core/res/res/values-fi-rFI/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>60169653</item>
+        <item>24939480</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-fr-rBE/arrays.xml b/core/res/res/values-fr-rBE/arrays.xml
deleted file mode 100644
index 9e93a0922154..000000000000
--- a/core/res/res/values-fr-rBE/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>50854509</item>
-        <item>4376678</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>5</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-fr-rBE/donottranslate-maps.xml b/core/res/res/values-fr-rBE/donottranslate-maps.xml
new file mode 100644
index 000000000000..9e93a0922154
--- /dev/null
+++ b/core/res/res/values-fr-rBE/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>50854509</item>
+        <item>4376678</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-fr-rCA/arrays.xml b/core/res/res/values-fr-rCA/arrays.xml
deleted file mode 100644
index 00c7ca421f98..000000000000
--- a/core/res/res/values-fr-rCA/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>49875832</item>
-        <item>-97150726</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-fr-rCA/donottranslate-maps.xml b/core/res/res/values-fr-rCA/donottranslate-maps.xml
new file mode 100644
index 000000000000..00c7ca421f98
--- /dev/null
+++ b/core/res/res/values-fr-rCA/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>49875832</item>
+        <item>-97150726</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-fr-rCH/arrays.xml b/core/res/res/values-fr-rCH/arrays.xml
deleted file mode 100644
index f2982e9f54d9..000000000000
--- a/core/res/res/values-fr-rCH/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>46948020</item>
-        <item>7448206</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-fr-rCH/donottranslate-maps.xml b/core/res/res/values-fr-rCH/donottranslate-maps.xml
new file mode 100644
index 000000000000..f2982e9f54d9
--- /dev/null
+++ b/core/res/res/values-fr-rCH/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>46948020</item>
+        <item>7448206</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-fr-rFR/arrays.xml b/core/res/res/values-fr-rFR/arrays.xml
deleted file mode 100644
index 504ab0f63a68..000000000000
--- a/core/res/res/values-fr-rFR/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>48850258</item>
-        <item>2351074</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>6</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-fr-rFR/donottranslate-maps.xml b/core/res/res/values-fr-rFR/donottranslate-maps.xml
new file mode 100644
index 000000000000..504ab0f63a68
--- /dev/null
+++ b/core/res/res/values-fr-rFR/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>48850258</item>
+        <item>2351074</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>6</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-hi-rIN/arrays.xml b/core/res/res/values-hi-rIN/arrays.xml
deleted file mode 100644
index d5b2889c59f2..000000000000
--- a/core/res/res/values-hi-rIN/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>20593684</item>
-        <item>78962880</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-hi-rIN/donottranslate-maps.xml b/core/res/res/values-hi-rIN/donottranslate-maps.xml
new file mode 100644
index 000000000000..d5b2889c59f2
--- /dev/null
+++ b/core/res/res/values-hi-rIN/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>20593684</item>
+        <item>78962880</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-hu-rHU/arrays.xml b/core/res/res/values-hu-rHU/arrays.xml
deleted file mode 100644
index 833bb24304b1..000000000000
--- a/core/res/res/values-hu-rHU/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>47162494</item>
-        <item>19503304</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-hu-rHU/donottranslate-maps.xml b/core/res/res/values-hu-rHU/donottranslate-maps.xml
new file mode 100644
index 000000000000..833bb24304b1
--- /dev/null
+++ b/core/res/res/values-hu-rHU/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>47162494</item>
+        <item>19503304</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-in-rID/arrays.xml b/core/res/res/values-in-rID/arrays.xml
deleted file mode 100644
index 512cace1a568..000000000000
--- a/core/res/res/values-in-rID/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-789275</item>
-        <item>113921327</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-in-rID/donottranslate-maps.xml b/core/res/res/values-in-rID/donottranslate-maps.xml
new file mode 100644
index 000000000000..512cace1a568
--- /dev/null
+++ b/core/res/res/values-in-rID/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-789275</item>
+        <item>113921327</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-it-rCH/arrays.xml b/core/res/res/values-it-rCH/arrays.xml
deleted file mode 100644
index f2982e9f54d9..000000000000
--- a/core/res/res/values-it-rCH/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>46948020</item>
-        <item>7448206</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-it-rCH/donottranslate-maps.xml b/core/res/res/values-it-rCH/donottranslate-maps.xml
new file mode 100644
index 000000000000..f2982e9f54d9
--- /dev/null
+++ b/core/res/res/values-it-rCH/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>46948020</item>
+        <item>7448206</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-it-rIT/arrays.xml b/core/res/res/values-it-rIT/arrays.xml
deleted file mode 100644
index 92e5260d3c3d..000000000000
--- a/core/res/res/values-it-rIT/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>41795888</item>
-        <item>12480469</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>6</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-it-rIT/donottranslate-maps.xml b/core/res/res/values-it-rIT/donottranslate-maps.xml
new file mode 100644
index 000000000000..92e5260d3c3d
--- /dev/null
+++ b/core/res/res/values-it-rIT/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>41795888</item>
+        <item>12480469</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>6</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-iw-rIL/arrays.xml b/core/res/res/values-iw-rIL/arrays.xml
deleted file mode 100644
index 87c1231cf5dd..000000000000
--- a/core/res/res/values-iw-rIL/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>31046051</item>
-        <item>34851612</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-iw-rIL/donottranslate-maps.xml b/core/res/res/values-iw-rIL/donottranslate-maps.xml
new file mode 100644
index 000000000000..87c1231cf5dd
--- /dev/null
+++ b/core/res/res/values-iw-rIL/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>31046051</item>
+        <item>34851612</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ja-rJP/arrays.xml b/core/res/res/values-ja-rJP/arrays.xml
deleted file mode 100644
index 74e8a59b17e0..000000000000
--- a/core/res/res/values-ja-rJP/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2009, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>35666667</item>
-        <item>139750000</item>
-     </integer-array>
-     <!-- Do not translate. -->
-     <integer-array name="maps_starting_zoom">
-         <item>5</item>
-     </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ja-rJP/donottranslate-maps.xml b/core/res/res/values-ja-rJP/donottranslate-maps.xml
new file mode 100644
index 000000000000..74e8a59b17e0
--- /dev/null
+++ b/core/res/res/values-ja-rJP/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2009, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>35666667</item>
+        <item>139750000</item>
+     </integer-array>
+     <!-- Do not translate. -->
+     <integer-array name="maps_starting_zoom">
+         <item>5</item>
+     </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ko-rKR/arrays.xml b/core/res/res/values-ko-rKR/arrays.xml
deleted file mode 100644
index e245def469e9..000000000000
--- a/core/res/res/values-ko-rKR/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>37560908</item>
-        <item>126987705</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ko-rKR/donottranslate-maps.xml b/core/res/res/values-ko-rKR/donottranslate-maps.xml
new file mode 100644
index 000000000000..e245def469e9
--- /dev/null
+++ b/core/res/res/values-ko-rKR/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>37560908</item>
+        <item>126987705</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-lt-rLT/arrays.xml b/core/res/res/values-lt-rLT/arrays.xml
deleted file mode 100644
index 0d5a3aa8253b..000000000000
--- a/core/res/res/values-lt-rLT/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>55169438</item>
-        <item>23881275</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-lt-rLT/donottranslate-maps.xml b/core/res/res/values-lt-rLT/donottranslate-maps.xml
new file mode 100644
index 000000000000..0d5a3aa8253b
--- /dev/null
+++ b/core/res/res/values-lt-rLT/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>55169438</item>
+        <item>23881275</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-lv-rLV/arrays.xml b/core/res/res/values-lv-rLV/arrays.xml
deleted file mode 100644
index d9ba7a44afc0..000000000000
--- a/core/res/res/values-lv-rLV/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>55879635</item>
-        <item>24603189</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-lv-rLV/donottranslate-maps.xml b/core/res/res/values-lv-rLV/donottranslate-maps.xml
new file mode 100644
index 000000000000..d9ba7a44afc0
--- /dev/null
+++ b/core/res/res/values-lv-rLV/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>55879635</item>
+        <item>24603189</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-mcc204/arrays.xml b/core/res/res/values-mcc204/arrays.xml
deleted file mode 100644
index 7902a13c70d7..000000000000
--- a/core/res/res/values-mcc204/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>51589256</item>
-        <item>4774396</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>6</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-mcc204/donottranslate-maps.xml b/core/res/res/values-mcc204/donottranslate-maps.xml
new file mode 100644
index 000000000000..7902a13c70d7
--- /dev/null
+++ b/core/res/res/values-mcc204/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>51589256</item>
+        <item>4774396</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>6</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-mcc230/arrays.xml b/core/res/res/values-mcc230/arrays.xml
deleted file mode 100644
index 71c3ed671d6d..000000000000
--- a/core/res/res/values-mcc230/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>50087811</item>
-        <item>14420460</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>6</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-mcc230/donottranslate-maps.xml b/core/res/res/values-mcc230/donottranslate-maps.xml
new file mode 100644
index 000000000000..71c3ed671d6d
--- /dev/null
+++ b/core/res/res/values-mcc230/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>50087811</item>
+        <item>14420460</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>6</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-mcc232/arrays.xml b/core/res/res/values-mcc232/arrays.xml
deleted file mode 100644
index 98458f848aa3..000000000000
--- a/core/res/res/values-mcc232/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>48209206</item>
-        <item>16372778</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>6</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-mcc232/donottranslate-maps.xml b/core/res/res/values-mcc232/donottranslate-maps.xml
new file mode 100644
index 000000000000..98458f848aa3
--- /dev/null
+++ b/core/res/res/values-mcc232/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>48209206</item>
+        <item>16372778</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>6</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-mcc260/arrays.xml b/core/res/res/values-mcc260/arrays.xml
deleted file mode 100644
index 03447ab28acc..000000000000
--- a/core/res/res/values-mcc260/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>59910761</item>
-        <item>10749092</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>5</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-mcc260/donottranslate-maps.xml b/core/res/res/values-mcc260/donottranslate-maps.xml
new file mode 100644
index 000000000000..03447ab28acc
--- /dev/null
+++ b/core/res/res/values-mcc260/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>59910761</item>
+        <item>10749092</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-mcc262/arrays.xml b/core/res/res/values-mcc262/arrays.xml
deleted file mode 100644
index 955df7d2eeef..000000000000
--- a/core/res/res/values-mcc262/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>52372026</item>
-        <item>9735672</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>5</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-mcc262/donottranslate-maps.xml b/core/res/res/values-mcc262/donottranslate-maps.xml
new file mode 100644
index 000000000000..955df7d2eeef
--- /dev/null
+++ b/core/res/res/values-mcc262/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* 
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>52372026</item>
+        <item>9735672</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ms-rMY/arrays.xml b/core/res/res/values-ms-rMY/arrays.xml
deleted file mode 100644
index 3a708e6aa87e..000000000000
--- a/core/res/res/values-ms-rMY/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>4210484</item>
-        <item>101975766</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ms-rMY/donottranslate-maps.xml b/core/res/res/values-ms-rMY/donottranslate-maps.xml
new file mode 100644
index 000000000000..3a708e6aa87e
--- /dev/null
+++ b/core/res/res/values-ms-rMY/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>4210484</item>
+        <item>101975766</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-nb-rNO/arrays.xml b/core/res/res/values-nb-rNO/arrays.xml
deleted file mode 100644
index 500e8e1edf1d..000000000000
--- a/core/res/res/values-nb-rNO/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>59910761</item>
-        <item>10749092</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-nb-rNO/donottranslate-maps.xml b/core/res/res/values-nb-rNO/donottranslate-maps.xml
new file mode 100644
index 000000000000..500e8e1edf1d
--- /dev/null
+++ b/core/res/res/values-nb-rNO/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>59910761</item>
+        <item>10749092</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-nl-rBE/arrays.xml b/core/res/res/values-nl-rBE/arrays.xml
deleted file mode 100644
index 9e93a0922154..000000000000
--- a/core/res/res/values-nl-rBE/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>50854509</item>
-        <item>4376678</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>5</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-nl-rBE/donottranslate-maps.xml b/core/res/res/values-nl-rBE/donottranslate-maps.xml
new file mode 100644
index 000000000000..9e93a0922154
--- /dev/null
+++ b/core/res/res/values-nl-rBE/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>50854509</item>
+        <item>4376678</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>5</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-nl-rNL/arrays.xml b/core/res/res/values-nl-rNL/arrays.xml
deleted file mode 100644
index fe5422bf953b..000000000000
--- a/core/res/res/values-nl-rNL/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>51589256</item>
-        <item>4774396</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-nl-rNL/donottranslate-maps.xml b/core/res/res/values-nl-rNL/donottranslate-maps.xml
new file mode 100644
index 000000000000..fe5422bf953b
--- /dev/null
+++ b/core/res/res/values-nl-rNL/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>51589256</item>
+        <item>4774396</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-pl-rPL/arrays.xml b/core/res/res/values-pl-rPL/arrays.xml
deleted file mode 100644
index 950248c4d545..000000000000
--- a/core/res/res/values-pl-rPL/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>52235474</item>
-        <item>21004057</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-pl-rPL/donottranslate-maps.xml b/core/res/res/values-pl-rPL/donottranslate-maps.xml
new file mode 100644
index 000000000000..950248c4d545
--- /dev/null
+++ b/core/res/res/values-pl-rPL/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>52235474</item>
+        <item>21004057</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-pt-rBR/arrays.xml b/core/res/res/values-pt-rBR/arrays.xml
deleted file mode 100644
index 389d0c4fc0a7..000000000000
--- a/core/res/res/values-pt-rBR/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-22863878</item>
-        <item>-43244097</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-pt-rBR/donottranslate-maps.xml b/core/res/res/values-pt-rBR/donottranslate-maps.xml
new file mode 100644
index 000000000000..389d0c4fc0a7
--- /dev/null
+++ b/core/res/res/values-pt-rBR/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-22863878</item>
+        <item>-43244097</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-pt-rPT/arrays.xml b/core/res/res/values-pt-rPT/arrays.xml
deleted file mode 100644
index a1ba15aa9c8a..000000000000
--- a/core/res/res/values-pt-rPT/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>38707163</item>
-        <item>-9135517</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-pt-rPT/donottranslate-maps.xml b/core/res/res/values-pt-rPT/donottranslate-maps.xml
new file mode 100644
index 000000000000..a1ba15aa9c8a
--- /dev/null
+++ b/core/res/res/values-pt-rPT/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>38707163</item>
+        <item>-9135517</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-rm-rCH/arrays.xml b/core/res/res/values-rm-rCH/arrays.xml
deleted file mode 100644
index 48e861302476..000000000000
--- a/core/res/res/values-rm-rCH/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2010, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>46948020</item>
-        <item>7448206</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-rm-rCH/donottranslate-maps.xml b/core/res/res/values-rm-rCH/donottranslate-maps.xml
new file mode 100644
index 000000000000..48e861302476
--- /dev/null
+++ b/core/res/res/values-rm-rCH/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2010, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>46948020</item>
+        <item>7448206</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ro-rRO/arrays.xml b/core/res/res/values-ro-rRO/arrays.xml
deleted file mode 100644
index c5579d0e4d45..000000000000
--- a/core/res/res/values-ro-rRO/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>45943161</item>
-        <item>24966760</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ro-rRO/donottranslate-maps.xml b/core/res/res/values-ro-rRO/donottranslate-maps.xml
new file mode 100644
index 000000000000..c5579d0e4d45
--- /dev/null
+++ b/core/res/res/values-ro-rRO/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>45943161</item>
+        <item>24966760</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-ru-rRU/arrays.xml b/core/res/res/values-ru-rRU/arrays.xml
deleted file mode 100644
index 733fdc07de1c..000000000000
--- a/core/res/res/values-ru-rRU/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>55750449</item>
-        <item>37621136</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>2</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-ru-rRU/donottranslate-maps.xml b/core/res/res/values-ru-rRU/donottranslate-maps.xml
new file mode 100644
index 000000000000..733fdc07de1c
--- /dev/null
+++ b/core/res/res/values-ru-rRU/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>55750449</item>
+        <item>37621136</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>2</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-sk-rSK/arrays.xml b/core/res/res/values-sk-rSK/arrays.xml
deleted file mode 100644
index b065ba52431a..000000000000
--- a/core/res/res/values-sk-rSK/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>48669026</item>
-        <item>19699024</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-sk-rSK/donottranslate-maps.xml b/core/res/res/values-sk-rSK/donottranslate-maps.xml
new file mode 100644
index 000000000000..b065ba52431a
--- /dev/null
+++ b/core/res/res/values-sk-rSK/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>48669026</item>
+        <item>19699024</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-sl-rSI/arrays.xml b/core/res/res/values-sl-rSI/arrays.xml
deleted file mode 100644
index 41581571d9a8..000000000000
--- a/core/res/res/values-sl-rSI/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>46151241</item>
-        <item>14995463</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-sl-rSI/donottranslate-maps.xml b/core/res/res/values-sl-rSI/donottranslate-maps.xml
new file mode 100644
index 000000000000..41581571d9a8
--- /dev/null
+++ b/core/res/res/values-sl-rSI/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>46151241</item>
+        <item>14995463</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-sr-rRS/arrays.xml b/core/res/res/values-sr-rRS/arrays.xml
deleted file mode 100644
index 98dc954dbdb1..000000000000
--- a/core/res/res/values-sr-rRS/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>44016521</item>
-        <item>21005859</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-sr-rRS/donottranslate-maps.xml b/core/res/res/values-sr-rRS/donottranslate-maps.xml
new file mode 100644
index 000000000000..98dc954dbdb1
--- /dev/null
+++ b/core/res/res/values-sr-rRS/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>44016521</item>
+        <item>21005859</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-sv-rSE/arrays.xml b/core/res/res/values-sv-rSE/arrays.xml
deleted file mode 100644
index 988d356ff16d..000000000000
--- a/core/res/res/values-sv-rSE/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>59330650</item>
-        <item>18067360</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-sv-rSE/donottranslate-maps.xml b/core/res/res/values-sv-rSE/donottranslate-maps.xml
new file mode 100644
index 000000000000..988d356ff16d
--- /dev/null
+++ b/core/res/res/values-sv-rSE/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>59330650</item>
+        <item>18067360</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-sw-rTZ/arrays.xml b/core/res/res/values-sw-rTZ/arrays.xml
deleted file mode 100644
index d1018a776314..000000000000
--- a/core/res/res/values-sw-rTZ/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-6369028</item>
-        <item>34888822</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-sw-rTZ/donottranslate-maps.xml b/core/res/res/values-sw-rTZ/donottranslate-maps.xml
new file mode 100644
index 000000000000..d1018a776314
--- /dev/null
+++ b/core/res/res/values-sw-rTZ/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-6369028</item>
+        <item>34888822</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-th-rTH/arrays.xml b/core/res/res/values-th-rTH/arrays.xml
deleted file mode 100644
index fe765922b955..000000000000
--- a/core/res/res/values-th-rTH/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>15870032</item>
-        <item>100992541</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-th-rTH/donottranslate-maps.xml b/core/res/res/values-th-rTH/donottranslate-maps.xml
new file mode 100644
index 000000000000..fe765922b955
--- /dev/null
+++ b/core/res/res/values-th-rTH/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>15870032</item>
+        <item>100992541</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-tl-rPH/arrays.xml b/core/res/res/values-tl-rPH/arrays.xml
deleted file mode 100644
index 2edac64dd7c2..000000000000
--- a/core/res/res/values-tl-rPH/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>12879721</item>
-        <item>121774017</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-tl-rPH/donottranslate-maps.xml b/core/res/res/values-tl-rPH/donottranslate-maps.xml
new file mode 100644
index 000000000000..2edac64dd7c2
--- /dev/null
+++ b/core/res/res/values-tl-rPH/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>12879721</item>
+        <item>121774017</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-tr-rTR/arrays.xml b/core/res/res/values-tr-rTR/arrays.xml
deleted file mode 100644
index f045cfff50bd..000000000000
--- a/core/res/res/values-tr-rTR/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>41034435</item>
-        <item>28977556</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-tr-rTR/donottranslate-maps.xml b/core/res/res/values-tr-rTR/donottranslate-maps.xml
new file mode 100644
index 000000000000..f045cfff50bd
--- /dev/null
+++ b/core/res/res/values-tr-rTR/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>41034435</item>
+        <item>28977556</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-uk-rUA/arrays.xml b/core/res/res/values-uk-rUA/arrays.xml
deleted file mode 100644
index 746befd86918..000000000000
--- a/core/res/res/values-uk-rUA/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>48379433</item>
-        <item>31165580</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-uk-rUA/donottranslate-maps.xml b/core/res/res/values-uk-rUA/donottranslate-maps.xml
new file mode 100644
index 000000000000..746befd86918
--- /dev/null
+++ b/core/res/res/values-uk-rUA/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>48379433</item>
+        <item>31165580</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-vi-rVN/arrays.xml b/core/res/res/values-vi-rVN/arrays.xml
deleted file mode 100644
index 6b220815fa21..000000000000
--- a/core/res/res/values-vi-rVN/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>14058324</item>
-        <item>108277199</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-vi-rVN/donottranslate-maps.xml b/core/res/res/values-vi-rVN/donottranslate-maps.xml
new file mode 100644
index 000000000000..6b220815fa21
--- /dev/null
+++ b/core/res/res/values-vi-rVN/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>14058324</item>
+        <item>108277199</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-zh-rCN/arrays.xml b/core/res/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index 16da6d91e49f..000000000000
--- a/core/res/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>39937795</item>
-        <item>116387224</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>2</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-zh-rCN/donottranslate-maps.xml b/core/res/res/values-zh-rCN/donottranslate-maps.xml
new file mode 100644
index 000000000000..16da6d91e49f
--- /dev/null
+++ b/core/res/res/values-zh-rCN/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>39937795</item>
+        <item>116387224</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>2</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-zh-rTW/arrays.xml b/core/res/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index be0795b84af0..000000000000
--- a/core/res/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>25022112</item>
-        <item>121478019</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-zh-rTW/donottranslate-maps.xml b/core/res/res/values-zh-rTW/donottranslate-maps.xml
new file mode 100644
index 000000000000..be0795b84af0
--- /dev/null
+++ b/core/res/res/values-zh-rTW/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>25022112</item>
+        <item>121478019</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values-zu-rZA/arrays.xml b/core/res/res/values-zu-rZA/arrays.xml
deleted file mode 100644
index 5bff0f489ca3..000000000000
--- a/core/res/res/values-zu-rZA/arrays.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/colors.xml
-**
-** Copyright 2006, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>-30559482</item>
-        <item>22937506</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>4</item>
-    </integer-array>
-
-</resources>
diff --git a/core/res/res/values-zu-rZA/donottranslate-maps.xml b/core/res/res/values-zu-rZA/donottranslate-maps.xml
new file mode 100644
index 000000000000..5bff0f489ca3
--- /dev/null
+++ b/core/res/res/values-zu-rZA/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, Google Inc.
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+<resources>
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>-30559482</item>
+        <item>22937506</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>4</item>
+    </integer-array>
+
+</resources>
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index ce734fce8bb6..90ddc4b287a7 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -338,16 +338,6 @@
         <item>#ffffffff</item>
     </array>
 
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_lat_lng">
-        <item>36149777</item>
-        <item>-95993398</item>
-    </integer-array>
-    <!-- Do not translate. -->
-    <integer-array name="maps_starting_zoom">
-        <item>3</item>
-    </integer-array>
-
     <!-- Used in LocalePicker -->
     <string-array translatable="false" name="special_locale_codes">
         <item>zh_CN</item>
diff --git a/core/res/res/values/donottranslate-maps.xml b/core/res/res/values/donottranslate-maps.xml
new file mode 100644
index 000000000000..ee32f01cbf77
--- /dev/null
+++ b/core/res/res/values/donottranslate-maps.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_lat_lng">
+        <item>36149777</item>
+        <item>-95993398</item>
+    </integer-array>
+    <!-- Do not translate. -->
+    <integer-array name="maps_starting_zoom">
+        <item>3</item>
+    </integer-array>
+
+</resources>
-- 
cgit v1.2.3-59-g8ed1b