From 7391431501a77e92e24d926fb6998021b9d38124 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Thu, 6 Oct 2016 21:44:13 +0200
Subject: [PATCH] Added note about customtabs and proxys. Fixes #77

---
 app/src/main/res/values-de/strings-preferences.xml | 2 +-
 app/src/main/res/values/strings-preferences.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-de/strings-preferences.xml b/app/src/main/res/values-de/strings-preferences.xml
index ed3586f7..e4517b62 100644
--- a/app/src/main/res/values-de/strings-preferences.xml
+++ b/app/src/main/res/values-de/strings-preferences.xml
@@ -27,7 +27,7 @@
   <string name="pref_title__proxy_port">Port</string>
   <!-- Chrome custom tabs -->
   <string name="pref_title__chrome_custom_tabs_enabled">Chrome Custom Tabs</string>
-  <string name="pref_desc__chrome_custom_tabs_enabled">Externe Links mit Chrome Custom Tabs öffnen. Für dieses Feature muss Chromium oder Google Chrome installiert sein</string>
+  <string name="pref_desc__chrome_custom_tabs_enabled">Externe Links mit Chrome Custom Tabs öffnen. Für dieses Feature muss Chromium oder Google Chrome installiert sein.\nAchtung: Chrome Custom Tabs ignorieren die Proxy Server Einstellungen!</string>
   <!-- Diaspora Settings -->
   <string name="pref_title__personal_settings">Persönliche Einstellungen</string>
   <string name="pref_desc__personal_settings">Öffne die Einstellungen deines Diaspora Accounts</string>
diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml
index fe4e728b..4c275c23 100644
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@@ -91,7 +91,7 @@
 
     <!-- Chrome custom tabs -->
     <string name="pref_title__chrome_custom_tabs_enabled">Chrome Custom Tabs</string>
-    <string name="pref_desc__chrome_custom_tabs_enabled">Open external links with Chrome Custom Tabs. Chromium or Google Chrome needs to be installed for this feature</string>
+    <string name="pref_desc__chrome_custom_tabs_enabled">Open external links with Chrome Custom Tabs. Chromium or Google Chrome needs to be installed for this feature. \nIMPORTANT NOTE: Chrome Custom Tabs do not use configured proxy servers!</string>
 
     <!-- Diaspora Settings -->
     <string name="pref_title__personal_settings">Personal settings</string>