From e084814474c9788dfebfd62caf59d5a298712052 Mon Sep 17 00:00:00 2001
From: Geoff Mendal <mendal@google.com>
Date: Mon, 23 Mar 2015 07:46:37 -0500
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: I40cd8ee6c6901d97827a93e1f6fa33a8a4cfe4db
Auto-generated-cl: translation import
---
 res/values-nb/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6c2f370d02d..f47e07243d8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -275,7 +275,7 @@
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefoninformasjon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Minnekort"</string>
-    <string name="proxy_settings_label" msgid="3271174136184391743">"Mellomtjener-innstillinger"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"Innstillinger for proxy-tjener"</string>
     <string name="cancel" msgid="6859253417269739139">"Avbryt"</string>
     <string name="cancel_all_caps" msgid="3183966387632229461">"AVBRYT"</string>
     <string name="continue_all_caps" msgid="5152713914673789893">"FORTSETT"</string>