From: masensio <masensio@solidgear.es>
Date: Tue, 27 May 2014 11:18:41 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.5.6
X-Git-Tag: oc-android-1.7.0_signed~295^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a3a5cd4eb7e020d7a197dc266cc9d18f738266ad?ds=inline;hp=-c

Merge branch 'develop' into release-1.5.6
---

a3a5cd4eb7e020d7a197dc266cc9d18f738266ad
diff --combined res/values/strings.xml
index a62c39ac,ea584f07..8304ecb8
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -86,6 -86,7 +86,7 @@@
      <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
      <string name="uploader_upload_failed_ticker">Upload failed</string>
      <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
+     <string name="uploader_upload_failed_credentials_error">Upload failed, you need to relogin</string>
      <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
      <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
      <string name="downloader_download_succeeded_ticker">Download succeeded</string>
@@@ -93,6 -94,7 +94,7 @@@
      <string name="downloader_download_failed_ticker">Download failed</string>
      <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
      <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
+     <string name="downloader_download_failed_credentials_error">Download failed, you need to relogin</string>
      <string name="common_choose_account">Choose account</string>
      <string name="sync_fail_ticker">Synchronization failed</string>
      <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
@@@ -173,13 -175,13 +175,13 @@@
  	<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
  	<string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator
  	</string>
 -	<string name="auth_can_not_auth_against_server">Can not authenticate against this server</string>
 +	<string name="auth_can_not_auth_against_server">Cannot authenticate against this server</string>
      
      <string name="fd_keep_in_sync">Keep file up to date</string>
      <string name="common_rename">Rename</string>
      <string name="common_remove">Remove</string>
 -    <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
 -    <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents ?"</string>
 +    <string name="confirmation_remove_alert">"Do you really want to remove %1$s?"</string>
 +    <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents?"</string>
      <string name="confirmation_remove_local">Local only</string>
      <string name="confirmation_remove_folder_local">Local contents only</string>
      <string name="confirmation_remove_remote">Remove from server</string>
@@@ -244,7 -246,7 +246,7 @@@
      <string name="conflict_dont_upload">Don\'t upload</string>
      
      <string name="preview_image_description">Image preview</string>
 -    <string name="preview_image_error_unknown_format">This image can not be shown</string>
 +    <string name="preview_image_error_unknown_format">This image cannot be shown</string>
      
      <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
      <string name="actionbar_failed_instant_upload">Failed InstantUpload</string>
@@@ -271,5 -273,12 +273,11 @@@
  	<string name="copy_link">Copy link</string>
  	<string name="clipboard_text_copied">Copied to clipboard</string>
  
 -	<string name="error_cant_bind_to_operations_service">Critical error: can not perform operations</string>
 +	<string name="error_cant_bind_to_operations_service">Critical error: cannot perform operations</string>
+ 	
+ 	<string name="network_error_socket_exception">An error occurred while connecting with the server.</string>
+ 	<string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
+ 	<string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
+ 	<string name="network_host_not_available">The operation couldn\'t be completed, server is unavaliable</string>
+ 	
 -	
  </resources>