From 21e71296b4daebc424d9722e46ae5e633cbb7160 Mon Sep 17 00:00:00 2001
From: Cary Clark <cary@android.com>
Date: Wed, 7 Oct 2009 09:56:38 -0400
Subject: 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
---
 res/values-nb/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'res/values-nb/strings.xml')

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 />
-- 
cgit v1.1