From 4216350a2a2d7be80b644d7f074b0bc077d38700 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 16 Mar 2012 16:13:43 -0700
Subject: [PATCH] Move locale-specific configuration out of config.xml.

Having it in a translatable file would sometimes cause the translation
importer to try to replace the locale-specific configuration file.

Change-Id: Ib450454b63c1a4de8b85905561a59224b9410147
---
 .../{config.xml => donottranslate-config.xml} |  0
 java/res/values/config.xml                    |  1 -
 java/res/values/donottranslate-config.xml     | 23 +++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 rename java/res/values-de/{config.xml => donottranslate-config.xml} (100%)
 create mode 100644 java/res/values/donottranslate-config.xml

diff --git a/java/res/values-de/config.xml b/java/res/values-de/donottranslate-config.xml
similarity index 100%
rename from java/res/values-de/config.xml
rename to java/res/values-de/donottranslate-config.xml
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index c51800fb0..cccec635e 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -98,5 +98,4 @@
             4 = ?
     -->
     <integer name="log_screen_metrics">0</integer>
-    <bool name="config_require_umlaut_processing">false</bool>
 </resources>
diff --git a/java/res/values/donottranslate-config.xml b/java/res/values/donottranslate-config.xml
new file mode 100644
index 000000000..9b94272e2
--- /dev/null
+++ b/java/res/values/donottranslate-config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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>
+    <bool name="config_require_umlaut_processing">false</bool>
+</resources>