From: masensio <masensio@solidgear.es>
Date: Fri, 17 Jan 2014 13:20:14 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_saml_authentication
X-Git-Tag: oc-android-1.5.5~73^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5581bd9c117472432c6897d9376ecf1dc0131ba6?hp=10dac352323cb6b39809da5b7a32a37ef7541f23

Merge branch 'develop' into refactor_remote_saml_authentication
---

diff --git a/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar b/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar
deleted file mode 100755
index 2dd374f9..00000000
Binary files a/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar and /dev/null differ
diff --git a/oc_framework/libs/commons-httpclient-3.1.jar b/oc_framework/libs/commons-httpclient-3.1.jar
new file mode 100755
index 00000000..7c59774a
Binary files /dev/null and b/oc_framework/libs/commons-httpclient-3.1.jar differ
diff --git a/oc_framework/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar b/oc_framework/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar
deleted file mode 100644
index 2dd374f9..00000000
Binary files a/oc_framework/libs/jackrabbit-webdav-2.2.5-jar-with-dependencies.jar and /dev/null differ
diff --git a/oc_framework/libs/jackrabbit-webdav-2.7.2.jar b/oc_framework/libs/jackrabbit-webdav-2.7.2.jar
new file mode 100755
index 00000000..6ebfbf70
Binary files /dev/null and b/oc_framework/libs/jackrabbit-webdav-2.7.2.jar differ
diff --git a/oc_framework/libs/slf4j-api-1.7.5.jar b/oc_framework/libs/slf4j-api-1.7.5.jar
new file mode 100755
index 00000000..8f004d39
Binary files /dev/null and b/oc_framework/libs/slf4j-api-1.7.5.jar differ
diff --git a/oc_framework/pom.xml b/oc_framework/pom.xml
index 674c0310..e811ffda 100755
--- a/oc_framework/pom.xml
+++ b/oc_framework/pom.xml
@@ -30,15 +30,9 @@
         </dependency>
 
         <dependency>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-          <version>3.1</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.5.2</version>
+            <version>2.7.2</version>
         </dependency>
 
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 4e4b7241..5e7c1ea3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,12 +50,6 @@
             <type>apklib</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-webdav</artifactId>
-            <version>2.5.2</version>
-        </dependency>
-        
         <!-- MUST BE INSTALLED FIRST: cd oc_framework; mvn install -->
         <dependency>
          <groupId>com.owncloud.android</groupId>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b8188011..b8e445e2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="about_android">App Android %1$s</string>
+  <string name="about_android">%1$s para Android</string>
   <string name="about_version">versión %1$s</string>
   <string name="actionbar_sync">Actualizar cuenta</string>
   <string name="actionbar_upload">Subir</string>
@@ -16,7 +16,7 @@
   <string name="prefs_manage_accounts">Gestionar cuentas</string>
   <string name="prefs_pincode">PIN de aplicación </string>
   <string name="prefs_pincode_summary">Proteja su cliente</string>
-  <string name="prefs_instant_upload">Habilitar la subida instantánea</string>
+  <string name="prefs_instant_upload">Activar la subida instantánea</string>
   <string name="prefs_instant_upload_summary">Subir instantáneamente las fotos tomadas por la cámara</string>
   <string name="prefs_log_title">Habilitar registro</string>
   <string name="prefs_log_summary">Esto es usado para registrar problemas</string>
@@ -78,7 +78,7 @@
   <string name="uploader_upload_failed_ticker">Error en la subida</string>
   <string name="uploader_upload_failed_content_single">La subida de %1$s no se pudo completar</string>
   <string name="downloader_download_in_progress_ticker">Descargando ...</string>
-  <string name="downloader_download_in_progress_content">%1$s Descargada de %2$s</string>
+  <string name="downloader_download_in_progress_content">%1$d%% Descargado de %2$s</string>
   <string name="downloader_download_succeeded_ticker">Descarga completa</string>
   <string name="downloader_download_succeeded_content">%1$s se ha descargado con éxito</string>
   <string name="downloader_download_failed_ticker">Falló la descarga</string>
@@ -178,7 +178,7 @@
   <string name="filename_forbidden_characters">Carácteres ilegales: / \\ &lt; &gt; : \" | ? *</string>
   <string name="wait_a_moment">Espere un momento</string>
   <string name="filedisplay_unexpected_bad_get_content">Problema inesperado; por favor, prueba otra app para seleccionar el archivo</string>
-  <string name="filedisplay_no_file_selected">No fué seleccionado ningún archivo</string>
+  <string name="filedisplay_no_file_selected">No hay ficheros seleccionados.</string>
   <string name="oauth_check_onoff">Ingresar con oAuth2</string>
   <string name="oauth_login_connection">Conectando al servidor oAuth2...</string>
   <string name="ssl_validator_header">La identidad del sitio no puede ser verificada</string>
@@ -209,7 +209,7 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_on_wifi">Subir imágenes sólo via WiFi</string>
+  <string name="instant_upload_on_wifi">Subir imágenes sólo cuando hay WiFi</string>
   <string name="instant_upload_path">/SubidasInstantáneas</string>
   <string name="conflict_title">Conflicto en la actualización</string>
   <string name="conflict_message">El archivo remoto %s no está sincronizado con el archivo local. Si continúa, se reemplazará el contenido del archivo en el servidor.</string>