From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 6 Aug 2013 10:17:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Tag: oc-android-1.4.6~22
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1f02143d9997dcfa66f8b3f93378c3e1877cb498?hp=01cc23802f9dff9637fa0d148fc68c28c2e3f185

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

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index eebb1bde..065e95b1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -117,7 +117,7 @@
   <string name="sync_string_contacts">Contactos</string>
   <string name="sync_fail_ticker">Falló la sincronización</string>
   <string name="sync_fail_content">La sincronización de %1$s s no se pudo completar</string>
-  <string name="sync_fail_content_unauthorized">Contraseña no válida para %1$</string>
+  <string name="sync_fail_content_unauthorized">Contraseña no válida para %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">Se encontraron conflictos</string>
   <string name="sync_conflicts_in_favourites_content">Falló la sincronización de contenidos de %1$d ficheros</string>
   <string name="sync_fail_in_favourites_ticker">Fallos en la sincronización de contenidos</string>