From: masensio <masensio@solidgear.es>
Date: Tue, 15 Oct 2013 12:07:59 +0000 (+0200)
Subject: Merge branch 'develop' into contact_settings
X-Git-Tag: oc-android-1.5.5~159^2~1^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/066cd5aab34344264d2269e6a03785d20226b7e9?ds=inline;hp=-c

Merge branch 'develop' into contact_settings

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

066cd5aab34344264d2269e6a03785d20226b7e9
diff --combined res/values/strings.xml
index 0af01cd7,0872084a..c458fb2c
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -27,7 -27,6 +27,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>
@@@ -48,14 -47,9 +48,16 @@@
      <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>
      <string name="auth_username">Username</string>
      <string name="auth_password">Password</string>
@@@ -196,6 -190,8 +198,8 @@@
      <string name="auth_testing_connection">Testing connection&#8230;</string>
      <string name="auth_not_configured_title">Malformed server configuration</string>
      <string name="auth_not_configured_message">It seems that your server instance is not correctly configured. Contact your administrator for more details.</string>
+     <string name="auth_account_not_new">An account for the same user and server already exists in the device</string>
+     <string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
      <string name="auth_unknown_error_title">Unknown error occurred!</string>
      <string name="auth_unknown_error_message">An unknown error occurred. Please contact support and include logs from your device.</string>
      <string name="auth_unknown_host_title">Couldn\'t find host</string>
@@@ -215,8 -211,12 +219,12 @@@
      <string name="auth_not_found">Wrong path given</string>
      <string name="auth_internal">Internal server error, code %1$d</string>
      <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
-     <string name="auth_expired_oauth_token_toast">Your authorization expired.\nPlease, authorize again</string>
+     <string name="auth_expired_oauth_token_toast">Your authorization expired. Please, authorize again</string>
      <string name="auth_expired_basic_auth_toast">Please, enter the current password</string>
+     <string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>
+ 	<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="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
      <string name="crashlog_send_report">Send report</string>