do not merge

Change https://android-git.corp.google.com/g/#change,27762
conflicted when the auto-merger ran -- this implements
the change by hand. The original comments:

Add '&android-home' to the google homepage string

Also, mark it as non-translatable, and remove the translated
versions.

fixes http://b/issue?id=2148022

21 files changed, 2 insertions, 21 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0871700..7dba48f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"Nelze stáhnout. Velikost položky nelze určit."</string>
     <string name="download_precondition_failed">"Stahování bylo přerušeno a nelze v něm pokračovat."</string>
     <string name="activity_instrumentation_test_runner">"Testovací verze prohlížeče"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Vyhledat na webu"</string>
     <string name="zoom_overview_button_text">"Přehled"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 291b7b7..a0548ef 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"Der kan ikke downloades. Størrelsen på elementet kan ikke afgøres."</string>
     <string name="download_precondition_failed">"Download blev afbrudt. Den kan ikke genoptages."</string>
     <string name="activity_instrumentation_test_runner">"Browsertestkørsel"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cf56d18..ed9b9c7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"Download kann nicht gestartet werden, da die Größe des Elements nicht bestimmt werden kann."</string>
     <string name="download_precondition_failed">"Download wurde unterbrochen und kann nicht fortgesetzt werden."</string>
     <string name="activity_instrumentation_test_runner">"Browser Test Runner"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Web durchsuchen"</string>
     <string name="zoom_overview_button_text">"Übersicht"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7ca87c4..4ae1134 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -243,7 +243,6 @@
     <string name="download_length_required">"Δεν είναι δυνατή η λήψη. Δεν είναι δυνατός ο προσδιορισμός του μεγέθους του στοιχείου."</string>
     <string name="download_precondition_failed">"Η λήψη διακόπηκε. Δεν είναι δυνατή η συνέχισή της."</string>
     <string name="activity_instrumentation_test_runner">"Πρόγραμμα εκτέλεσης δοκιμών προγράμματος περιήγησης"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fa61f98..ace0fba 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"No es posible realizar la descarga. No puede determinarse el tamaño del elemento."</string>
     <string name="download_precondition_failed">"Descarga interrumpida. No se puede retomar."</string>
     <string name="activity_instrumentation_test_runner">"Ejecutor de pruebas del navegador"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8ceeb2c..b712924 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"No se puede realizar la descarga, porque no es posible determinar el tamaño del elemento."</string>
     <string name="download_precondition_failed">"La descarga se ha interrumpido y no se puede reanudar."</string>
     <string name="activity_instrumentation_test_runner">"Realizador de pruebas del navegador"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Buscar en la Web"</string>
     <string name="zoom_overview_button_text">"Información general"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 74c0a9a..d4fde7a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"Téléchargement impossible. La taille de l\'élément n\'a pas pu être déterminée."</string>
     <string name="download_precondition_failed">"Téléchargement interrompu. Impossible de reprendre le téléchargement."</string>
     <string name="activity_instrumentation_test_runner">"Testeur de navigateur"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Rechercher sur le Web"</string>
     <string name="zoom_overview_button_text">"Présentation"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ae6ca5e..b390717 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"Impossibile effettuare il download. Impossibile determinare le dimensioni dell\'elemento."</string>
     <string name="download_precondition_failed">"Download interrotto. Impossibile ripristinarlo."</string>
     <string name="activity_instrumentation_test_runner">"Browser Test Runner"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Cerca nel Web"</string>
     <string name="zoom_overview_button_text">"Panoramica"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7e98801..e9abfbe 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"項目のサイズを特定できないため、ダウンロードできません。"</string>
     <string name="download_precondition_failed">"ダウンロードが中断されました。再開できません。"</string>
     <string name="activity_instrumentation_test_runner">"Browser Test Runner"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3bc1f6a..684b40d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"항목의 크기를 확인할 수 없으므로 다운로드할 수 없습니다."</string>
     <string name="download_precondition_failed">"다운로드가 중단되었으며 다시 시작할 수 없습니다."</string>
     <string name="activity_instrumentation_test_runner">"브라우저 테스트 실행기"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 47b08f6..15f6f85 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -243,7 +243,6 @@
     <string name="download_length_required">"Kan ikke laste ned. Klarte ikke bestemme størrelsen på filen."</string>
     <string name="download_precondition_failed">"Nedlastingen ble avbrutt. Den kan ikke fortsettes."</string>
     <string name="activity_instrumentation_test_runner">"Browser Test Runner"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c1b2ba4..31815db 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"Kan niet downloaden. De grootte van het item kan niet worden vastgesteld."</string>
     <string name="download_precondition_failed">"Download is onderbroken. Deze kan niet worden voortgezet."</string>
     <string name="activity_instrumentation_test_runner">"Browser Test Runner"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Zoeken op internet"</string>
     <string name="zoom_overview_button_text">"Overzicht"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6972973..9ddeed9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"Pobieranie niemożliwe. Nie można ustalić rozmiaru elementu."</string>
     <string name="download_precondition_failed">"Pobieranie zostało przerwane. Nie można go wznowić."</string>
     <string name="activity_instrumentation_test_runner">"Uruchamianie testów przeglądarki"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Szukaj w internecie"</string>
     <string name="zoom_overview_button_text">"Widok ogólny"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5b65d02..a25e143 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -243,7 +243,6 @@
     <string name="download_length_required">"Não é possível transferir porque o tamanho do item é indeterminado."</string>
     <string name="download_precondition_failed">"A transferência foi interrompida e não pode ser retomada."</string>
     <string name="activity_instrumentation_test_runner">"Teste·de·browser"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a88f3d3..77761f3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"Não é possível fazer o download. O tamanho do item não pode ser determinado."</string>
     <string name="download_precondition_failed">"Download interrompido. Não é possível retomar."</string>
     <string name="activity_instrumentation_test_runner">"Executador de teste do navegador"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 143d1f3..8ed0e01 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"Загрузка невозможна. Размер файла не определен."</string>
     <string name="download_precondition_failed">"Загрузка прервана и не может быть возобновлена."</string>
     <string name="activity_instrumentation_test_runner">"Тестирование браузера"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fcc0dff..46caf4e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -243,7 +243,6 @@
     <string name="download_length_required">"Det går inte att hämta eftersom objektets storlek inte kan avläsas."</string>
     <string name="download_precondition_failed">"Hämtningen avbröts. Den kan inte återupptas."</string>
     <string name="activity_instrumentation_test_runner">"Testprogram för webbläsaren"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cb821f8..a7dc75a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"İndirilemiyor. Öğenin boyutu belirlenemiyor."</string>
     <string name="download_precondition_failed">"İndirme işlemi kesintiye uğradı. Sürdürülemez."</string>
     <string name="activity_instrumentation_test_runner">"Tarayıcı Test Aracı"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a47d6b9..4adc572 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -242,7 +242,6 @@
     <string name="download_length_required">"无法下载，无法确定该项的大小。"</string>
     <string name="download_precondition_failed">"下载中断，无法重新开始。"</string>
     <string name="activity_instrumentation_test_runner">"浏览器测试运行程序"</string>
-    <!-- no translation found for homepage_base (7888126987935305566) -->
     <skip />
     <!-- no translation found for search_the_web (6046130189241962337) -->
     <skip />
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 886e2a1..167c537 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"無法下載。物件大小無法估計。"</string>
     <string name="download_precondition_failed">"下載中斷。無法續傳。"</string>
     <string name="activity_instrumentation_test_runner">"Browser Test Runner"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"搜尋網頁"</string>
     <string name="zoom_overview_button_text">"總覽"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ffe06d..3bb6ffd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -651,7 +651,8 @@
     <!-- The default homepage. If it starts with "http://www.google" and the
             user signs up the device with a Google sites account, the site's
             domain will be appended. -->
-    <string name="homepage_base">http://www.google.com/m?client=ms-{CID}&amp;source=android-home</string>
+    <string name="homepage_base" translatable="false">
+        http://www.google.com/m?client=ms-{CID}&amp;source=android-home</string>
 
     <!-- Bookmarks -->
     <string-array name="bookmarks" translatable="false">