diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 566ae39f92c1a6eda7137d172741d32d13915643..db8b8ff57bac8ff4c2048c1427db707ed87f20dd 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:.3em; float:left; height:2em; width:10em; }
+.actions { padding:.3em; float:left; height:2em; }
 .actions input, .actions button, .actions .button { margin:0; }
 #file_menu { right:0; position:absolute; top:0; }
 #file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index d6fc942069cd8f8dec607e73920160ac6907dd01..3890fda4b7aaf2660031ad43f5f9dafdb8689743 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -9,7 +9,7 @@
 "Files" => "ファイル",
 "Unshare" => "共有しない",
 "Delete" => "削除",
-"Rename" => "名称変更",
+"Rename" => "名前の変更",
 "already exists" => "既に存在します",
 "replace" => "置き換え",
 "suggest name" => "推奨名称",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..a15c37e730eae89fb61754432cfefe8bc65331cc
--- /dev/null
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Encriptación",
+"Exclude the following file types from encryption" => "Exceptuar de la encriptación los siguientes tipos de archivo",
+"None" => "Ninguno",
+"Enable Encryption" => "Habilitar encriptación"
+);
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..52ed44556abd632ebb8bd193f0515636eee8c728
--- /dev/null
+++ b/apps/files_external/l10n/es_AR.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Almacenamiento externo",
+"Mount point" => "Punto de montaje",
+"Backend" => "Motor",
+"Configuration" => "Configuración",
+"Options" => "Opciones",
+"Applicable" => "Aplicable",
+"Add mount point" => "Añadir punto de montaje",
+"None set" => "No fue configurado",
+"All Users" => "Todos los usuarios",
+"Groups" => "Grupos",
+"Users" => "Usuarios",
+"Delete" => "Borrar",
+"SSL root certificates" => "certificados SSL raíz",
+"Import Root Certificate" => "Importar certificado raíz",
+"Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
+"Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo"
+);
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index 5ef7a8bbb9c2edae02b8362fe239aa0c80bc24d7..dc8c8dd73fcbc17c4dbff3203ff54d4fe9204fad 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -5,6 +5,10 @@ if (version_compare($installedVersion, '0.3', '<')) {
 	$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing`');
 	$result = $query->execute();
 	$groupShares = array();
+	//we need to set up user backends, otherwise creating the shares will fail with "because user does not exist"
+	OC_User::useBackend(new OC_User_Database());
+	OC_Group::useBackend(new OC_Group_Database());
+	OC_App::loadApps(array('authentication'));
 	while ($row = $result->fetchRow()) {
 		$itemSource = OC_FileCache::getId($row['source'], '');
 		if ($itemSource != -1) {
@@ -39,6 +43,8 @@ if (version_compare($installedVersion, '0.3', '<')) {
 				$shareWith = $row['uid_shared_with'];
 			}
 			OC_User::setUserId($row['uid_owner']);
+			//we need to setup the filesystem for the user, otherwise OC_FileSystem::getRoot will fail and break
+			OC_Util::setupFS($row['uid_owner']);
 			try {
 				OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions);
 			}
@@ -46,6 +52,7 @@ if (version_compare($installedVersion, '0.3', '<')) {
 				$update_error = true;
 				echo 'Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")<br/>';
 			}
+			OC_Util::tearDownFS();
 		}
 	}
 	if ($update_error) {
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..a2d6e232f2077d17fefd6c91a21148ded48937e2
--- /dev/null
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Contraseña",
+"Submit" => "Enviar",
+"%s shared the folder %s with you" => "%s compartió la carpeta %s con vos",
+"%s shared the file %s with you" => "%s compartió el archivo %s con vos",
+"Download" => "Descargar",
+"No preview available for" => "La vista preliminar no está disponible para",
+"web services under your control" => "servicios web controlados por vos"
+);
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 70ff2e8876cb90d9fce7aec4af59cbd40ae49faf..ebef0f445edf2d6526cb4aaa8f3e4a85310468f0 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Pasahitza",
 "Submit" => "Bidali",
+"%s shared the folder %s with you" => "%sk zurekin %s karpeta elkarbanatu du",
+"%s shared the file %s with you" => "%sk zurekin %s fitxategia elkarbanatu du",
 "Download" => "Deskargatu",
 "No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat ",
 "web services under your control" => "web zerbitzuak zure kontrolpean"
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 54d9e9ec567414193e4379b2a16b099f45644762..1038d819330557bf3082562b67ffbba0bb39acdf 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Mot de passe",
 "Submit" => "Envoyer",
+"%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous",
+"%s shared the file %s with you" => "%s a partagé le fichier %s avec vous",
 "Download" => "Télécharger",
 "No preview available for" => "Pas d'aperçu disponible pour",
 "web services under your control" => "services web sous votre contrôle"
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..a78264de03fdb55bb6b082dc2d63ba42cbbc58f4
--- /dev/null
+++ b/apps/files_versions/l10n/es_AR.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Expirar todas las versiones",
+"History" => "Historia",
+"Versions" => "Versiones",
+"This will delete all existing backup versions of your files" => "Hacer estom borrará todas las versiones guardadas como copia de seguridad de tus archivos",
+"Files Versioning" => "Versionado de archivos",
+"Enable" => "Activar"
+);
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index d4353c96cd6f9515491f8db0ef9da160a3d0a40d..d84d901170766e0e0f439f77c02bbb80e810e3ca 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Iraungi bertsio guztiak",
+"History" => "Historia",
 "Versions" => "Bertsioak",
 "This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu",
 "Files Versioning" => "Fitxategien Bertsioak",
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index b0e658e8df0285e60fae3ee8c281d41f6bb09d6f..e6dbc274456ae1dbf295a41f04fe3a9ab0a723c3 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,5 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Supprimer les versions intermédiaires",
+"History" => "Historique",
 "Versions" => "Versions",
-"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)."
+"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date).",
+"Files Versioning" => "Versionnage des fichiers",
+"Enable" => "Activer"
 );
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..6bd452e9d90b8e47e7a2800f96967ba3f57268ee
--- /dev/null
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -0,0 +1,37 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Servidor",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
+"Base DN" => "DN base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
+"User DN" => "DN usuario",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos.",
+"Password" => "Contraseña",
+"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.",
+"User Login Filter" => "Filtro de inicio de sesión de usuario",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como plantilla, p. ej.: \"uid=%%uid\"",
+"User List Filter" => "Lista de filtros de usuario",
+"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
+"without any placeholder, e.g. \"objectClass=person\"." => "Sin plantilla, p. ej.: \"objectClass=person\".",
+"Group Filter" => "Filtro de grupo",
+"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar cuando se obtienen grupos.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\".",
+"Port" => "Puerto",
+"Base User Tree" => "Árbol base de usuario",
+"Base Group Tree" => "Árbol base de grupo",
+"Group-Member association" => "Asociación Grupo-Miembro",
+"Use TLS" => "Usar TLS",
+"Do not use it for SSL connections, it will fail." => "No usarlo para SSL, dará error.",
+"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
+"Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud.",
+"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
+"User Display Name Field" => "Campo de nombre de usuario a mostrar",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
+"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud.",
+"in bytes" => "en bytes",
+"in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
+"Help" => "Ayuda"
+);
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 948057aa3c31e6c9b9037452647424c012b6284f..fc400a69f1101e288f09026c7f9d0ae6df403bf2 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -15,13 +15,37 @@
 "October" => "Urria",
 "November" => "Azaroa",
 "December" => "Abendua",
+"Choose" => "Aukeratu",
 "Cancel" => "Ezeztatu",
 "No" => "Ez",
 "Yes" => "Bai",
 "Ok" => "Ados",
 "No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
 "Error" => "Errorea",
+"Error while sharing" => "Errore bat egon da elkarbanatzean",
+"Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
+"Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
+"Shared with you and the group %s by %s" => "Zurekin eta %s taldearekin %sk elkarbanatuta",
+"Shared with you by %s" => "%sk zurekin elkarbanatuta",
+"Share with" => "Elkarbanatu honekin",
+"Share with link" => "Elkarbanatu lotura batekin",
+"Password protect" => "Babestu pasahitzarekin",
 "Password" => "Pasahitza",
+"Set expiration date" => "Ezarri muga data",
+"Expiration date" => "Muga data",
+"Share via email: %s" => "Elkarbanatu eposta bidez: %s",
+"No people found" => "Ez da inor aurkitu",
+"Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
+"Shared in %s with %s" => "Elkarbanatuta hemen %s %srekin",
+"Unshare" => "Ez elkarbanatu",
+"can edit" => "editatu dezake",
+"access control" => "sarrera kontrola",
+"create" => "sortu",
+"update" => "eguneratu",
+"delete" => "ezabatu",
+"share" => "elkarbanatu",
+"Password protected" => "Pasahitzarekin babestuta",
+"Error setting expiration date" => "Errore bat egon da muga data ezartzean",
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 1b26a315e23a57f8373280894532576e374b2eca..d6fbb7693df665684d369be543b11faaa577a959 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -15,13 +15,37 @@
 "October" => "octobre",
 "November" => "novembre",
 "December" => "décembre",
+"Choose" => "Choisir",
 "Cancel" => "Annuler",
 "No" => "Non",
 "Yes" => "Oui",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
 "Error" => "Erreur",
+"Error while sharing" => "Erreur lors de la mise en partage",
+"Error while unsharing" => "Erreur lors de l'annulation du partage",
+"Error while changing permissions" => "Erreur lors du changement des permissions",
+"Shared with you and the group %s by %s" => "Partagé avec vous ainsi qu'avec le groupe %s par %s",
+"Shared with you by %s" => "Partagé avec vous par %s",
+"Share with" => "Partager avec",
+"Share with link" => "Partager via lien",
+"Password protect" => "Protéger par un mot de passe",
 "Password" => "Mot de passe",
+"Set expiration date" => "Spécifier la date d'expiration",
+"Expiration date" => "Date d'expiration",
+"Share via email: %s" => "Partager via email : %s",
+"No people found" => "Aucun utilisateur trouvé",
+"Resharing is not allowed" => "Le repartage n'est pas autorisé",
+"Shared in %s with %s" => "Partagé dans %s avec %s",
+"Unshare" => "Ne plus partager",
+"can edit" => "édition autorisée",
+"access control" => "contrôle des accès",
+"create" => "créer",
+"update" => "mettre à jour",
+"delete" => "supprimer",
+"share" => "partager",
+"Password protected" => "Protégé par un mot de passe",
+"Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5b951be129e654ce51e9ab231c339361e190fb4b..e563c09cf15787a506acd1aad5840fe2cf2e6747 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -27,12 +27,12 @@
 "Error while changing permissions" => "権限変更でエラー発生",
 "Shared with you and the group %s by %s" => "あなたと %s グループが %s で共有しています",
 "Shared with you by %s" => "あなたと %s で共有しています",
-"Share with" => "と共有",
+"Share with" => "共有者",
 "Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
 "Password" => "パスワード",
-"Set expiration date" => "期限日設定",
-"Expiration date" => "期限日",
+"Set expiration date" => "有効期限を設定",
+"Expiration date" => "有効期限",
 "Share via email: %s" => "メール経由で共有: %s",
 "No people found" => "ユーザーが見つかりません",
 "Resharing is not allowed" => "再共有は許可されていません",
@@ -45,7 +45,7 @@
 "delete" => "削除",
 "share" => "共有",
 "Password protected" => "パスワード保護",
-"Error setting expiration date" => "期限日設定でエラー発生",
+"Error setting expiration date" => "有効期限の設定でエラー発生",
 "ownCloud password reset" => "ownCloudのパスワードをリセットします",
 "Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index baae607bfd3700244aac7c14d189093079e2487a..16b134f329dbe40a1e287efbc06eda8759ad9034 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 04:41+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Encriptación"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Exceptuar de la encriptación los siguientes tipos de archivo"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Habilitar encriptación"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 5d3fc5f21cf39d00f8e6a0802ab97deca901e3cc..d5d7f2b6fbf2b93f11e25a0a3b41f331ab7a8c65 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 04:43+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Almacenamiento externo"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Punto de montaje"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Motor"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Opciones"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Aplicable"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Añadir punto de montaje"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "No fue configurado"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Todos los usuarios"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Borrar"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "certificados SSL raíz"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importar certificado raíz"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Habilitar almacenamiento de usuario externo"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 7224a32567912ec3c65d238042b621a858849dae..62233486fb0d792d78b73bc8d122c167d8e1b31d 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 04:38+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +20,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s compartió la carpeta %s con vos"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s compartió el archivo %s con vos"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
-msgstr ""
+msgstr "Descargar"
 
 #: templates/public.php:29
 msgid "No preview available for"
-msgstr ""
+msgstr "La vista preliminar no está disponible para"
 
 #: templates/public.php:37
 msgid "web services under your control"
-msgstr ""
+msgstr "servicios web controlados por vos"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 3124e2db96a90665de60cfd635a27dc0b09e4390..51e4552b00098dfbd5cf3608e1950d84e2e19fef 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 04:28+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +20,24 @@ msgstr ""
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
-msgstr ""
+msgstr "Expirar todas las versiones"
 
 #: js/versions.js:16
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versiones"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Hacer estom borrará todas las versiones guardadas como copia de seguridad de tus archivos"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
-msgstr ""
+msgstr "Versionado de archivos"
 
 #: templates/settings.php:4
 msgid "Enable"
-msgstr ""
+msgstr "Activar"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 2453c051a485c3a98e6a628cf10ed7d1489a2c92..07b048d92ade8c990bdc6f32235ed5dae62878ac 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 04:22+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,107 +20,107 @@ msgstr ""
 
 #: app.php:285
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: app.php:292
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: app.php:297
 msgid "Settings"
-msgstr ""
+msgstr "Ajustes"
 
 #: app.php:302
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: app.php:309
 msgid "Apps"
-msgstr ""
+msgstr "Aplicaciones"
 
 #: app.php:311
 msgid "Admin"
-msgstr ""
+msgstr "Administración"
 
-#: files.php:309
+#: files.php:310
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "La descarga en ZIP está desactivada."
 
-#: files.php:310
+#: files.php:311
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Los archivos deben ser descargados de a uno."
 
-#: files.php:310 files.php:335
+#: files.php:311 files.php:336
 msgid "Back to Files"
-msgstr ""
+msgstr "Volver a archivos"
 
-#: files.php:334
+#: files.php:335
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "La aplicación no está habilitada"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Error de autenticación"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token expirado. Por favor, recargá la página."
 
 #: template.php:87
 msgid "seconds ago"
-msgstr ""
+msgstr "hace unos segundos"
 
 #: template.php:88
 msgid "1 minute ago"
-msgstr ""
+msgstr "hace 1 minuto"
 
 #: template.php:89
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "hace %d minutos"
 
 #: template.php:92
 msgid "today"
-msgstr ""
+msgstr "hoy"
 
 #: template.php:93
 msgid "yesterday"
-msgstr ""
+msgstr "ayer"
 
 #: template.php:94
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "hace %d días"
 
 #: template.php:95
 msgid "last month"
-msgstr ""
+msgstr "este mes"
 
 #: template.php:96
 msgid "months ago"
-msgstr ""
+msgstr "hace meses"
 
 #: template.php:97
 msgid "last year"
-msgstr ""
+msgstr "este año"
 
 #: template.php:98
 msgid "years ago"
-msgstr ""
+msgstr "hace años"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s está disponible. Conseguí <a href=\"%s\">más información</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "actualizado"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "comprobar actualizaciones está desactivado"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 5adca3621109c0d0ed7e585592e5aec9905c4dd6..fe21f0857e987804398ca9e92a0ffd53d72eb4ba 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-25 02:03+0200\n"
+"PO-Revision-Date: 2012-09-24 23:02+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +20,82 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Imposible cargar la lista desde el App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
 #: ajax/togglegroups.php:15
 msgid "Authentication error"
-msgstr ""
+msgstr "Error al autenticar"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "El grupo ya existe"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "No fue posible añadir el grupo"
 
 #: ajax/enableapp.php:14
 msgid "Could not enable app. "
-msgstr ""
+msgstr "No se puede  habilitar la aplicación."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "e-mail guardado"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "el e-mail no es válido "
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID cambiado"
 
 #: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr ""
+msgstr "Solicitud no válida"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "No fue posible eliminar el grupo"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "No fue posible eliminar el usuario"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
-msgstr ""
+msgstr "Idioma cambiado"
 
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "No fue posible añadir el usuario al grupo %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "No es posible eliminar al usuario del grupo %s"
 
 #: js/apps.js:27 js/apps.js:61
 msgid "Disable"
-msgstr ""
+msgstr "Desactivar"
 
 #: js/apps.js:27 js/apps.js:50
 msgid "Enable"
-msgstr ""
+msgstr "Activar"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Guardando..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
-msgstr ""
+msgstr "Castellano (Argentina)"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Advertencia de seguridad"
 
 #: templates/admin.php:17
 msgid ""
@@ -103,71 +104,71 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "El directorio de datos -data- y los archivos que contiene, probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configures su servidor web de forma que el directorio de datos ya no sea accesible o que muevas el directorio de datos fuera de la raíz de documentos del servidor web."
 
 #: templates/admin.php:31
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Ejecutar una tarea con cada página cargada"
 
 #: templates/admin.php:43
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php está registrado como un servicio del webcron. Llamá a la página de cron.php en la raíz de ownCloud cada minuto sobre http."
 
 #: templates/admin.php:49
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Usar el servicio de cron del sistema. Llamá al archivo cron.php en la carpeta de ownCloud via servidor cronjob cada minuto."
 
 #: templates/admin.php:56
 msgid "Sharing"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activar API de compartición"
 
 #: templates/admin.php:62
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Permitir a las aplicaciones usar la API de compartición"
 
 #: templates/admin.php:67
 msgid "Allow links"
-msgstr ""
+msgstr "Permitir enlaces"
 
 #: templates/admin.php:68
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Permitir a los usuarios compartir elementos públicamente con enlaces"
 
 #: templates/admin.php:73
 msgid "Allow resharing"
-msgstr ""
+msgstr "Permitir re-compartir"
 
 #: templates/admin.php:74
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Permitir a los usuarios compartir elementos ya compartidos"
 
 #: templates/admin.php:79
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Permitir a los usuarios compartir con cualquiera"
 
 #: templates/admin.php:81
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Permitir a los usuarios compartir con usuarios en sus grupos"
 
 #: templates/admin.php:88
 msgid "Log"
-msgstr ""
+msgstr "Registro"
 
 #: templates/admin.php:116
 msgid "More"
-msgstr ""
+msgstr "Más"
 
 #: templates/admin.php:124
 msgid ""
@@ -177,141 +178,141 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr ""
+msgstr "Añadí tu aplicación"
 
 #: templates/apps.php:26
 msgid "Select an App"
-msgstr ""
+msgstr "Seleccionar una aplicación"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Mirá la web de aplicaciones apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\">"
 
 #: templates/help.php:9
 msgid "Documentation"
-msgstr ""
+msgstr "Documentación"
 
 #: templates/help.php:10
 msgid "Managing Big Files"
-msgstr ""
+msgstr "Administrar archivos grandes"
 
 #: templates/help.php:11
 msgid "Ask a question"
-msgstr ""
+msgstr "Hacer una pregunta"
 
 #: templates/help.php:23
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Problemas al conectar con la base de datos de ayuda."
 
 #: templates/help.php:24
 msgid "Go there manually."
-msgstr ""
+msgstr "Ir de forma manual"
 
 #: templates/help.php:32
 msgid "Answer"
-msgstr ""
+msgstr "Respuesta"
 
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr ""
+msgstr "Usaste <strong>%s</strong> de <strong>%s<strong> disponible"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Clientes de sincronización para celulares, tablets y de escritorio"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr ""
+msgstr "Descargar"
 
 #: templates/personal.php:19
 msgid "Your password was changed"
-msgstr ""
+msgstr "Tu contraseña fue cambiada"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
-msgstr ""
+msgstr "No fue posible cambiar tu contraseña"
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr ""
+msgstr "Contraseña actual"
 
 #: templates/personal.php:22
 msgid "New password"
-msgstr ""
+msgstr "Nueva contraseña:"
 
 #: templates/personal.php:23
 msgid "show"
-msgstr ""
+msgstr "mostrar"
 
 #: templates/personal.php:24
 msgid "Change password"
-msgstr ""
+msgstr "Cambiar contraseña"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr ""
+msgstr "Tu dirección de e-mail"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Escribí una dirección de correo electrónico para restablecer la contraseña"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr ""
+msgstr "Ayudanos a traducir"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "usá esta dirección para conectarte a tu ownCloud desde tu gestor de archivos"
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #: templates/users.php:23 templates/users.php:77
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: templates/users.php:26 templates/users.php:78 templates/users.php:98
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #: templates/users.php:32
 msgid "Create"
-msgstr ""
+msgstr "Crear"
 
 #: templates/users.php:35
 msgid "Default Quota"
-msgstr ""
+msgstr "Cuota predeterminada"
 
 #: templates/users.php:55 templates/users.php:138
 msgid "Other"
-msgstr ""
+msgstr "Otro"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupo admin"
 
 #: templates/users.php:82
 msgid "Quota"
-msgstr ""
+msgstr "Cuota"
 
 #: templates/users.php:146
 msgid "Delete"
-msgstr ""
+msgstr "Borrar"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index ad61f6c747f4cbb823bf9d1d08939796dd00077c..218284e3da9d6adfbcc69891e87f4d0e17928029 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 22:51+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,152 +20,152 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Servidor"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "DN base"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "DN usuario"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos."
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtro de inicio de sesión de usuario"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Lista de filtros de usuario"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Filtro de grupo"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Define el filtro a aplicar cuando se obtienen grupos."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Puerto"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Árbol base de usuario"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Árbol base de grupo"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Asociación Grupo-Miembro"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Usar TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "No usarlo para SSL, dará error."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Desactivar la validación por certificado SSL."
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "No recomendado, sólo para pruebas."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Campo de nombre de usuario a mostrar"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Campo de nombre de grupo a mostrar"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "en bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "en segundos. Cambiarlo vacía la cache."
 
 #: templates/settings.php:30
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
 
 #: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index a4e5903ebdd3eeeb36b1781b131ad8813698f700..e9aac806cc490e98755a12554ec7b4aef6871f85 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:14+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 13:34+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,61 +31,61 @@ msgstr "Ez dago gehitzeko kategoriarik?"
 msgid "This category already exists: "
 msgstr "Kategoria hau dagoeneko existitzen da:"
 
-#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
+#: js/js.js:213 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "February"
 msgstr "Otsaila"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "March"
 msgstr "Martxoa"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "April"
 msgstr "Apirila"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "May"
 msgstr "Maiatza"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "June"
 msgstr "Ekaina"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "July"
 msgstr "Uztaila"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "August"
 msgstr "Abuztua"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "September"
 msgstr "Iraila"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "October"
 msgstr "Urria"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "November"
 msgstr "Azaroa"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "December"
 msgstr "Abendua"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "Aukeratu"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
@@ -113,37 +113,37 @@ msgstr "Errorea"
 
 #: js/share.js:103
 msgid "Error while sharing"
-msgstr ""
+msgstr "Errore bat egon da elkarbanatzean"
 
 #: js/share.js:114
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Errore bat egon da elkarbanaketa desegitean"
 
 #: js/share.js:121
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Errore bat egon da baimenak aldatzean"
 
 #: js/share.js:130
 #, perl-format
 msgid "Shared with you and the group %s by %s"
-msgstr ""
+msgstr "Zurekin eta %s taldearekin %sk elkarbanatuta"
 
 #: js/share.js:132
 #, perl-format
 msgid "Shared with you by %s"
-msgstr ""
+msgstr "%sk zurekin elkarbanatuta"
 
 #: js/share.js:137
 msgid "Share with"
-msgstr ""
+msgstr "Elkarbanatu honekin"
 
 #: js/share.js:142
 msgid "Share with link"
-msgstr ""
+msgstr "Elkarbanatu lotura batekin"
 
 #: js/share.js:143
 msgid "Password protect"
-msgstr ""
+msgstr "Babestu pasahitzarekin"
 
 #: js/share.js:147 templates/installation.php:30 templates/login.php:13
 msgid "Password"
@@ -151,65 +151,65 @@ msgstr "Pasahitza"
 
 #: js/share.js:152
 msgid "Set expiration date"
-msgstr ""
+msgstr "Ezarri muga data"
 
 #: js/share.js:153
 msgid "Expiration date"
-msgstr ""
+msgstr "Muga data"
 
 #: js/share.js:182
 #, perl-format
 msgid "Share via email: %s"
-msgstr ""
+msgstr "Elkarbanatu eposta bidez: %s"
 
 #: js/share.js:184
 msgid "No people found"
-msgstr ""
+msgstr "Ez da inor aurkitu"
 
 #: js/share.js:210
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Berriz elkarbanatzea ez dago baimendua"
 
 #: js/share.js:246
 #, perl-format
 msgid "Shared in %s with %s"
-msgstr ""
+msgstr "Elkarbanatuta hemen %s %srekin"
 
 #: js/share.js:267
 msgid "Unshare"
-msgstr ""
+msgstr "Ez elkarbanatu"
 
 #: js/share.js:275
 msgid "can edit"
-msgstr ""
+msgstr "editatu dezake"
 
 #: js/share.js:277
 msgid "access control"
-msgstr ""
+msgstr "sarrera kontrola"
 
 #: js/share.js:280
 msgid "create"
-msgstr ""
+msgstr "sortu"
 
 #: js/share.js:283
 msgid "update"
-msgstr ""
+msgstr "eguneratu"
 
 #: js/share.js:286
 msgid "delete"
-msgstr ""
+msgstr "ezabatu"
 
 #: js/share.js:289
 msgid "share"
-msgstr ""
+msgstr "elkarbanatu"
 
 #: js/share.js:313 js/share.js:463
 msgid "Password protected"
-msgstr ""
+msgstr "Pasahitzarekin babestuta"
 
 #: js/share.js:485
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Errore bat egon da muga data ezartzean"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index ee689c3ee28e9695a3f8d2eb3a6cd7f61a75b7e9..1b97a4c57e96984ece2967c7b2fcd8883f62e2b9 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 13:26+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,12 +29,12 @@ msgstr "Bidali"
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%sk zurekin %s karpeta elkarbanatu du"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%sk zurekin %s fitxategia elkarbanatu du"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 3d770fecbb54e9d8039a66819e6fd52300ae90a4..471bd1ee586ee0a42dbc2fa8cbb3857f10565408 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 13:25+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "Iraungi bertsio guztiak"
 
 #: js/versions.js:16
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index e224bab81f63474238867ade26426cd5154ee5b1..a7923e66a33bf504189932e1edfb24b108829a0c 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:14+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 14:36+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,61 +35,61 @@ msgstr "Pas de catégorie à ajouter ?"
 msgid "This category already exists: "
 msgstr "Cette catégorie existe déjà : "
 
-#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
+#: js/js.js:213 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "January"
 msgstr "janvier"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "February"
 msgstr "février"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "March"
 msgstr "mars"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "April"
 msgstr "avril"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "May"
 msgstr "mai"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "June"
 msgstr "juin"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "July"
 msgstr "juillet"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "August"
 msgstr "août"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "September"
 msgstr "septembre"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "October"
 msgstr "octobre"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "November"
 msgstr "novembre"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "December"
 msgstr "décembre"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "Choisir"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
@@ -117,37 +117,37 @@ msgstr "Erreur"
 
 #: js/share.js:103
 msgid "Error while sharing"
-msgstr ""
+msgstr "Erreur lors de la mise en partage"
 
 #: js/share.js:114
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Erreur lors de l'annulation du partage"
 
 #: js/share.js:121
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Erreur lors du changement des permissions"
 
 #: js/share.js:130
 #, perl-format
 msgid "Shared with you and the group %s by %s"
-msgstr ""
+msgstr "Partagé avec vous ainsi qu'avec le groupe %s par %s"
 
 #: js/share.js:132
 #, perl-format
 msgid "Shared with you by %s"
-msgstr ""
+msgstr "Partagé avec vous par %s"
 
 #: js/share.js:137
 msgid "Share with"
-msgstr ""
+msgstr "Partager avec"
 
 #: js/share.js:142
 msgid "Share with link"
-msgstr ""
+msgstr "Partager via lien"
 
 #: js/share.js:143
 msgid "Password protect"
-msgstr ""
+msgstr "Protéger par un mot de passe"
 
 #: js/share.js:147 templates/installation.php:30 templates/login.php:13
 msgid "Password"
@@ -155,65 +155,65 @@ msgstr "Mot de passe"
 
 #: js/share.js:152
 msgid "Set expiration date"
-msgstr ""
+msgstr "Spécifier la date d'expiration"
 
 #: js/share.js:153
 msgid "Expiration date"
-msgstr ""
+msgstr "Date d'expiration"
 
 #: js/share.js:182
 #, perl-format
 msgid "Share via email: %s"
-msgstr ""
+msgstr "Partager via email : %s"
 
 #: js/share.js:184
 msgid "No people found"
-msgstr ""
+msgstr "Aucun utilisateur trouvé"
 
 #: js/share.js:210
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Le repartage n'est pas autorisé"
 
 #: js/share.js:246
 #, perl-format
 msgid "Shared in %s with %s"
-msgstr ""
+msgstr "Partagé dans %s avec %s"
 
 #: js/share.js:267
 msgid "Unshare"
-msgstr ""
+msgstr "Ne plus partager"
 
 #: js/share.js:275
 msgid "can edit"
-msgstr ""
+msgstr "édition autorisée"
 
 #: js/share.js:277
 msgid "access control"
-msgstr ""
+msgstr "contrôle des accès"
 
 #: js/share.js:280
 msgid "create"
-msgstr ""
+msgstr "créer"
 
 #: js/share.js:283
 msgid "update"
-msgstr ""
+msgstr "mettre à jour"
 
 #: js/share.js:286
 msgid "delete"
-msgstr ""
+msgstr "supprimer"
 
 #: js/share.js:289
 msgid "share"
-msgstr ""
+msgstr "partager"
 
 #: js/share.js:313 js/share.js:463
 msgid "Password protected"
-msgstr ""
+msgstr "Protégé par un mot de passe"
 
 #: js/share.js:485
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Erreur lors de la spécification de la date d'expiration"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 758a757d00bea414bc164f6ed54efeda5611b94c..36628ca4e7d3f9c1bbb18c41c52d5618eb6ade47 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 14:21+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,12 +33,12 @@ msgstr "Envoyer"
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s a partagé le répertoire %s avec vous"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s a partagé le fichier %s avec vous"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 4e000bd8b0952e71bd81e583081b358e7425efa5..a88cc9a369b2b88ca6b3b23db0b93a95003a3981 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 14:20+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "Supprimer les versions intermédiaires"
 
 #: js/versions.js:16
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
@@ -36,8 +36,8 @@ msgstr "Cette opération va effacer toutes les versions intermédiaires de vos f
 
 #: templates/settings.php:3
 msgid "Files Versioning"
-msgstr ""
+msgstr "Versionnage des fichiers"
 
 #: templates/settings.php:4
 msgid "Enable"
-msgstr ""
+msgstr "Activer"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 59ee856f5b3c9962be911c0bffebb413619dbbf8..df93aec9fa36e57cb90a62e4a7c1ab96d37d4f3b 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:02+0200\n"
-"PO-Revision-Date: 2012-09-23 22:53+0000\n"
+"POT-Creation-Date: 2012-09-25 02:03+0200\n"
+"PO-Revision-Date: 2012-09-24 14:48+0000\n"
 "Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -123,7 +123,7 @@ msgstr "Cron"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Exécute une tâche à chaque chargement de page"
 
 #: templates/admin.php:43
 msgid ""
@@ -135,11 +135,11 @@ msgstr "cron.php est enregistré en tant que service webcron. Veuillez appeler l
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système."
 
 #: templates/admin.php:56
 msgid "Sharing"
-msgstr ""
+msgstr "Partage"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
@@ -234,7 +234,7 @@ msgstr "Réponse"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr ""
+msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -246,7 +246,7 @@ msgstr "Télécharger"
 
 #: templates/personal.php:19
 msgid "Your password was changed"
-msgstr ""
+msgstr "Votre mot de passe a été changé"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 559b6f0e8f25956be95788f8f2317066fb20f59c..e9c10b54a863bb04eb10575830da25a152032aef 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 00:54+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 12:24+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,55 +31,55 @@ msgstr "追加するカテゴリはありませんか？"
 msgid "This category already exists: "
 msgstr "このカテゴリはすでに存在します: "
 
-#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
+#: js/js.js:213 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "January"
 msgstr "1月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "February"
 msgstr "2月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "March"
 msgstr "3月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "April"
 msgstr "4月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "May"
 msgstr "5月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "June"
 msgstr "6月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "July"
 msgstr "7月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "August"
 msgstr "8月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "September"
 msgstr "9月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "October"
 msgstr "10月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "November"
 msgstr "11月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "December"
 msgstr "12月"
 
@@ -135,7 +135,7 @@ msgstr "あなたと %s で共有しています"
 
 #: js/share.js:137
 msgid "Share with"
-msgstr "と共有"
+msgstr "共有者"
 
 #: js/share.js:142
 msgid "Share with link"
@@ -151,11 +151,11 @@ msgstr "パスワード"
 
 #: js/share.js:152
 msgid "Set expiration date"
-msgstr "期限日設定"
+msgstr "有効期限を設定"
 
 #: js/share.js:153
 msgid "Expiration date"
-msgstr "期限日"
+msgstr "有効期限"
 
 #: js/share.js:182
 #, perl-format
@@ -209,7 +209,7 @@ msgstr "パスワード保護"
 
 #: js/share.js:485
 msgid "Error setting expiration date"
-msgstr "期限日設定でエラー発生"
+msgstr "有効期限の設定でエラー発生"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index f3ac21a193aed61820e6b10ade6767592253ce09..c61c718c941a2272ab1b0e9e15098b394f7569b2 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 00:32+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
+"PO-Revision-Date: 2012-09-24 11:59+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,41 +63,41 @@ msgstr "削除"
 
 #: js/fileactions.js:182
 msgid "Rename"
-msgstr "名称変更"
+msgstr "名前の変更"
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "already exists"
 msgstr "既に存在します"
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:188
+#: js/filelist.js:190
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:237 js/filelist.js:239
+#: js/filelist.js:239 js/filelist.js:241
 msgid "replaced"
 msgstr "置換："
 
-#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
+#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:239
+#: js/filelist.js:241
 msgid "with"
 msgstr "←"
 
-#: js/filelist.js:271
+#: js/filelist.js:273
 msgid "unshared"
 msgstr "未共有"
 
-#: js/filelist.js:273
+#: js/filelist.js:275
 msgid "deleted"
 msgstr "削除"
 
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index a9698d8459b3620bdff5e0a5e727c740d2c4055c..b50c866aba021d208418e54cf7d47c67e2bcd24d 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:02+0200\n"
-"PO-Revision-Date: 2012-09-23 15:48+0000\n"
+"POT-Creation-Date: 2012-09-25 02:03+0200\n"
+"PO-Revision-Date: 2012-09-24 01:31+0000\n"
 "Last-Translator: sedir <philippi.sedir@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr "Incapaz de carregar lista da App Store"
+msgstr "Não foi possivel carregar lista da App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
 #: ajax/togglegroups.php:15
@@ -39,7 +39,7 @@ msgstr "Grupo já existe"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr "Incapaz de adicionar grupo"
+msgstr "Não foi possivel adicionar grupo"
 
 #: ajax/enableapp.php:14
 msgid "Could not enable app. "
@@ -63,11 +63,11 @@ msgstr "Pedido inválido"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr "Incapaz de remover grupo"
+msgstr "Não foi possivel remover grupo"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr "Incapaz de remover usuário"
+msgstr "Não foi possivel remover usuário"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -76,12 +76,12 @@ msgstr "Mudou Idioma"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "Incapaz de adicionar usuário ao grupo %s"
+msgstr "Não foi possivel adicionar usuário ao grupo %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "Incapaz de remover usuário ao grupo %s"
+msgstr "Não foi possivel remover usuário ao grupo %s"
 
 #: js/apps.js:27 js/apps.js:61
 msgid "Disable"
@@ -118,7 +118,7 @@ msgstr "Cron"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr "Executar uma tarefa com cada página carregada"
+msgstr "Executa uma tarefa com cada página carregada"
 
 #: templates/admin.php:43
 msgid ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 74383797de0a423baa367cb450938eb66c59a371..777b908ad17cde9565722fa0f3b1d314dac4e91b 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 09bd1c838818b9872f2e382390ef565ac0bcc1f9..2f30248e1a478ff79372f0fb6d4814c93472a420 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 8d6e4bbd6513bea8ed198bdcd5d4d5e869613d4d..1819d067a9dd11c19d679b0619df83a802939745 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index c93ad21273b9745506401426b2b9eae0d5debf49..6cd3a3f7d6af5455ea26f02f6c5131e3a4b65766 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 1080db4bfab034e9a370c074fe88ca42b0da2802..5e8a2a3929edd3f1d8b996f8dd13c37ed0b957ef 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 1a1b19064092aa882460b9f2c71ab2f19c96a894..dbd3b16a90e5fbab58f2d60a22bd6093c4462fff 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index ebe2734fe2214c210aefa194b5dfeb4e044a2a59..43ed734b6586e4d17f9f3f39f0091c9fe5591780 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:02+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:309
+#: files.php:310
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:310
+#: files.php:311
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:310 files.php:335
+#: files.php:311 files.php:336
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:334
+#: files.php:335
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 03bc7229ba0bcc8f426550bd27859ef0f0ff1767..4dfbc786448669ba42cef58df14c8cda464d7667 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:02+0200\n"
+"POT-Creation-Date: 2012-09-25 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 89346d499142cc7d689c1388ee946f6d9178794f..be05146826679f4a2412227651e748557f743cdd 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
+"POT-Creation-Date: 2012-09-25 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index cecdf46351cb3c6c37cc4a069d345721ef26f185..9f380f870b98da0d83b72e77a90074abfdeddc8a 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -44,6 +44,12 @@ class OC_Cache_XCache {
 	}
 
 	public function clear($prefix='') {
+		if(!function_exists('xcache_unset_by_prefix')) {
+			function xcache_unset_by_prefix($prefix) {
+				// Since we can't clear targetted cache, we'll clear all. :(
+				xcache_clear_cache(XC_TYPE_VAR, 0);
+			}
+		}
 		xcache_unset_by_prefix($this->getNamespace().$prefix);
 		return true;
 	}
diff --git a/lib/files.php b/lib/files.php
index 360614caec9798b826f84cea03787a34ad23f778..052d798805864474ca062eca2a38346ba1503fa3 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -47,7 +47,8 @@ class OC_Files {
 				$info = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
 			}
 			else {
-				$info = OCP\Share::getItemSharedWith('file', '/'.$name, OC_Share_Backend_File::FORMAT_FILE_APP);
+				$path = substr($path, 7);
+				$info = OCP\Share::getItemSharedWith('file', $path, OC_Share_Backend_File::FORMAT_FILE_APP);
 			}
 			$info = $info[0];
 		}
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..fd50027d8a146b3786a1fa57a8e4f2cf6c816a27
--- /dev/null
+++ b/lib/l10n/es_AR.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ayuda",
+"Personal" => "Personal",
+"Settings" => "Ajustes",
+"Users" => "Usuarios",
+"Apps" => "Aplicaciones",
+"Admin" => "Administración",
+"ZIP download is turned off." => "La descarga en ZIP está desactivada.",
+"Files need to be downloaded one by one." => "Los archivos deben ser descargados de a uno.",
+"Back to Files" => "Volver a archivos",
+"Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"Application is not enabled" => "La aplicación no está habilitada",
+"Authentication error" => "Error de autenticación",
+"Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
+"seconds ago" => "hace unos segundos",
+"1 minute ago" => "hace 1 minuto",
+"%d minutes ago" => "hace %d minutos",
+"today" => "hoy",
+"yesterday" => "ayer",
+"%d days ago" => "hace %d días",
+"last month" => "este mes",
+"months ago" => "hace meses",
+"last year" => "este año",
+"years ago" => "hace años",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponible. Conseguí <a href=\"%s\">más información</a>",
+"up to date" => "actualizado",
+"updates check is disabled" => "comprobar actualizaciones está desactivado"
+);
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 50e16457672d2541912f78afc8219052d8f9ce14..135e40667b141f16667572b789aac686746b0fa3 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -15,16 +15,16 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 					case 'audio':
 						break;
 					case 'text':
-						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Text');
+						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Text');
 						break;
 					case 'image':
-						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Images');
+						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Images');
 						break;
 					default:
 						if($mime=='application/xml') {
-							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Text');
+							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Text');
 						}else{
-							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Files');
+							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Files');
 						}
 				}
 			}
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
new file mode 100644
index 0000000000000000000000000000000000000000..06f808ee516417d36e91781ed68ac4b6331b4517
--- /dev/null
+++ b/settings/l10n/es_AR.php
@@ -0,0 +1,72 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
+"Authentication error" => "Error al autenticar",
+"Group already exists" => "El grupo ya existe",
+"Unable to add group" => "No fue posible añadir el grupo",
+"Could not enable app. " => "No se puede  habilitar la aplicación.",
+"Email saved" => "e-mail guardado",
+"Invalid email" => "el e-mail no es válido ",
+"OpenID Changed" => "OpenID cambiado",
+"Invalid request" => "Solicitud no válida",
+"Unable to delete group" => "No fue posible eliminar el grupo",
+"Unable to delete user" => "No fue posible eliminar el usuario",
+"Language changed" => "Idioma cambiado",
+"Unable to add user to group %s" => "No fue posible añadir el usuario al grupo %s",
+"Unable to remove user from group %s" => "No es posible eliminar al usuario del grupo %s",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
+"Saving..." => "Guardando...",
+"__language_name__" => "Castellano (Argentina)",
+"Security Warning" => "Advertencia de seguridad",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "El directorio de datos -data- y los archivos que contiene, probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configures su servidor web de forma que el directorio de datos ya no sea accesible o que muevas el directorio de datos fuera de la raíz de documentos del servidor web.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio del webcron. Llamá a la página de cron.php en la raíz de ownCloud cada minuto sobre http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar el servicio de cron del sistema. Llamá al archivo cron.php en la carpeta de ownCloud via servidor cronjob cada minuto.",
+"Sharing" => "Compartir",
+"Enable Share API" => "Activar API de compartición",
+"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la API de compartición",
+"Allow links" => "Permitir enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos públicamente con enlaces",
+"Allow resharing" => "Permitir re-compartir",
+"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos ya compartidos",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera",
+"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir con usuarios en sus grupos",
+"Log" => "Registro",
+"More" => "Más",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Añadí tu aplicación",
+"Select an App" => "Seleccionar una aplicación",
+"See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
+"Documentation" => "Documentación",
+"Managing Big Files" => "Administrar archivos grandes",
+"Ask a question" => "Hacer una pregunta",
+"Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
+"Go there manually." => "Ir de forma manual",
+"Answer" => "Respuesta",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Usaste <strong>%s</strong> de <strong>%s<strong> disponible",
+"Desktop and Mobile Syncing Clients" => "Clientes de sincronización para celulares, tablets y de escritorio",
+"Download" => "Descargar",
+"Your password was changed" => "Tu contraseña fue cambiada",
+"Unable to change your password" => "No fue posible cambiar tu contraseña",
+"Current password" => "Contraseña actual",
+"New password" => "Nueva contraseña:",
+"show" => "mostrar",
+"Change password" => "Cambiar contraseña",
+"Email" => "Correo electrónico",
+"Your email address" => "Tu dirección de e-mail",
+"Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña",
+"Language" => "Idioma",
+"Help translate" => "Ayudanos a traducir",
+"use this address to connect to your ownCloud in your file manager" => "usá esta dirección para conectarte a tu ownCloud desde tu gestor de archivos",
+"Name" => "Nombre",
+"Password" => "Contraseña",
+"Groups" => "Grupos",
+"Create" => "Crear",
+"Default Quota" => "Cuota predeterminada",
+"Other" => "Otro",
+"Group Admin" => "Grupo admin",
+"Quota" => "Cuota",
+"Delete" => "Borrar"
+);
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index f8b34c9650a1b3158a9dad738d0f34f6d21bb39b..b81f545b13eb96f8d2e00d77ea2f7181a450d03f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -20,7 +20,10 @@
 "Security Warning" => "Alertes de sécurité",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web.",
 "Cron" => "Cron",
+"Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php est enregistré en tant que service webcron. Veuillez appeler la page cron.php située à la racine du serveur ownCoud via http toute les minutes.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilise le service cron du système. Appelle le fichier cron.php du répertoire owncloud toutes les minutes grâce à une tâche cron du système.",
+"Sharing" => "Partage",
 "Enable Share API" => "Activer l'API de partage",
 "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
 "Allow links" => "Autoriser les liens",
@@ -42,8 +45,10 @@
 "Problems connecting to help database." => "Problème de connexion à la base de données d'aide.",
 "Go there manually." => "S'y rendre manuellement.",
 "Answer" => "Réponse",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
 "Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
 "Download" => "Télécharger",
+"Your password was changed" => "Votre mot de passe a été changé",
 "Unable to change your password" => "Impossible de changer votre mot de passe",
 "Current password" => "Mot de passe actuel",
 "New password" => "Nouveau mot de passe",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 6ebe8948969c507cd7a9a13cb15a2b12b40b7a14..ddfba1a670e9e4f03466acd250dd3ace1bac3660 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Incapaz de carregar lista da App Store",
+"Unable to load list from App Store" => "Não foi possivel carregar lista da App Store",
 "Authentication error" => "erro de autenticação",
 "Group already exists" => "Grupo já existe",
-"Unable to add group" => "Incapaz de adicionar grupo",
+"Unable to add group" => "Não foi possivel adicionar grupo",
 "Could not enable app. " => "Não pôde habilitar aplicação",
 "Email saved" => "Email gravado",
 "Invalid email" => "Email inválido",
 "OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
-"Unable to delete group" => "Incapaz de remover grupo",
-"Unable to delete user" => "Incapaz de remover usuário",
+"Unable to delete group" => "Não foi possivel remover grupo",
+"Unable to delete user" => "Não foi possivel remover usuário",
 "Language changed" => "Mudou Idioma",
-"Unable to add user to group %s" => "Incapaz de adicionar usuário ao grupo %s",
-"Unable to remove user from group %s" => "Incapaz de remover usuário ao grupo %s",
+"Unable to add user to group %s" => "Não foi possivel adicionar usuário ao grupo %s",
+"Unable to remove user from group %s" => "Não foi possivel remover usuário ao grupo %s",
 "Disable" => "Desabilitado",
 "Enable" => "Habilitado",
 "Saving..." => "Gravando...",
@@ -20,7 +20,7 @@
 "Security Warning" => "Aviso de Segurança",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Seu diretório de dados e seus arquivos estão, provavelmente, acessíveis a partir da internet. O .htaccess que o ownCloud fornece não está funcionando. Nós sugerimos que você configure o seu servidor web de uma forma que o diretório de dados esteja mais acessível ou que você mova o diretório de dados para fora da raiz do servidor web.",
 "Cron" => "Cron",
-"Execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
+"Execute one task with each page loaded" => "Executa uma tarefa com cada página carregada",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado no serviço webcron. Chama a página cron.php na raíz do owncloud uma vez por minuto via http.",
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa o serviço cron do sistema. Chama o arquivo cron.php na pasta do owncloud através do cronjob do sistema uma vez a cada minuto.",
 "Sharing" => "Compartilhamento",