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

30 files changed, 75 insertions, 133 deletions

diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d329b920302..63f337f9c56 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error en compartir",
 "Error while unsharing" => "Error en deixar de compartir",
 "Error while changing permissions" => "Error en canviar els permisos",
-"Shared with you and the group" => "Compartit amb vós i amb el grup",
-"by" => "per",
-"Shared with you by" => "compartit amb vós per",
 "Share with" => "Comparteix amb",
 "Share with link" => "Comparteix amb enllaç",
 "Password protect" => "Protegir amb contrasenya",
@@ -37,8 +34,6 @@
 "Share via email:" => "Comparteix per correu electrònic",
 "No people found" => "No s'ha trobat ningú",
 "Resharing is not allowed" => "No es permet compartir de nou",
-"Shared in" => "Compartit en",
-"with" => "amb",
 "Unshare" => "Deixa de compartir",
 "can edit" => "pot editar",
 "access control" => "control d'accés",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index a6e0d42dac3..9ccb3b01430 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Chyba při sdílení",
 "Error while unsharing" => "Chyba při rušení sdílení",
 "Error while changing permissions" => "Chyba při změně oprávnění",
-"Shared with you and the group" => "S Vámi a skupinou",
-"by" => "sdílí",
-"Shared with you by" => "S Vámi sdílí",
 "Share with" => "Sdílet s",
 "Share with link" => "Sdílet s odkazem",
 "Password protect" => "Chránit heslem",
@@ -37,8 +34,6 @@
 "Share via email:" => "Sdílet e-mailem:",
 "No people found" => "Žádní lidé nenalezeni",
 "Resharing is not allowed" => "Sdílení již sdílené položky není povoleno",
-"Shared in" => "Sdíleno v",
-"with" => "s",
 "Unshare" => "Zrušit sdílení",
 "can edit" => "lze upravovat",
 "access control" => "řízení přístupu",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 5a56b670859..6d925e5b616 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fejl under deling",
 "Error while unsharing" => "Fejl under annullering af deling",
 "Error while changing permissions" => "Fejl under justering af rettigheder",
-"Shared with you and the group" => "Delt med dig og gruppen",
-"by" => "af",
-"Shared with you by" => "Delt med dig af",
 "Share with" => "Del med",
 "Share with link" => "Del med link",
 "Password protect" => "Beskyt med adgangskode",
@@ -37,8 +34,6 @@
 "Share via email:" => "Del via email:",
 "No people found" => "Ingen personer fundet",
 "Resharing is not allowed" => "Videredeling ikke tilladt",
-"Shared in" => "Delt i",
-"with" => "med",
 "Unshare" => "Fjern deling",
 "can edit" => "kan redigere",
 "access control" => "Adgangskontrol",
@@ -69,6 +64,7 @@
 "Cloud not found" => "Sky ikke fundet",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Tilføj",
+"Security Warning" => "Sikkerhedsadvarsel",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Advanced" => "Avanceret",
 "Data folder" => "Datamappe",
@@ -82,10 +78,16 @@
 "Finish setup" => "Afslut opsætning",
 "web services under your control" => "Webtjenester under din kontrol",
 "Log out" => "Log ud",
+"Automatic logon rejected!" => "Automatisk login afvist!",
+"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
+"Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
 "Lost your password?" => "Mistet dit kodeord?",
 "remember" => "husk",
 "Log in" => "Log ind",
 "You are logged out." => "Du er nu logget ud.",
 "prev" => "forrige",
-"next" => "næste"
+"next" => "næste",
+"Security Warning!" => "Sikkerhedsadvarsel!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verificer din adgangskode.<br/>Af sikkerhedsårsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen.",
+"Verify" => "Verificer"
 );
diff --git a/core/l10n/de.php b/core/l10n/de.php
index cb6df3b6d10..230d4fc8402 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern  der Rechte",
-"Shared with you and the group" => "Für Dich und folgende Gruppe freigegeben",
-"by" => "mit",
-"Shared with you by" => "Dies wurde mit dir geteilt von",
 "Share with" => "Freigeben für",
 "Share with link" => "Über einen Link freigeben",
 "Password protect" => "Passwortschutz",
@@ -37,8 +34,6 @@
 "Share via email:" => "Über eine E-Mail freigeben:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
-"Shared in" => "Freigegeben in",
-"with" => "mit",
 "Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 1d2daeef037..55f5ac63336 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern  der Rechte",
-"Shared with you and the group" => "Für Dich und folgende Gruppe freigegeben",
-"by" => "mit",
-"Shared with you by" => "Dies wurde mit dir geteilt von",
 "Share with" => "Freigeben für",
 "Share with link" => "Über einen Link freigeben",
 "Password protect" => "Passwortschutz",
@@ -37,8 +34,6 @@
 "Share via email:" => "Über eine E-Mail freigeben:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
-"Shared in" => "Freigegeben in",
-"with" => "mit",
 "Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index f2b9a48fe12..2914eb774ab 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
 "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
 "Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
-"Shared with you and the group" => "Διαμοιρασμένο με εσένα και την ομάδα",
-"by" => "από",
-"Shared with you by" => "Μοιράστηκε μαζί σας από ",
 "Share with" => "Διαμοιρασμός με",
 "Share with link" => "Διαμοιρασμός με σύνδεσμο",
 "Password protect" => "Προστασία κωδικού",
@@ -37,8 +34,6 @@
 "Share via email:" => "Διαμοιρασμός μέσω email:",
 "No people found" => "Δεν βρέθηκε άνθρωπος",
 "Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
-"Shared in" => "Διαμοιράστηκε με",
-"with" => "με",
 "Unshare" => "Σταμάτημα μοιράσματος",
 "can edit" => "δυνατότητα αλλαγής",
 "access control" => "έλεγχος πρόσβασης",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index a8f5b38a303..9b51bfc0737 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Eraro dum kunhavigo",
 "Error while unsharing" => "Eraro dum malkunhavigo",
 "Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
-"Shared with you and the group" => "Kunhavigita kun vi kaj la grupo",
-"by" => "de",
-"Shared with you by" => "Kunhavigita kun vi de",
 "Share with" => "Kunhavigi kun",
 "Share with link" => "Kunhavigi per ligilo",
 "Password protect" => "Protekti per pasvorto",
@@ -37,8 +34,6 @@
 "Share via email:" => "Kunhavigi per retpoŝto:",
 "No people found" => "Ne troviĝis gento",
 "Resharing is not allowed" => "Rekunhavigo ne permesatas",
-"Shared in" => "Kunhavigita en",
-"with" => "kun",
 "Unshare" => "Malkunhavigi",
 "can edit" => "povas redakti",
 "access control" => "alirkontrolo",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 6c929477453..d1c20087c7f 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error compartiendo",
 "Error while unsharing" => "Error descompartiendo",
 "Error while changing permissions" => "Error cambiando permisos",
-"Shared with you and the group" => "Comprtido contigo y con el grupo",
-"by" => "por",
-"Shared with you by" => "Compartido contigo por",
 "Share with" => "Compartir con",
 "Share with link" => "Compartir con enlace",
 "Password protect" => "Protegido por contraseña",
@@ -37,8 +34,6 @@
 "Share via email:" => "compartido via e-mail:",
 "No people found" => "No se encontró gente",
 "Resharing is not allowed" => "No se permite compartir de nuevo",
-"Shared in" => "Compartido en",
-"with" => "con",
 "Unshare" => "No compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index ecb909e2ed7..38c7566f17a 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error al compartir",
 "Error while unsharing" => "Error en el procedimiento de ",
 "Error while changing permissions" => "Error al cambiar permisos",
-"Shared with you and the group" => "Compartido con vos y con el grupo",
-"by" => "por",
-"Shared with you by" => "Compartido con vos por",
 "Share with" => "Compartir con",
 "Share with link" => "Compartir con link",
 "Password protect" => "Proteger con contraseña ",
@@ -37,14 +34,12 @@
 "Share via email:" => "compartido a través de e-mail:",
 "No people found" => "No se encontraron usuarios",
 "Resharing is not allowed" => "No se permite volver a compartir",
-"Shared in" => "Compartido en",
-"with" => "con",
 "Unshare" => "Remover compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
 "update" => "actualizar",
-"delete" => "remover",
+"delete" => "borrar",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
 "Error unsetting expiration date" => "Error al remover la fecha de caducidad",
@@ -53,10 +48,10 @@
 "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",
 "Requested" => "Pedido",
-"Login failed!" => "¡Fallo al iniciar sesión!",
+"Login failed!" => "¡Error al iniciar sesión!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
-"Your password was reset" => "Tu contraseña ha sido restablecida",
+"Your password was reset" => "Tu contraseña fue restablecida",
 "To login page" => "A la página de inicio de sesión",
 "New password" => "Nueva contraseña",
 "Reset password" => "Restablecer contraseña",
@@ -66,14 +61,14 @@
 "Admin" => "Administrador",
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso denegado",
-"Cloud not found" => "No se encontró owncloud",
+"Cloud not found" => "No se encontró ownCloud",
 "Edit categories" => "Editar categorías",
-"Add" => "Añadir",
+"Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta.",
 "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." => "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web.",
-"Create an <strong>admin account</strong>" => "Creá una <strong>cuenta de administrador</strong>",
+"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index d60ddfa7349..c9025a0173e 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -25,8 +25,6 @@
 "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" => "Zurekin eta taldearekin elkarbanatuta",
-"Shared with you by" => "Honek zurekin elkarbanatuta:",
 "Share with" => "Elkarbanatu honekin",
 "Share with link" => "Elkarbanatu lotura batekin",
 "Password protect" => "Babestu pasahitzarekin",
@@ -36,8 +34,6 @@
 "Share via email:" => "Elkarbanatu eposta bidez:",
 "No people found" => "Ez da inor aurkitu",
 "Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
-"Shared in" => "Elkarbanatua hemen:",
-"with" => "honekin",
 "Unshare" => "Ez elkarbanatu",
 "can edit" => "editatu dezake",
 "access control" => "sarrera kontrola",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index a1856067310..a8da4f37b4e 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -25,7 +25,6 @@
 "Error while sharing" => "Virhe jaettaessa",
 "Error while unsharing" => "Virhe jakoa peruttaessa",
 "Error while changing permissions" => "Virhe oikeuksia muuttaessa",
-"Shared with you and the group" => "Jaettu sinulle ja ryhmälle",
 "Share with link" => "Jaa linkillä",
 "Password protect" => "Suojaa salasanalla",
 "Password" => "Salasana",
@@ -34,7 +33,6 @@
 "Share via email:" => "Jaa sähköpostilla:",
 "No people found" => "Henkilöitä ei löytynyt",
 "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
-"with" => "kanssa",
 "Unshare" => "Peru jakaminen",
 "can edit" => "voi muokata",
 "access control" => "Pääsyn hallinta",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 0bdc3a33bdd..7d5c967c9f4 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -25,9 +25,6 @@
 "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" => "Partagé avec vous ainsi qu'avec le groupe",
-"by" => "par",
-"Shared with you by" => "Partagé avec vous par",
 "Share with" => "Partager avec",
 "Share with link" => "Partager via lien",
 "Password protect" => "Protéger par un mot de passe",
@@ -37,8 +34,6 @@
 "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" => "Partagé dans",
-"with" => "avec",
 "Unshare" => "Ne plus partager",
 "can edit" => "édition autorisée",
 "access control" => "contrôle des accès",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 54b42547428..dfc834a88cb 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Greška prilikom djeljenja",
 "Error while unsharing" => "Greška prilikom isključivanja djeljenja",
 "Error while changing permissions" => "Greška prilikom promjena prava",
-"Shared with you and the group" => "Dijeli sa tobom i grupom",
-"by" => "preko",
-"Shared with you by" => "Dijeljeno sa tobom preko ",
 "Share with" => "Djeli sa",
 "Share with link" => "Djeli preko link-a",
 "Password protect" => "Zaštiti lozinkom",
@@ -37,8 +34,6 @@
 "Share via email:" => "Dijeli preko email-a:",
 "No people found" => "Osobe nisu pronađene",
 "Resharing is not allowed" => "Ponovo dijeljenje nije dopušteno",
-"Shared in" => "Dijeljeno u",
-"with" => "sa",
 "Unshare" => "Makni djeljenje",
 "can edit" => "može mjenjat",
 "access control" => "kontrola pristupa",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 950517f9d07..4e95683071f 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Errore durante la condivisione",
 "Error while unsharing" => "Errore durante la rimozione della condivisione",
 "Error while changing permissions" => "Errore durante la modifica dei permessi",
-"Shared with you and the group" => "Condiviso con te e con il gruppo",
-"by" => "da",
-"Shared with you by" => "Condiviso con te da",
 "Share with" => "Condividi con",
 "Share with link" => "Condividi con collegamento",
 "Password protect" => "Proteggi con password",
@@ -37,8 +34,6 @@
 "Share via email:" => "Condividi tramite email:",
 "No people found" => "Non sono state trovate altre persone",
 "Resharing is not allowed" => "La ri-condivisione non è consentita",
-"Shared in" => "Condiviso in",
-"with" => "con",
 "Unshare" => "Rimuovi condivisione",
 "can edit" => "può modificare",
 "access control" => "controllo d'accesso",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index cb3f02a2efd..021790ae190 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "共有でエラー発生",
 "Error while unsharing" => "共有解除でエラー発生",
 "Error while changing permissions" => "権限変更でエラー発生",
-"Shared with you and the group" => "あなたとグループで共有中",
-"by" => "により",
-"Shared with you by" => "あなたと共有",
 "Share with" => "共有者",
 "Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
@@ -37,8 +34,6 @@
 "Share via email:" => "メール経由で共有:",
 "No people found" => "ユーザーが見つかりません",
 "Resharing is not allowed" => "再共有は許可されていません",
-"Shared in" => "の中で共有中",
-"with" => "と",
 "Unshare" => "共有解除",
 "can edit" => "編集可能",
 "access control" => "アクセス権限",
diff --git a/core/l10n/l10n-de.php b/core/l10n/l10n-de.php
index f3084b05df8..976f8ce3c51 100644
--- a/core/l10n/l10n-de.php
+++ b/core/l10n/l10n-de.php
@@ -1,5 +1,5 @@
 <?php
 $LOCALIZATIONS = array(
-	'date' => 'd.m.Y',
-	'datetime' => 'd.m.Y H:i:s',
-	'time' => 'H:i:s' );
+	'date' => '%d.%m.%Y',
+	'datetime' => '%d.%m.%Y %H:%M:%S',
+	'time' => '%H:%M:%S' );
diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php
new file mode 100644
index 00000000000..3a050d477ce
--- /dev/null
+++ b/core/l10n/l10n-en.php
@@ -0,0 +1,5 @@
+<?php
+$LOCALIZATIONS = array(
+	'date' => '%B %e, %Y',
+	'datetime' => '%B %e, %Y %H:%M',
+	'time' => '%H:%M:%S' );
diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php
new file mode 100644
index 00000000000..b81464b491a
--- /dev/null
+++ b/core/l10n/l10n-es.php
@@ -0,0 +1,5 @@
+<?php
+$LOCALIZATIONS = array(
+	'date' => '%e de %B de %Y',
+	'datetime' => '%e de %B de %Y %H:%M',
+	'time' => '%H:%M:%S' );
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 2e2a32c29bb..3c010491dc7 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fout tijdens het delen",
 "Error while unsharing" => "Fout tijdens het stoppen met delen",
 "Error while changing permissions" => "Fout tijdens het veranderen van permissies",
-"Shared with you and the group" => "Gedeeld me u en de groep",
-"by" => "door",
-"Shared with you by" => "Gedeeld met u door",
 "Share with" => "Deel met",
 "Share with link" => "Deel met link",
 "Password protect" => "Passeerwoord beveiliging",
@@ -37,8 +34,6 @@
 "Share via email:" => "Deel via email:",
 "No people found" => "Geen mensen gevonden",
 "Resharing is not allowed" => "Verder delen is niet toegestaan",
-"Shared in" => "Gedeeld in",
-"with" => "met",
 "Unshare" => "Stop met delen",
 "can edit" => "kan wijzigen",
 "access control" => "toegangscontrole",
@@ -69,6 +64,7 @@
 "Cloud not found" => "Cloud niet gevonden",
 "Edit categories" => "Wijzigen categorieën",
 "Add" => "Toevoegen",
+"Security Warning" => "Beveiligings waarschuwing",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 328cc0b60ba..e80e7641644 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error al partejar",
 "Error while unsharing" => "Error al non partejar",
 "Error while changing permissions" => "Error al cambiar permissions",
-"Shared with you and the group" => "Partejat amb tu e lo grop",
-"by" => "per",
-"Shared with you by" => "Partejat amb tu per",
 "Share with" => "Parteja amb",
 "Share with link" => "Parteja amb lo ligam",
 "Password protect" => "Parat per senhal",
@@ -37,8 +34,6 @@
 "Share via email:" => "Parteja tras corrièl :",
 "No people found" => "Deguns trobat",
 "Resharing is not allowed" => "Tornar partejar es pas permis",
-"Shared in" => "Partejat dins",
-"with" => "amb",
 "Unshare" => "Non parteje",
 "can edit" => "pòt modificar",
 "access control" => "Contraròtle d'acces",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 44e8aa65457..a0fa51da76d 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Błąd podczas współdzielenia",
 "Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia",
 "Error while changing permissions" => "Błąd przy zmianie uprawnień",
-"Shared with you and the group" => "Współdzielony z tobą i grupą",
-"by" => "przez",
-"Shared with you by" => "Współdzielone z taba przez",
 "Share with" => "Współdziel z",
 "Share with link" => "Współdziel z link",
 "Password protect" => "Zabezpieczone hasłem",
@@ -37,8 +34,6 @@
 "Share via email:" => "Współdziel poprzez maila",
 "No people found" => "Nie znaleziono ludzi",
 "Resharing is not allowed" => "Współdzielenie nie jest możliwe",
-"Shared in" => "Współdziel  w",
-"with" => "z",
 "Unshare" => "Zatrzymaj współdzielenie",
 "can edit" => "można edytować",
 "access control" => "kontrola dostępu",
@@ -69,6 +64,10 @@
 "Cloud not found" => "Nie odnaleziono chmury",
 "Edit categories" => "Edytuj kategorię",
 "Add" => "Dodaj",
+"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem.",
+"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." => "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu. Sprawdź plik .htaccess oraz konfigurację serwera (hosta). Sugerujemy, skonfiguruj swój serwer w taki sposób, żeby dane katalogu nie były dostępne lub przenieść katalog danych spoza głównego dokumentu webserwera.",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
@@ -82,10 +81,16 @@
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "usługi internetowe pod kontrolą",
 "Log out" => "Wylogowuje użytkownika",
+"Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
+"If you did not change your password recently, your account may be compromised!" => "Jeśli nie było zmianie niedawno hasło, Twoje konto może być zagrożone!",
+"Please change your password to secure your account again." => "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie.",
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "Zapamiętanie",
 "Log in" => "Zaloguj",
 "You are logged out." => "Wylogowano użytkownika.",
 "prev" => "wstecz",
-"next" => "naprzód"
+"next" => "naprzód",
+"Security Warning!" => "Ostrzeżenie o zabezpieczeniach!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Sprawdź swoje hasło.<br/>Ze względów bezpieczeństwa możesz zostać czasami poproszony o wprowadzenie hasła ponownie.",
+"Verify" => "Zweryfikowane"
 );
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 54a442bc2f2..17a24ae4e19 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -25,9 +25,6 @@
 "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" => "Compartilhado com você e o grupo",
-"by" => "por",
-"Shared with you by" => "Compartilhado com você por",
 "Share with" => "Compartilhar com",
 "Share with link" => "Compartilhar com link",
 "Password protect" => "Proteger com senha",
@@ -37,8 +34,6 @@
 "Share via email:" => "Compartilhar via e-mail:",
 "No people found" => "Nenhuma pessoa encontrada",
 "Resharing is not allowed" => "Não é permitido re-compartilhar",
-"Shared in" => "Compartilhado em",
-"with" => "com",
 "Unshare" => "Descompartilhar",
 "can edit" => "pode editar",
 "access control" => "controle de acesso",
@@ -85,10 +80,12 @@
 "Finish setup" => "Concluir configuração",
 "web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
+"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",
 "Log in" => "Log in",
 "You are logged out." => "Você está desconectado.",
 "prev" => "anterior",
-"next" => "próximo"
+"next" => "próximo",
+"Security Warning!" => "Aviso de Segurança!"
 );
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index d483d087103..dfb2e8a5e79 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Erro ao partilhar",
 "Error while unsharing" => "Erro ao deixar de partilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
-"Shared with you and the group" => "Partilhado consigo e o grupo",
-"by" => "por",
-"Shared with you by" => "Partilhado consigo por",
 "Share with" => "Partilhar com",
 "Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
@@ -37,8 +34,6 @@
 "Share via email:" => "Partilhar via email:",
 "No people found" => "Não foi encontrado ninguém",
 "Resharing is not allowed" => "Não é permitido partilhar de novo",
-"Shared in" => "Partilhado em",
-"with" => "com",
 "Unshare" => "Deixar de partilhar",
 "can edit" => "pode editar",
 "access control" => "Controlo de acesso",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index d658ecb18e5..ca2b18ae7ac 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -26,6 +26,7 @@
 "Error while unsharing" => "Ошибка отключения общего доступа",
 "Error while changing permissions" => "Ошибка при изменении прав доступа",
 "Share with" => "Сделать общим с",
+"Share with link" => "Опубликовать с ссылкой",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
 "Set expiration date" => "Установить срок действия",
@@ -33,7 +34,6 @@
 "Share via email:" => "Сделать общедоступным посредством email:",
 "No people found" => "Не найдено людей",
 "Resharing is not allowed" => "Рекурсивный общий доступ не разрешен",
-"with" => "с",
 "Unshare" => "Отключить общий доступ",
 "can edit" => "возможно редактирование",
 "access control" => "контроль доступа",
@@ -65,6 +65,8 @@
 "Edit categories" => "Редактирование категорий",
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение системы безопасности",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без защищенного генератора случайных чисел злоумышленник может спрогнозировать пароль, сбросить учетные данные и завладеть Вашим аккаунтом.",
 "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." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
 "Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
 "Advanced" => "Расширенный",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 935f9ab16f4..2743262a774 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Chyba počas zdieľania",
 "Error while unsharing" => "Chyba počas ukončenia zdieľania",
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
-"Shared with you and the group" => "Zdieľané s vami a so skupinou",
-"by" => "od",
-"Shared with you by" => "Zdieľané s vami od",
 "Share with" => "Zdieľať s",
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
@@ -36,7 +33,6 @@
 "Expiration date" => "Dátum expirácie",
 "Share via email:" => "Zdieľať cez e-mail:",
 "No people found" => "Užívateľ nenájdený",
-"with" => "s",
 "Unshare" => "Zrušiť zdieľanie",
 "can edit" => "môže upraviť",
 "access control" => "riadenie prístupu",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 2833792e0b7..799e4bb6c76 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fel vid delning",
 "Error while unsharing" => "Fel när delning skulle avslutas",
 "Error while changing permissions" => "Fel vid ändring av rättigheter",
-"Shared with you and the group" => "Delas med dig och gruppen",
-"by" => "av",
-"Shared with you by" => "Delas med dig av",
 "Share with" => "Delad med",
 "Share with link" => "Delad med länk",
 "Password protect" => "Lösenordsskydda",
@@ -37,8 +34,6 @@
 "Share via email:" => "Dela via e-post:",
 "No people found" => "Hittar inga användare",
 "Resharing is not allowed" => "Dela vidare är inte tillåtet",
-"Shared in" => "Delas i",
-"with" => "med",
 "Unshare" => "Sluta dela",
 "can edit" => "kan redigera",
 "access control" => "åtkomstkontroll",
@@ -90,5 +85,7 @@
 "Log in" => "Logga in",
 "You are logged out." => "Du är utloggad.",
 "prev" => "föregående",
-"next" => "nästa"
+"next" => "nästa",
+"Security Warning!" => "Säkerhetsvarning!",
+"Verify" => "Verifiera"
 );
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
new file mode 100644
index 00000000000..33a27d4058d
--- /dev/null
+++ b/core/l10n/ta_LK.php
@@ -0,0 +1,27 @@
+<?php $TRANSLATIONS = array(
+"Settings" => "அமைப்புகள்",
+"January" => "தை",
+"February" => "மாசி",
+"March" => "பங்குனி",
+"April" => "சித்திரை",
+"May" => "வைகாசி",
+"June" => "ஆனி",
+"July" => "ஆடி",
+"August" => "ஆவணி",
+"September" => "புரட்டாசி",
+"Password" => "கடவுச்சொல்",
+"create" => "படைத்தல்",
+"update" => "இற்றைப்படுத்தல்",
+"delete" => "நீக்குக",
+"Username" => "பயனாளர் பெயர்",
+"Help" => "உதவி",
+"Advanced" => "மேம்பட்ட",
+"Data folder" => "தரவு கோப்புறை",
+"Database user" => "தரவுத்தள பயனாளர்",
+"Database password" => "தரவுத்தள கடவுச்சொல்",
+"Database name" => "தரவுத்தள பெயர்",
+"Finish setup" => "அமைப்பை முடிக்க",
+"You are logged out." => "நீங்கள் விடுபதிகை செய்துவிட்டீர்கள்.",
+"prev" => "முந்தைய",
+"next" => "அடுத்து"
+);
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 79a50b2c78d..85a6e2d7eec 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
 "Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
 "Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
-"Shared with you and the group" => "แชร์ให้คุณและกลุ่ม",
-"by" => "โดย",
-"Shared with you by" => "แชร์ให้คุณโดย",
 "Share with" => "แชร์ให้กับ",
 "Share with link" => "แชร์ด้วยลิงก์",
 "Password protect" => "ใส่รหัสผ่านไว้",
@@ -37,8 +34,6 @@
 "Share via email:" => "แชร์ผ่านทางอีเมล",
 "No people found" => "ไม่พบบุคคลที่ต้องการ",
 "Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
-"Shared in" => "แชร์ไว้ใน",
-"with" => "ด้วย",
 "Unshare" => "ยกเลิกการแชร์",
 "can edit" => "สามารถแก้ไข",
 "access control" => "ระดับควบคุมการเข้าใช้งาน",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 758bd7274ff..5da698e2f07 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -25,8 +25,6 @@
 "Error while sharing" => "Lỗi trong quá trình chia sẻ",
 "Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
 "Error while changing permissions" => "Lỗi trong quá trình phân quyền",
-"Shared with you and the group" => "Được chia sẻ với bạn và Nhóm",
-"Shared with you by" => "Được chia sẻ với bạn qua",
 "Share with" => "Chia sẻ với",
 "Share with link" => "Chia sẻ với link",
 "Password" => "Mật khẩu",
@@ -34,8 +32,6 @@
 "Expiration date" => "Ngày kết thúc",
 "Share via email:" => "Chia sẻ thông qua email",
 "No people found" => "Không tìm thấy người nào",
-"Shared in" => "Chi sẻ trong",
-"with" => "với",
 "Unshare" => "Gỡ bỏ chia sẻ",
 "access control" => "quản lý truy cập",
 "create" => "tạo",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index a69bbec0b26..b27adf5517c 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "分享出错",
 "Error while unsharing" => "取消分享出错",
 "Error while changing permissions" => "变更权限出错",
-"Shared with you and the group" => "与您和小组成员分享",
-"by" => "由",
-"Shared with you by" => "与您的分享，由",
 "Share with" => "分享",
 "Share with link" => "分享链接",
 "Password protect" => "密码保护",
@@ -37,8 +34,6 @@
 "Share via email:" => "通过电子邮件分享：",
 "No people found" => "查无此人",
 "Resharing is not allowed" => "不允许重复分享",
-"Shared in" => "分享在",
-"with" => "与",
 "Unshare" => "取消分享",
 "can edit" => "可编辑",
 "access control" => "访问控制",