From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 10:42:00 +0000 (+0200)
Subject: Merge branch 'contact_settings' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b66e309dfa8b145a293cb47b7cbcf588dc0c79ab?ds=inline;hp=--cc

Merge branch 'contact_settings' into setup_app_name

Conflicts:
	res/values/setup.xml
---

b66e309dfa8b145a293cb47b7cbcf588dc0c79ab
diff --cc res/values/setup.xml
index ecf3afe6,75714e67..b5b91169
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -17,12 -7,16 +17,24 @@@
      <string name="auth_method_oauth2">off</string>
      <string name="auth_method_saml_web_sso">off</string>
      
 +    <!-- Colors -->
 +    <color name="background_color">#F7F7F7</color>
 +    <color name="actionbar_start_color">#1D2D44</color>
 +    <color name="actionbar_end_color">#1D2D44</color>
 +    
 +    <!-- Multiaccount support -->
 +    <bool name="multiaccount_support">true</bool>
 +    
+     <!-- Help, imprint and feedback -->
+     <bool name="help_enabled">false</bool>
+     <bool name="imprint_enabled">false</bool> 
+     <bool name="recommend_enabled">false</bool>
+     <bool name="feedback_enabled">false</bool>
+     <string name="url_help">https://owncloud.com/mobile/help</string>
+     <string name="url_imprint"></string>
+     <string name="mail_recommend">"mailto:"</string>
+     <string name="mail_feedback">"mailto:apps@owncloud.com"</string>
+     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string>
 -</resources>
+ 
 +</resources>
+