From 602ccda69b7315f7b5ce202e1d92bbd2f031c508 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Sat, 10 Oct 2015 12:06:09 +0200
Subject: [PATCH] Update submodule + small fix

---
 extern/UnifiedNlp                                     | 2 +-
 play-services-core/src/main/res/values-de/strings.xml | 1 -
 play-services-core/src/main/res/values/strings.xml    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp
index 5f22b0a5..2bb70fe9 160000
--- a/extern/UnifiedNlp
+++ b/extern/UnifiedNlp
@@ -1 +1 @@
-Subproject commit 5f22b0a56f4676cd44a0e69ed5a1913d4d84ab41
+Subproject commit 2bb70fe90c07fad8144094a80e14fdb1b99c557e
diff --git a/play-services-core/src/main/res/values-de/strings.xml b/play-services-core/src/main/res/values-de/strings.xml
index ec89ffd9..c8a86b18 100644
--- a/play-services-core/src/main/res/values-de/strings.xml
+++ b/play-services-core/src/main/res/values-de/strings.xml
@@ -41,7 +41,6 @@ Dies kann einige Minuten dauern."</string>
     <string name="perm_c2dm_receive_label">Empfange C2DM Nachrichten</string>
     <string name="perm_c2dm_send_label">Sende C2DM Nachrichten zu anderen Apps</string>
 
-    <string name="pref_auth_trust_google">auth_manager_trust_google</string>
     <string name="pref_auth_trust_google_title">Vertraue Google bei App Rechten</string>
     <string name="pref_auth_trust_google_summary">Wenn deaktiviert, wird der Nutzer gefragt bevor eine App Autorisierungsanfrage an Google geschickt wird. Einige Apps werden das Google Konto nicht nutzen können, wenn deaktiviert.</string>
     
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index fe96deeb..ceb4e5c2 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -41,7 +41,7 @@ This can take a couple of minutes."</string>
     <string name="perm_c2dm_receive_label">listen to C2DM messages</string>
     <string name="perm_c2dm_send_label">send C2DM messages to other apps</string>
 
-    <string name="pref_auth_trust_google">auth_manager_trust_google</string>
+    <string name="pref_auth_trust_google" translatable="false">auth_manager_trust_google</string>
     <string name="pref_auth_trust_google_title">Trust Google for app permissions</string>
     <string name="pref_auth_trust_google_summary">When disabled, the user is asked before an apps authorization request is sent to Google. Some applications will fail to use the Google account if this is disabled.</string>