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 a328143..6fc2efb 100644 (file)
--- 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 (file)
index 0000000..64bd780
--- /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>