diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index bdaeabb68c..ec15af8fc2 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -25,6 +25,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
+    "Bad Signature" : "Firma errónea",
+    "Missing Signature" : "No se encuentra la firma",
     "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 3eb7994eb9..12d0c6188e 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -23,6 +23,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
+    "Bad Signature" : "Firma errónea",
+    "Missing Signature" : "No se encuentra la firma",
     "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
diff --git a/apps/federation/l10n/es.js b/apps/federation/l10n/es.js
new file mode 100644
index 0000000000..fb899bb0fc
--- /dev/null
+++ b/apps/federation/l10n/es.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "federation",
+    {
+    "Server added to the list of trusted ownClouds" : "Servidor agregado a la lista de ownClouds en los que se confía",
+    "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.",
+    "No ownCloud server found" : "No se ha encontrado el servidor ownCloud",
+    "Could not add server" : "No se pudo agregar el servidor",
+    "Federation" : "Federación",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Federación de ownCloud permite conectar con otros ownClouds en los que se confíe para intercambiar el directorio de usuario. Por ejemplo esto se usará para autocompletar usuarios externos para compartición federada."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/es.json b/apps/federation/l10n/es.json
new file mode 100644
index 0000000000..f4797b10ee
--- /dev/null
+++ b/apps/federation/l10n/es.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Server added to the list of trusted ownClouds" : "Servidor agregado a la lista de ownClouds en los que se confía",
+    "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.",
+    "No ownCloud server found" : "No se ha encontrado el servidor ownCloud",
+    "Could not add server" : "No se pudo agregar el servidor",
+    "Federation" : "Federación",
+    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La Federación de ownCloud permite conectar con otros ownClouds en los que se confíe para intercambiar el directorio de usuario. Por ejemplo esto se usará para autocompletar usuarios externos para compartición federada."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index 5227bf0b9a..4b4a9e1927 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -79,7 +79,7 @@ OC.L10N.register(
     "New folder" : "Ny mappe",
     "{newname} already exists" : "{newname} finnes allerede",
     "Upload" : "Last opp",
-    "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
+    "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av merkelappene",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begrens varsling om oppretting og endringer til <strong>favorittfilene</strong> dine <em>(Kun strøm)</em>",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index 586850a9e8..f3b0021dbb 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -77,7 +77,7 @@
     "New folder" : "Ny mappe",
     "{newname} already exists" : "{newname} finnes allerede",
     "Upload" : "Last opp",
-    "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
+    "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av merkelappene",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begrens varsling om oppretting og endringer til <strong>favorittfilene</strong> dine <em>(Kun strøm)</em>",
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index e2110f2b6a..01f65761ab 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -40,10 +40,18 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s",
     "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s compartó %1$s con %3$s",
+    "You removed the share of %2$s for %1$s" : "Ha cambiado el compartido %2$s por %1$s",
+    "%2$s removed the share of %3$s for %1$s" : "%2$s eliminó la compartición de %3$s con %1$s",
     "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s compartió %1$s con el grupo %3$s",
+    "You removed the share of group %2$s for %1$s" : "Ha cambiado el compartido del grupo %2$s por %1$s",
+    "%2$s removed the share of group %3$s for %1$s" : "%2$s ha cambiado el compartido del grupo %3$s por %1$s",
     "%2$s shared %1$s via link" : "%2$s compartió %1$s vía enlace",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+    "You removed the public link for %1$s" : "Ha borrado el enlace público de %1$s",
+    "%2$s removed the public link for %1$s" : "%2$s ha eliminado el enlace público de %1$s",
+    "Your public link for %1$s expired" : "Su enlace público %1$s ha expirado",
+    "The public link of %2$s for %1$s expired" : "El enlace público de %2$s para %1$s ha expirado",
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "Downloaded via public link" : "Descargado vía enlace público",
     "Shared with %2$s" : "Compartido con %2$s",
@@ -52,6 +60,8 @@ OC.L10N.register(
     "Shared with group %3$s by %2$s" : "Compartido con el grupo %3$s por %2$s",
     "Shared via link by %2$s" : "Compartido vía enlace por %2$s",
     "Shared via public link" : "Compartido vía enlace público",
+    "Removed public link" : "Eliminado enlace público",
+    "Public link expired" : "El enlace público ha expirado",
     "Shared by %2$s" : "Compartido por %2$s",
     "Shares" : "Compartidos",
     "Accept" : "Aceptar",
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 4372f6c661..bd5d497829 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -38,10 +38,18 @@
     "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s",
     "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s compartó %1$s con %3$s",
+    "You removed the share of %2$s for %1$s" : "Ha cambiado el compartido %2$s por %1$s",
+    "%2$s removed the share of %3$s for %1$s" : "%2$s eliminó la compartición de %3$s con %1$s",
     "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s compartió %1$s con el grupo %3$s",
+    "You removed the share of group %2$s for %1$s" : "Ha cambiado el compartido del grupo %2$s por %1$s",
+    "%2$s removed the share of group %3$s for %1$s" : "%2$s ha cambiado el compartido del grupo %3$s por %1$s",
     "%2$s shared %1$s via link" : "%2$s compartió %1$s vía enlace",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+    "You removed the public link for %1$s" : "Ha borrado el enlace público de %1$s",
+    "%2$s removed the public link for %1$s" : "%2$s ha eliminado el enlace público de %1$s",
+    "Your public link for %1$s expired" : "Su enlace público %1$s ha expirado",
+    "The public link of %2$s for %1$s expired" : "El enlace público de %2$s para %1$s ha expirado",
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "Downloaded via public link" : "Descargado vía enlace público",
     "Shared with %2$s" : "Compartido con %2$s",
@@ -50,6 +58,8 @@
     "Shared with group %3$s by %2$s" : "Compartido con el grupo %3$s por %2$s",
     "Shared via link by %2$s" : "Compartido vía enlace por %2$s",
     "Shared via public link" : "Compartido vía enlace público",
+    "Removed public link" : "Eliminado enlace público",
+    "Public link expired" : "El enlace público ha expirado",
     "Shared by %2$s" : "Compartido por %2$s",
     "Shares" : "Compartidos",
     "Accept" : "Aceptar",
diff --git a/apps/systemtags/l10n/es.js b/apps/systemtags/l10n/es.js
index 7ed27b6c08..56941f3f5d 100644
--- a/apps/systemtags/l10n/es.js
+++ b/apps/systemtags/l10n/es.js
@@ -1,7 +1,21 @@
 OC.L10N.register(
     "systemtags",
     {
+    "<strong>System tags</strong> for a file have been modified" : "Se han modificado las <strong>etiquetas de sistema</strong> de un archivo",
+    "%1$s assigned system tag %3$s" : "%1$s asignó la etiqueta de sistema %3$s",
+    "%1$s unassigned system tag %3$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s",
+    "%1$s created system tag %2$s" : "%1$s creó la etiqueta de sistema %2$s",
+    "%1$s deleted system tag %2$s" : "%1$s eliminó la etiqueta de sistema %2$s",
+    "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta de sistema %3$s a %2$s",
+    "%1$s assigned system tag %3$s to %2$s" : "%1$s asignó la etiqueta de sistema %3$s a %2$s",
+    "%1$s unassigned system tag %3$s from %2$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s de %2$s",
+    "%s (not-assignable)" : "%s (no asignable)",
+    "%s (invisible)" : "%s (invisible)",
     "Tags" : "Etiquetas",
+    "Tagged files" : "Archivos etiquetados",
+    "Select tags to filter by" : "Seleccionar etiquetas por las que filtrar",
+    "Please select tags to filter by" : "Por favor, seleccione las etiquetas por las que desea filtrar",
+    "No files found for the selected tags" : "No se han encontrado archivos para las etiquetas seleccionadas",
     "No files in here" : "Aquí no hay archivos",
     "No entries found in this folder" : "No hay entradas en esta carpeta",
     "Name" : "Nombre",
diff --git a/apps/systemtags/l10n/es.json b/apps/systemtags/l10n/es.json
index 038cf956fb..e5ad1d78fe 100644
--- a/apps/systemtags/l10n/es.json
+++ b/apps/systemtags/l10n/es.json
@@ -1,5 +1,19 @@
 { "translations": {
+    "<strong>System tags</strong> for a file have been modified" : "Se han modificado las <strong>etiquetas de sistema</strong> de un archivo",
+    "%1$s assigned system tag %3$s" : "%1$s asignó la etiqueta de sistema %3$s",
+    "%1$s unassigned system tag %3$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s",
+    "%1$s created system tag %2$s" : "%1$s creó la etiqueta de sistema %2$s",
+    "%1$s deleted system tag %2$s" : "%1$s eliminó la etiqueta de sistema %2$s",
+    "%1$s updated system tag %3$s to %2$s" : "%1$s actualizó la etiqueta de sistema %3$s a %2$s",
+    "%1$s assigned system tag %3$s to %2$s" : "%1$s asignó la etiqueta de sistema %3$s a %2$s",
+    "%1$s unassigned system tag %3$s from %2$s" : "%1$s eliminó la asignación de etiqueta de sistema %3$s de %2$s",
+    "%s (not-assignable)" : "%s (no asignable)",
+    "%s (invisible)" : "%s (invisible)",
     "Tags" : "Etiquetas",
+    "Tagged files" : "Archivos etiquetados",
+    "Select tags to filter by" : "Seleccionar etiquetas por las que filtrar",
+    "Please select tags to filter by" : "Por favor, seleccione las etiquetas por las que desea filtrar",
+    "No files found for the selected tags" : "No se han encontrado archivos para las etiquetas seleccionadas",
     "No files in here" : "Aquí no hay archivos",
     "No entries found in this folder" : "No hay entradas en esta carpeta",
     "Name" : "Nombre",
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index cd142e3789..798b4ba07c 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -98,6 +98,8 @@ OC.L10N.register(
     "delete" : "حذف",
     "access control" : "ضبط الوصول",
     "Share" : "شارك",
+    "Share with users or groups …" : "شارِك مع مستخدمين أو مجموعات",
+    "Share with users, groups or remote users …" : "شارِك مع مستخدمين أو مجموعات أو مستخدمين عن بُعد",
     "Warning" : "تحذير",
     "Delete" : "إلغاء",
     "Rename" : "إعادة التسمية",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index bf22663adb..885babf2e6 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -96,6 +96,8 @@
     "delete" : "حذف",
     "access control" : "ضبط الوصول",
     "Share" : "شارك",
+    "Share with users or groups …" : "شارِك مع مستخدمين أو مجموعات",
+    "Share with users, groups or remote users …" : "شارِك مع مستخدمين أو مجموعات أو مستخدمين عن بُعد",
     "Warning" : "تحذير",
     "Delete" : "إلغاء",
     "Rename" : "إعادة التسمية",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index bac2f7222b..ec991bf418 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -185,6 +185,7 @@ OC.L10N.register(
     "({scope})" : "({scope})",
     "Delete" : "Delete",
     "Rename" : "Rename",
+    "Collaborative tags" : "Collaborative tags",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Enter new",
     "Add" : "Add",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 6139aea21d..44c88fae99 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -183,6 +183,7 @@
     "({scope})" : "({scope})",
     "Delete" : "Delete",
     "Rename" : "Rename",
+    "Collaborative tags" : "Collaborative tags",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Enter new",
     "Add" : "Add",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index d37bc2f60e..145879a957 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -130,6 +130,7 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está ingresando a este sitio de internet vía HTTP. Le sugerimos enérgicamente que configure su servidor que utilice HTTPS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
@@ -166,7 +167,11 @@ OC.L10N.register(
     "access control" : "control de acceso",
     "Could not unshare" : "No se puede quitar el comparto",
     "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.",
+    "No users or groups found for {search}" : "No se han encontrado usuarios ni grupos para {search}",
     "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
+    "{sharee} (group)" : "{sharee} (grupo)",
+    "{sharee} (at {server})" : "{sharee} (en {server})",
+    "{sharee} (remote)" : "{sharee} (remoto)",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
@@ -180,6 +185,7 @@ OC.L10N.register(
     "({scope})" : "({scope})",
     "Delete" : "Eliminar",
     "Rename" : "Renombrar",
+    "Collaborative tags" : "Etiquetas colaborativas",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
     "Add" : "Agregar",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 512a096391..299d6303ce 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -128,6 +128,7 @@
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está ingresando a este sitio de internet vía HTTP. Le sugerimos enérgicamente que configure su servidor que utilice HTTPS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
@@ -164,7 +165,11 @@
     "access control" : "control de acceso",
     "Could not unshare" : "No se puede quitar el comparto",
     "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.",
+    "No users or groups found for {search}" : "No se han encontrado usuarios ni grupos para {search}",
     "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
+    "{sharee} (group)" : "{sharee} (grupo)",
+    "{sharee} (at {server})" : "{sharee} (en {server})",
+    "{sharee} (remote)" : "{sharee} (remoto)",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
@@ -178,6 +183,7 @@
     "({scope})" : "({scope})",
     "Delete" : "Eliminar",
     "Rename" : "Renombrar",
+    "Collaborative tags" : "Etiquetas colaborativas",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
     "Add" : "Agregar",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index f013409ecf..ccae2ebea7 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -179,12 +179,13 @@ OC.L10N.register(
     "Error removing share" : "Feil ved fjerning av deling",
     "Warning" : "Advarsel",
     "Error while sending notification" : "Feil ved sending av varsling",
-    "Non-existing tag #{tag}" : "Ikke-eksisterende merkelap #{tag}",
+    "Non-existing tag #{tag}" : "Ikke-eksisterende merkelapp #{tag}",
     "not assignable" : "kan ikke tilordnes",
     "invisible" : "usynlig",
     "({scope})" : "({scope})",
     "Delete" : "Slett",
     "Rename" : "Gi nytt navn",
+    "Collaborative tags" : "Felles merkelapper",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
     "Add" : "Legg til",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 929f89a4af..f77e354a3d 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -177,12 +177,13 @@
     "Error removing share" : "Feil ved fjerning av deling",
     "Warning" : "Advarsel",
     "Error while sending notification" : "Feil ved sending av varsling",
-    "Non-existing tag #{tag}" : "Ikke-eksisterende merkelap #{tag}",
+    "Non-existing tag #{tag}" : "Ikke-eksisterende merkelapp #{tag}",
     "not assignable" : "kan ikke tilordnes",
     "invisible" : "usynlig",
     "({scope})" : "({scope})",
     "Delete" : "Slett",
     "Rename" : "Gi nytt navn",
+    "Collaborative tags" : "Felles merkelapper",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
     "Add" : "Legg til",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 3a8aaf429e..fc00b30959 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -185,6 +185,7 @@ OC.L10N.register(
     "({scope})" : "({scope})",
     "Delete" : "Eliminar",
     "Rename" : "Renomear",
+    "Collaborative tags" : "Etiquetas de colaboração",
     "The object type is not specified." : "O tipo de objeto não foi especificado.",
     "Enter new" : "Entrar uma nova",
     "Add" : "Adicionar",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 968bb3f3fd..659da4f76c 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -183,6 +183,7 @@
     "({scope})" : "({scope})",
     "Delete" : "Eliminar",
     "Rename" : "Renomear",
+    "Collaborative tags" : "Etiquetas de colaboração",
     "The object type is not specified." : "O tipo de objeto não foi especificado.",
     "Enter new" : "Entrar uma nova",
     "Add" : "Adicionar",
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
index 3bf5421f01..5d4b36c292 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb_NO.js
@@ -59,7 +59,7 @@ OC.L10N.register(
     "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signatur kunne ikke sjekkes. Kontakt app-utvikleren og sjekk admin-bildet.",
     "App can't be installed because of not allowed code in the App" : "App kan ikke installeres på grunn av ulovlig kode i appen.",
     "App can't be installed because it is not compatible with this version of ownCloud" : "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
-    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den er merket med <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
     "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "App kan ikke installeres fordi versjonen i info.xml ikke er den samme som versjonen som rapporteres fra app-butikken",
     "Application is not enabled" : "Applikasjon er ikke påslått",
     "Authentication error" : "Autentikasjonsfeil",
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
index 21bbc1bf41..bd586c1448 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb_NO.json
@@ -57,7 +57,7 @@
     "Signature could not get checked. Please contact the app developer and check your admin screen." : "Signatur kunne ikke sjekkes. Kontakt app-utvikleren og sjekk admin-bildet.",
     "App can't be installed because of not allowed code in the App" : "App kan ikke installeres på grunn av ulovlig kode i appen.",
     "App can't be installed because it is not compatible with this version of ownCloud" : "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
-    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den er merket med <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
     "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "App kan ikke installeres fordi versjonen i info.xml ikke er den samme som versjonen som rapporteres fra app-butikken",
     "Application is not enabled" : "Applikasjon er ikke påslått",
     "Authentication error" : "Autentikasjonsfeil",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index ae02136a67..9c0e716ddc 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -47,6 +47,9 @@ OC.L10N.register(
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
     "Add trusted domain" : "Lägg till betrodd domän",
     "Sending..." : "Skickar ...",
+    "Official" : "Officiell",
+    "Approved" : "Godkänd",
+    "Experimental" : "Experimentiell",
     "All" : "Alla",
     "Update to %s" : "Uppdatera till %s",
     "Please wait...." : "Var god vänta ...",
@@ -60,6 +63,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Avinstallerar ...",
     "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades",
     "Uninstall" : "Avinstallera",
+    "App update" : "Uppdatering av app",
     "Valid until {date}" : "Giltig t.o.m. {date}",
     "Delete" : "Radera",
     "An error occurred: {message}" : "Ett fel inträffade: {message}",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index b94ee22a6f..0de90bd292 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -45,6 +45,9 @@
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
     "Add trusted domain" : "Lägg till betrodd domän",
     "Sending..." : "Skickar ...",
+    "Official" : "Officiell",
+    "Approved" : "Godkänd",
+    "Experimental" : "Experimentiell",
     "All" : "Alla",
     "Update to %s" : "Uppdatera till %s",
     "Please wait...." : "Var god vänta ...",
@@ -58,6 +61,7 @@
     "Uninstalling ...." : "Avinstallerar ...",
     "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades",
     "Uninstall" : "Avinstallera",
+    "App update" : "Uppdatering av app",
     "Valid until {date}" : "Giltig t.o.m. {date}",
     "Delete" : "Radera",
     "An error occurred: {message}" : "Ett fel inträffade: {message}",