From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 29 Jan 2014 11:56:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into bug_handling_failure_in_request_fo... 
X-Git-Tag: oc-android-1.5.5~65^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2bf9af568368c54af813e2439939aa1c384b6daa?hp=5db7b8e6f6b6f11429477850b092fd8754d19892

Merge remote-tracking branch 'origin/develop' into bug_handling_failure_in_request_for_remote_username
---

diff --git a/res/values-es-rCL/strings.xml b/res/values-es-rCL/strings.xml
index a3281431..6fc2efb7 100644
--- a/res/values-es-rCL/strings.xml
+++ b/res/values-es-rCL/strings.xml
@@ -12,4 +12,5 @@
   <string name="setup_btn_connect">Conectar</string>
   <string name="uploader_btn_upload_text">Subir</string>
   <string name="uploader_wrn_no_account_title">No se encuentra la cuenta</string>
+  <string name="uploader_info_uploading">Subiendo</string>
 </resources>