From be72b1d08af5851ba79651671df8c8b750e35f73 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 22 Jan 2009 00:13:44 -0800
Subject: [PATCH] auto import from //branches/cupcake/...@127436

---
 res/values-cs/arrays.xml                      | 14 +++++++
 res/values-cs/build_number.xml                | 14 +++++++
 res/values-cs/strings.xml                     | 14 +++++++
 res/values-de/arrays.xml                      | 16 --------
 res/values-de/build_number.xml                |  6 ---
 res/values-de/strings.xml                     | 20 ++++++++--
 res/values-es/arrays.xml                      | 14 +++++++
 res/values-es/build_number.xml                | 14 +++++++
 res/values-es/strings.xml                     | 14 +++++++
 res/values-fr/arrays.xml                      | 14 +++++++
 res/values-fr/build_number.xml                | 14 +++++++
 res/values-fr/strings.xml                     | 14 +++++++
 res/values-it/arrays.xml                      | 14 +++++++
 res/values-it/build_number.xml                | 14 +++++++
 res/values-it/strings.xml                     | 14 +++++++
 res/values-ja/arrays.xml                      | 14 +++++++
 res/values-ja/build_number.xml                | 14 +++++++
 res/values-ja/strings.xml                     | 14 +++++++
 res/values-nl/arrays.xml                      | 14 +++++++
 res/values-nl/build_number.xml                | 14 +++++++
 res/values-nl/strings.xml                     | 14 +++++++
 res/values-pl/arrays.xml                      | 14 +++++++
 res/values-pl/build_number.xml                | 14 +++++++
 res/values-pl/strings.xml                     | 14 +++++++
 res/values-ru/arrays.xml                      | 14 +++++++
 res/values-ru/build_number.xml                | 14 +++++++
 res/values-ru/strings.xml                     | 14 +++++++
 res/values-zh-rCN/arrays.xml                  | 14 +++++++
 res/values-zh-rCN/build_number.xml            | 14 +++++++
 res/values-zh-rCN/strings.xml                 | 14 +++++++
 res/values-zh-rTW/arrays.xml                  | 14 +++++++
 res/values-zh-rTW/build_number.xml            | 14 +++++++
 res/values-zh-rTW/strings.xml                 | 14 +++++++
 res/xml/providers.xml                         | 37 +++++++++++--------
 res/xml/providers_product.xml                 | 17 +++++++++
 .../activity/setup/AccountSetupBasics.java    | 27 +++++++++++++-
 36 files changed, 501 insertions(+), 42 deletions(-)
 delete mode 100644 res/values-de/arrays.xml
 delete mode 100644 res/values-de/build_number.xml
 create mode 100644 res/xml/providers_product.xml

diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-cs/build_number.xml b/res/values-cs/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-cs/build_number.xml
+++ b/res/values-cs/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d07213ef7..56d470df0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"přečíst přílohy e-mailu"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
deleted file mode 100644
index ea93c038f..000000000
--- a/res/values-de/arrays.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
-    <!-- no translation found for account_settings_check_frequency_entries:1 (271959156650891766) -->
-    <!-- no translation found for account_settings_check_frequency_entries:2 (3703160866906139249) -->
-    <!-- no translation found for account_settings_check_frequency_entries:3 (2130422272993390083) -->
-    <!-- no translation found for account_settings_check_frequency_entries:4 (4707916393216404274) -->
-    <!-- no translation found for account_settings_check_frequency_entries:5 (3714517029910621169) -->
-    <!-- no translation found for account_settings_check_frequency_values:0 (1874431642725996953) -->
-    <!-- no translation found for account_settings_check_frequency_values:1 (8503211337630070991) -->
-    <!-- no translation found for account_settings_check_frequency_values:2 (7144192225349441129) -->
-    <!-- no translation found for account_settings_check_frequency_values:3 (127467919701651956) -->
-    <!-- no translation found for account_settings_check_frequency_values:4 (3166230337924339946) -->
-    <!-- no translation found for account_settings_check_frequency_values:5 (6385758141502045540) -->
-</resources>
diff --git a/res/values-de/build_number.xml b/res/values-de/build_number.xml
deleted file mode 100644
index a35567c76..000000000
--- a/res/values-de/build_number.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for build_number (1503862851302283365) -->
-    <skip />
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d4aa7cf33..30936e738 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"Anhänge lesen"</string>
@@ -162,10 +176,8 @@
     <string name="account_settings_servers">"Servereinstellungen"</string>
     <string name="account_delete_dlg_title">"Entfernen"</string>
     <string name="account_delete_dlg_instructions_fmt">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" wird aus Email entfernt."</string>
-    <!-- no translation found for provider_note_yahoo (8762024183024261236) -->
-    <skip />
-    <!-- no translation found for provider_note_yahoo_uk (2055976404478603298) -->
-    <skip />
+    <string name="provider_note_yahoo">"Der Zugang zum Postfach bestimmter E-Mail-Konten von Yahoo! wird nicht unterstützt. Bei Verbindungsproblemen besuchen Sie die Website von Yahoo! für weitere Informationen."</string>
+    <string name="provider_note_yahoo_uk">"Vor Eröffnung dieses E-Mail-Kontos bitte die Website von Yahoo! besuchen und E-Mail-Zugang über POP3 für dieses Konto aktivieren."</string>
     <string name="provider_note_live">"Nur einige \"Plus\"-Konten ermöglichen einen POP-Zugang und damit diesem Programm, eine Verbindung aufzubauen. Sollten Sie nicht dazu in der Lage sein, sich mit Ihrer korrekten E-Mail-Adresse und dem richtigen Password anzumelden, verfügen Sie möglicherweise nicht über ein kostenpflichtiges \"Plus\"-Konto. Starten Sie Ihren Webbrowser, um Zugriff auf diese Konten zu erlangen."</string>
     <string name="provider_note_t_online">"Vor Erstellung des E-Mail Kontos bitte \\\"eMail-Passwort\\\" für den POP3-Zugang auf der T-Online Homepage einrichten."</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-es/build_number.xml b/res/values-es/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-es/build_number.xml
+++ b/res/values-es/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0a936bbff..f02cd3500 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"leer los archivos adjuntos del mensaje"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-fr/build_number.xml b/res/values-fr/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-fr/build_number.xml
+++ b/res/values-fr/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ecc3317f8..8fe1f8083 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"lire les pièces jointes"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-it/build_number.xml b/res/values-it/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-it/build_number.xml
+++ b/res/values-it/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f94896c76..f1eb249b9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"lettura allegati email"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-ja/build_number.xml b/res/values-ja/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-ja/build_number.xml
+++ b/res/values-ja/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4fdb73f76..09a58c00d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"メールの添付ファイルを読み取る"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-nl/build_number.xml b/res/values-nl/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-nl/build_number.xml
+++ b/res/values-nl/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5d38c38d9..175151f49 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"Bijlages van e-mail lezen"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-pl/build_number.xml b/res/values-pl/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-pl/build_number.xml
+++ b/res/values-pl/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f92888a65..a275c3d00 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"odczyt załączników w wiadomościach e-mail"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-ru/build_number.xml b/res/values-ru/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-ru/build_number.xml
+++ b/res/values-ru/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8b8b2c6d4..a96a70586 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"чтение почтовых приложений"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-zh-rCN/build_number.xml b/res/values-zh-rCN/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-zh-rCN/build_number.xml
+++ b/res/values-zh-rCN/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e85d3debd..17cd2fd1c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"读取电子邮件附件"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index d85063424..1d337a8ec 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- no translation found for account_settings_check_frequency_entries:0 (6411009116891757034) -->
diff --git a/res/values-zh-rTW/build_number.xml b/res/values-zh-rTW/build_number.xml
index 875b7296c..4be95dcab 100644
--- a/res/values-zh-rTW/build_number.xml
+++ b/res/values-zh-rTW/build_number.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="build_number">"20080722-0001"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dc2385ec7..9f3ff7326 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1,4 +1,18 @@
 <?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.
+-->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="read_attachment_label">"讀取電子郵件附件"</string>
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index 45eec5878..c97afa3a8 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -15,6 +15,21 @@
 -->
 
     <!--
+        This file contains configuration data for commonly-used email providers.
+        
+        ==== CONTENT GUIDELINES ====
+        
+        This file should only be used for email providers that are considered "universal"
+        and are appropriate for *all* android platform devices.  These entries must be accessible
+        from all networks.  It should be reasonable for any user to obtain an account on these
+        networks, and test accounts must be easily obtainable.  No entries should be added
+        that are device, product, or carrier-specific.
+        
+        Entries that are device, product or carrier-specific should be added as overlays 
+        in the appropriate providers_product.xml file.
+     
+        ==== FORMAT OF ENTRIES ====
+        
         This file is used to specify providers that we know default settings for
         so that the user can set up their account by simply entering their email
         address and password.
@@ -79,6 +94,7 @@
         The username attribute MAY be the empty string for the outgoing element, but only if the 
         SMTP server supports anonymous transmission (most don't).
     -->
+
 <providers>
 
     <!-- Gmail variants -->
@@ -99,7 +115,7 @@
         <outgoing uri="smtp+ssl+://smtp.gmail.com" username="$email" />
     </provider>
 
-    <!-- Common US providers -->
+    <!-- USA -->
     <provider id="aim" label="AIM" domain="aim.com">
         <incoming uri="imap://imap.aim.com" label="IMAP" username="$email" />
         <outgoing uri="smtp://smtp.aim.com:587" username="$email" />
@@ -164,7 +180,7 @@
         <outgoing uri="smtp+ssl+://plus.smtp.mail.yahoo.com" username="$user" />
     </provider>
     
-    <!-- Common UK providers -->
+    <!-- UK -->
     <provider id="aol-uk" label="AOL" domain="aol.co.uk">
         <incoming uri="imap+ssl+://imap.uk.aol.com" label="IMAP" username="$user" />
         <outgoing uri="smtp+ssl+://smtp.uk.aol.com" username="$user" />
@@ -173,17 +189,12 @@
         <incoming uri="pop3://mail.btinternet.com" username="$email" />
         <outgoing uri="smtp://mail.btinternet.com" username="" />
     </provider>
-    <provider id="tiscali" label="Tiscali" domain="tiscali.co.uk">
-        <incoming uri="pop3://pop.tiscali.co.uk" username="$email" />
-        <outgoing uri="smtp://smtp.tiscali.co.uk" username="$email:wq" />
-    </provider>
-    <provider id="yahoo-uk" label="Yahoo" domain="yahoo.co.uk" 
-              note="@string/provider_note_yahoo_uk">
+    <provider id="yahoo-uk" label="Yahoo" domain="yahoo.co.uk" note="@string/provider_note_yahoo_uk">
         <incoming uri="pop3+ssl+://pop.mail.yahoo.co.uk" username="$user" />
         <outgoing uri="smtp+ssl+://smtp.mail.yahoo.co.uk" username="$user" />
     </provider>
     
-    <!-- Common Germany providers -->
+    <!-- Germany -->
     <provider id="freenet" label="Freenet" domain="freenet.de">
         <incoming uri="pop3://mx.freenet.de" username="$user" />
         <outgoing uri="smtp+ssl://mx.freenet.de" username="$email" />
@@ -202,7 +213,7 @@
         <outgoing uri="smtp+tls://smtp.web.de" username="$user" />
     </provider>
 
-    <!-- TMobile Netherlands -->
+    <!-- Netherlands -->
     <!-- TODO:  For all of these, please confirm POP3, and switch to IMAP if supported -->
     <!-- TODO:  username="" in incoming element is broken - will not work -->
     <!-- Disabled until username="" is resolved
@@ -231,11 +242,7 @@
     </provider>
      -->
 
-    <!-- ERA (TMobile Poland) -->
-    <provider id="eranet" label="Era Internet" domain="eranet.pl">
-        <incoming uri="imap+ssl://mail.eranet.pl:993" username="$user" />
-        <outgoing uri="smtp://mail.eranet.pl:25" username="$user" />
-    </provider>
+    <!-- Poland -->
     <provider id="onet" label="Onet.pl" domain="poczta.onet.pl">
         <incoming uri="pop3://pop3.poczta.onet.pl:110" username="$email" />
         <outgoing uri="smtp://smtp.poczta.onet.pl:25" username="$email" />
diff --git a/res/xml/providers_product.xml b/res/xml/providers_product.xml
new file mode 100644
index 000000000..f10382dfb
--- /dev/null
+++ b/res/xml/providers_product.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <!--
+        Email providers that are considered "universal" and are appropriate for *all* android 
+        platform devices should be defined in providers.xml.
+        
+        Entries that are device, product or carrier-specific should be added as overlays 
+        in the appropriate providers_product.xml file.
+
+        Because overlays must correspond to an existing platform resource, this empty placeholder
+        is included in the platform build.
+     -->
+
+<providers_product>
+
+    <!-- THIS SECTION MUST REMAIN EMPTY -->
+
+</providers_product>
diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java
index 0f4d5a622..adf694645 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasics.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasics.java
@@ -348,9 +348,34 @@ public class AccountSetupBasics extends Activity
         }
     }
 
+    /**
+     * Search the list of known Email providers looking for one that matches the user's email
+     * domain.  We look in providers_product.xml first, followed by the entries in
+     * platform providers.xml.  This provides a nominal override capability.
+     * 
+     * A match is defined as any provider entry for which the "domain" attribute matches.
+     * 
+     * @param domain The domain portion of the user's email address
+     * @return suitable Provider definition, or null if no match found
+     */
     private Provider findProviderForDomain(String domain) {
+        Provider p = findProviderForDomain(domain, R.xml.providers_product);
+        if (p == null) {
+            p = findProviderForDomain(domain, R.xml.providers);
+        }
+        return p;
+    }
+
+    /**
+     * Search a single resource containing known Email provider definitions.
+     *
+     * @param domain The domain portion of the user's email address
+     * @param resourceId Id of the provider resource to scan
+     * @return suitable Provider definition, or null if no match found
+     */
+    private Provider findProviderForDomain(String domain, int resourceId) {
         try {
-            XmlResourceParser xml = getResources().getXml(R.xml.providers);
+            XmlResourceParser xml = getResources().getXml(resourceId);
             int xmlEventType;
             Provider provider = null;
             while ((xmlEventType = xml.next()) != XmlResourceParser.END_DOCUMENT) {