Update submodule + small fix

This commit is contained in:
mar-v-in 2015-10-10 12:06:09 +02:00
parent 328b2411e9
commit 602ccda69b
3 changed files with 2 additions and 3 deletions

2
extern/UnifiedNlp vendored

@ -1 +1 @@
Subproject commit 5f22b0a56f4676cd44a0e69ed5a1913d4d84ab41
Subproject commit 2bb70fe90c07fad8144094a80e14fdb1b99c557e

View File

@ -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>

View File

@ -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>