Merge branch 'master' of github.com:owncloud/core into vcategories_db

Conflicts:
	lib/vcategories.php

8 files changed, 31 insertions, 4 deletions

diff --git a/core/l10n/de.php b/core/l10n/de.php
index 3c92f028581..2e761280519 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -37,7 +37,9 @@
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.",
+"Request failed!" => "Die Anfrage schlug fehl!",
 "Username" => "Benutzername",
 "Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 32ce4f0396e..1425970f3a4 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -38,8 +38,8 @@
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-"Reset email send." => "E-Mail zum Zurücksetzen des Passwort gesendet.",
-"Request failed!" => "Die Anforderung schlug fehl!",
+"Reset email send." => "E-Mail zum Zurücksetzen des Passworts gesendet.",
+"Request failed!" => "Die Anfrage schlug fehl!",
 "Username" => "Benutzername",
 "Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index c9b58ef7cd1..86c95cce5f0 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "Reiniciar contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
+"Reset email send." => "Email de reconfiguración enviado.",
+"Request failed!" => "Pedido fallado!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña se ha restablecido",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 622fc65a770..5cbdbe42401 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "Restablecer contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
+"Reset email send." => "Reiniciar envío de email.",
+"Request failed!" => "Error en el pedido!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña fue restablecida",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 597f58172d9..cdddea02b30 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -13,6 +13,8 @@
 "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 {group} by {owner}" => "Partagé par {owner} avec vous et le groupe {group}",
+"Shared with you by {owner}" => "Partagé avec vous par {owner}",
 "Share with" => "Partager avec",
 "Share with link" => "Partager via lien",
 "Password protect" => "Protéger par un mot de passe",
@@ -22,6 +24,7 @@
 "Share via email:" => "Partager via e-mail :",
 "No people found" => "Aucun utilisateur trouvé",
 "Resharing is not allowed" => "Le repartage n'est pas autorisé",
+"Shared in {item} with {user}" => "Partagé dans {item} avec {user}",
 "Unshare" => "Ne plus partager",
 "can edit" => "édition autorisée",
 "access control" => "contrôle des accès",
@@ -35,6 +38,8 @@
 "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.",
+"Reset email send." => "Mail de réinitialisation envoyé.",
+"Request failed!" => "La requête a échoué !",
 "Username" => "Nom d'utilisateur",
 "Request reset" => "Demander la réinitialisation",
 "Your password was reset" => "Votre mot de passe a été réinitialisé",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 377aa1d478d..18806af7945 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -38,6 +38,7 @@
 "ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
+"Reset email send." => "Wyślij zresetowany email.",
 "Request failed!" => "Próba nieudana!",
 "Username" => "Nazwa użytkownika",
 "Request reset" => "Żądanie resetowania",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index f40328407f9..f51c1a94c27 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -13,6 +13,8 @@
 "Error while sharing" => "Erro ao compartilhar",
 "Error while unsharing" => "Erro ao descompartilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
+"Shared with you and the group {group} by {owner}" => "Compartilhado com você e com o grupo {group} por {owner}",
+"Shared with you by {owner}" => "Compartilhado com você por {owner}",
 "Share with" => "Compartilhar com",
 "Share with link" => "Compartilhar com link",
 "Password protect" => "Proteger com senha",
@@ -22,6 +24,7 @@
 "Share via email:" => "Compartilhar via e-mail:",
 "No people found" => "Nenhuma pessoa encontrada",
 "Resharing is not allowed" => "Não é permitido re-compartilhar",
+"Shared in {item} with {user}" => "Compartilhado em {item} com {user}",
 "Unshare" => "Descompartilhar",
 "can edit" => "pode editar",
 "access control" => "controle de acesso",
@@ -35,6 +38,8 @@
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
+"Reset email send." => "Email de redefinição de senha enviado.",
+"Request failed!" => "A requisição falhou!",
 "Username" => "Nome de Usuário",
 "Request reset" => "Pedido de reposição",
 "Your password was reset" => "Sua senha foi mudada",
@@ -86,6 +91,8 @@
 "December" => "Dezembro",
 "web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
+"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
+"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
 "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
 "Lost your password?" => "Esqueçeu sua senha?",
 "remember" => "lembrete",
@@ -93,5 +100,7 @@
 "You are logged out." => "Você está desconectado.",
 "prev" => "anterior",
 "next" => "próximo",
-"Security Warning!" => "Aviso de Segurança!"
+"Security Warning!" => "Aviso de Segurança!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.",
+"Verify" => "Verificar"
 );
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 97d83f037b0..9061274fb15 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -24,6 +24,7 @@
 "Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත",
 "Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
 "Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+"Request failed!" => "ඉල්ලීම අසාර්ථකයි!",
 "Username" => "පරිශීලක නම",
 "To login page" => "පිවිසුම් පිටුවට",
 "New password" => "නව මුර පදයක්",
@@ -33,12 +34,14 @@
 "Admin" => "පරිපාලක",
 "Help" => "උදව්",
 "Access forbidden" => "ඇතුල් වීම තහනම්",
+"Cloud not found" => "සොයා ගත නොහැක",
 "Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
 "Add" => "එක් කරන්න",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
 "Advanced" => "දියුණු/උසස්",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
+"Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
 "Database user" => "දත්තගබඩා භාවිතාකරු",
 "Database password" => "දත්තගබඩාවේ මුරපදය",
 "Database name" => "දත්තගබඩාවේ නම",
@@ -64,8 +67,11 @@
 "November" => "නොවැම්බර්",
 "December" => "දෙසැම්බර්",
 "web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
+"Log out" => "නික්මීම",
+"Lost your password?" => "මුරපදය අමතකද?",
 "remember" => "මතක තබාගන්න",
 "Log in" => "ප්‍රවේශවන්න",
+"You are logged out." => "ඔබ නික්මී ඇත.",
 "prev" => "පෙර",
 "next" => "ඊළඟ"
 );