From: masensio <masensio@solidgear.es>
Date: Wed, 29 Jan 2014 10:06:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into share_link_show_shared_files
X-Git-Tag: oc-android-1.5.5~35^2~43^2^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/063ec9eff5b80ef9f8fd9ff3c400fae24c70996c?hp=5562c96268340b02cffb8404dad92c01d86591a1

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

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>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
new file mode 100644
index 00000000..64bd780c
--- /dev/null
+++ b/res/values-eu-rES/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="filedetails_download">Deskargatu</string>
+  <string name="common_cancel">Ezeztatu</string>
+</resources>