[tx-robot] updated from transifex

65 files changed, 158 insertions, 212 deletions

diff --git a/core/l10n/af.php b/core/l10n/af.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/af.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 212d850e6f5..481db3a6d61 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "مجموعة",
 "Sunday" => "الاحد",
 "Monday" => "الأثنين",
 "Tuesday" => "الثلاثاء",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
 "Shared with you and the group {group} by {owner}" => "شورك معك ومع المجموعة {group} من قبل {owner}",
 "Shared with you by {owner}" => "شورك معك من قبل {owner}",
-"Share with" => "شارك مع",
-"Share with link" => "شارك مع رابط",
 "Password protect" => "حماية كلمة السر",
 "Password" => "كلمة المرور",
 "Email link to person" => "ارسل الرابط بالبريد الى صديق",
@@ -56,6 +53,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "تاريخ إنتهاء الصلاحية",
 "Share via email:" => "مشاركة عبر البريد الإلكتروني:",
 "No people found" => "لم يتم العثور على أي شخص",
+"group" => "مجموعة",
 "Resharing is not allowed" => "لا يسمح بعملية إعادة المشاركة",
 "Shared in {item} with {user}" => "شورك في {item} مع {user}",
 "Unshare" => "إلغاء مشاركة",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 8c7a644d522..efad7496615 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -37,7 +37,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Отказ",
 "Share" => "Споделяне",
 "Error" => "Грешка",
-"Share with" => "Споделено с",
 "Password" => "Парола",
 "create" => "създаване",
 "Warning" => "Внимание",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 3e266f11063..ff21c33b6de 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
 "Shared with you and the group {group} by {owner}" => "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
 "Shared with you by {owner}" => "{owner} আপনার সাথে ভাগাভাগি করেছেন",
-"Share with" => "যাদের সাথে ভাগাভাগি করা হয়েছে",
-"Share with link" => "লিংকের সাথে ভাগাভাগি কর",
 "Password protect" => "কূটশব্দ সুরক্ষিত",
 "Password" => "কূটশব্দ",
 "Email link to person" => "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index cd6bca1bd10..382ffb9e474 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
-"group" => "grup",
 "Turned on maintenance mode" => "Activat el mode de manteniment",
 "Turned off maintenance mode" => "Desactivat el mode de manteniment",
 "Updated database" => "Actualitzada la base de dades",
@@ -67,8 +66,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Error en canviar els permisos",
 "Shared with you and the group {group} by {owner}" => "Compartit amb vos i amb el grup {group} per {owner}",
 "Shared with you by {owner}" => "Compartit amb vos per {owner}",
-"Share with" => "Comparteix amb",
-"Share with link" => "Comparteix amb enllaç",
 "Password protect" => "Protegir amb contrasenya",
 "Password" => "Contrasenya",
 "Allow Public Upload" => "Permet pujada pública",
@@ -78,6 +75,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data de venciment",
 "Share via email:" => "Comparteix per correu electrònic",
 "No people found" => "No s'ha trobat ningú",
+"group" => "grup",
 "Resharing is not allowed" => "No es permet compartir de nou",
 "Shared in {item} with {user}" => "Compartit en {item} amb {user}",
 "Unshare" => "Deixa de compartir",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 486723047bb..3229dcc76d9 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s s vámi sdílí »%s«",
 "Couldn't send mail to following users: %s " => "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
-"group" => "skupina",
 "Turned on maintenance mode" => "Zapnut režim údržby",
 "Turned off maintenance mode" => "Vypnut režim údržby",
 "Updated database" => "Zaktualizována databáze",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Chyba při změně oprávnění",
 "Shared with you and the group {group} by {owner}" => "S Vámi a skupinou {group} sdílí {owner}",
 "Shared with you by {owner}" => "S Vámi sdílí {owner}",
-"Share with" => "Sdílet s",
-"Share with link" => "Sdílet s odkazem",
 "Password protect" => "Chránit heslem",
 "Password" => "Heslo",
 "Allow Public Upload" => "Povolit veřejné nahrávání",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Datum vypršení platnosti",
 "Share via email:" => "Sdílet e-mailem:",
 "No people found" => "Žádní lidé nenalezeni",
+"group" => "skupina",
 "Resharing is not allowed" => "Sdílení již sdílené položky není povoleno",
 "Shared in {item} with {user}" => "Sdíleno v {item} s {user}",
 "Unshare" => "Zrušit sdílení",
-"notify user by email" => "upozornit uživatele e-mailem",
 "can edit" => "lze upravovat",
 "access control" => "řízení přístupu",
 "create" => "vytvořit",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 6781382fa01..8dc8dea8921 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "grŵp",
 "Sunday" => "Sul",
 "Monday" => "Llun",
 "Tuesday" => "Mawrth",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Gwall wrth newid caniatâd",
 "Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
 "Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
-"Share with" => "Rhannu gyda",
-"Share with link" => "Dolen ar gyfer rhannu",
 "Password protect" => "Diogelu cyfrinair",
 "Password" => "Cyfrinair",
 "Email link to person" => "E-bostio dolen at berson",
@@ -56,6 +53,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Dyddiad dod i ben",
 "Share via email:" => "Rhannu drwy e-bost:",
 "No people found" => "Heb ganfod pobl",
+"group" => "grŵp",
 "Resharing is not allowed" => "Does dim hawl ail-rannu",
 "Shared in {item} with {user}" => "Rhannwyd yn {item} â {user}",
 "Unshare" => "Dad-rannu",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 93fad7047d6..9a0a13f3593 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delte »%s« med sig",
-"group" => "gruppe",
 "Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
 "Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
 "Updated database" => "Opdaterede database",
@@ -67,8 +66,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Fejl under justering af rettigheder",
 "Shared with you and the group {group} by {owner}" => "Delt med dig og gruppen {group} af {owner}",
 "Shared with you by {owner}" => "Delt med dig af {owner}",
-"Share with" => "Del med",
-"Share with link" => "Del med link",
 "Password protect" => "Beskyt med adgangskode",
 "Password" => "Kodeord",
 "Allow Public Upload" => "Tillad Offentlig Upload",
@@ -78,6 +75,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Udløbsdato",
 "Share via email:" => "Del via email:",
 "No people found" => "Ingen personer fundet",
+"group" => "gruppe",
 "Resharing is not allowed" => "Videredeling ikke tilladt",
 "Shared in {item} with {user}" => "Delt i {item} med {user}",
 "Unshare" => "Fjern deling",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index d6cc8752b03..f3b0e0dc30c 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s teilte »%s« mit Ihnen",
 "Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
-"group" => "Gruppe",
 "Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
 "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
 "Updated database" => "Datenbank aktualisiert",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Fehler beim Ändern der Rechte",
 "Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
 "Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
-"Share with" => "Teilen mit",
-"Share with link" => "Über einen Link freigegeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Ablaufdatum",
 "Share via email:" => "Über eine E-Mail teilen:",
 "No people found" => "Niemand gefunden",
+"group" => "Gruppe",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
 "Unshare" => "Freigabe aufheben",
-"notify user by email" => "Benutzer per E-Mail informieren",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
 "create" => "erstellen",
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index e3e48a718d7..ceaf5af0edc 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s teilt »%s« mit Ihnen",
-"group" => "Gruppe",
 "Sunday" => "Sonntag",
 "Monday" => "Montag",
 "Tuesday" => "Dienstag",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
 "Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
-"Share with" => "Teilen mit",
-"Share with link" => "Über einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
@@ -58,6 +55,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Ablaufdatum",
 "Share via email:" => "Mittels einer E-Mail teilen:",
 "No people found" => "Niemand gefunden",
+"group" => "Gruppe",
 "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
 "Unshare" => "Freigabe aufheben",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index e373aee460d..2a05df983ff 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
 "Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
-"group" => "Gruppe",
 "Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
 "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
 "Updated database" => "Datenbank aktualisiert",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
 "Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
-"Share with" => "Teilen mit",
-"Share with link" => "Über einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Ablaufdatum",
 "Share via email:" => "Mittels einer E-Mail teilen:",
 "No people found" => "Niemand gefunden",
+"group" => "Gruppe",
 "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
 "Unshare" => "Freigabe aufheben",
-"notify user by email" => "Benutzer per E-Mail informieren",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
 "create" => "erstellen",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 0348babe56c..0d4270bb507 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
-"group" => "ομάδα",
 "Sunday" => "Κυριακή",
 "Monday" => "Δευτέρα",
 "Tuesday" => "Τρίτη",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
 "Shared with you and the group {group} by {owner}" => "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
 "Shared with you by {owner}" => "Διαμοιράστηκε με σας από τον {owner}",
-"Share with" => "Διαμοιρασμός με",
-"Share with link" => "Διαμοιρασμός με σύνδεσμο",
 "Password protect" => "Προστασία συνθηματικού",
 "Password" => "Συνθηματικό",
 "Allow Public Upload" => "Να επιτρέπεται η Δημόσια Αποστολή",
@@ -58,6 +55,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Ημερομηνία λήξης",
 "Share via email:" => "Διαμοιρασμός μέσω email:",
 "No people found" => "Δεν βρέθηκε άνθρωπος",
+"group" => "ομάδα",
 "Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
 "Shared in {item} with {user}" => "Διαμοιρασμός του {item} με τον {user}",
 "Unshare" => "Σταμάτημα διαμοιρασμού",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 575abe23f71..e19c66bda58 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s shared \"%s\" with you",
 "Couldn't send mail to following users: %s " => "Couldn't send mail to following users: %s ",
-"group" => "group",
 "Turned on maintenance mode" => "Turned on maintenance mode",
 "Turned off maintenance mode" => "Turned off maintenance mode",
 "Updated database" => "Updated database",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Error whilst changing permissions",
 "Shared with you and the group {group} by {owner}" => "Shared with you and the group {group} by {owner}",
 "Shared with you by {owner}" => "Shared with you by {owner}",
-"Share with" => "Share with",
-"Share with link" => "Share with link",
 "Password protect" => "Password protect",
 "Password" => "Password",
 "Allow Public Upload" => "Allow Public Upload",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Expiration date",
 "Share via email:" => "Share via email:",
 "No people found" => "No people found",
+"group" => "group",
 "Resharing is not allowed" => "Resharing is not allowed",
 "Shared in {item} with {user}" => "Shared in {item} with {user}",
 "Unshare" => "Unshare",
-"notify user by email" => "notify user by email",
 "can edit" => "can edit",
 "access control" => "access control",
 "create" => "create",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 24e845622c2..9cd2beed44a 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
-"group" => "grupo",
 "Sunday" => "dimanĉo",
 "Monday" => "lundo",
 "Tuesday" => "mardo",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
 "Shared with you and the group {group} by {owner}" => "Kunhavigita kun vi kaj la grupo {group} de {owner}",
 "Shared with you by {owner}" => "Kunhavigita kun vi de {owner}",
-"Share with" => "Kunhavigi kun",
-"Share with link" => "Kunhavigi per ligilo",
 "Password protect" => "Protekti per pasvorto",
 "Password" => "Pasvorto",
 "Email link to person" => "Retpoŝti la ligilon al ulo",
@@ -57,6 +54,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Limdato",
 "Share via email:" => "Kunhavigi per retpoŝto:",
 "No people found" => "Ne troviĝis gento",
+"group" => "grupo",
 "Resharing is not allowed" => "Rekunhavigo ne permesatas",
 "Shared in {item} with {user}" => "Kunhavigita en {item} kun {user}",
 "Unshare" => "Malkunhavigi",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 29a947b47e7..b2f17a2145d 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,8 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ha compatido  »%s« contigo",
-"Couldn't send mail to following users: %s " => "No se pudo enviar mensajes a los siguientes usuarios: %s",
-"group" => "grupo",
+"Couldn't send mail to following users: %s " => "No se pudo enviar el mensaje a los siguientes usuarios: %s",
 "Turned on maintenance mode" => "Modo mantenimiento activado",
 "Turned off maintenance mode" => "Modo mantenimiento desactivado",
 "Updated database" => "Base de datos actualizada",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Error al cambiar permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido contigo por {owner}",
-"Share with" => "Compartir con",
-"Share with link" => "Compartir con enlace",
 "Password protect" => "Protección con contraseña",
 "Password" => "Contraseña",
 "Allow Public Upload" => "Permitir Subida Pública",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Fecha de caducidad",
 "Share via email:" => "Compartir por correo electrónico:",
 "No people found" => "No se encontró gente",
+"group" => "grupo",
 "Resharing is not allowed" => "No se permite compartir de nuevo",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Dejar de compartir",
-"notify user by email" => "notificar al usuario por correo electrónico",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
@@ -96,8 +93,12 @@ $TRANSLATIONS = array(
 "Email sent" => "Correo electrónico enviado",
 "Warning" => "Precaución",
 "The object type is not specified." => "El tipo de objeto no está especificado.",
+"Enter new" => "Ingresar nueva",
 "Delete" => "Eliminar",
 "Add" => "Agregar",
+"Edit tags" => "Editar etiquetas",
+"Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
+"No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
 "%s password reset" => "%s restablecer contraseña",
@@ -118,6 +119,13 @@ $TRANSLATIONS = array(
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
 "Help" => "Ayuda",
+"Error loading tags" => "Error cargando etiquetas.",
+"Tag already exists" => "La etiqueta ya existe",
+"Error deleting tag(s)" => "Error borrando etiqueta(s)",
+"Error tagging" => "Error al etiquetar",
+"Error untagging" => "Error al quitar etiqueta",
+"Error favoriting" => "Error al marcar como favorito",
+"Error unfavoriting" => "Error al quitar como favorito",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se encuentra la nube",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
@@ -148,7 +156,7 @@ $TRANSLATIONS = array(
 "If you did not change your password recently, your account may be compromised!" => "Si no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
 "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
 "Server side authentication failed!" => "La autenticación a fallado en el servidor.",
-"Please contact your administrator." => "Sírvase contactar a su administrador.",
+"Please contact your administrator." => "Por favor, contacte con el administrador.",
 "Lost your password?" => "¿Ha perdido su contraseña?",
 "remember" => "recordar",
 "Log in" => "Entrar",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 195db409ab9..13eaf539363 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s compartió \"%s\" con vos",
-"group" => "grupo",
 "Turned on maintenance mode" => "Modo de mantenimiento activado",
 "Turned off maintenance mode" => "Modo de mantenimiento desactivado",
 "Updated database" => "Base de datos actualizada",
 "Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar mucho tiempo...",
 "Updated filecache" => "Caché de archivos actualizada",
 "... %d%% done ..." => "... %d%% hecho ...",
+"Unknown filetype" => "Tipo de archivo desconocido",
+"Invalid image" => "Imagen inválida",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
@@ -53,8 +54,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Error al cambiar permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido con vos y el grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido con vos por {owner}",
-"Share with" => "Compartir con",
-"Share with link" => "Compartir con enlace",
 "Password protect" => "Proteger con contraseña ",
 "Password" => "Contraseña",
 "Allow Public Upload" => "Permitir Subida Pública",
@@ -64,6 +63,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Fecha de vencimiento",
 "Share via email:" => "Compartir a través de e-mail:",
 "No people found" => "No se encontraron usuarios",
+"group" => "grupo",
 "Resharing is not allowed" => "No se permite volver a compartir",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Dejar de compartir",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 6ccaf930af8..e97b12fa26f 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s jagas sinuga »%s«",
 "Couldn't send mail to following users: %s " => "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
-"group" => "grupp",
 "Turned on maintenance mode" => "Haldusreziimis",
 "Turned off maintenance mode" => "Haldusreziim lõpetatud",
 "Updated database" => "Uuendatud andmebaas",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Viga õiguste muutmisel",
 "Shared with you and the group {group} by {owner}" => "Jagatud sinu ja {group} grupiga {owner} poolt",
 "Shared with you by {owner}" => "Sinuga jagas {owner}",
-"Share with" => "Jaga",
-"Share with link" => "Jaga lingiga",
 "Password protect" => "Parooliga kaitstud",
 "Password" => "Parool",
 "Allow Public Upload" => "Luba avalik üleslaadimine",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Aegumise kuupäev",
 "Share via email:" => "Jaga e-postiga:",
 "No people found" => "Ühtegi inimest ei leitud",
+"group" => "grupp",
 "Resharing is not allowed" => "Edasijagamine pole lubatud",
 "Shared in {item} with {user}" => "Jagatud {item} kasutajaga {user}",
 "Unshare" => "Lõpeta jagamine",
-"notify user by email" => "teavita kasutajaid e-postiga",
 "can edit" => "saab muuta",
 "access control" => "ligipääsukontroll",
 "create" => "loo",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 50e4e12d770..53a522adc7d 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
-"group" => "taldea",
 "Sunday" => "Igandea",
 "Monday" => "Astelehena",
 "Tuesday" => "Asteartea",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
 "Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin elkarbanatuta",
 "Shared with you by {owner}" => "{owner}-k zurekin elkarbanatuta",
-"Share with" => "Elkarbanatu honekin",
-"Share with link" => "Elkarbanatu lotura batekin",
 "Password protect" => "Babestu pasahitzarekin",
 "Password" => "Pasahitza",
 "Allow Public Upload" => "Gaitu igotze publikoa",
@@ -58,6 +55,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Muga data",
 "Share via email:" => "Elkarbanatu eposta bidez:",
 "No people found" => "Ez da inor aurkitu",
+"group" => "taldea",
 "Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
 "Shared in {item} with {user}" => "{user}ekin {item}-n elkarbanatuta",
 "Unshare" => "Ez elkarbanatu",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index a9fc022b45a..fafc2348640 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
-"group" => "گروه",
 "Sunday" => "یکشنبه",
 "Monday" => "دوشنبه",
 "Tuesday" => "سه شنبه",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "خطا در حال تغییر مجوز",
 "Shared with you and the group {group} by {owner}" => "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
 "Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}",
-"Share with" => "به اشتراک گذاشتن با",
-"Share with link" => "به اشتراک گذاشتن با پیوند",
 "Password protect" => "نگهداری کردن رمز عبور",
 "Password" => "گذرواژه",
 "Allow Public Upload" => "اجازه آپلود عمومی",
@@ -58,6 +55,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "تاریخ انقضا",
 "Share via email:" => "از طریق ایمیل به اشتراک بگذارید :",
 "No people found" => "کسی یافت نشد",
+"group" => "گروه",
 "Resharing is not allowed" => "اشتراک گذاری مجدد مجاز نمی باشد",
 "Shared in {item} with {user}" => "به اشتراک گذاشته شده در {بخش} با {کاربر}",
 "Unshare" => "لغو اشتراک",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 85b3ab3a14a..fc2b00b1c7d 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
 "Couldn't send mail to following users: %s " => "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
-"group" => "ryhmä",
 "Turned on maintenance mode" => "Siirrytty ylläpitotilaan",
 "Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä",
 "Updated database" => "Tietokanta ajan tasalla",
@@ -48,7 +47,9 @@ $TRANSLATIONS = array(
 "Yes" => "Kyllä",
 "No" => "Ei",
 "Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
+"One file conflict" => "Yhden tiedoston ristiriita",
 "Which files do you want to keep?" => "Mitkä tiedostot haluat säilyttää?",
 "If you select both versions, the copied file will have a number added to its name." => "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
 "Cancel" => "Peru",
@@ -63,8 +64,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Virhe oikeuksia muuttaessa",
 "Shared with you and the group {group} by {owner}" => "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
 "Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
-"Share with" => "Jaa",
-"Share with link" => "Jaa linkillä",
 "Password protect" => "Suojaa salasanalla",
 "Password" => "Salasana",
 "Allow Public Upload" => "Salli julkinen lähetys",
@@ -74,10 +73,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Päättymispäivä",
 "Share via email:" => "Jaa sähköpostilla:",
 "No people found" => "Henkilöitä ei löytynyt",
+"group" => "ryhmä",
 "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
 "Shared in {item} with {user}" => "{item} on jaettu {user} kanssa",
 "Unshare" => "Peru jakaminen",
-"notify user by email" => "ilmoita käyttäjälle sähköpostitse",
 "can edit" => "voi muokata",
 "access control" => "Pääsyn hallinta",
 "create" => "luo",
@@ -90,9 +89,11 @@ $TRANSLATIONS = array(
 "Sending ..." => "Lähetetään...",
 "Email sent" => "Sähköposti lähetetty",
 "Warning" => "Varoitus",
+"Enter new" => "Kirjoita uusi",
 "Delete" => "Poista",
 "Add" => "Lisää",
 "Edit tags" => "Muokkaa tunnisteita",
+"No tags selected for deletion." => "Tunnisteita ei valittu poistettavaksi.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
 "%s password reset" => "%s salasanan nollaus",
@@ -114,6 +115,7 @@ $TRANSLATIONS = array(
 "Help" => "Ohje",
 "Error loading tags" => "Virhe tunnisteita ladattaessa",
 "Tag already exists" => "Tunniste on jo olemassa",
+"Error deleting tag(s)" => "Virhe tunnisteita poistaessa",
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 7eff85ce6a6..bf27286915f 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s partagé »%s« avec vous",
 "Couldn't send mail to following users: %s " => "Impossible d'envoyer un mail aux utilisateurs suivant : %s",
-"group" => "groupe",
 "Turned on maintenance mode" => "Basculé en mode maintenance",
 "Turned off maintenance mode" => "Basculé en mode production (non maintenance)",
 "Updated database" => "Base de données mise à jour",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "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",
 "Password" => "Mot de passe",
 "Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Date d'expiration",
 "Share via email:" => "Partager via e-mail :",
 "No people found" => "Aucun utilisateur trouvé",
+"group" => "groupe",
 "Resharing is not allowed" => "Le repartage n'est pas autorisé",
 "Shared in {item} with {user}" => "Partagé dans {item} avec {user}",
 "Unshare" => "Ne plus partager",
-"notify user by email" => "Prévenir l'utilisateur par couriel",
 "can edit" => "édition autorisée",
 "access control" => "contrôle des accès",
 "create" => "créer",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index a2d9606ac86..827f7253b1f 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s compartiu «%s» con vostede",
 "Couldn't send mail to following users: %s " => "Non é posíbel enviar correo aos usuarios seguintes: %s",
-"group" => "grupo",
 "Turned on maintenance mode" => "Modo de mantemento activado",
 "Turned off maintenance mode" => "Modo de mantemento desactivado",
 "Updated database" => "Base de datos actualizada",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Produciuse un erro ao cambiar os permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido con vostede e co grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido con vostede por {owner}",
-"Share with" => "Compartir con",
-"Share with link" => "Compartir coa ligazón",
 "Password protect" => "Protexido con contrasinais",
 "Password" => "Contrasinal",
 "Allow Public Upload" => "Permitir o envío público",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data de caducidade",
 "Share via email:" => "Compartir por correo:",
 "No people found" => "Non se atopou xente",
+"group" => "grupo",
 "Resharing is not allowed" => "Non se permite volver a compartir",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Deixar de compartir",
-"notify user by email" => "notificar ao usuario por correo",
 "can edit" => "pode editar",
 "access control" => "control de acceso",
 "create" => "crear",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 5b81ec547d9..f2e2a8f01a4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«",
-"group" => "קבוצה",
 "Sunday" => "יום ראשון",
 "Monday" => "יום שני",
 "Tuesday" => "יום שלישי",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "שגיאה במהלך שינוי ההגדרות",
 "Shared with you and the group {group} by {owner}" => "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
 "Shared with you by {owner}" => "שותף אתך על ידי {owner}",
-"Share with" => "שיתוף עם",
-"Share with link" => "שיתוף עם קישור",
 "Password protect" => "הגנה בססמה",
 "Password" => "סיסמא",
 "Email link to person" => "שליחת קישור בדוא״ל למשתמש",
@@ -57,6 +54,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "תאריך התפוגה",
 "Share via email:" => "שיתוף באמצעות דוא״ל:",
 "No people found" => "לא נמצאו אנשים",
+"group" => "קבוצה",
 "Resharing is not allowed" => "אסור לעשות שיתוף מחדש",
 "Shared in {item} with {user}" => "שותף תחת {item} עם {user}",
 "Unshare" => "הסר שיתוף",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index c8bfaac9267..b841628f28e 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -27,7 +27,6 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Share" => "साझा करें",
 "Error" => "त्रुटि",
-"Share with" => "के साथ साझा",
 "Password" => "पासवर्ड",
 "Send" => "भेजें",
 "No people found" => "कोई व्यक्ति नहीं मिले ",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 4278dfa7b05..c9aeebe1e0b 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -42,8 +42,6 @@ $TRANSLATIONS = array(
 "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",
-"Share with" => "Djeli sa",
-"Share with link" => "Djeli preko link-a",
 "Password protect" => "Zaštiti lozinkom",
 "Password" => "Lozinka",
 "Set expiration date" => "Postavi datum isteka",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 4985edf0378..bbb32041261 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
 "Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
-"group" => "csoport",
 "Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
 "Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
 "Updated database" => "Frissítet adatbázis",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Nem sikerült módosítani a jogosultságokat",
 "Shared with you and the group {group} by {owner}" => "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
 "Shared with you by {owner}" => "Megosztotta Önnel: {owner}",
-"Share with" => "Kivel osztom meg",
-"Share with link" => "Link megadásával osztom meg",
 "Password protect" => "Jelszóval is védem",
 "Password" => "Jelszó",
 "Allow Public Upload" => "Feltöltést is engedélyezek",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "A lejárati idő",
 "Share via email:" => "Megosztás emaillel:",
 "No people found" => "Nincs találat",
+"group" => "csoport",
 "Resharing is not allowed" => "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
 "Shared in {item} with {user}" => "Megosztva {item}-ben {user}-rel",
 "Unshare" => "A megosztás visszavonása",
-"notify user by email" => "felhasználó értesítése e-mailben",
 "can edit" => "módosíthat",
 "access control" => "jogosultság",
 "create" => "létrehoz",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index d6ec5f0191d..09b72873cd9 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "grup",
 "Sunday" => "Minggu",
 "Monday" => "Senin",
 "Tuesday" => "Selasa",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Galat ketika mengubah izin",
 "Shared with you and the group {group} by {owner}" => "Dibagikan dengan Anda dan grup {group} oleh {owner}",
 "Shared with you by {owner}" => "Dibagikan dengan Anda oleh {owner}",
-"Share with" => "Bagikan dengan",
-"Share with link" => "Bagikan lewat tautan",
 "Password protect" => "Lindungi dengan sandi",
 "Password" => "Sandi",
 "Email link to person" => "Emailkan tautan ini ke orang",
@@ -56,6 +53,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Tanggal kedaluwarsa",
 "Share via email:" => "Bagian lewat email:",
 "No people found" => "Tidak ada orang ditemukan",
+"group" => "grup",
 "Resharing is not allowed" => "Berbagi ulang tidak diizinkan",
 "Shared in {item} with {user}" => "Dibagikan dalam {item} dengan {user}",
 "Unshare" => "Batalkan berbagi",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 0de5568aa1e..ac57060c641 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Villa við að breyta aðgangsheimildum",
 "Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}",
 "Shared with you by {owner}" => "Deilt með þér af {owner}",
-"Share with" => "Deila með",
-"Share with link" => "Deila með veftengli",
 "Password protect" => "Verja með lykilorði",
 "Password" => "Lykilorð",
 "Email link to person" => "Senda vefhlekk í tölvupóstu til notenda",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index dead0fab87c..2da589d1606 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ha condiviso «%s» con te",
 "Couldn't send mail to following users: %s " => "Impossibile inviare email ai seguenti utenti: %s",
-"group" => "gruppo",
 "Turned on maintenance mode" => "Modalità di manutenzione attivata",
 "Turned off maintenance mode" => "Modalità di manutenzione disattivata",
 "Updated database" => "Database aggiornato",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Errore durante la modifica dei permessi",
 "Shared with you and the group {group} by {owner}" => "Condiviso con te e con il gruppo {group} da {owner}",
 "Shared with you by {owner}" => "Condiviso con te da {owner}",
-"Share with" => "Condividi con",
-"Share with link" => "Condividi con collegamento",
 "Password protect" => "Proteggi con password",
 "Password" => "Password",
 "Allow Public Upload" => "Consenti caricamento pubblico",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data di scadenza",
 "Share via email:" => "Condividi tramite email:",
 "No people found" => "Non sono state trovate altre persone",
+"group" => "gruppo",
 "Resharing is not allowed" => "La ri-condivisione non è consentita",
 "Shared in {item} with {user}" => "Condiviso in {item} con {user}",
 "Unshare" => "Rimuovi condivisione",
-"notify user by email" => "notifica l'utente tramite email",
 "can edit" => "può modificare",
 "access control" => "controllo d'accesso",
 "create" => "creare",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 469d75e229e..4c4cdf58309 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%sが あなたと »%s«を共有しました",
 "Couldn't send mail to following users: %s " => "次のユーザにメールを送信できませんでした: %s",
-"group" => "グループ",
 "Turned on maintenance mode" => "メンテナンスモードがオンになりました",
 "Turned off maintenance mode" => "メンテナンスモードがオフになりました",
 "Updated database" => "データベース更新完了",
@@ -36,12 +35,12 @@ $TRANSLATIONS = array(
 "Settings" => "設定",
 "seconds ago" => "数秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
-"_%n hour ago_::_%n hours ago_" => array("%n 時間後"),
+"_%n hour ago_::_%n hours ago_" => array("%n 時間前"),
 "today" => "今日",
 "yesterday" => "昨日",
-"_%n day ago_::_%n days ago_" => array("%n 日後"),
+"_%n day ago_::_%n days ago_" => array("%n 日前"),
 "last month" => "一月前",
-"_%n month ago_::_%n months ago_" => array("%n カ月後"),
+"_%n month ago_::_%n months ago_" => array("%n ヶ月前"),
 "months ago" => "月前",
 "last year" => "一年前",
 "years ago" => "年前",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "権限変更でエラー発生",
 "Shared with you and the group {group} by {owner}" => "あなたと {owner} のグループ {group} で共有中",
 "Shared with you by {owner}" => "{owner} と共有中",
-"Share with" => "共有者",
-"Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
 "Password" => "パスワード",
 "Allow Public Upload" => "アップロードを許可",
@@ -79,11 +76,11 @@ $TRANSLATIONS = array(
 "Expiration date" => "有効期限",
 "Share via email:" => "メール経由で共有:",
 "No people found" => "ユーザーが見つかりません",
+"group" => "グループ",
 "Resharing is not allowed" => "再共有は許可されていません",
 "Shared in {item} with {user}" => "{item} 内で {user} と共有中",
 "Unshare" => "共有解除",
-"notify user by email" => "ユーザにメールで通知",
-"can edit" => "編集可能",
+"can edit" => "編集を許可",
 "access control" => "アクセス権限",
 "create" => "作成",
 "update" => "更新",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 4e38aeede13..80a07108122 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "ჯგუფი",
 "Sunday" => "კვირა",
 "Monday" => "ორშაბათი",
 "Tuesday" => "სამშაბათი",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
 "Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
 "Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
-"Share with" => "გააზიარე შემდეგით:",
-"Share with link" => "გაუზიარე ლინკით",
 "Password protect" => "პაროლით დაცვა",
 "Password" => "პაროლი",
 "Email link to person" => "ლინკის პიროვნების იმეილზე გაგზავნა",
@@ -56,6 +53,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "ვადის გასვლის დრო",
 "Share via email:" => "გააზიარე მეილზე",
 "No people found" => "მომხმარებელი არ არის ნაპოვნი",
+"group" => "ჯგუფი",
 "Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
 "Shared in {item} with {user}" => "გაზიარდა {item}–ში  {user}–ის მიერ",
 "Unshare" => "გაუზიარებადი",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index dbedde7e637..86faa16f73e 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "_%n hour ago_::_%n hours ago_" => array(""),
 "_%n day ago_::_%n days ago_" => array(""),
 "_%n month ago_::_%n months ago_" => array(""),
-"_{count} file conflict_::_{count} file conflicts_" => array("")
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Delete" => "លុប"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 9eccf12d089..fda9a89bf2e 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "그룹",
 "Sunday" => "일요일",
 "Monday" => "월요일",
 "Tuesday" => "화요일",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "권한 변경하는 중 오류 발생",
 "Shared with you and the group {group} by {owner}" => "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
 "Shared with you by {owner}" => "{owner} 님이 공유 중",
-"Share with" => "다음으로 공유",
-"Share with link" => "URL 링크로 공유",
 "Password protect" => "암호 보호",
 "Password" => "암호",
 "Allow Public Upload" => "퍼블릭 업로드 허용",
@@ -57,6 +54,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "만료 날짜",
 "Share via email:" => "이메일로 공유:",
 "No people found" => "발견된 사람 없음",
+"group" => "그룹",
 "Resharing is not allowed" => "다시 공유할 수 없습니다",
 "Shared in {item} with {user}" => "{user} 님과 {item}에서 공유 중",
 "Unshare" => "공유 해제",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index faebdda63d3..9a9ebea3995 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt",
-"group" => "Grupp",
 "Sunday" => "Sonndeg",
 "Monday" => "Méindeg",
 "Tuesday" => "Dënschdeg",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Feeler beim Ännere vun de Rechter",
 "Shared with you and the group {group} by {owner}" => "Gedeelt mat dir an der Grupp {group} vum {owner}",
 "Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
-"Share with" => "Deele mat",
-"Share with link" => "Mat Link deelen",
 "Password protect" => "Passwuertgeschützt",
 "Password" => "Passwuert",
 "Allow Public Upload" => "Ëffentlechen Upload erlaaben",
@@ -58,6 +55,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Verfallsdatum",
 "Share via email:" => "Via E-Mail deelen:",
 "No people found" => "Keng Persoune fonnt",
+"group" => "Grupp",
 "Resharing is not allowed" => "Weiderdeelen ass net erlaabt",
 "Shared in {item} with {user}" => "Gedeelt an {item} mat {user}",
 "Unshare" => "Net méi deelen",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 81e3be95e0f..e29c0d5a96c 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s pasidalino »%s« su tavimi",
 "Couldn't send mail to following users: %s " => "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
-"group" => "grupė",
 "Turned on maintenance mode" => "Įjungta priežiūros veiksena",
 "Turned off maintenance mode" => "Išjungta priežiūros veiksena",
 "Updated database" => "Atnaujinta duomenų bazė",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Klaida, keičiant privilegijas",
 "Shared with you and the group {group} by {owner}" => "Pasidalino su Jumis ir {group} grupe {owner}",
 "Shared with you by {owner}" => "Pasidalino su Jumis {owner}",
-"Share with" => "Dalintis su",
-"Share with link" => "Dalintis nuoroda",
 "Password protect" => "Apsaugotas slaptažodžiu",
 "Password" => "Slaptažodis",
 "Allow Public Upload" => "Leisti viešą įkėlimą",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Galiojimo laikas",
 "Share via email:" => "Dalintis per el. paštą:",
 "No people found" => "Žmonių nerasta",
+"group" => "grupė",
 "Resharing is not allowed" => "Dalijinasis išnaujo negalimas",
 "Shared in {item} with {user}" => "Pasidalino {item} su {user}",
 "Unshare" => "Nebesidalinti",
-"notify user by email" => "informuoti naudotoją el. paštu",
 "can edit" => "gali redaguoti",
 "access control" => "priėjimo kontrolė",
 "create" => "sukurti",
@@ -96,8 +93,12 @@ $TRANSLATIONS = array(
 "Email sent" => "Laiškas išsiųstas",
 "Warning" => "Įspėjimas",
 "The object type is not specified." => "Objekto tipas nenurodytas.",
+"Enter new" => "Įveskite naują",
 "Delete" => "Ištrinti",
 "Add" => "Pridėti",
+"Edit tags" => "Redaguoti žymes",
+"Error loading dialog template: {error}" => "Klaida įkeliant dialogo ruošinį: {error}",
+"No tags selected for deletion." => "Trynimui nepasirinkta jokia žymė.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
 "%s password reset" => "%s slaptažodžio atnaujinimas",
@@ -118,6 +119,11 @@ $TRANSLATIONS = array(
 "Apps" => "Programos",
 "Admin" => "Administravimas",
 "Help" => "Pagalba",
+"Error loading tags" => "Klaida įkeliant žymes",
+"Tag already exists" => "Žymė jau egzistuoja",
+"Error deleting tag(s)" => "Klaida trinant žymę(-es)",
+"Error tagging" => "Klaida pridedant žymę",
+"Error untagging" => "Klaida šalinant žymę",
 "Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
@@ -147,6 +153,8 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
 "If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!",
 "Please change your password to secure your account again." => "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo.",
+"Server side authentication failed!" => "Autentikacija serveryje nepavyko!",
+"Please contact your administrator." => "Kreipkitės į savo sistemos administratorių.",
 "Lost your password?" => "Pamiršote slaptažodį?",
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 647ad2bca3f..faf96431e02 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s kopīgots »%s« ar jums",
-"group" => "grupa",
 "Sunday" => "Svētdiena",
 "Monday" => "Pirmdiena",
 "Tuesday" => "Otrdiena",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Kļūda, mainot atļaujas",
 "Shared with you and the group {group} by {owner}" => "{owner} dalījās ar jums un grupu {group}",
 "Shared with you by {owner}" => "{owner} dalījās ar jums",
-"Share with" => "Dalīties ar",
-"Share with link" => "Dalīties ar saiti",
 "Password protect" => "Aizsargāt ar paroli",
 "Password" => "Parole",
 "Allow Public Upload" => "Ļaut publisko augšupielādi.",
@@ -58,6 +55,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Termiņa datums",
 "Share via email:" => "Dalīties, izmantojot e-pastu:",
 "No people found" => "Nav atrastu cilvēku",
+"group" => "grupa",
 "Resharing is not allowed" => "Atkārtota dalīšanās nav atļauta",
 "Shared in {item} with {user}" => "Dalījās ar {item} ar {user}",
 "Unshare" => "Pārtraukt dalīšanos",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 35815d145b5..82b6b70e653 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "група",
 "Updated database" => "Базата е надградена",
 "Updated filecache" => "Кешот е надграден",
 "Invalid image" => "Невалидна фотографија",
@@ -53,8 +52,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Грешка при промена на привилегии",
 "Shared with you and the group {group} by {owner}" => "Споделено со Вас и групата {group} од {owner}",
 "Shared with you by {owner}" => "Споделено со Вас од {owner}",
-"Share with" => "Сподели со",
-"Share with link" => "Сподели со врска",
 "Password protect" => "Заштити со лозинка",
 "Password" => "Лозинка",
 "Allow Public Upload" => "Дозволи јавен аплоуд",
@@ -64,10 +61,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Рок на траење",
 "Share via email:" => "Сподели по е-пошта:",
 "No people found" => "Не се најдени луѓе",
+"group" => "група",
 "Resharing is not allowed" => "Повторно споделување не е дозволено",
 "Shared in {item} with {user}" => "Споделено во {item} со {user}",
 "Unshare" => "Не споделувај",
-"notify user by email" => "извести го корисникот преку електронска пошта",
 "can edit" => "може да се измени",
 "access control" => "контрола на пристап",
 "create" => "креирај",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 7240b8f318a..a103ebead7f 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delte »%s« med deg",
-"group" => "gruppe",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
 "Tuesday" => "Tirsdag",
@@ -44,8 +43,6 @@ $TRANSLATIONS = array(
 "Error" => "Feil",
 "Error while sharing" => "Feil under deling",
 "Shared with you by {owner}" => "Delt med deg av {owner}",
-"Share with" => "Del med",
-"Share with link" => "Del med link",
 "Password protect" => "Passordbeskyttet",
 "Password" => "Passord",
 "Send" => "Send",
@@ -53,6 +50,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Utløpsdato",
 "Share via email:" => "Del på epost",
 "No people found" => "Ingen personer funnet",
+"group" => "gruppe",
 "Unshare" => "Avslutt deling",
 "can edit" => "kan endre",
 "access control" => "tilgangskontroll",
diff --git a/core/l10n/nds.php b/core/l10n/nds.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/nds.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 5e99d831132..aaac72355dd 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s deelde »%s« met jou",
 "Couldn't send mail to following users: %s " => "Kon geen e-mail sturen aan de volgende gebruikers: %s",
-"group" => "groep",
 "Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld",
 "Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld",
 "Updated database" => "Database bijgewerkt",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Fout tijdens het veranderen van permissies",
 "Shared with you and the group {group} by {owner}" => "Gedeeld met u en de groep {group} door {owner}",
 "Shared with you by {owner}" => "Gedeeld met u door {owner}",
-"Share with" => "Deel met",
-"Share with link" => "Deel met link",
 "Password protect" => "Wachtwoord beveiligd",
 "Password" => "Wachtwoord",
 "Allow Public Upload" => "Sta publieke uploads toe",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Vervaldatum",
 "Share via email:" => "Deel via e-mail:",
 "No people found" => "Geen mensen gevonden",
+"group" => "groep",
 "Resharing is not allowed" => "Verder delen is niet toegestaan",
 "Shared in {item} with {user}" => "Gedeeld in {item} met {user}",
 "Unshare" => "Stop met delen",
-"notify user by email" => "Gebruiker via e-mail notificeren",
 "can edit" => "kan wijzigen",
 "access control" => "toegangscontrole",
 "create" => "creëer",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 3ac3a6ea690..af42b3a9bdf 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delte «%s» med deg",
-"group" => "gruppe",
 "Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
 "Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
 "Updated database" => "Database oppdatert",
@@ -67,8 +66,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Feil ved endring av tillatingar",
 "Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
 "Shared with you by {owner}" => "Delt med deg av {owner}",
-"Share with" => "Del med",
-"Share with link" => "Del med lenkje",
 "Password protect" => "Passordvern",
 "Password" => "Passord",
 "Allow Public Upload" => "Tillat offentleg opplasting",
@@ -78,6 +75,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Utløpsdato",
 "Share via email:" => "Del over e-post:",
 "No people found" => "Fann ingen personar",
+"group" => "gruppe",
 "Resharing is not allowed" => "Vidaredeling er ikkje tillate",
 "Shared in {item} with {user}" => "Delt i {item} med {brukar}",
 "Unshare" => "Udel",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index c6472b1c17d..8f1dec5636c 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "grop",
 "Sunday" => "Dimenge",
 "Monday" => "Diluns",
 "Tuesday" => "Dimarç",
@@ -43,14 +42,13 @@ $TRANSLATIONS = array(
 "Error while sharing" => "Error al partejar",
 "Error while unsharing" => "Error al non partejar",
 "Error while changing permissions" => "Error al cambiar permissions",
-"Share with" => "Parteja amb",
-"Share with link" => "Parteja amb lo ligam",
 "Password protect" => "Parat per senhal",
 "Password" => "Senhal",
 "Set expiration date" => "Met la data d'expiracion",
 "Expiration date" => "Data d'expiracion",
 "Share via email:" => "Parteja tras corrièl :",
 "No people found" => "Deguns trobat",
+"group" => "grop",
 "Resharing is not allowed" => "Tornar partejar es pas permis",
 "Unshare" => "Pas partejador",
 "can edit" => "pòt modificar",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 60476b5aad6..b92fdd69d56 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
-"group" => "grupa",
 "Turned on maintenance mode" => "Włączony tryb konserwacji",
 "Turned off maintenance mode" => "Wyłączony tryb konserwacji",
 "Updated database" => "Zaktualizuj bazę",
@@ -43,11 +42,13 @@ $TRANSLATIONS = array(
 "last year" => "w zeszłym roku",
 "years ago" => "lat temu",
 "Choose" => "Wybierz",
+"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
 "Yes" => "Tak",
 "No" => "Nie",
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
 "One file conflict" => "Konflikt pliku",
+"Which files do you want to keep?" => "Które pliki chcesz zachować?",
 "Cancel" => "Anuluj",
 "Continue" => "Kontynuuj ",
 "(all selected)" => "(wszystkie zaznaczone)",
@@ -60,8 +61,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Błąd przy zmianie uprawnień",
 "Shared with you and the group {group} by {owner}" => "Udostępnione tobie i grupie {group} przez {owner}",
 "Shared with you by {owner}" => "Udostępnione tobie przez {owner}",
-"Share with" => "Współdziel z",
-"Share with link" => "Współdziel wraz z odnośnikiem",
 "Password protect" => "Zabezpiecz hasłem",
 "Password" => "Hasło",
 "Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
@@ -71,10 +70,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data wygaśnięcia",
 "Share via email:" => "Współdziel poprzez e-mail:",
 "No people found" => "Nie znaleziono ludzi",
+"group" => "grupa",
 "Resharing is not allowed" => "Współdzielenie nie jest możliwe",
 "Shared in {item} with {user}" => "Współdzielone w {item} z {user}",
 "Unshare" => "Zatrzymaj współdzielenie",
-"notify user by email" => "powiadom użytkownika przez email",
 "can edit" => "może edytować",
 "access control" => "kontrola dostępu",
 "create" => "utwórz",
@@ -88,8 +87,11 @@ $TRANSLATIONS = array(
 "Email sent" => "E-mail wysłany",
 "Warning" => "Ostrzeżenie",
 "The object type is not specified." => "Nie określono typu obiektu.",
+"Enter new" => "Wpisz nowy",
 "Delete" => "Usuń",
 "Add" => "Dodaj",
+"Edit tags" => "Edytuj tagi",
+"No tags selected for deletion." => "Nie zaznaczono tagów do usunięcia.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
 "%s password reset" => "%s reset hasła",
@@ -110,6 +112,11 @@ $TRANSLATIONS = array(
 "Apps" => "Aplikacje",
 "Admin" => "Administrator",
 "Help" => "Pomoc",
+"Error loading tags" => "Błąd ładowania tagów",
+"Tag already exists" => "Tag już istnieje",
+"Error deleting tag(s)" => "Błąd przy osuwaniu tag(ów)",
+"Error tagging" => "Błąd tagowania",
+"Error untagging" => "Błąd odtagowania",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
 "The share will expire on %s.\n\n" => "Udostępnienie wygaśnie w dniu %s.\n\n",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 8c000d523d9..f56c39dea88 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s compartilhou »%s« com você",
 "Couldn't send mail to following users: %s " => "Não foi possível enviar e-mail para os seguintes usuários: %s",
-"group" => "grupo",
 "Turned on maintenance mode" => "Ativar modo de manutenção",
 "Turned off maintenance mode" => "Desligar o modo de manutenção",
 "Updated database" => "Atualizar o banco de dados",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "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",
 "Password" => "Senha",
 "Allow Public Upload" => "Permitir upload público",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data de expiração",
 "Share via email:" => "Compartilhar via e-mail:",
 "No people found" => "Nenhuma pessoa encontrada",
+"group" => "grupo",
 "Resharing is not allowed" => "Não é permitido re-compartilhar",
 "Shared in {item} with {user}" => "Compartilhado em {item} com {user}",
 "Unshare" => "Descompartilhar",
-"notify user by email" => "notificar usuário por email",
 "can edit" => "pode editar",
 "access control" => "controle de acesso",
 "create" => "criar",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index b9c1d59c91f..abe203b571a 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s partilhado »%s« contigo",
-"group" => "grupo",
 "Turned on maintenance mode" => "Activado o modo de manutenção",
 "Turned off maintenance mode" => "Desactivado o modo de manutenção",
 "Updated database" => "Base de dados actualizada",
@@ -61,8 +60,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Erro ao mudar permissões",
 "Shared with you and the group {group} by {owner}" => "Partilhado consigo e com o grupo {group} por {owner}",
 "Shared with you by {owner}" => "Partilhado consigo por {owner}",
-"Share with" => "Partilhar com",
-"Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
 "Password" => "Password",
 "Allow Public Upload" => "Permitir Envios Públicos",
@@ -72,10 +69,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data de expiração",
 "Share via email:" => "Partilhar via email:",
 "No people found" => "Não foi encontrado ninguém",
+"group" => "grupo",
 "Resharing is not allowed" => "Não é permitido partilhar de novo",
 "Shared in {item} with {user}" => "Partilhado em {item} com {user}",
 "Unshare" => "Deixar de partilhar",
-"notify user by email" => "notificar utilizador por correio electrónico",
 "can edit" => "pode editar",
 "access control" => "Controlo de acesso",
 "create" => "criar",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 1224dcfd332..dae599608ca 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
-"group" => "grup",
 "Updated database" => "Bază de date actualizată",
 "Unknown filetype" => "Tip fișier necunoscut",
 "Invalid image" => "Imagine invalidă",
@@ -54,8 +53,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Eroare la modificarea permisiunilor",
 "Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}",
 "Shared with you by {owner}" => "Distribuie cu tine de {owner}",
-"Share with" => "Partajat cu",
-"Share with link" => "Partajare cu legătură",
 "Password protect" => "Protejare cu parolă",
 "Password" => "Parolă",
 "Allow Public Upload" => "Permiteţi încărcarea publică.",
@@ -65,6 +62,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data expirării",
 "Share via email:" => "Distribuie prin email:",
 "No people found" => "Nici o persoană găsită",
+"group" => "grup",
 "Resharing is not allowed" => "Repartajarea nu este permisă",
 "Shared in {item} with {user}" => "Distribuie in {item} si {user}",
 "Unshare" => "Anulare partajare",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 25ba4f680bc..8ca65dd9e6c 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s поделился »%s« с вами",
-"group" => "группа",
+"Couldn't send mail to following users: %s " => "Невозможно отправить письмо следующим пользователям: %s",
 "Turned on maintenance mode" => "Режим отладки включён",
 "Turned off maintenance mode" => "Режим отладки отключён",
 "Updated database" => "База данных обновлена",
@@ -67,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Ошибка при смене разрешений",
 "Shared with you and the group {group} by {owner}" => "{owner} открыл доступ для Вас и группы {group} ",
 "Shared with you by {owner}" => "{owner} открыл доступ для Вас",
-"Share with" => "Поделиться с",
-"Share with link" => "Поделиться с ссылкой",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
 "Allow Public Upload" => "Разрешить открытую загрузку",
@@ -78,6 +76,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Дата окончания",
 "Share via email:" => "Поделится через электронную почту:",
 "No people found" => "Ни один человек не найден",
+"group" => "группа",
 "Resharing is not allowed" => "Общий доступ не разрешен",
 "Shared in {item} with {user}" => "Общий доступ к {item} с {user}",
 "Unshare" => "Закрыть общий доступ",
@@ -94,8 +93,11 @@ $TRANSLATIONS = array(
 "Email sent" => "Письмо отправлено",
 "Warning" => "Предупреждение",
 "The object type is not specified." => "Тип объекта не указан",
+"Enter new" => "Ввести новое",
 "Delete" => "Удалить",
 "Add" => "Добавить",
+"Edit tags" => "Изменить метки",
+"No tags selected for deletion." => "Не выбраны меток для удаления.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
 "%s password reset" => "%s сброс пароля",
@@ -116,8 +118,16 @@ $TRANSLATIONS = array(
 "Apps" => "Приложения",
 "Admin" => "Админпанель",
 "Help" => "Помощь",
+"Error loading tags" => "Ошибка загрузки меток",
+"Tag already exists" => "Метка уже существует",
+"Error deleting tag(s)" => "Ошибка удаления метки(ок)",
+"Error tagging" => "Ошибка присваивания метки",
+"Error untagging" => "Ошибка снятия метки",
 "Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здравствуйте,\n\nпросто даём вам знать, что %s расшарил %s для вас.\nПосмотреть: %s\n\n",
+"The share will expire on %s.\n\n" => "Шара закончится %s\n\n",
+"Cheers!" => "Приветствуем!",
 "Security Warning" => "Предупреждение безопасности",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.",
@@ -136,15 +146,20 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Табличое пространство базы данных",
 "Database host" => "Хост базы данных",
 "Finish setup" => "Завершить установку",
+"Finishing …" => "Завершаем...",
 "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
 "Log out" => "Выйти",
 "Automatic logon rejected!" => "Автоматический вход в систему отключен!",
 "If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
 "Please change your password to secure your account again." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.",
+"Server side authentication failed!" => "Неудачная аутентификация с сервером!",
+"Please contact your administrator." => "Пожалуйста, свяжитесь с вашим администратором.",
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "Log in" => "Войти",
 "Alternative Logins" => "Альтернативные имена пользователя",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>просто даём вам знать, что %s расшарил %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>",
+"The share will expire on %s.<br><br>" => "Шара закончится %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до версии %s. Это может занять некоторое время."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 8a82c09c5b1..06e9392092b 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Error" => "Ошибка",
 "Password" => "Пароль",
 "Warning" => "Предупреждение",
-"Username" => "Имя пользователя"
+"Username" => "Имя пользователя",
+"Help" => "Помощь"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index ecff3705287..0b788ad73fe 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "කණ්ඩායම",
 "Sunday" => "ඉරිදා",
 "Monday" => "සඳුදා",
 "Tuesday" => "අඟහරුවාදා",
@@ -40,13 +39,12 @@ $TRANSLATIONS = array(
 "Cancel" => "එපා",
 "Share" => "බෙදා හදා ගන්න",
 "Error" => "දෝෂයක්",
-"Share with" => "බෙදාගන්න",
-"Share with link" => "යොමුවක් මඟින් බෙදාගන්න",
 "Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
 "Password" => "මුර පදය",
 "Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
 "Expiration date" => "කල් ඉකුත් විමේ දිනය",
 "Share via email:" => "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: ",
+"group" => "කණ්ඩායම",
 "Unshare" => "නොබෙදු",
 "can edit" => "සංස්කරණය කළ හැක",
 "access control" => "ප්‍රවේශ පාලනය",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 5aa9b56ec07..00372bdfda2 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
 "Couldn't send mail to following users: %s " => "Nebolo možné odoslať email týmto používateľom: %s ",
-"group" => "skupina",
 "Turned on maintenance mode" => "Mód údržby zapnutý",
 "Turned off maintenance mode" => "Mód údržby vypnutý",
 "Updated database" => "Databáza aktualizovaná",
@@ -67,8 +66,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
 "Shared with you and the group {group} by {owner}" => "Zdieľané s vami a so skupinou {group} používateľom {owner}",
 "Shared with you by {owner}" => "Zdieľané s vami používateľom {owner}",
-"Share with" => "Zdieľať s",
-"Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
 "Password" => "Heslo",
 "Allow Public Upload" => "Povoliť verejné nahrávanie",
@@ -78,10 +75,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Dátum expirácie",
 "Share via email:" => "Zdieľať cez e-mail:",
 "No people found" => "Používateľ nenájdený",
+"group" => "skupina",
 "Resharing is not allowed" => "Zdieľanie už zdieľanej položky nie je povolené",
 "Shared in {item} with {user}" => "Zdieľané v {item} s {user}",
 "Unshare" => "Zrušiť zdieľanie",
-"notify user by email" => "upozorniť používateľa emailom",
 "can edit" => "môže upraviť",
 "access control" => "prístupové práva",
 "create" => "vytvoriť",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 46c7b7b2452..a2f029e041a 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s je delil »%s« z vami",
-"group" => "skupina",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljek",
 "Tuesday" => "torek",
@@ -47,8 +46,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Napaka med spreminjanjem dovoljenj",
 "Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
 "Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.",
-"Share with" => "Omogoči souporabo z",
-"Share with link" => "Omogoči souporabo preko povezave",
 "Password protect" => "Zaščiti z geslom",
 "Password" => "Geslo",
 "Allow Public Upload" => "Dovoli javne prenose na strežnik",
@@ -58,6 +55,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Datum preteka",
 "Share via email:" => "Souporaba preko elektronske pošte:",
 "No people found" => "Ni najdenih uporabnikov",
+"group" => "skupina",
 "Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena",
 "Shared in {item} with {user}" => "V souporabi v {item} z {user}",
 "Unshare" => "Prekliči souporabo",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index c0bfee52412..15838276744 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s ndau »%s« me ju",
-"group" => "grupi",
 "Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua",
 "Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua",
 "Updated database" => "Database-i u azhurnua",
@@ -53,8 +52,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Veprim i gabuar gjatë ndryshimit të lejeve",
 "Shared with you and the group {group} by {owner}" => "Ndarë me ju dhe me grupin {group} nga {owner}",
 "Shared with you by {owner}" => "Ndarë me ju nga {owner}",
-"Share with" => "Nda me",
-"Share with link" => "Nda me lidhje",
 "Password protect" => "Mbro me kod",
 "Password" => "Kodi",
 "Allow Public Upload" => "Lejo Ngarkimin Publik",
@@ -64,6 +61,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Data e përfundimit",
 "Share via email:" => "Nda me email:",
 "No people found" => "Nuk u gjet asnjë person",
+"group" => "grupi",
 "Resharing is not allowed" => "Rindarja nuk lejohet",
 "Shared in {item} with {user}" => "Ndarë në {item} me {user}",
 "Unshare" => "Hiq ndarjen",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 4b1d41f289a..0e7451fca2e 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "група",
 "Sunday" => "Недеља",
 "Monday" => "Понедељак",
 "Tuesday" => "Уторак",
@@ -45,8 +44,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Грешка код промене дозвола",
 "Shared with you and the group {group} by {owner}" => "Дељено са вама и са групом {group}. Поделио {owner}.",
 "Shared with you by {owner}" => "Поделио са вама {owner}",
-"Share with" => "Подели са",
-"Share with link" => "Подели линк",
 "Password protect" => "Заштићено лозинком",
 "Password" => "Лозинка",
 "Send" => "Пошаљи",
@@ -54,6 +51,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Датум истека",
 "Share via email:" => "Подели поштом:",
 "No people found" => "Особе нису пронађене.",
+"group" => "група",
 "Resharing is not allowed" => "Поновно дељење није дозвољено",
 "Shared in {item} with {user}" => "Подељено унутар {item} са {user}",
 "Unshare" => "Укини дељење",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 04a4b758bb1..30a9e15348a 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -45,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Greška u promeni dozvola",
 "Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ",
 "Shared with you by {owner}" => "Sa vama podelio {owner}",
-"Share with" => "Podeli sa",
-"Share with link" => "Podeli koristei link",
 "Password protect" => "Zaštita lozinkom",
 "Password" => "Lozinka",
 "Email link to person" => "Pošalji link e-mailom",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index e89ab9d85e8..ebf1ad35cfa 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s delade »%s« med dig",
 "Couldn't send mail to following users: %s " => "Gick inte att skicka e-post till följande användare: %s",
-"group" => "Grupp",
 "Turned on maintenance mode" => "Aktiverade underhållsläge",
 "Turned off maintenance mode" => "Deaktiverade underhållsläge",
 "Updated database" => "Uppdaterade databasen",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Fel vid ändring av rättigheter",
 "Shared with you and the group {group} by {owner}" => "Delad med dig och gruppen {group} av {owner}",
 "Shared with you by {owner}" => "Delad med dig av {owner}",
-"Share with" => "Delad med",
-"Share with link" => "Delad med länk",
 "Password protect" => "Lösenordsskydda",
 "Password" => "Lösenord",
 "Allow Public Upload" => "Tillåt publik uppladdning",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "Utgångsdatum",
 "Share via email:" => "Dela via e-post:",
 "No people found" => "Hittar inga användare",
+"group" => "Grupp",
 "Resharing is not allowed" => "Dela vidare är inte tillåtet",
 "Shared in {item} with {user}" => "Delad i {item} med {user}",
 "Unshare" => "Sluta dela",
-"notify user by email" => "notifiera användare via e-post",
 "can edit" => "kan redigera",
 "access control" => "åtkomstkontroll",
 "create" => "skapa",
@@ -99,6 +96,9 @@ $TRANSLATIONS = array(
 "Enter new" => "Skriv nytt",
 "Delete" => "Radera",
 "Add" => "Lägg till",
+"Edit tags" => "Editera taggar",
+"Error loading dialog template: {error}" => "Fel under laddning utav dialog mall: {fel}",
+"No tags selected for deletion." => "Inga taggar valda för borttagning.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
 "%s password reset" => "%s återställ lösenord",
@@ -119,7 +119,13 @@ $TRANSLATIONS = array(
 "Apps" => "Program",
 "Admin" => "Admin",
 "Help" => "Hjälp",
+"Error loading tags" => "Fel vid laddning utav taggar",
+"Tag already exists" => "Tagg existerar redan",
+"Error deleting tag(s)" => "Fel vid borttagning utav tagg(ar)",
+"Error tagging" => "Fel taggning",
+"Error untagging" => "Fel av taggning",
 "Error favoriting" => "Fel favorisering",
+"Error unfavoriting" => "Fel av favorisering ",
 "Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\n",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 7dba820066d..dd4ef9c09ea 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "குழு",
 "Sunday" => "ஞாயிற்றுக்கிழமை",
 "Monday" => "திங்கட்கிழமை",
 "Tuesday" => "செவ்வாய்க்கிழமை",
@@ -45,14 +44,13 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "அனுமதிகள் மாறும்போதான வழு",
 "Shared with you and the group {group} by {owner}" => "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
 "Shared with you by {owner}" => "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-"Share with" => "பகிர்தல்",
-"Share with link" => "இணைப்புடன் பகிர்தல்",
 "Password protect" => "கடவுச்சொல்லை பாதுகாத்தல்",
 "Password" => "கடவுச்சொல்",
 "Set expiration date" => "காலாவதி தேதியை குறிப்பிடுக",
 "Expiration date" => "காலவதியாகும் திகதி",
 "Share via email:" => "மின்னஞ்சலினூடான பகிர்வு: ",
 "No people found" => "நபர்கள் யாரும் இல்லை",
+"group" => "குழு",
 "Resharing is not allowed" => "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
 "Shared in {item} with {user}" => "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
 "Unshare" => "பகிரப்படாதது",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 8deb3ef20df..487c4a2751e 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "กลุ่มผู้ใช้งาน",
 "Sunday" => "วันอาทิตย์",
 "Monday" => "วันจันทร์",
 "Tuesday" => "วันอังคาร",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
 "Shared with you and the group {group} by {owner}" => "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
 "Shared with you by {owner}" => "ถูกแชร์ให้กับคุณโดย {owner}",
-"Share with" => "แชร์ให้กับ",
-"Share with link" => "แชร์ด้วยลิงก์",
 "Password protect" => "ใส่รหัสผ่านไว้",
 "Password" => "รหัสผ่าน",
 "Email link to person" => "ส่งลิงก์ให้ทางอีเมล",
@@ -56,6 +53,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "วันที่หมดอายุ",
 "Share via email:" => "แชร์ผ่านทางอีเมล",
 "No people found" => "ไม่พบบุคคลที่ต้องการ",
+"group" => "กลุ่มผู้ใช้งาน",
 "Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
 "Shared in {item} with {user}" => "ได้แชร์ {item} ให้กับ {user}",
 "Unshare" => "ยกเลิกการแชร์",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index f10f3cf25b5..234ba925cd1 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s  sizinle »%s« paylaşımında bulundu",
 "Couldn't send mail to following users: %s " => "Şu kullanıcılara posta gönderilemedi: %s",
-"group" => "grup",
 "Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
 "Turned off maintenance mode" => "Bakım kipi kapatıldı",
 "Updated database" => "Veritabanı güncellendi",
@@ -68,32 +67,30 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "İzinleri değiştirirken hata oluştu",
 "Shared with you and the group {group} by {owner}" => " {owner} tarafından sizinle ve {group} ile paylaştırılmış",
 "Shared with you by {owner}" => "{owner} trafından sizinle paylaştırıldı",
-"Share with" => "ile Paylaş",
-"Share with link" => "Bağlantı ile paylaş",
-"Password protect" => "Şifre korunması",
+"Password protect" => "Parola koruması",
 "Password" => "Parola",
 "Allow Public Upload" => "Herkes tarafından yüklemeye izin ver",
-"Email link to person" => "Kişiye e-posta linki",
+"Email link to person" => "Bağlantıyı e-posta ile gönder",
 "Send" => "Gönder",
 "Set expiration date" => "Son kullanma tarihini ayarla",
 "Expiration date" => "Son kullanım tarihi",
-"Share via email:" => "Eposta ile paylaş",
+"Share via email:" => "E-posta ile paylaş",
 "No people found" => "Kişi bulunamadı",
+"group" => "grup",
 "Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor",
 "Shared in {item} with {user}" => " {item} içinde  {user} ile paylaşılanlarlar",
 "Unshare" => "Paylaşılmayan",
-"notify user by email" => "kullanıcıyı e-posta ile bildir",
 "can edit" => "düzenleyebilir",
 "access control" => "erişim kontrolü",
 "create" => "oluştur",
 "update" => "güncelle",
 "delete" => "sil",
 "share" => "paylaş",
-"Password protected" => "Paralo korumalı",
+"Password protected" => "Parola korumalı",
 "Error unsetting expiration date" => "Geçerlilik tarihi tanımlama kaldırma hatası",
 "Error setting expiration date" => "Geçerlilik tarihi tanımlama hatası",
 "Sending ..." => "Gönderiliyor...",
-"Email sent" => "Eposta gönderildi",
+"Email sent" => "E-posta gönderildi",
 "Warning" => "Uyarı",
 "The object type is not specified." => "Nesne türü belirtilmemiş.",
 "Enter new" => "Yeni girin",
@@ -106,9 +103,9 @@ $TRANSLATIONS = array(
 "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
 "%s password reset" => "%s parola sıfırlama",
 "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>I Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Isteği başarısız oldu!<br>E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?",
-"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
+"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız.",
 "Username" => "Kullanıcı Adı",
 "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını aktif etmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile irtibata geçiniz. Gerçekten devam etmek istiyor musunuz?",
 "Yes, I really want to reset my password now" => "Evet,Şu anda parolamı sıfırlamak istiyorum.",
@@ -156,8 +153,8 @@ $TRANSLATIONS = array(
 "%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.",
 "Log out" => "Çıkış yap",
 "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
-"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
-"Please change your password to secure your account again." => "Hesabınızı korumak için lütfen parolanızı değiştirin.",
+"If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmediyseniz hesabınız tehlikede olabilir!",
+"Please change your password to secure your account again." => "Hesabınızı tekrar güvene almak için lütfen parolanızı değiştirin.",
 "Server side authentication failed!" => "Sunucu taraflı yetkilendirme başarısız!",
 "Please contact your administrator." => "Lütfen sistem yöneticisi ile iletişime geçin.",
 "Lost your password?" => "Parolanızı mı unuttunuz?",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 3d9d39c854f..c340ff75405 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "گۇرۇپپا",
 "Sunday" => "يەكشەنبە",
 "Monday" => "دۈشەنبە",
 "Tuesday" => "سەيشەنبە",
@@ -34,9 +33,9 @@ $TRANSLATIONS = array(
 "Cancel" => "ۋاز كەچ",
 "Share" => "ھەمبەھىر",
 "Error" => "خاتالىق",
-"Share with" => "ھەمبەھىر",
 "Password" => "ئىم",
 "Send" => "يوللا",
+"group" => "گۇرۇپپا",
 "Unshare" => "ھەمبەھىرلىمە",
 "delete" => "ئۆچۈر",
 "share" => "ھەمبەھىر",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 64e79abcdd0..f3e56730d4a 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "група",
 "Sunday" => "Неділя",
 "Monday" => "Понеділок",
 "Tuesday" => "Вівторок",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Помилка при зміні повноважень",
 "Shared with you and the group {group} by {owner}" => " {owner} опублікував для Вас та для групи {group}",
 "Shared with you by {owner}" => "{owner} опублікував для Вас",
-"Share with" => "Опублікувати для",
-"Share with link" => "Опублікувати через посилання",
 "Password protect" => "Захистити паролем",
 "Password" => "Пароль",
 "Email link to person" => "Ел. пошта належить Пану",
@@ -56,6 +53,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "Термін дії",
 "Share via email:" => "Опублікувати через Ел. пошту:",
 "No people found" => "Жодної людини не знайдено",
+"group" => "група",
 "Resharing is not allowed" => "Пере-публікація не дозволяється",
 "Shared in {item} with {user}" => "Опубліковано {item} для {user}",
 "Unshare" => "Закрити доступ",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 9d40392c085..1981e756e47 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -27,8 +27,6 @@ $TRANSLATIONS = array(
 "Error while sharing" => "شئیرنگ کے دوران ایرر",
 "Error while unsharing" => "شئیرنگ ختم کرنے  کے دوران ایرر",
 "Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران ایرر",
-"Share with" => "اس کے ساتھ شئیر کریں",
-"Share with link" => "لنک کے ساتھ شئیر کریں",
 "Password protect" => "پاسورڈ سے محفوظ کریں",
 "Password" => "پاسورڈ",
 "Set expiration date" => "تاریخ معیاد سیٹ کریں",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 9d335e4427a..7860d486889 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"group" => "nhóm",
 "Sunday" => "Chủ nhật",
 "Monday" => "Thứ 2",
 "Tuesday" => "Thứ 3",
@@ -46,8 +45,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Lỗi trong quá trình phân quyền",
 "Shared with you and the group {group} by {owner}" => "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
 "Shared with you by {owner}" => "Đã được chia sẽ bởi {owner}",
-"Share with" => "Chia sẻ với",
-"Share with link" => "Chia sẻ với liên kết",
 "Password protect" => "Mật khẩu bảo vệ",
 "Password" => "Mật khẩu",
 "Email link to person" => "Liên kết email tới cá nhân",
@@ -56,6 +53,7 @@ $TRANSLATIONS = array(
 "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",
+"group" => "nhóm",
 "Resharing is not allowed" => "Chia sẻ lại không được cho phép",
 "Shared in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}",
 "Unshare" => "Bỏ chia sẻ",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 727daccad05..579318afd36 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s 向您分享了 »%s«",
-"group" => "组",
 "Turned on maintenance mode" => "启用维护模式",
 "Turned off maintenance mode" => "关闭维护模式",
 "Updated database" => "数据库已更新",
 "Updating filecache, this may take really long..." => "正在更新文件缓存，这可能需要较长时间...",
 "Updated filecache" => "文件缓存已更新",
 "... %d%% done ..." => "...已完成 %d%% ...",
+"Unknown filetype" => "未知的文件类型",
+"Invalid image" => "无效的图像",
 "Sunday" => "星期日",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -53,8 +54,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "修改权限时出错",
 "Shared with you and the group {group} by {owner}" => "{owner} 共享给您及 {group} 组",
 "Shared with you by {owner}" => "{owner} 与您共享",
-"Share with" => "分享之",
-"Share with link" => "共享链接",
 "Password protect" => "密码保护",
 "Password" => "密码",
 "Allow Public Upload" => "允许公开上传",
@@ -64,6 +63,7 @@ $TRANSLATIONS = array(
 "Expiration date" => "过期日期",
 "Share via email:" => "通过Email共享",
 "No people found" => "未找到此人",
+"group" => "组",
 "Resharing is not allowed" => "不允许二次共享",
 "Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
 "Unshare" => "取消共享",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 50caa86a2f2..02cabf847ef 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -41,8 +41,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "更改權限時發生錯誤",
 "Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享",
 "Shared with you by {owner}" => "{owner}與你的分享",
-"Share with" => "分享",
-"Share with link" => "以連結分享",
 "Password protect" => "密碼保護",
 "Password" => "密碼",
 "Send" => "傳送",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 0cb4967b2b5..256034b22eb 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s 與您分享了 %s",
 "Couldn't send mail to following users: %s " => "無法寄送郵件給這些使用者：%s",
-"group" => "群組",
 "Turned on maintenance mode" => "已啓用維護模式",
 "Turned off maintenance mode" => "已停用維護模式",
 "Updated database" => "已更新資料庫",
@@ -68,8 +67,6 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "修改權限時發生錯誤",
 "Shared with you and the group {group} by {owner}" => "由 {owner} 分享給您和 {group}",
 "Shared with you by {owner}" => "{owner} 已經和您分享",
-"Share with" => "分享給別人",
-"Share with link" => "使用連結分享",
 "Password protect" => "密碼保護",
 "Password" => "密碼",
 "Allow Public Upload" => "允許任何人上傳",
@@ -79,10 +76,10 @@ $TRANSLATIONS = array(
 "Expiration date" => "到期日",
 "Share via email:" => "透過電子郵件分享：",
 "No people found" => "沒有找到任何人",
+"group" => "群組",
 "Resharing is not allowed" => "不允許重新分享",
 "Shared in {item} with {user}" => "已和 {user} 分享 {item}",
 "Unshare" => "取消分享",
-"notify user by email" => "使用郵件通知使用者",
 "can edit" => "可編輯",
 "access control" => "存取控制",
 "create" => "建立",