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

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

a3a5cd4eb7e020d7a197dc266cc9d18f738266ad
diff --cc res/values/strings.xml
index a62c39ac,ea584f07..8304ecb8
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -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>