22 files changed, 114 insertions, 142 deletions
diff --git a/apps/sharebymail/l10n/de.js b/apps/sharebymail/l10n/de.js
index 4afc8207d31..95252e14e5e 100644
--- a/apps/sharebymail/l10n/de.js
+++ b/apps/sharebymail/l10n/de.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Senden der Freigabe über Mail ist fehlgeschlagen",
     "%s shared »%s« with you" : "%s hat „%s“ mit Dir geteilt",
     "%s shared »%s« with you on behalf of %s" : "%s hat »%s«  im Auftrag von %s mit Dir geteilt",
-    "Failed to create the E-mail" : "Erstellen der E-Mail ist fehlgeschalgen",
     "Password to access »%s« shared to you by %s" : "Das Passwort zum Zugriff auf %s wurde durch %s mit dir geteilt.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
+    "Share by mail" : "Geteilt über eine E-Mail",
+    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
+    "Send password by mail" : "Passwort per Mail senden",
+    "Failed to create the E-mail" : "Erstellen der E-Mail ist fehlgeschalgen",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« im Auftrag von %s mit Dir geteilt.\n\n%s\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« mit Dir geteilt.\n\n%s\n",
     "Cheers!" : "Noch einen schönen Tag!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo,\n\n%s hat %s mit dir geteilt.\nDu solltest bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.\n\nDies ist mit dem folgenden Passwort geschützt: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> im Auftrag von %s mit Dir geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Dir geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hallo,<br><br>%s hat <i>%s</i> mit dir geteilt.<br>Du solltest bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.<br><br>Dies ist mit dem folgenden Passwort geschützt: %s<br><br>",
-    "Share by mail" : "Geteilt über eine E-Mail",
-    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
-    "Send password by mail" : "Passwort per Mail senden"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Dir geteilt.<br><br>"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/de.json b/apps/sharebymail/l10n/de.json
index 2baab9fe0d9..40ef70e78a4 100644
--- a/apps/sharebymail/l10n/de.json
+++ b/apps/sharebymail/l10n/de.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Senden der Freigabe über Mail ist fehlgeschlagen",
     "%s shared »%s« with you" : "%s hat „%s“ mit Dir geteilt",
     "%s shared »%s« with you on behalf of %s" : "%s hat »%s«  im Auftrag von %s mit Dir geteilt",
-    "Failed to create the E-mail" : "Erstellen der E-Mail ist fehlgeschalgen",
     "Password to access »%s« shared to you by %s" : "Das Passwort zum Zugriff auf %s wurde durch %s mit dir geteilt.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
+    "Share by mail" : "Geteilt über eine E-Mail",
+    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
+    "Send password by mail" : "Passwort per Mail senden",
+    "Failed to create the E-mail" : "Erstellen der E-Mail ist fehlgeschalgen",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« im Auftrag von %s mit Dir geteilt.\n\n%s\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« mit Dir geteilt.\n\n%s\n",
     "Cheers!" : "Noch einen schönen Tag!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo,\n\n%s hat %s mit dir geteilt.\nDu solltest bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.\n\nDies ist mit dem folgenden Passwort geschützt: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> im Auftrag von %s mit Dir geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Dir geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hallo,<br><br>%s hat <i>%s</i> mit dir geteilt.<br>Du solltest bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.<br><br>Dies ist mit dem folgenden Passwort geschützt: %s<br><br>",
-    "Share by mail" : "Geteilt über eine E-Mail",
-    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
-    "Send password by mail" : "Passwort per Mail senden"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Dir geteilt.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/de_DE.js b/apps/sharebymail/l10n/de_DE.js
index e4961360323..4fde011dc88 100644
--- a/apps/sharebymail/l10n/de_DE.js
+++ b/apps/sharebymail/l10n/de_DE.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Fehler beim Senden der Freigabe per E-Mail",
     "%s shared »%s« with you" : "%s hat »%s« mit Ihnen geteilt",
     "%s shared »%s« with you on behalf of %s" : "%s hat »%s«  im Auftrag von %s mit Ihnen geteilt",
-    "Failed to create the E-mail" : "Erstellen der E-Mail fehlgeschlagen",
     "Password to access »%s« shared to you by %s" : "Das Passwort zum Zugriff auf %s wurde durch %s mit Ihnen geteilt.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
+    "Share by mail" : "Geteilt über eine E-Mail",
+    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
+    "Send password by mail" : "Passwort per Mail senden",
+    "Failed to create the E-mail" : "Erstellen der E-Mail fehlgeschlagen",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« im Auftrag von %s mit Ihnen geteilt.\n\n%s\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« mit Ihnen geteilt.\n\n%s\n",
     "Cheers!" : "Einen schönen Tag noch!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nSie sollten bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.\n\nDies ist mit dem folgenden Passwort geschützt: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> im Auftrag von %s mit Ihnen geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Ihnen geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hallo,<br><br>%s hat <i>%s</i> mit Ihnen geteilt.<br>Sie sollten bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.<br><br>Dies ist mit dem folgenden Passwort geschützt: %s<br><br>",
-    "Share by mail" : "Geteilt über eine E-Mail",
-    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
-    "Send password by mail" : "Passwort per Mail senden"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Ihnen geteilt.<br><br>"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/de_DE.json b/apps/sharebymail/l10n/de_DE.json
index 28e4f5566c6..3dfc7543680 100644
--- a/apps/sharebymail/l10n/de_DE.json
+++ b/apps/sharebymail/l10n/de_DE.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Fehler beim Senden der Freigabe per E-Mail",
     "%s shared »%s« with you" : "%s hat »%s« mit Ihnen geteilt",
     "%s shared »%s« with you on behalf of %s" : "%s hat »%s«  im Auftrag von %s mit Ihnen geteilt",
-    "Failed to create the E-mail" : "Erstellen der E-Mail fehlgeschlagen",
     "Password to access »%s« shared to you by %s" : "Das Passwort zum Zugriff auf %s wurde durch %s mit Ihnen geteilt.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
+    "Share by mail" : "Geteilt über eine E-Mail",
+    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
+    "Send password by mail" : "Passwort per Mail senden",
+    "Failed to create the E-mail" : "Erstellen der E-Mail fehlgeschlagen",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« im Auftrag von %s mit Ihnen geteilt.\n\n%s\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo,\n\n%s hat »%s« mit Ihnen geteilt.\n\n%s\n",
     "Cheers!" : "Einen schönen Tag noch!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nSie sollten bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.\n\nDies ist mit dem folgenden Passwort geschützt: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> im Auftrag von %s mit Ihnen geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Ihnen geteilt.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hallo,<br><br>%s hat <i>%s</i> mit Ihnen geteilt.<br>Sie sollten bereits eine separate E-Mail mit einem Zugriffslink erhalten haben.<br><br>Dies ist mit dem folgenden Passwort geschützt: %s<br><br>",
-    "Share by mail" : "Geteilt über eine E-Mail",
-    "Send a personalized link to a file or folder by mail." : "Einen personalisierten Link zu einer Datei oder Ordner per E-Mail versenden.",
-    "Send password by mail" : "Passwort per Mail senden"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo,<br><br>%s hat <a href=\"%s\">%s</a> mit Ihnen geteilt.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/es.js b/apps/sharebymail/l10n/es.js
index 6e2a15bba50..e86a037315f 100644
--- a/apps/sharebymail/l10n/es.js
+++ b/apps/sharebymail/l10n/es.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Falló enviar recurso compartido por correo electrónico",
     "%s shared »%s« with you" : "%s compartió »%s« con usted",
     "%s shared »%s« with you on behalf of %s" : "%s compartió »%s« con usted a nombre de %s",
-    "Failed to create the E-mail" : "Falló crear el correo electrónico",
     "Password to access »%s« shared to you by %s" : "Contraseña para acceder »%s« compartido con usted por %s",
     "Could not find share" : "No se pudo encontrar el recurso compartido",
+    "Share by mail" : "Enviado por correo electrónico",
+    "Send a personalized link to a file or folder by mail." : "Enviar un enlace personalizado a uno de los archivos o carpetas por correo electrónico.",
+    "Send password by mail" : "Enviar contraseñas por email",
+    "Failed to create the E-mail" : "Falló crear el correo electrónico",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "¡Hola!,\n\n%s comapartió »%s« con usted a nombre de %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hola,\n\n%s compartió »%s« con usted.\n\n%s\n\n",
     "Cheers!" : "¡Ánimo!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hola que tal,\n\n%s compartió »%s« contigo.\nDeberías ya haber recibido un mensaje separado con un enlace para acceder a él.\n\nEstá protegido por la siguiente contraseña: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hola,<br><br>%s compartió <a href=\"%s\">%s</a> con usted a nombre de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola,<br><br>%s compartió <a href=\"%s\">%s</a> con usted.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hola que tal,<br><br>%s compartió <i>%s</i> contigo.<br>Deberías ya haber recibido un mensaje separado con un enlace para acceder a él.<br><br>Está protegido por la siguiente contraseña: %s<br><br>",
-    "Share by mail" : "Enviado por correo electrónico",
-    "Send a personalized link to a file or folder by mail." : "Enviar un enlace personalizado a uno de los archivos o carpetas por correo electrónico.",
-    "Send password by mail" : "Enviar contraseñas por email"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola,<br><br>%s compartió <a href=\"%s\">%s</a> con usted.<br><br>"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/es.json b/apps/sharebymail/l10n/es.json
index 587497e72d9..f169ce654d8 100644
--- a/apps/sharebymail/l10n/es.json
+++ b/apps/sharebymail/l10n/es.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Falló enviar recurso compartido por correo electrónico",
     "%s shared »%s« with you" : "%s compartió »%s« con usted",
     "%s shared »%s« with you on behalf of %s" : "%s compartió »%s« con usted a nombre de %s",
-    "Failed to create the E-mail" : "Falló crear el correo electrónico",
     "Password to access »%s« shared to you by %s" : "Contraseña para acceder »%s« compartido con usted por %s",
     "Could not find share" : "No se pudo encontrar el recurso compartido",
+    "Share by mail" : "Enviado por correo electrónico",
+    "Send a personalized link to a file or folder by mail." : "Enviar un enlace personalizado a uno de los archivos o carpetas por correo electrónico.",
+    "Send password by mail" : "Enviar contraseñas por email",
+    "Failed to create the E-mail" : "Falló crear el correo electrónico",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "¡Hola!,\n\n%s comapartió »%s« con usted a nombre de %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hola,\n\n%s compartió »%s« con usted.\n\n%s\n\n",
     "Cheers!" : "¡Ánimo!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hola que tal,\n\n%s compartió »%s« contigo.\nDeberías ya haber recibido un mensaje separado con un enlace para acceder a él.\n\nEstá protegido por la siguiente contraseña: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hola,<br><br>%s compartió <a href=\"%s\">%s</a> con usted a nombre de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola,<br><br>%s compartió <a href=\"%s\">%s</a> con usted.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hola que tal,<br><br>%s compartió <i>%s</i> contigo.<br>Deberías ya haber recibido un mensaje separado con un enlace para acceder a él.<br><br>Está protegido por la siguiente contraseña: %s<br><br>",
-    "Share by mail" : "Enviado por correo electrónico",
-    "Send a personalized link to a file or folder by mail." : "Enviar un enlace personalizado a uno de los archivos o carpetas por correo electrónico.",
-    "Send password by mail" : "Enviar contraseñas por email"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola,<br><br>%s compartió <a href=\"%s\">%s</a> con usted.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/es_MX.js b/apps/sharebymail/l10n/es_MX.js
index 0cc51120cb9..6e6e0f69018 100644
--- a/apps/sharebymail/l10n/es_MX.js
+++ b/apps/sharebymail/l10n/es_MX.js
@@ -13,16 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Se presentó una falla al enviar el recurso compartido por correo electrónico",
     "%s shared »%s« with you" : "%s ha compartido »%s« con usted",
     "%s shared »%s« with you on behalf of %s" : "%s ha compartido »%s« con usted a nombre de %s",
-    "Failed to create the E-mail" : "Se presentó una falla al crear el correo electrónico",
     "Password to access »%s« shared to you by %s" : "Contraseña para acceder  »%s« compartido con usted por %s ",
     "Could not find share" : "No fue posible encontrar el elemento compartido",
+    "Share by mail" : "Compartir por correo",
+    "Send a personalized link to a file or folder by mail." : "Enviar por correo una liga personalizada a un archivo o carpeta.",
+    "Send password by mail" : "La contraseña ha sido enviada por correo",
+    "Failed to create the E-mail" : "Se presentó una falla al crear el correo electrónico",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hola,\n\n%s ha compartido »%s« con usted a nombre de %s.\n\n%s\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hola,\n\n%s ha compartido »%s« con usted.\n\n%s\n",
     "Cheers!" : "¡Saludos!",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hola,<br><br>%s ha compartido <a href=\"%s\">%s</a> con usted a nombre de %s.<br><br> ",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola, <br><br>%s ha compartido <a href=\"%s\">%s</a> con usted.<br><br> ",
-    "Share by mail" : "Compartir por correo",
-    "Send a personalized link to a file or folder by mail." : "Enviar por correo una liga personalizada a un archivo o carpeta.",
-    "Send password by mail" : "La contraseña ha sido enviada por correo"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola, <br><br>%s ha compartido <a href=\"%s\">%s</a> con usted.<br><br> "
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/es_MX.json b/apps/sharebymail/l10n/es_MX.json
index 86c8eb996d8..28f38425144 100644
--- a/apps/sharebymail/l10n/es_MX.json
+++ b/apps/sharebymail/l10n/es_MX.json
@@ -11,16 +11,16 @@
     "Failed to send share by E-mail" : "Se presentó una falla al enviar el recurso compartido por correo electrónico",
     "%s shared »%s« with you" : "%s ha compartido »%s« con usted",
     "%s shared »%s« with you on behalf of %s" : "%s ha compartido »%s« con usted a nombre de %s",
-    "Failed to create the E-mail" : "Se presentó una falla al crear el correo electrónico",
     "Password to access »%s« shared to you by %s" : "Contraseña para acceder  »%s« compartido con usted por %s ",
     "Could not find share" : "No fue posible encontrar el elemento compartido",
+    "Share by mail" : "Compartir por correo",
+    "Send a personalized link to a file or folder by mail." : "Enviar por correo una liga personalizada a un archivo o carpeta.",
+    "Send password by mail" : "La contraseña ha sido enviada por correo",
+    "Failed to create the E-mail" : "Se presentó una falla al crear el correo electrónico",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hola,\n\n%s ha compartido »%s« con usted a nombre de %s.\n\n%s\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hola,\n\n%s ha compartido »%s« con usted.\n\n%s\n",
     "Cheers!" : "¡Saludos!",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hola,<br><br>%s ha compartido <a href=\"%s\">%s</a> con usted a nombre de %s.<br><br> ",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola, <br><br>%s ha compartido <a href=\"%s\">%s</a> con usted.<br><br> ",
-    "Share by mail" : "Compartir por correo",
-    "Send a personalized link to a file or folder by mail." : "Enviar por correo una liga personalizada a un archivo o carpeta.",
-    "Send password by mail" : "La contraseña ha sido enviada por correo"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hola, <br><br>%s ha compartido <a href=\"%s\">%s</a> con usted.<br><br> "
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/fr.js b/apps/sharebymail/l10n/fr.js
index 54e0aa6662a..9b1bcca909b 100644
--- a/apps/sharebymail/l10n/fr.js
+++ b/apps/sharebymail/l10n/fr.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Erreur lors de l'envoi du partage par email",
     "%s shared »%s« with you" : "%s a partagé «%s» avec vous",
     "%s shared »%s« with you on behalf of %s" : "%s a partagé «%s» avec vous de la part de %s",
-    "Failed to create the E-mail" : "Erreur lors de la création du mail",
     "Password to access »%s« shared to you by %s" : "Mot de passe pour accèder à  «%s» partagé par %s",
     "Could not find share" : "Impossible de trouver le partage",
+    "Share by mail" : "Partage par email",
+    "Send a personalized link to a file or folder by mail." : "Envoyer un lien personnalisé vers un fichier ou un dossier par email.",
+    "Send password by mail" : "Envoyer le mot de passe par email",
+    "Failed to create the E-mail" : "Erreur lors de la création du mail",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Bonjour,\n\n%s a partagé «%s» avec vous de la part de %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Bonjour,\n\n%s a partagé «%s» avec vous.\n\n%s\n\n",
     "Cheers!" : "À bientôt !",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Bonjour,\n\n%s a partagé «%s» avec vous.\nVous avez normalement déjà reçu un autre email avec un lien pour y accéder.\n\nIl est protégé avec le mot de passe suivant : %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Bonjour,<br><br>%s a partagé <a href=\"%s\">%s</a> avec vous de la part de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Bonjour,<br><br>%s a partagé <a href=\"%s\">%s</a> avec vous.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Bonjour,<br><br>%s a partagé <i>%s</i> avec vous.<br>Vous avez normalement déjà reçu un autre email avec un lien pour y accéder.<br><br> Il est protégé avec le mot de passe suivant : %s<br><br>",
-    "Share by mail" : "Partage par email",
-    "Send a personalized link to a file or folder by mail." : "Envoyer un lien personnalisé vers un fichier ou un dossier par email.",
-    "Send password by mail" : "Envoyer le mot de passe par email"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Bonjour,<br><br>%s a partagé <a href=\"%s\">%s</a> avec vous.<br><br>"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/sharebymail/l10n/fr.json b/apps/sharebymail/l10n/fr.json
index 7ab94893771..6bb1e7d15ee 100644
--- a/apps/sharebymail/l10n/fr.json
+++ b/apps/sharebymail/l10n/fr.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Erreur lors de l'envoi du partage par email",
     "%s shared »%s« with you" : "%s a partagé «%s» avec vous",
     "%s shared »%s« with you on behalf of %s" : "%s a partagé «%s» avec vous de la part de %s",
-    "Failed to create the E-mail" : "Erreur lors de la création du mail",
     "Password to access »%s« shared to you by %s" : "Mot de passe pour accèder à  «%s» partagé par %s",
     "Could not find share" : "Impossible de trouver le partage",
+    "Share by mail" : "Partage par email",
+    "Send a personalized link to a file or folder by mail." : "Envoyer un lien personnalisé vers un fichier ou un dossier par email.",
+    "Send password by mail" : "Envoyer le mot de passe par email",
+    "Failed to create the E-mail" : "Erreur lors de la création du mail",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Bonjour,\n\n%s a partagé «%s» avec vous de la part de %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Bonjour,\n\n%s a partagé «%s» avec vous.\n\n%s\n\n",
     "Cheers!" : "À bientôt !",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Bonjour,\n\n%s a partagé «%s» avec vous.\nVous avez normalement déjà reçu un autre email avec un lien pour y accéder.\n\nIl est protégé avec le mot de passe suivant : %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Bonjour,<br><br>%s a partagé <a href=\"%s\">%s</a> avec vous de la part de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Bonjour,<br><br>%s a partagé <a href=\"%s\">%s</a> avec vous.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Bonjour,<br><br>%s a partagé <i>%s</i> avec vous.<br>Vous avez normalement déjà reçu un autre email avec un lien pour y accéder.<br><br> Il est protégé avec le mot de passe suivant : %s<br><br>",
-    "Share by mail" : "Partage par email",
-    "Send a personalized link to a file or folder by mail." : "Envoyer un lien personnalisé vers un fichier ou un dossier par email.",
-    "Send password by mail" : "Envoyer le mot de passe par email"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Bonjour,<br><br>%s a partagé <a href=\"%s\">%s</a> avec vous.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/nl.js b/apps/sharebymail/l10n/nl.js
index 4a69b3a2eb1..18c6c0928ba 100644
--- a/apps/sharebymail/l10n/nl.js
+++ b/apps/sharebymail/l10n/nl.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Fout bij delen via e-mail",
     "%s shared »%s« with you" : "%s deelde »%s« met jou",
     "%s shared »%s« with you on behalf of %s" : "%s deelde »%s« met jou in naam van %s",
-    "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt",
     "Password to access »%s« shared to you by %s" : "Toegangswachtwoord »%s« gedeeld met je door %s",
     "Could not find share" : "Kon gedeeld niet vinden",
+    "Share by mail" : "Gedeeld via een E-mail",
+    "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.",
+    "Send password by mail" : "Wachtwoord per E-mail verzenden",
+    "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou namens %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou.\n\n%s\n\n",
     "Cheers!" : "Proost!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo daar,\n\n%s deelt »%s« met je.\nJe zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.\n\nDe link is beschermd met het volgende wachtwoord: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou namens %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Halllo daar ,<br><br>%s deelt<i>%s</i> met je.<br>Je zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.<br><br>De link is beschermd met het volgende wachtwoord: %s<br><br>",
-    "Share by mail" : "Gedeeld via een E-mail",
-    "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.",
-    "Send password by mail" : "Wachtwoord per E-mail verzenden"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/nl.json b/apps/sharebymail/l10n/nl.json
index cb517ba5268..6cc2c0d4ff9 100644
--- a/apps/sharebymail/l10n/nl.json
+++ b/apps/sharebymail/l10n/nl.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Fout bij delen via e-mail",
     "%s shared »%s« with you" : "%s deelde »%s« met jou",
     "%s shared »%s« with you on behalf of %s" : "%s deelde »%s« met jou in naam van %s",
-    "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt",
     "Password to access »%s« shared to you by %s" : "Toegangswachtwoord »%s« gedeeld met je door %s",
     "Could not find share" : "Kon gedeeld niet vinden",
+    "Share by mail" : "Gedeeld via een E-mail",
+    "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.",
+    "Send password by mail" : "Wachtwoord per E-mail verzenden",
+    "Failed to create the E-mail" : "Opmaken van de e-mail is mislukt",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou namens %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hallo daar,\n\n%s deelde »%s« met jou.\n\n%s\n\n",
     "Cheers!" : "Proost!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hallo daar,\n\n%s deelt »%s« met je.\nJe zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.\n\nDe link is beschermd met het volgende wachtwoord: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou namens %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Halllo daar ,<br><br>%s deelt<i>%s</i> met je.<br>Je zou ondertussen een apparte E-mail moet hebben ontvangen met een link om toegang te verkrijgen.<br><br>De link is beschermd met het volgende wachtwoord: %s<br><br>",
-    "Share by mail" : "Gedeeld via een E-mail",
-    "Send a personalized link to a file or folder by mail." : "Zend een gepersonialiseerde link naar een bestand of map per mail.",
-    "Send password by mail" : "Wachtwoord per E-mail verzenden"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hallo daar,<br><br>%s deelde <a href=\"%s\">%s</a> met jou.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/pl.js b/apps/sharebymail/l10n/pl.js
index 23895615b26..b69418f08fb 100644
--- a/apps/sharebymail/l10n/pl.js
+++ b/apps/sharebymail/l10n/pl.js
@@ -13,8 +13,12 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Nie udało się wysłać współdzielenia przez e-maila",
     "%s shared »%s« with you" : "%s współdzieli »%s« z tobą",
     "%s shared »%s« with you on behalf of %s" : "%s współdzieli »%s« z tobą w imieniu %s",
-    "Failed to create the E-mail" : "Nie udało się utworzyć e-maila",
+    "Password to access »%s« shared to you by %s" : "Hasło dostępu do »%s« jest udostępnione tobie przez %s",
     "Could not find share" : "Nie można odnaleźć współdzielonego obiektu",
+    "Share by mail" : "Współdzielone e-mailem",
+    "Send a personalized link to a file or folder by mail." : "Wyślij spersonalizowany link do pliku lub folderu e-mailem.",
+    "Send password by mail" : "Wyślij hasło e-mailem",
+    "Failed to create the E-mail" : "Nie udało się utworzyć e-maila",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hej,\n\n%s współdzieli »%s« z tobą w imieniu %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hej,\n\n%s współdzieli »%s« z tobą.\n\n%s\n\n",
     "Cheers!" : "Zdrówko!",
diff --git a/apps/sharebymail/l10n/pl.json b/apps/sharebymail/l10n/pl.json
index 57cc762f874..bad56e2d23b 100644
--- a/apps/sharebymail/l10n/pl.json
+++ b/apps/sharebymail/l10n/pl.json
@@ -11,8 +11,12 @@
     "Failed to send share by E-mail" : "Nie udało się wysłać współdzielenia przez e-maila",
     "%s shared »%s« with you" : "%s współdzieli »%s« z tobą",
     "%s shared »%s« with you on behalf of %s" : "%s współdzieli »%s« z tobą w imieniu %s",
-    "Failed to create the E-mail" : "Nie udało się utworzyć e-maila",
+    "Password to access »%s« shared to you by %s" : "Hasło dostępu do »%s« jest udostępnione tobie przez %s",
     "Could not find share" : "Nie można odnaleźć współdzielonego obiektu",
+    "Share by mail" : "Współdzielone e-mailem",
+    "Send a personalized link to a file or folder by mail." : "Wyślij spersonalizowany link do pliku lub folderu e-mailem.",
+    "Send password by mail" : "Wyślij hasło e-mailem",
+    "Failed to create the E-mail" : "Nie udało się utworzyć e-maila",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hej,\n\n%s współdzieli »%s« z tobą w imieniu %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hej,\n\n%s współdzieli »%s« z tobą.\n\n%s\n\n",
     "Cheers!" : "Zdrówko!",
diff --git a/apps/sharebymail/l10n/pt_BR.js b/apps/sharebymail/l10n/pt_BR.js
index cafe8ffb746..91f456cdc2e 100644
--- a/apps/sharebymail/l10n/pt_BR.js
+++ b/apps/sharebymail/l10n/pt_BR.js
@@ -10,21 +10,19 @@ OC.L10N.register(
     "%3$s shared %1$s with %2$s by mail" : "%3$s compartilou %1$s com %2$s por email",
     "{actor} shared {file} with {email} by mail" : "{actor} compartilhou {file} com {email} por email",
     "Sharing %s failed, this item is already shared with %s" : "O compartilhamento %s falhou, este item já está compartilhado com %s",
-    "Failed to send share by E-mail" : "Falha ao enviar compartilhamento por e-mail",
+    "Failed to send share by E-mail" : "Falha ao enviar compartilhamento por email",
     "%s shared »%s« with you" : "%s compartilhado »%s« com você",
     "%s shared »%s« with you on behalf of %s" : "%s compartilhado »%s« com você em nome de %s",
-    "Failed to create the E-mail" : "Falha ao criar o E-mail",
     "Password to access »%s« shared to you by %s" : "Senha para acessar  %s compartilhado com você por  %s",
     "Could not find share" : "Não foi possível encontrar o compartilhamento",
+    "Share by mail" : "Compartilhar por email",
+    "Send a personalized link to a file or folder by mail." : "Envie um link personalizado para um arquivo ou pasta por email.",
+    "Send password by mail" : "Enviar senha por email",
+    "Failed to create the E-mail" : "Falhou ao criar o email",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Olá,\n%s compartilhou »%s« com você em nome de %s.\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Olá,\n%s compartilhou »%s« com você.\n%s\n",
     "Cheers!" : "Felicidades!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Olá,\n%s compartilhou %s com você.\nVocê já deve ter recebido um e-mail separado com um link para acessá-lo.\nÉ protegido com a seguinte senha: %s\n",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Olá,<br><br>%s compartilhado <a href=\"%s\">%s</a> com voc^em nome de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Olá,<br><br>%s compartilhado <a href=\"%s\">%s</a> com você.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Olá, <br> <br> %s shared <i>%s</ i> com você. <br> Você já deve ter recebido um e-mail separado com um link para acessá-lo. <br><br> Ele é protegido com o seguinte Senha: %s",
-    "Share by mail" : "Partilhar por correio",
-    "Send a personalized link to a file or folder by mail." : "Envie um link personalizado para um arquivo ou pasta por e-mail.",
-    "Send password by mail" : "nviar senha por e-mail"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Olá,<br><br>%s compartilhou <a href=\"%s\">%s</a> com você em nome de %s.<br><br>",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Olá,<br><br>%s compartilhou <a href=\"%s\">%s</a> com você.<br><br>"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/sharebymail/l10n/pt_BR.json b/apps/sharebymail/l10n/pt_BR.json
index 783c0cec8fe..d54d3a30735 100644
--- a/apps/sharebymail/l10n/pt_BR.json
+++ b/apps/sharebymail/l10n/pt_BR.json
@@ -8,21 +8,19 @@
     "%3$s shared %1$s with %2$s by mail" : "%3$s compartilou %1$s com %2$s por email",
     "{actor} shared {file} with {email} by mail" : "{actor} compartilhou {file} com {email} por email",
     "Sharing %s failed, this item is already shared with %s" : "O compartilhamento %s falhou, este item já está compartilhado com %s",
-    "Failed to send share by E-mail" : "Falha ao enviar compartilhamento por e-mail",
+    "Failed to send share by E-mail" : "Falha ao enviar compartilhamento por email",
     "%s shared »%s« with you" : "%s compartilhado »%s« com você",
     "%s shared »%s« with you on behalf of %s" : "%s compartilhado »%s« com você em nome de %s",
-    "Failed to create the E-mail" : "Falha ao criar o E-mail",
     "Password to access »%s« shared to you by %s" : "Senha para acessar  %s compartilhado com você por  %s",
     "Could not find share" : "Não foi possível encontrar o compartilhamento",
+    "Share by mail" : "Compartilhar por email",
+    "Send a personalized link to a file or folder by mail." : "Envie um link personalizado para um arquivo ou pasta por email.",
+    "Send password by mail" : "Enviar senha por email",
+    "Failed to create the E-mail" : "Falhou ao criar o email",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Olá,\n%s compartilhou »%s« com você em nome de %s.\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Olá,\n%s compartilhou »%s« com você.\n%s\n",
     "Cheers!" : "Felicidades!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Olá,\n%s compartilhou %s com você.\nVocê já deve ter recebido um e-mail separado com um link para acessá-lo.\nÉ protegido com a seguinte senha: %s\n",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Olá,<br><br>%s compartilhado <a href=\"%s\">%s</a> com voc^em nome de %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Olá,<br><br>%s compartilhado <a href=\"%s\">%s</a> com você.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Olá, <br> <br> %s shared <i>%s</ i> com você. <br> Você já deve ter recebido um e-mail separado com um link para acessá-lo. <br><br> Ele é protegido com o seguinte Senha: %s",
-    "Share by mail" : "Partilhar por correio",
-    "Send a personalized link to a file or folder by mail." : "Envie um link personalizado para um arquivo ou pasta por e-mail.",
-    "Send password by mail" : "nviar senha por e-mail"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Olá,<br><br>%s compartilhou <a href=\"%s\">%s</a> com você em nome de %s.<br><br>",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Olá,<br><br>%s compartilhou <a href=\"%s\">%s</a> com você.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/ru.js b/apps/sharebymail/l10n/ru.js
index 07679c8d2aa..58eb2236ab2 100644
--- a/apps/sharebymail/l10n/ru.js
+++ b/apps/sharebymail/l10n/ru.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Не удалось поделиться по e-mail",
     "%s shared »%s« with you" : "%s поделился »%s« с вами",
     "%s shared »%s« with you on behalf of %s" : "%s поделился »%s« с вами от имени %s",
-    "Failed to create the E-mail" : "Не удалось создать e-mail",
     "Password to access »%s« shared to you by %s" : "Пароль для доступа к »%s«, которым поделился %s",
     "Could not find share" : "Не удалось найти общий ресурс",
+    "Share by mail" : "Поделиться по почте",
+    "Send a personalized link to a file or folder by mail." : "Отправить персональную ссылку на файл или каталог по почте.",
+    "Send password by mail" : "Отправить пароль почтой",
+    "Failed to create the E-mail" : "Не удалось создать e-mail",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Привет,\n\n%s предоставил вам общий доступ к »%s« от имени %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Привет,\n\n%s предоставил вам общий доступ к »%s«.\n\n%s\n\n",
     "Cheers!" : "Всего наилучшего!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Привет,\n\n%s поделился »%s«.\nВы уже должны были получить отдельное письмо с сслкой для доступа.\n\nРесурс защищён следующим паролем: %s\n\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Привет,<br><br>%s вам предоставил общий доступ к <a href=\"%s\">%s</a> от имени %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Привет,<br><br>%s вам предоставил общий доступ к <a href=\"%s\">%s</a>.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Привет,<br><br>%s поделился <i>%s</i>. <br> Вы уже должны были получить отдельное письмо с сслкой для доступа.<br><br>Ресурс защищён следующим паролем: %s<br><br>",
-    "Share by mail" : "Поделиться по почте",
-    "Send a personalized link to a file or folder by mail." : "Отправить персональную ссылку на файл или каталог по почте.",
-    "Send password by mail" : "Отправить пароль почтой"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Привет,<br><br>%s вам предоставил общий доступ к <a href=\"%s\">%s</a>.<br><br>"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/sharebymail/l10n/ru.json b/apps/sharebymail/l10n/ru.json
index c9fce29263a..93336804fee 100644
--- a/apps/sharebymail/l10n/ru.json
+++ b/apps/sharebymail/l10n/ru.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Не удалось поделиться по e-mail",
     "%s shared »%s« with you" : "%s поделился »%s« с вами",
     "%s shared »%s« with you on behalf of %s" : "%s поделился »%s« с вами от имени %s",
-    "Failed to create the E-mail" : "Не удалось создать e-mail",
     "Password to access »%s« shared to you by %s" : "Пароль для доступа к »%s«, которым поделился %s",
     "Could not find share" : "Не удалось найти общий ресурс",
+    "Share by mail" : "Поделиться по почте",
+    "Send a personalized link to a file or folder by mail." : "Отправить персональную ссылку на файл или каталог по почте.",
+    "Send password by mail" : "Отправить пароль почтой",
+    "Failed to create the E-mail" : "Не удалось создать e-mail",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Привет,\n\n%s предоставил вам общий доступ к »%s« от имени %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Привет,\n\n%s предоставил вам общий доступ к »%s«.\n\n%s\n\n",
     "Cheers!" : "Всего наилучшего!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Привет,\n\n%s поделился »%s«.\nВы уже должны были получить отдельное письмо с сслкой для доступа.\n\nРесурс защищён следующим паролем: %s\n\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Привет,<br><br>%s вам предоставил общий доступ к <a href=\"%s\">%s</a> от имени %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Привет,<br><br>%s вам предоставил общий доступ к <a href=\"%s\">%s</a>.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Привет,<br><br>%s поделился <i>%s</i>. <br> Вы уже должны были получить отдельное письмо с сслкой для доступа.<br><br>Ресурс защищён следующим паролем: %s<br><br>",
-    "Share by mail" : "Поделиться по почте",
-    "Send a personalized link to a file or folder by mail." : "Отправить персональную ссылку на файл или каталог по почте.",
-    "Send password by mail" : "Отправить пароль почтой"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Привет,<br><br>%s вам предоставил общий доступ к <a href=\"%s\">%s</a>.<br><br>"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/sv.js b/apps/sharebymail/l10n/sv.js
index 486f0666593..c158a1113b1 100644
--- a/apps/sharebymail/l10n/sv.js
+++ b/apps/sharebymail/l10n/sv.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Misslyckades att dela via e-post",
     "%s shared »%s« with you" : "%s delade »%s« med dig",
     "%s shared »%s« with you on behalf of %s" : "%s delade »%s« med dig på begäran av %s",
-    "Failed to create the E-mail" : "Misslyckades att skapa e-post",
     "Password to access »%s« shared to you by %s" : "Lösenord för att få tillgång till »%s« delat med dig av %s",
     "Could not find share" : "Kunde inte hitta delning",
+    "Share by mail" : "Dela via e-mejl",
+    "Send a personalized link to a file or folder by mail." : "Skicka en personlig länk till en fil eller mapp via e-mejl",
+    "Send password by mail" : "Skicka lösenord med e-post",
+    "Failed to create the E-mail" : "Misslyckades att skapa e-post",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hej!\n\n%s delade »%s« med dig från%s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hej,\n\n%s delade »%s« med dig.\n\n%s\n",
     "Cheers!" : "Ha det fint!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hej!\n\n%s delade »%s« med dig.\nDu borde ha fått ett separat e-mejl med länk för att få tillgång till det.\n\nDet är skyddat med följande lösnord: %s\n\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig från  %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hej!<br><br>%s delade <i>%s</i> med dig.<br>Du borde ha fått ett separat e-mejl med en länk för att få tillgång till det.<br><br>Det är skyddat med följande lösenord: %s<br><br>",
-    "Share by mail" : "Dela via e-mejl",
-    "Send a personalized link to a file or folder by mail." : "Skicka en personlig länk till en fil eller mapp via e-mejl",
-    "Send password by mail" : "Skicka lösenord med e-post"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig.<br><br>"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/sv.json b/apps/sharebymail/l10n/sv.json
index e295de544ea..a76bf446c6a 100644
--- a/apps/sharebymail/l10n/sv.json
+++ b/apps/sharebymail/l10n/sv.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Misslyckades att dela via e-post",
     "%s shared »%s« with you" : "%s delade »%s« med dig",
     "%s shared »%s« with you on behalf of %s" : "%s delade »%s« med dig på begäran av %s",
-    "Failed to create the E-mail" : "Misslyckades att skapa e-post",
     "Password to access »%s« shared to you by %s" : "Lösenord för att få tillgång till »%s« delat med dig av %s",
     "Could not find share" : "Kunde inte hitta delning",
+    "Share by mail" : "Dela via e-mejl",
+    "Send a personalized link to a file or folder by mail." : "Skicka en personlig länk till en fil eller mapp via e-mejl",
+    "Send password by mail" : "Skicka lösenord med e-post",
+    "Failed to create the E-mail" : "Misslyckades att skapa e-post",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hej!\n\n%s delade »%s« med dig från%s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hej,\n\n%s delade »%s« med dig.\n\n%s\n",
     "Cheers!" : "Ha det fint!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Hej!\n\n%s delade »%s« med dig.\nDu borde ha fått ett separat e-mejl med länk för att få tillgång till det.\n\nDet är skyddat med följande lösnord: %s\n\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig från  %s.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Hej!<br><br>%s delade <i>%s</i> med dig.<br>Du borde ha fått ett separat e-mejl med en länk för att få tillgång till det.<br><br>Det är skyddat med följande lösenord: %s<br><br>",
-    "Share by mail" : "Dela via e-mejl",
-    "Send a personalized link to a file or folder by mail." : "Skicka en personlig länk till en fil eller mapp via e-mejl",
-    "Send password by mail" : "Skicka lösenord med e-post"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hej!<br><br>%s delade <a href=\"%s\">%s</a> med dig.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
 \ No newline at end of file
diff --git a/apps/sharebymail/l10n/tr.js b/apps/sharebymail/l10n/tr.js
index e7c3944ed31..e41fafcb943 100644
--- a/apps/sharebymail/l10n/tr.js
+++ b/apps/sharebymail/l10n/tr.js
@@ -13,18 +13,16 @@ OC.L10N.register(
     "Failed to send share by E-mail" : "Paylaşım e-postası gönderilemedi",
     "%s shared »%s« with you" : "%s sizinle »%s« ögesini paylaştı",
     "%s shared »%s« with you on behalf of %s" : "%s sizinle »%s« ögesini %s adına paylaştı",
-    "Failed to create the E-mail" : "E-posta oluşturulamadı",
     "Password to access »%s« shared to you by %s" : "»%s« için sizin tarafınızdan %s üzerinden paylaşılan erişim parolası",
     "Could not find share" : "Paylaşım bulunamadı",
+    "Share by mail" : "E-posta ile paylaş",
+    "Send a personalized link to a file or folder by mail." : "Bir dosya ya da klasörün kişiselleştirilmiş bağlantısını e-posta ile gönderin.",
+    "Send password by mail" : "Parolayı e-posta ile gönder",
+    "Failed to create the E-mail" : "E-posta oluşturulamadı",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Merhaba,\n\n%s sizinle »%s« ögesini %s adına paylaştı.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Merhaba,\n\n%s sizinle »%s« ögesini paylaştı.\n\n%s\n\n",
     "Cheers!" : "Hoşça kalın!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Merhaba\n\n%s sizinle »%s« paylaştı.\nErişim bilgilerini içeren başka bir e-posta daha gönderilmiş olmalı.\n\nKoruma parolası: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Merhaba,<br><br>%s sizinle <a href=\"%s\">%s</a> ögesini %s adına paylaştı.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Merhaba,<br><br>%s sizinle <a href=\"%s\">%s</a> ögesini paylaştı.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Merhaba,<br><br>%s sizinle <i>%s</i> paylaştı.<br>Erişim bilgilerini içeren başka bir e-posta daha gönderilmiş olmalı.<br><br> Koruma parolası: %s<br><br>",
-    "Share by mail" : "E-posta ile paylaş",
-    "Send a personalized link to a file or folder by mail." : "Bir dosya ya da klasörün kişiselleştirilmiş bağlantısını e-posta ile gönderin.",
-    "Send password by mail" : "Parolayı e-posta ile gönder"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Merhaba,<br><br>%s sizinle <a href=\"%s\">%s</a> ögesini paylaştı.<br><br>"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/sharebymail/l10n/tr.json b/apps/sharebymail/l10n/tr.json
index c214174465c..e87aa1ba2c4 100644
--- a/apps/sharebymail/l10n/tr.json
+++ b/apps/sharebymail/l10n/tr.json
@@ -11,18 +11,16 @@
     "Failed to send share by E-mail" : "Paylaşım e-postası gönderilemedi",
     "%s shared »%s« with you" : "%s sizinle »%s« ögesini paylaştı",
     "%s shared »%s« with you on behalf of %s" : "%s sizinle »%s« ögesini %s adına paylaştı",
-    "Failed to create the E-mail" : "E-posta oluşturulamadı",
     "Password to access »%s« shared to you by %s" : "»%s« için sizin tarafınızdan %s üzerinden paylaşılan erişim parolası",
     "Could not find share" : "Paylaşım bulunamadı",
+    "Share by mail" : "E-posta ile paylaş",
+    "Send a personalized link to a file or folder by mail." : "Bir dosya ya da klasörün kişiselleştirilmiş bağlantısını e-posta ile gönderin.",
+    "Send password by mail" : "Parolayı e-posta ile gönder",
+    "Failed to create the E-mail" : "E-posta oluşturulamadı",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Merhaba,\n\n%s sizinle »%s« ögesini %s adına paylaştı.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Merhaba,\n\n%s sizinle »%s« ögesini paylaştı.\n\n%s\n\n",
     "Cheers!" : "Hoşça kalın!",
-    "Hey there,\n\n%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n\nIt is protected with the following password: %s\n\n" : "Merhaba\n\n%s sizinle »%s« paylaştı.\nErişim bilgilerini içeren başka bir e-posta daha gönderilmiş olmalı.\n\nKoruma parolası: %s\n",
     "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Merhaba,<br><br>%s sizinle <a href=\"%s\">%s</a> ögesini %s adına paylaştı.<br><br>",
-    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Merhaba,<br><br>%s sizinle <a href=\"%s\">%s</a> ögesini paylaştı.<br><br>",
-    "Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>" : "Merhaba,<br><br>%s sizinle <i>%s</i> paylaştı.<br>Erişim bilgilerini içeren başka bir e-posta daha gönderilmiş olmalı.<br><br> Koruma parolası: %s<br><br>",
-    "Share by mail" : "E-posta ile paylaş",
-    "Send a personalized link to a file or folder by mail." : "Bir dosya ya da klasörün kişiselleştirilmiş bağlantısını e-posta ile gönderin.",
-    "Send password by mail" : "Parolayı e-posta ile gönder"
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Merhaba,<br><br>%s sizinle <a href=\"%s\">%s</a> ögesini paylaştı.<br><br>"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
 \ No newline at end of file