Merge branch 'develop' into release-1.5.6
authormasensio <masensio@solidgear.es>
Tue, 27 May 2014 11:18:41 +0000 (13:18 +0200)
committermasensio <masensio@solidgear.es>
Tue, 27 May 2014 11:18:41 +0000 (13:18 +0200)
1  2 
res/values/strings.xml

        <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>