Fix errors in the web search metadata checked in earlier.

We had a copy of en-US strings checked into the values-en-rUS directory but it
should have been under values directory.
Reinstating the '@' symbol in 2 search engine names by escaping them with a
backslash. The script used to generate these files will be submitted in a
separate review.

4 files changed, 27 insertions, 77 deletions

diff --git a/res/values-en-rUS/search_engines.xml b/res/values-en-rUS/search_engines.xml
deleted file mode 100644
index 5115fb3..0000000
--- a/res/values-en-rUS/search_engines.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<!--
-****
-**** THIS IS AN AUTOGENERATED FILE.
-**** PLEASE DO NOT EDIT IT MANUALLY WITHOUT REMOVING THIS NOTICE.
-****
-**** To regenerate this file, use:
-****       $ tools/get_search_engines.py $locale
-**** e.g.  $ tools/get_search_engines.py es-MX
-****
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <bool   name="engine_1_enabled">true</bool>
-  <string name="engine_1_name">yahoo</string>
-  <string name="engine_1_label">Yahoo!</string>
-  <bool   name="engine_2_enabled">true</bool>
-  <string name="engine_2_name">live_en_US</string>
-  <string name="engine_2_label">Live Search</string>
-  <bool   name="engine_3_enabled">true</bool>
-  <string name="engine_3_name">aol</string>
-  <string name="engine_3_label">AOL</string>
-  <bool   name="engine_4_enabled">true</bool>
-  <string name="engine_4_name">ask</string>
-  <string name="engine_4_label">Ask</string>
-  <bool   name="engine_5_enabled">false</bool>
-  <string name="engine_5_name"></string>
-  <string name="engine_5_label"></string>
-  <bool   name="engine_6_enabled">false</bool>
-  <string name="engine_6_name"></string>
-  <string name="engine_6_label"></string>
-  <bool   name="engine_7_enabled">false</bool>
-  <string name="engine_7_name"></string>
-  <string name="engine_7_label"></string>
-</resources>
diff --git a/res/values-ja-rJP/search_engines.xml b/res/values-ja-rJP/search_engines.xml
index 74d777e..5a581e3 100644
--- a/res/values-ja-rJP/search_engines.xml
+++ b/res/values-ja-rJP/search_engines.xml
@@ -38,7 +38,7 @@
   <string name="engine_4_label">goo</string>
   <bool   name="engine_5_enabled">true</bool>
   <string name="engine_5_name">nifty</string>
-  <string name="engine_5_label">nifty</string>
+  <string name="engine_5_label">\@nifty</string>
   <bool   name="engine_6_enabled">false</bool>
   <string name="engine_6_name"></string>
   <string name="engine_6_label"></string>
diff --git a/res/values-ru-rRU/search_engines.xml b/res/values-ru-rRU/search_engines.xml
index 9b775f7..c7de338 100644
--- a/res/values-ru-rRU/search_engines.xml
+++ b/res/values-ru-rRU/search_engines.xml
@@ -32,7 +32,7 @@
   <string name="engine_2_label">Rambler</string>
   <bool   name="engine_3_enabled">true</bool>
   <string name="engine_3_name">mail_ru</string>
-  <string name="engine_3_label">MAIL.RU</string>
+  <string name="engine_3_label">\@MAIL.RU</string>
   <bool   name="engine_4_enabled">true</bool>
   <string name="engine_4_name">yahoo_ru</string>
   <string name="engine_4_label">Yahoo! &amp;#x043f&amp;#x043e-&amp;#x0440&amp;#x0443&amp;#x0441&amp;#x0441&amp;#x043a&amp;#x0438</string>
diff --git a/res/values/search_engines.xml b/res/values/search_engines.xml
index 3cd80fe..5115fb3 100644
--- a/res/values/search_engines.xml
+++ b/res/values/search_engines.xml
@@ -18,33 +18,31 @@
 **** THIS IS AN AUTOGENERATED FILE.
 **** PLEASE DO NOT EDIT IT MANUALLY WITHOUT REMOVING THIS NOTICE.
 ****
+**** To regenerate this file, use:
+****       $ tools/get_search_engines.py $locale
+**** e.g.  $ tools/get_search_engines.py es-MX
+****
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <bool   name="engine_1_enabled">true</bool>
-    <string name="engine_1_name">yahoo</string>
-    <string name="engine_1_label">Yahoo</string>
-
-    <bool   name="engine_2_enabled">true</bool>
-    <string name="engine_2_name">live_en_US</string>
-    <string name="engine_2_label">MSN</string>
-
-    <bool   name="engine_3_enabled">true</bool>
-    <string name="engine_3_name">aol</string>
-    <string name="engine_3_label">AOL</string>
-
-    <bool   name="engine_4_enabled">true</bool>
-    <string name="engine_4_name">ask</string>
-    <string name="engine_4_label">Ask</string>
-
-    <bool   name="engine_5_enabled">false</bool>
-    <string name="engine_5_name"></string>
-    <string name="engine_5_label"></string>
-
-    <bool   name="engine_6_enabled">false</bool>
-    <string name="engine_6_name"></string>
-    <string name="engine_6_label"></string>
-
-    <bool   name="engine_7_enabled">false</bool>
-    <string name="engine_7_name"></string>
-    <string name="engine_7_label"></string>
+  <bool   name="engine_1_enabled">true</bool>
+  <string name="engine_1_name">yahoo</string>
+  <string name="engine_1_label">Yahoo!</string>
+  <bool   name="engine_2_enabled">true</bool>
+  <string name="engine_2_name">live_en_US</string>
+  <string name="engine_2_label">Live Search</string>
+  <bool   name="engine_3_enabled">true</bool>
+  <string name="engine_3_name">aol</string>
+  <string name="engine_3_label">AOL</string>
+  <bool   name="engine_4_enabled">true</bool>
+  <string name="engine_4_name">ask</string>
+  <string name="engine_4_label">Ask</string>
+  <bool   name="engine_5_enabled">false</bool>
+  <string name="engine_5_name"></string>
+  <string name="engine_5_label"></string>
+  <bool   name="engine_6_enabled">false</bool>
+  <string name="engine_6_name"></string>
+  <string name="engine_6_label"></string>
+  <bool   name="engine_7_enabled">false</bool>
+  <string name="engine_7_name"></string>
+  <string name="engine_7_label"></string>
 </resources>