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?hp=-c

Merge branch 'contact_settings' into setup_app_name

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

b66e309dfa8b145a293cb47b7cbcf588dc0c79ab
diff --combined res/values/setup.xml
index ecf3afe6,75714e67..b5b91169
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -1,15 -1,5 +1,15 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <resources>
 +    <!-- App name  and other strings-->
 +    <string name="app_name">ownCloud</string>
 +    <string name="account_type">owncloud</string>
 +    <string name="authority">org.owncloud</string>
 +    <string name ="db_file">owncloud.db</string>
 +    <string name ="db_name">ownCloud</string>
 +    <string name ="data_folder"></string>
 +    <string name ="log_name">Owncloud_</string>
 +    
 +    <!-- Server URL -->
      <string name="server_url"></string>
      <bool name="show_server_url_input">true</bool>
      
@@@ -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>
+ 
diff --combined res/values/strings.xml
index eb5174d8,c458fb2c..0f60b9ae
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -1,6 -1,7 +1,6 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <resources>
  
 -    <string name="app_name">ownCloud</string>
      <string name="main_password">Password:</string>
      <string name="main_login">Username:</string>
      <string name="main_button_login">Login</string>
@@@ -26,6 -27,7 +26,7 @@@
      <string name="actionbar_see_details">Details</string>
      
      <string name="prefs_category_general">General</string>
+     <string name="prefs_category_more">More</string>
      <string name="prefs_add_session">Add new session</string>
      <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
      <string name="prefs_select_oc_account">Select an account</string>
@@@ -46,7 -48,14 +47,14 @@@
      <string name="prefs_log_title_history">Logging History</string>
      <string name="prefs_log_summary_history">This shows the recorded logs</string>
      <string name="prefs_log_delete_history_button">Delete History</string>
+     <string name="prefs_help">Help</string>
+     <string name="prefs_recommend">Recommend to a friend</string>
+     <string name="prefs_feedback">Feedback</string>
+     <string name="prefs_imprint">Imprint</string>
      
+ 	<string name="recommend_subject">"Try %1$s on your smartphone!"</string>
+ 	<string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>  
+ 
      <string name="auth_check_server">Check Server</string>
      <string name="auth_account_name">Account name</string>
      <string name="auth_host_url">Server address</string>
@@@ -216,7 -225,6 +224,7 @@@
  	<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
  	<string name="auth_follow_auth_server">Follow instructions above to get authenticated</string>
  	<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
 +	<string name="auth_unsupported_multiaccount">This version of ownCloud doesn\'t support multiaccount</string>
      
      <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
      <string name="crashlog_send_report">Send report</string>