diff --git a/apps/federatedfilesharing/l10n/pl.js b/apps/federatedfilesharing/l10n/pl.js
index 8a51bfc13d2198e6a5f0c81d9fcad2a8cae3a739..282c7bbf129300e91360047f6d4d7c1df2bc665a 100644
--- a/apps/federatedfilesharing/l10n/pl.js
+++ b/apps/federatedfilesharing/l10n/pl.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "Open documentation" : "Otwórz dokumentację",
     "Allow users on this server to send shares to other servers" : "Zezwalaj użytkownikom na tym serwerze wysłać udostępnienia do innych serwerów",
     "Allow users on this server to receive shares from other servers" : "Zezwalaj użytkownikom na tym serwerze do otrzymania udostępnień z innych serwerów",
+    "Search global and public address book for users" : "Szukaj użytkowników w globalnej i publicznej książce adresowej",
     "Federated Cloud" : "Stowarzyszona Chmura",
     "Your Federated Cloud ID:" : "Twoje ID Stowarzyszonej Chmury:",
     "Share it:" : "Udostępnij to:",
diff --git a/apps/federatedfilesharing/l10n/pl.json b/apps/federatedfilesharing/l10n/pl.json
index f84f2d022536a536337b8946c7724a21fcdc0763..18c54c89d423bb280f0be3c03f80a12056bd81b9 100644
--- a/apps/federatedfilesharing/l10n/pl.json
+++ b/apps/federatedfilesharing/l10n/pl.json
@@ -39,6 +39,7 @@
     "Open documentation" : "Otwórz dokumentację",
     "Allow users on this server to send shares to other servers" : "Zezwalaj użytkownikom na tym serwerze wysłać udostępnienia do innych serwerów",
     "Allow users on this server to receive shares from other servers" : "Zezwalaj użytkownikom na tym serwerze do otrzymania udostępnień z innych serwerów",
+    "Search global and public address book for users" : "Szukaj użytkowników w globalnej i publicznej książce adresowej",
     "Federated Cloud" : "Stowarzyszona Chmura",
     "Your Federated Cloud ID:" : "Twoje ID Stowarzyszonej Chmury:",
     "Share it:" : "Udostępnij to:",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index b31977f2774f681162ca79ccad6485aacf722675..34fca8819b65dbc7e17321b6ac49e6a87fb087ae 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -62,7 +62,7 @@ OC.L10N.register(
     "Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Armazenamento do {owner} está quase cheio ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
-    "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"],
+    "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincidem com '{filter}'"],
     "View in folder" : "Exibir na pasta",
     "Path" : "Caminho",
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index f5481c8ab0d7fcc8cd3cf9738e73dd506b8caf80..aa783480953666fedee5d8235e01e89d0e167d4d 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -60,7 +60,7 @@
     "Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Armazenamento do {owner} está quase cheio ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
-    "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"],
+    "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincidem com '{filter}'"],
     "View in folder" : "Exibir na pasta",
     "Path" : "Caminho",
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index 4dff7b988e48b4e9ad70d2eed9f3cae8f5dabb72..9e09cb63a11a93950ead7aefe39b8ea665163a61 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Sdílení",
     "File shares" : "Sdílení souboru",
     "Downloaded via public link" : "Staženo pomocí veřejného odkazu",
-    "Downloaded by %1$s" : "Stáhnul(o) %1$s",
     "Downloaded by {email}" : "Stáhl {email}",
-    "%1$s downloaded via public link" : "%1$s stažen pomocí veřejného odkazu",
     "{file} downloaded via public link" : "{file} stažen pomocí veřejného odkazu",
-    "%1$s downloaded %2$s" : "%1$s stáhl(a) %2$s",
     "{email} downloaded {file}" : "{email} stáhnul {file}",
-    "Shared with group %1$s" : "Sdíleno se skupinou %1$s",
     "Shared with group {group}" : "Sdíleno se skupinou {group}",
-    "Removed share for group %1$s" : "Odstraněno sdílení pro skupinu %1$s",
     "Removed share for group {group}" : "Odstranil sdílení pro skupinu {group}",
-    "%2$s shared with group %1$s" : "%2$s sdílel se skupinou %1$s",
     "{actor} shared with group {group}" : "{actor} sdílel(a) se skupinou {group}",
-    "%2$s removed share for group %1$s" : "%2$s odstranil(a) sdílení pro skupinu %1$s",
     "{actor} removed share for group {group}" : "{actor} odstranil(a) sdílení pro skupinu {group}",
-    "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
     "You shared {file} with group {group}" : "Se skupinou {group} jste nasdílel(a) {file}",
-    "You removed group %2$s from %1$s" : "Z %1$s jste odstranil(a) skupinu %2$s",
     "You removed group {group} from {file}" : "Z {file} jste odstranil(a) skupinu {group}",
-    "%3$s shared %1$s with group %2$s" : "%3$s sdílel %1$s se skupinou %2$s",
     "{actor} shared {file} with group {group}" : "{actor} sdílel(a) {file} se skupinou {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s odstranil(a) z %1$s skupinu %2$s",
     "{actor} removed group {group} from {file}" : "{actor} odstranil(a) skupinu {group} z {file}",
     "Shared as public link" : "Sdíleno jako veřejný odkaz",
     "Removed public link" : "Odstranil(a) veřejný odkaz",
-    "%1$s shared as public link" : "%1$s sdílen jako veřejný odkaz",
+    "Public link expired" : "Veřejný odkaz vypršel",
     "{actor} shared as public link" : "{actor} sdílel(a) jako veřejný odkaz",
-    "%1$s removed public link" : "%1$s odstranil(a) veřejný odkaz",
     "{actor} removed public link" : "{actor} odstranil(a) veřejný odkaz",
-    "You shared %1$s as public link" : "Sdílel(a) jste %1$s jako veřejný odkaz",
     "You shared {file} as public link" : "Sdílel(a) jste {file} jako veřejný odkaz",
-    "You removed public link for %1$s" : "Odstranil(a) jste veřejný odkaz pro %1$s",
     "You removed public link for {file}" : "Odstranil(a) jste veřejný odkaz pro {file}",
-    "%2$s shared %1$s as public link" : "%2$s sdílel(a) %1$s jako veřejný odkaz",
     "{actor} shared {file} as public link" : "{actor} sdílel(a) {file} jako veřejný odkaz",
-    "%2$s removed public link for %1$s" : "%2$s odstranil veřejný odkaz z %1$s",
     "{actor} removed public link for {file}" : "{actor} odstranil(a) veřejný odkaz pro {file}",
-    "%1$s accepted the remote share" : "%1$s přijal(a) vzdálené sdílení",
     "{user} accepted the remote share" : "{user} přijal(a) vzdálené sdílení",
-    "%1$s declined the remote share" : "%1$s odmítl(a) vzdálené sdílení",
     "{user} declined the remote share" : "{user} odmítl vzdálené sdílení",
-    "You received a new remote share %1$s from %2$s" : "Obdržel(a) jste nové vzdálené sdílení %1$s z %2$s",
     "You received a new remote share {file} from {user}" : "Obdržel(a) jste nové vzdálené sdílení souboru {file} od {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s přijal(a) vzdálené sdílení %1$s",
     "{user} accepted the remote share of {file}" : "{user} přijal vzdálené sdílení souboru {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s odmítl vzdálené sdílení %1$s",
     "{user} declined the remote share of {file}" : "{user} odmítl(a) vzdálené sdílení {file}",
-    "%2$s unshared %1$s from you" : "%2$s s vámi přestal(a) sdílet %1$s",
     "{user} unshared {file} from you" : "{user} s vámi již nesdílí soubor {file}",
-    "Shared with %1$s" : "Sdíleno s %1$s",
     "Shared with {user}" : "Sdíleno s {user}",
-    "Removed share for %1$s" : "Odstraněno sdílení %1$s",
     "Removed share for {user}" : "Odstraněno sdílení pro {user}",
-    "%2$s shared with %1$s" : "%2$s sdíleno s %1$s",
     "{actor} shared with {user}" : "{actor} sdílel(a) s {user}",
-    "%2$s removed share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s",
     "{actor} removed share for {user}" : "{actor} odstranil(a) sdílení pro {user}",
-    "Shared by %1$s" : "Sdíleno %1$s",
     "Shared by {actor}" : "Sdílel {actor}",
-    "%1$s removed share" : "%1$s odstranil(a) sdílení",
     "{actor} removed share" : "{actor} odebral(a) sdílení",
-    "You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
     "You shared {file} with {user}" : "Sdílel(a) jste {file} s {user}",
-    "You removed %2$s from %1$s" : "Odstranil(a) jste %2$s z %1$s",
     "You removed {user} from {file}" : "Odstranil(a) jste uživatele {user} z {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s s %2$s sdílel(a) %1$s",
     "{actor} removed {user} from {file}" : "{actor} odstranil(a) uživatele {user} z {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s odstranil(a) %2$s z %1$s",
-    "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "{actor} shared {file} with you" : "{actor} s vámi sdílel(a) soubor {file}",
-    "%2$s removed you from %1$s" : "%2$s vás odstranil(a) z %1$s",
     "{actor} removed you from {file}" : "{actor} vás odstranil(a) ze souboru {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> soubor nebo adresář sdílený jako veřejný odkaz",
     "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo adresář byl nasdílen z <strong>jiného serveru</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s již více nesdílí %2$s",
     "Public shared folder %1$s was downloaded" : "Byl stažen veřejně sdílený adresář %1$s ",
     "Public shared file %1$s was downloaded" : "Byl stažen veřejně sdílený soubor %1$s ",
+    "You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s nasdílel(a) %1$s s %3$s",
     "You removed the share of %2$s for %1$s" : "Odstranil(a) jsi sdílení %2$s pro %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s odstranil(a) sdílení %3$s pro %1$s",
+    "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s nasdílel(a) %1$s se skupinou %3$s",
     "You removed the share of group %2$s for %1$s" : "Odstranil(a) jsi sdílení skupině %2$s pro %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s odstranil(a) sdílení skupině %3$s pro %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s odstranil(a) veřejný odkaz na %1$s",
     "Your public link for %1$s expired" : "Veřejný odkaz pro %1$s vypršel",
     "The public link of %2$s for %1$s expired" : "Veřejný odkaz na %2$s pro %1$s vypršel",
+    "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "%2$s removed the share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s",
     "Shared with %2$s" : "Sdíleno s %2$s",
     "Shared with %3$s by %2$s" : "%2$s sdílí s %3$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "%2$s sdílel(a) jako odkaz",
     "Shared via public link" : "Sdíleno jako veřejný odkaz",
     "%2$s removed public link" : "%2$s odstranil(a) veřejný odkaz",
-    "Public link expired" : "Veřejný odkaz vypršel",
     "Public link of %2$s expired" : "Veřejný odkaz %2$s vypršel",
     "Shared by %2$s" : "%2$s sdílel(a)",
-    "Shares" : "Sdílení"
+    "Shares" : "Sdílení",
+    "Downloaded by %1$s" : "Stáhnul(o) %1$s",
+    "%1$s downloaded via public link" : "%1$s stažen pomocí veřejného odkazu",
+    "%1$s downloaded %2$s" : "%1$s stáhl(a) %2$s",
+    "Shared with group %1$s" : "Sdíleno se skupinou %1$s",
+    "Removed share for group %1$s" : "Odstraněno sdílení pro skupinu %1$s",
+    "%2$s shared with group %1$s" : "%2$s sdílel se skupinou %1$s",
+    "%2$s removed share for group %1$s" : "%2$s odstranil(a) sdílení pro skupinu %1$s",
+    "You removed group %2$s from %1$s" : "Z %1$s jste odstranil(a) skupinu %2$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s sdílel %1$s se skupinou %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s odstranil(a) z %1$s skupinu %2$s",
+    "%1$s shared as public link" : "%1$s sdílen jako veřejný odkaz",
+    "%1$s removed public link" : "%1$s odstranil(a) veřejný odkaz",
+    "You shared %1$s as public link" : "Sdílel(a) jste %1$s jako veřejný odkaz",
+    "You removed public link for %1$s" : "Odstranil(a) jste veřejný odkaz pro %1$s",
+    "%2$s shared %1$s as public link" : "%2$s sdílel(a) %1$s jako veřejný odkaz",
+    "%2$s removed public link for %1$s" : "%2$s odstranil veřejný odkaz z %1$s",
+    "%1$s accepted the remote share" : "%1$s přijal(a) vzdálené sdílení",
+    "%1$s declined the remote share" : "%1$s odmítl(a) vzdálené sdílení",
+    "You received a new remote share %1$s from %2$s" : "Obdržel(a) jste nové vzdálené sdílení %1$s z %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s přijal(a) vzdálené sdílení %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s odmítl vzdálené sdílení %1$s",
+    "%2$s unshared %1$s from you" : "%2$s s vámi přestal(a) sdílet %1$s",
+    "Shared with %1$s" : "Sdíleno s %1$s",
+    "Removed share for %1$s" : "Odstraněno sdílení %1$s",
+    "%2$s shared with %1$s" : "%2$s sdíleno s %1$s",
+    "%2$s removed share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s",
+    "Shared by %1$s" : "Sdíleno %1$s",
+    "%1$s removed share" : "%1$s odstranil(a) sdílení",
+    "You removed %2$s from %1$s" : "Odstranil(a) jste %2$s z %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s s %2$s sdílel(a) %1$s",
+    "%3$s removed %2$s from %1$s" : "%3$s odstranil(a) %2$s z %1$s",
+    "%2$s removed you from %1$s" : "%2$s vás odstranil(a) z %1$s"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index a96d2fd6f7eac3c3f649b0d44d04258c10b38f1d..9d86d08a921f370aaad1a7d6a541bb73cef795cc 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -18,76 +18,42 @@
     "Sharing" : "Sdílení",
     "File shares" : "Sdílení souboru",
     "Downloaded via public link" : "Staženo pomocí veřejného odkazu",
-    "Downloaded by %1$s" : "Stáhnul(o) %1$s",
     "Downloaded by {email}" : "Stáhl {email}",
-    "%1$s downloaded via public link" : "%1$s stažen pomocí veřejného odkazu",
     "{file} downloaded via public link" : "{file} stažen pomocí veřejného odkazu",
-    "%1$s downloaded %2$s" : "%1$s stáhl(a) %2$s",
     "{email} downloaded {file}" : "{email} stáhnul {file}",
-    "Shared with group %1$s" : "Sdíleno se skupinou %1$s",
     "Shared with group {group}" : "Sdíleno se skupinou {group}",
-    "Removed share for group %1$s" : "Odstraněno sdílení pro skupinu %1$s",
     "Removed share for group {group}" : "Odstranil sdílení pro skupinu {group}",
-    "%2$s shared with group %1$s" : "%2$s sdílel se skupinou %1$s",
     "{actor} shared with group {group}" : "{actor} sdílel(a) se skupinou {group}",
-    "%2$s removed share for group %1$s" : "%2$s odstranil(a) sdílení pro skupinu %1$s",
     "{actor} removed share for group {group}" : "{actor} odstranil(a) sdílení pro skupinu {group}",
-    "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
     "You shared {file} with group {group}" : "Se skupinou {group} jste nasdílel(a) {file}",
-    "You removed group %2$s from %1$s" : "Z %1$s jste odstranil(a) skupinu %2$s",
     "You removed group {group} from {file}" : "Z {file} jste odstranil(a) skupinu {group}",
-    "%3$s shared %1$s with group %2$s" : "%3$s sdílel %1$s se skupinou %2$s",
     "{actor} shared {file} with group {group}" : "{actor} sdílel(a) {file} se skupinou {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s odstranil(a) z %1$s skupinu %2$s",
     "{actor} removed group {group} from {file}" : "{actor} odstranil(a) skupinu {group} z {file}",
     "Shared as public link" : "Sdíleno jako veřejný odkaz",
     "Removed public link" : "Odstranil(a) veřejný odkaz",
-    "%1$s shared as public link" : "%1$s sdílen jako veřejný odkaz",
+    "Public link expired" : "Veřejný odkaz vypršel",
     "{actor} shared as public link" : "{actor} sdílel(a) jako veřejný odkaz",
-    "%1$s removed public link" : "%1$s odstranil(a) veřejný odkaz",
     "{actor} removed public link" : "{actor} odstranil(a) veřejný odkaz",
-    "You shared %1$s as public link" : "Sdílel(a) jste %1$s jako veřejný odkaz",
     "You shared {file} as public link" : "Sdílel(a) jste {file} jako veřejný odkaz",
-    "You removed public link for %1$s" : "Odstranil(a) jste veřejný odkaz pro %1$s",
     "You removed public link for {file}" : "Odstranil(a) jste veřejný odkaz pro {file}",
-    "%2$s shared %1$s as public link" : "%2$s sdílel(a) %1$s jako veřejný odkaz",
     "{actor} shared {file} as public link" : "{actor} sdílel(a) {file} jako veřejný odkaz",
-    "%2$s removed public link for %1$s" : "%2$s odstranil veřejný odkaz z %1$s",
     "{actor} removed public link for {file}" : "{actor} odstranil(a) veřejný odkaz pro {file}",
-    "%1$s accepted the remote share" : "%1$s přijal(a) vzdálené sdílení",
     "{user} accepted the remote share" : "{user} přijal(a) vzdálené sdílení",
-    "%1$s declined the remote share" : "%1$s odmítl(a) vzdálené sdílení",
     "{user} declined the remote share" : "{user} odmítl vzdálené sdílení",
-    "You received a new remote share %1$s from %2$s" : "Obdržel(a) jste nové vzdálené sdílení %1$s z %2$s",
     "You received a new remote share {file} from {user}" : "Obdržel(a) jste nové vzdálené sdílení souboru {file} od {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s přijal(a) vzdálené sdílení %1$s",
     "{user} accepted the remote share of {file}" : "{user} přijal vzdálené sdílení souboru {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s odmítl vzdálené sdílení %1$s",
     "{user} declined the remote share of {file}" : "{user} odmítl(a) vzdálené sdílení {file}",
-    "%2$s unshared %1$s from you" : "%2$s s vámi přestal(a) sdílet %1$s",
     "{user} unshared {file} from you" : "{user} s vámi již nesdílí soubor {file}",
-    "Shared with %1$s" : "Sdíleno s %1$s",
     "Shared with {user}" : "Sdíleno s {user}",
-    "Removed share for %1$s" : "Odstraněno sdílení %1$s",
     "Removed share for {user}" : "Odstraněno sdílení pro {user}",
-    "%2$s shared with %1$s" : "%2$s sdíleno s %1$s",
     "{actor} shared with {user}" : "{actor} sdílel(a) s {user}",
-    "%2$s removed share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s",
     "{actor} removed share for {user}" : "{actor} odstranil(a) sdílení pro {user}",
-    "Shared by %1$s" : "Sdíleno %1$s",
     "Shared by {actor}" : "Sdílel {actor}",
-    "%1$s removed share" : "%1$s odstranil(a) sdílení",
     "{actor} removed share" : "{actor} odebral(a) sdílení",
-    "You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
     "You shared {file} with {user}" : "Sdílel(a) jste {file} s {user}",
-    "You removed %2$s from %1$s" : "Odstranil(a) jste %2$s z %1$s",
     "You removed {user} from {file}" : "Odstranil(a) jste uživatele {user} z {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s s %2$s sdílel(a) %1$s",
     "{actor} removed {user} from {file}" : "{actor} odstranil(a) uživatele {user} z {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s odstranil(a) %2$s z %1$s",
-    "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "{actor} shared {file} with you" : "{actor} s vámi sdílel(a) soubor {file}",
-    "%2$s removed you from %1$s" : "%2$s vás odstranil(a) z %1$s",
     "{actor} removed you from {file}" : "{actor} vás odstranil(a) ze souboru {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> soubor nebo adresář sdílený jako veřejný odkaz",
     "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo adresář byl nasdílen z <strong>jiného serveru</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s již více nesdílí %2$s",
     "Public shared folder %1$s was downloaded" : "Byl stažen veřejně sdílený adresář %1$s ",
     "Public shared file %1$s was downloaded" : "Byl stažen veřejně sdílený soubor %1$s ",
+    "You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s nasdílel(a) %1$s s %3$s",
     "You removed the share of %2$s for %1$s" : "Odstranil(a) jsi sdílení %2$s pro %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s odstranil(a) sdílení %3$s pro %1$s",
+    "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s nasdílel(a) %1$s se skupinou %3$s",
     "You removed the share of group %2$s for %1$s" : "Odstranil(a) jsi sdílení skupině %2$s pro %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s odstranil(a) sdílení skupině %3$s pro %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s odstranil(a) veřejný odkaz na %1$s",
     "Your public link for %1$s expired" : "Veřejný odkaz pro %1$s vypršel",
     "The public link of %2$s for %1$s expired" : "Veřejný odkaz na %2$s pro %1$s vypršel",
+    "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "%2$s removed the share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s",
     "Shared with %2$s" : "Sdíleno s %2$s",
     "Shared with %3$s by %2$s" : "%2$s sdílí s %3$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "%2$s sdílel(a) jako odkaz",
     "Shared via public link" : "Sdíleno jako veřejný odkaz",
     "%2$s removed public link" : "%2$s odstranil(a) veřejný odkaz",
-    "Public link expired" : "Veřejný odkaz vypršel",
     "Public link of %2$s expired" : "Veřejný odkaz %2$s vypršel",
     "Shared by %2$s" : "%2$s sdílel(a)",
-    "Shares" : "Sdílení"
+    "Shares" : "Sdílení",
+    "Downloaded by %1$s" : "Stáhnul(o) %1$s",
+    "%1$s downloaded via public link" : "%1$s stažen pomocí veřejného odkazu",
+    "%1$s downloaded %2$s" : "%1$s stáhl(a) %2$s",
+    "Shared with group %1$s" : "Sdíleno se skupinou %1$s",
+    "Removed share for group %1$s" : "Odstraněno sdílení pro skupinu %1$s",
+    "%2$s shared with group %1$s" : "%2$s sdílel se skupinou %1$s",
+    "%2$s removed share for group %1$s" : "%2$s odstranil(a) sdílení pro skupinu %1$s",
+    "You removed group %2$s from %1$s" : "Z %1$s jste odstranil(a) skupinu %2$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s sdílel %1$s se skupinou %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s odstranil(a) z %1$s skupinu %2$s",
+    "%1$s shared as public link" : "%1$s sdílen jako veřejný odkaz",
+    "%1$s removed public link" : "%1$s odstranil(a) veřejný odkaz",
+    "You shared %1$s as public link" : "Sdílel(a) jste %1$s jako veřejný odkaz",
+    "You removed public link for %1$s" : "Odstranil(a) jste veřejný odkaz pro %1$s",
+    "%2$s shared %1$s as public link" : "%2$s sdílel(a) %1$s jako veřejný odkaz",
+    "%2$s removed public link for %1$s" : "%2$s odstranil veřejný odkaz z %1$s",
+    "%1$s accepted the remote share" : "%1$s přijal(a) vzdálené sdílení",
+    "%1$s declined the remote share" : "%1$s odmítl(a) vzdálené sdílení",
+    "You received a new remote share %1$s from %2$s" : "Obdržel(a) jste nové vzdálené sdílení %1$s z %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s přijal(a) vzdálené sdílení %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s odmítl vzdálené sdílení %1$s",
+    "%2$s unshared %1$s from you" : "%2$s s vámi přestal(a) sdílet %1$s",
+    "Shared with %1$s" : "Sdíleno s %1$s",
+    "Removed share for %1$s" : "Odstraněno sdílení %1$s",
+    "%2$s shared with %1$s" : "%2$s sdíleno s %1$s",
+    "%2$s removed share for %1$s" : "%2$s odstranil(a) sdílení pro %1$s",
+    "Shared by %1$s" : "Sdíleno %1$s",
+    "%1$s removed share" : "%1$s odstranil(a) sdílení",
+    "You removed %2$s from %1$s" : "Odstranil(a) jste %2$s z %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s s %2$s sdílel(a) %1$s",
+    "%3$s removed %2$s from %1$s" : "%3$s odstranil(a) %2$s z %1$s",
+    "%2$s removed you from %1$s" : "%2$s vás odstranil(a) z %1$s"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 3505b3b07ab6bc1f2715bac406ec4bae651944dd..17b76d788eec97de3e84ad90fa95cc7dbaa31fdd 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Teilen",
     "File shares" : "Dateifreigaben",
     "Downloaded via public link" : "Heruntergeladen mittels öffentlichen Link",
-    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
     "Downloaded by {email}" : "Heruntergeladen von {email}",
-    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
     "{file} downloaded via public link" : "{file} heruntergeladen mittels öffentlichen Link",
-    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
     "{email} downloaded {file}" : "{email} hat {file} heruntergeladen",
-    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
     "Shared with group {group}" : "Geteilt mit der Gruppe {group}",
-    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
     "Removed share for group {group}" : "Freigabe für die Gruppe {group} entfernt",
-    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
     "{actor} shared with group {group}" : "{actor} geteilt mit der Gruppe {group}",
-    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
     "{actor} removed share for group {group}" : "{actor} hat die Freigabe für die Gruppe {group} entfernt",
-    "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
     "You shared {file} with group {group}" : "Du hast {file} mit der Gruppe {group} geteilt",
-    "You removed group %2$s from %1$s" : "Du hast die Gruppe %2$s von %1$s entfernt",
     "You removed group {group} from {file}" : "Du hast die Gruppe {group} von {file} entfernt",
-    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
     "{actor} shared {file} with group {group}" : "{actor} hat {file} mit der Gruppe {group} geteilt",
-    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
     "{actor} removed group {group} from {file}" : "{actor} hat die Gruppe {group} von {file} entfernt",
     "Shared as public link" : "Als öffentlichen Link geteilt",
     "Removed public link" : "Öffentlichen Link entfernt",
-    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "{actor} shared as public link" : "{actor} hat einen öffentlichen Link geteilt",
-    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
     "{actor} removed public link" : "{actor} hat einen öffentlichen Link entfernt",
-    "You shared %1$s as public link" : "Du hast %1$s über einen öffentlichen Link geteilt",
     "You shared {file} as public link" : "Du hast {file} über einen öffentlichen Link geteilt",
-    "You removed public link for %1$s" : "Du hast die öffentliche Freigabe für %1$s entfernt",
     "You removed public link for {file}" : "Du hast die öffentliche Freigabe für {file} entfernt",
-    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
     "{actor} shared {file} as public link" : "{actor} hat {file} über einen öffentlichen Link geteilt",
-    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "{actor} removed public link for {file}" : "{actor} hat einen öffentlichen Link {file} entfernt",
-    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
     "{user} accepted the remote share" : "{user} hat die Remotefreigabe akzeptiert",
-    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
     "{user} declined the remote share" : "{user} hat die Remotefreigabe abgelehnt",
-    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
     "You received a new remote share {file} from {user}" : "Du hast eine neue Remotefreigabe {file} von {user} erhalten",
-    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
     "{user} accepted the remote share of {file}" : "{user} hat die Remotefreigabe von {file} akzeptiert",
-    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
     "{user} declined the remote share of {file}" : "{user} hat die Remotefreigabe von {file} abgelehnt",
-    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit dir",
     "{user} unshared {file} from you" : "{user} teilt {file} nicht mehr mit dir",
-    "Shared with %1$s" : "Geteilt mit %1$s",
     "Shared with {user}" : "Geteilt mit {user}",
-    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
     "Removed share for {user}" : "Freigabe für {user} entfernt",
-    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
     "{actor} shared with {user}" : "{actor} hat mit {user} geteilt",
-    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "{actor} removed share for {user}" : "{actor} hat die Freigabe für {user} entfernt",
-    "Shared by %1$s" : "Geteilt von %1$s",
     "Shared by {actor}" : "Geteilt von {actor}",
-    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
     "{actor} removed share" : "{actor} hat die Freigabe entfernt",
-    "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
     "You shared {file} with {user}" : "Du hast {file} mit {user} geteilt",
-    "You removed %2$s from %1$s" : "Sie haben die %2$s von %1$s entfernt",
     "You removed {user} from {file}" : "Sie haben die {user} von {file} entfernt",
-    "%3$s shared %1$s with %2$s" : "%3$s geteilt %1$s mit %2$s",
     "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt",
-    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
-    "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
     "{actor} shared {file} with you" : "{actor} hat {file} mit dir geteilt",
-    "%2$s removed you from %1$s" : "Du wurdest durch %2$s von %1$s entfernt",
     "{actor} removed you from {file}" : "Du wurdest durch {actor} von {file} entfernt",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Öffentlich oder per E-Mail geteilte Datei / Ordner wurde <strong>heruntergeladen</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt",
     "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
     "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
+    "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
     "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s",
     "You removed the share of %2$s for %1$s" : "Du hast die Freigabe von %2$s für %1$s entfernt",
     "%2$s removed the share of %3$s for %1$s" : "%2$s hat die Freigabe der %3$s für %1$s entfernt",
+    "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
     "%2$s shared %1$s with group %3$s" : "%2$s hat %1$s mit Gruppe %3$s geteilt",
     "You removed the share of group %2$s for %1$s" : "Du hast die Freigabe der Gruppe %2$s für %1$s entfernt",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s hat die Freigabe der Gruppe %3$s für %1$s entfernt",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "Your public link for %1$s expired" : "Dein öffentlicher Link für %1$s ist abgelaufen",
     "The public link of %2$s for %1$s expired" : "Der öffentliche Link von %2$s für %1$s ist abgelaufen",
+    "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
     "%2$s removed the share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "Shared with %2$s" : "Geteilt mit %2$s",
     "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Geteilt mittels Link von %2$s",
     "Shared via public link" : "Geteilt mittels öffentlichem Link",
     "%2$s removed public link" : "%2$s hat den öffentlichen Link entfernt",
-    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "Public link of %2$s expired" : "Öffentlicher Link von %2$s ist abgelaufen",
     "Shared by %2$s" : "Geteilt von %2$s",
-    "Shares" : "Freigaben"
+    "Shares" : "Freigaben",
+    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
+    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
+    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
+    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
+    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
+    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
+    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
+    "You removed group %2$s from %1$s" : "Du hast die Gruppe %2$s von %1$s entfernt",
+    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
+    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
+    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
+    "You shared %1$s as public link" : "Du hast %1$s über einen öffentlichen Link geteilt",
+    "You removed public link for %1$s" : "Du hast die öffentliche Freigabe für %1$s entfernt",
+    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
+    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
+    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
+    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
+    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
+    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
+    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
+    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit dir",
+    "Shared with %1$s" : "Geteilt mit %1$s",
+    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
+    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
+    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
+    "Shared by %1$s" : "Geteilt von %1$s",
+    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
+    "You removed %2$s from %1$s" : "Sie haben die %2$s von %1$s entfernt",
+    "%3$s shared %1$s with %2$s" : "%3$s geteilt %1$s mit %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
+    "%2$s removed you from %1$s" : "Du wurdest durch %2$s von %1$s entfernt"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 95c3f5dd72eaf117beecc22a6b9d1095f0dd46d0..e634290cd45f2207c0afde00e5dfa622d0dbf85b 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -18,76 +18,42 @@
     "Sharing" : "Teilen",
     "File shares" : "Dateifreigaben",
     "Downloaded via public link" : "Heruntergeladen mittels öffentlichen Link",
-    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
     "Downloaded by {email}" : "Heruntergeladen von {email}",
-    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
     "{file} downloaded via public link" : "{file} heruntergeladen mittels öffentlichen Link",
-    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
     "{email} downloaded {file}" : "{email} hat {file} heruntergeladen",
-    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
     "Shared with group {group}" : "Geteilt mit der Gruppe {group}",
-    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
     "Removed share for group {group}" : "Freigabe für die Gruppe {group} entfernt",
-    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
     "{actor} shared with group {group}" : "{actor} geteilt mit der Gruppe {group}",
-    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
     "{actor} removed share for group {group}" : "{actor} hat die Freigabe für die Gruppe {group} entfernt",
-    "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
     "You shared {file} with group {group}" : "Du hast {file} mit der Gruppe {group} geteilt",
-    "You removed group %2$s from %1$s" : "Du hast die Gruppe %2$s von %1$s entfernt",
     "You removed group {group} from {file}" : "Du hast die Gruppe {group} von {file} entfernt",
-    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
     "{actor} shared {file} with group {group}" : "{actor} hat {file} mit der Gruppe {group} geteilt",
-    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
     "{actor} removed group {group} from {file}" : "{actor} hat die Gruppe {group} von {file} entfernt",
     "Shared as public link" : "Als öffentlichen Link geteilt",
     "Removed public link" : "Öffentlichen Link entfernt",
-    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "{actor} shared as public link" : "{actor} hat einen öffentlichen Link geteilt",
-    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
     "{actor} removed public link" : "{actor} hat einen öffentlichen Link entfernt",
-    "You shared %1$s as public link" : "Du hast %1$s über einen öffentlichen Link geteilt",
     "You shared {file} as public link" : "Du hast {file} über einen öffentlichen Link geteilt",
-    "You removed public link for %1$s" : "Du hast die öffentliche Freigabe für %1$s entfernt",
     "You removed public link for {file}" : "Du hast die öffentliche Freigabe für {file} entfernt",
-    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
     "{actor} shared {file} as public link" : "{actor} hat {file} über einen öffentlichen Link geteilt",
-    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "{actor} removed public link for {file}" : "{actor} hat einen öffentlichen Link {file} entfernt",
-    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
     "{user} accepted the remote share" : "{user} hat die Remotefreigabe akzeptiert",
-    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
     "{user} declined the remote share" : "{user} hat die Remotefreigabe abgelehnt",
-    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
     "You received a new remote share {file} from {user}" : "Du hast eine neue Remotefreigabe {file} von {user} erhalten",
-    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
     "{user} accepted the remote share of {file}" : "{user} hat die Remotefreigabe von {file} akzeptiert",
-    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
     "{user} declined the remote share of {file}" : "{user} hat die Remotefreigabe von {file} abgelehnt",
-    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit dir",
     "{user} unshared {file} from you" : "{user} teilt {file} nicht mehr mit dir",
-    "Shared with %1$s" : "Geteilt mit %1$s",
     "Shared with {user}" : "Geteilt mit {user}",
-    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
     "Removed share for {user}" : "Freigabe für {user} entfernt",
-    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
     "{actor} shared with {user}" : "{actor} hat mit {user} geteilt",
-    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "{actor} removed share for {user}" : "{actor} hat die Freigabe für {user} entfernt",
-    "Shared by %1$s" : "Geteilt von %1$s",
     "Shared by {actor}" : "Geteilt von {actor}",
-    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
     "{actor} removed share" : "{actor} hat die Freigabe entfernt",
-    "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
     "You shared {file} with {user}" : "Du hast {file} mit {user} geteilt",
-    "You removed %2$s from %1$s" : "Sie haben die %2$s von %1$s entfernt",
     "You removed {user} from {file}" : "Sie haben die {user} von {file} entfernt",
-    "%3$s shared %1$s with %2$s" : "%3$s geteilt %1$s mit %2$s",
     "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt",
-    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
-    "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
     "{actor} shared {file} with you" : "{actor} hat {file} mit dir geteilt",
-    "%2$s removed you from %1$s" : "Du wurdest durch %2$s von %1$s entfernt",
     "{actor} removed you from {file}" : "Du wurdest durch {actor} von {file} entfernt",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Öffentlich oder per E-Mail geteilte Datei / Ordner wurde <strong>heruntergeladen</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt",
     "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen",
     "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
+    "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
     "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s",
     "You removed the share of %2$s for %1$s" : "Du hast die Freigabe von %2$s für %1$s entfernt",
     "%2$s removed the share of %3$s for %1$s" : "%2$s hat die Freigabe der %3$s für %1$s entfernt",
+    "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
     "%2$s shared %1$s with group %3$s" : "%2$s hat %1$s mit Gruppe %3$s geteilt",
     "You removed the share of group %2$s for %1$s" : "Du hast die Freigabe der Gruppe %2$s für %1$s entfernt",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s hat die Freigabe der Gruppe %3$s für %1$s entfernt",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "Your public link for %1$s expired" : "Dein öffentlicher Link für %1$s ist abgelaufen",
     "The public link of %2$s for %1$s expired" : "Der öffentliche Link von %2$s für %1$s ist abgelaufen",
+    "%2$s shared %1$s with you" : "%2$s hat %1$s mit dir geteilt",
     "%2$s removed the share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "Shared with %2$s" : "Geteilt mit %2$s",
     "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Geteilt mittels Link von %2$s",
     "Shared via public link" : "Geteilt mittels öffentlichem Link",
     "%2$s removed public link" : "%2$s hat den öffentlichen Link entfernt",
-    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "Public link of %2$s expired" : "Öffentlicher Link von %2$s ist abgelaufen",
     "Shared by %2$s" : "Geteilt von %2$s",
-    "Shares" : "Freigaben"
+    "Shares" : "Freigaben",
+    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
+    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
+    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
+    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
+    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
+    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
+    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
+    "You removed group %2$s from %1$s" : "Du hast die Gruppe %2$s von %1$s entfernt",
+    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
+    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
+    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
+    "You shared %1$s as public link" : "Du hast %1$s über einen öffentlichen Link geteilt",
+    "You removed public link for %1$s" : "Du hast die öffentliche Freigabe für %1$s entfernt",
+    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
+    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
+    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
+    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
+    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
+    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
+    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
+    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit dir",
+    "Shared with %1$s" : "Geteilt mit %1$s",
+    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
+    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
+    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
+    "Shared by %1$s" : "Geteilt von %1$s",
+    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
+    "You removed %2$s from %1$s" : "Sie haben die %2$s von %1$s entfernt",
+    "%3$s shared %1$s with %2$s" : "%3$s geteilt %1$s mit %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
+    "%2$s removed you from %1$s" : "Du wurdest durch %2$s von %1$s entfernt"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 01bcc8ccbe894d1580c11f00609bad312e748b63..9bb79fe91834686149b24df2d2b8dd3b275a2dca 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Teilen",
     "File shares" : "Dateifreigaben",
     "Downloaded via public link" : "Über den öffentlichen Link heruntergeladen",
-    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
     "Downloaded by {email}" : "Heruntergeladen von {email}",
-    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
     "{file} downloaded via public link" : "{file} heruntergeladen mittels öffentlichen Link",
-    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
     "{email} downloaded {file}" : "{email} hat {file} heruntergeladen",
-    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
     "Shared with group {group}" : "Geteilt mit der Gruppe {group}",
-    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
     "Removed share for group {group}" : "Freigabe für die Gruppe {group} entfernt",
-    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
     "{actor} shared with group {group}" : "{actor} geteilt mit der Gruppe {group}",
-    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
     "{actor} removed share for group {group}" : "{actor} hat die Freigabe für die Gruppe {group} entfernt",
-    "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt",
     "You shared {file} with group {group}" : "Sie haben {file} mit der Gruppe {group} geteilt",
-    "You removed group %2$s from %1$s" : "Sie haben die Gruppe %2$s von %1$s entfernt",
     "You removed group {group} from {file}" : "Sie haben die Gruppe {group} von {file} entfernt",
-    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
     "{actor} shared {file} with group {group}" : "{actor} hat {file} mit der Gruppe {group} geteilt",
-    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
     "{actor} removed group {group} from {file}" : "{actor} hat die Gruppe {group} von {file} entfernt",
     "Shared as public link" : "Als öffentlichen Link geteilt",
     "Removed public link" : "Öffentlichen Link entfernt",
-    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "{actor} shared as public link" : "{actor} hat einen öffentlichen Link geteilt",
-    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
     "{actor} removed public link" : "{actor} hat einen öffentlichen Link entfernt",
-    "You shared %1$s as public link" : "Sie haben %1$s über einen öffentlichen Link geteilt",
     "You shared {file} as public link" : "Sie haben {file} über einen öffentlichen Link geteilt",
-    "You removed public link for %1$s" : "Sie haben die öffentliche Freigabe für %1$s entfernt",
     "You removed public link for {file}" : "Sie haben die öffentliche Freigabe für {file} entfernt",
-    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
     "{actor} shared {file} as public link" : "{actor} hat {file} über einen öffentlichen Link geteilt",
-    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "{actor} removed public link for {file}" : "{actor} hat einen öffentlichen Link {file} entfernt",
-    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
     "{user} accepted the remote share" : "{user} hat die Remotefreigabe akzeptiert",
-    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
     "{user} declined the remote share" : "{user} hat die Remotefreigabe abgelehnt",
-    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
     "You received a new remote share {file} from {user}" : "Du hast eine neue Remotefreigabe {file} von {user} erhalten",
-    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
     "{user} accepted the remote share of {file}" : "{user} hat die Remotefreigabe von {file} akzeptiert",
-    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
     "{user} declined the remote share of {file}" : "{user} hat die Remotefreigabe von {file} abgelehnt",
-    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit Ihnen",
     "{user} unshared {file} from you" : "{user} teilt {file} nicht mehr mit Ihnen",
-    "Shared with %1$s" : "Geteilt mit %1$s",
     "Shared with {user}" : "Geteilt mit {user}",
-    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
     "Removed share for {user}" : "Freigabe für {user} entfernt",
-    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
     "{actor} shared with {user}" : "{actor} hat mit {user} geteilt",
-    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "{actor} removed share for {user}" : "{actor} hat die Freigabe für {user} entfernt",
-    "Shared by %1$s" : "Geteilt von %1$s",
     "Shared by {actor}" : "Geteilt von {actor}",
-    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
     "{actor} removed share" : "{actor} hat die Freigabe entfernt",
-    "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt",
     "You shared {file} with {user}" : "Sie haben {file} mit {user} geteilt",
-    "You removed %2$s from %1$s" : "Sie haben %2$s von %1$s entfernt",
     "You removed {user} from {file}" : "Sie haben {user} von {file} entfernt",
-    "%3$s shared %1$s with %2$s" : "%3$s hat %1$s mit %2$s geteilt",
     "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt",
-    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
-    "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "{actor} shared {file} with you" : "{actor} hat {file} mit Ihnen geteilt",
-    "%2$s removed you from %1$s" : "Sie wurden durch %2$s von %1$s entfernt",
     "{actor} removed you from {file}" : "Sie wurden durch {actor} von {file} entfernt",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Eine Datei oder ein Ordner der per E-Mail oder öffentlich geteilt ist wurde <strong>heruntergeladen</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt",
     "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
     "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+    "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt",
     "%2$s shared %1$s with %3$s" : "%2$s hat %1$s mit %3$s geteilt",
     "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s entfernt",
     "%2$s removed the share of %3$s for %1$s" : "%2$s hat die Freigabe von %3$s für %1$s entfernt",
+    "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt",
     "%2$s shared %1$s with group %3$s" : "%2$s hat %1$s mit der Gruppe %3$s geteilt",
     "You removed the share of group %2$s for %1$s" : "Sie haben die Freigabe der Gruppe %2$s für %1$s entfernt",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s hat die Freigabe der Gruppe %3$s für %1$s entfernt",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "Your public link for %1$s expired" : "Ihre Freigabe als Link für %1$s ist abgelaufen",
     "The public link of %2$s for %1$s expired" : "Die Freigabe als Link von %2$s für %1$s ist abgelaufen",
+    "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "%2$s removed the share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "Shared with %2$s" : "Geteilt mit %2$s",
     "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Geteilt durch einen Link von %2$s",
     "Shared via public link" : "Durch einen öffentlichen Link geteilt",
     "%2$s removed public link" : "%2$s hat die Freigabe als öffentlichen Link entfernt",
-    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "Public link of %2$s expired" : "Öffentlicher Link von %2$s ist abgelaufen",
     "Shared by %2$s" : "Geteilt von %2$s",
-    "Shares" : "Geteiltes"
+    "Shares" : "Geteiltes",
+    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
+    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
+    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
+    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
+    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
+    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
+    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
+    "You removed group %2$s from %1$s" : "Sie haben die Gruppe %2$s von %1$s entfernt",
+    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
+    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
+    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
+    "You shared %1$s as public link" : "Sie haben %1$s über einen öffentlichen Link geteilt",
+    "You removed public link for %1$s" : "Sie haben die öffentliche Freigabe für %1$s entfernt",
+    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
+    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
+    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
+    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
+    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
+    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
+    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
+    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit Ihnen",
+    "Shared with %1$s" : "Geteilt mit %1$s",
+    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
+    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
+    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
+    "Shared by %1$s" : "Geteilt von %1$s",
+    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
+    "You removed %2$s from %1$s" : "Sie haben %2$s von %1$s entfernt",
+    "%3$s shared %1$s with %2$s" : "%3$s hat %1$s mit %2$s geteilt",
+    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
+    "%2$s removed you from %1$s" : "Sie wurden durch %2$s von %1$s entfernt"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 5c5d6b815b7f2b3e8b6f824e6e1ebb36789f5523..124928b4449ca8ee30cca64009b5c8f30dacdec8 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -18,76 +18,42 @@
     "Sharing" : "Teilen",
     "File shares" : "Dateifreigaben",
     "Downloaded via public link" : "Über den öffentlichen Link heruntergeladen",
-    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
     "Downloaded by {email}" : "Heruntergeladen von {email}",
-    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
     "{file} downloaded via public link" : "{file} heruntergeladen mittels öffentlichen Link",
-    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
     "{email} downloaded {file}" : "{email} hat {file} heruntergeladen",
-    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
     "Shared with group {group}" : "Geteilt mit der Gruppe {group}",
-    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
     "Removed share for group {group}" : "Freigabe für die Gruppe {group} entfernt",
-    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
     "{actor} shared with group {group}" : "{actor} geteilt mit der Gruppe {group}",
-    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
     "{actor} removed share for group {group}" : "{actor} hat die Freigabe für die Gruppe {group} entfernt",
-    "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt",
     "You shared {file} with group {group}" : "Sie haben {file} mit der Gruppe {group} geteilt",
-    "You removed group %2$s from %1$s" : "Sie haben die Gruppe %2$s von %1$s entfernt",
     "You removed group {group} from {file}" : "Sie haben die Gruppe {group} von {file} entfernt",
-    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
     "{actor} shared {file} with group {group}" : "{actor} hat {file} mit der Gruppe {group} geteilt",
-    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
     "{actor} removed group {group} from {file}" : "{actor} hat die Gruppe {group} von {file} entfernt",
     "Shared as public link" : "Als öffentlichen Link geteilt",
     "Removed public link" : "Öffentlichen Link entfernt",
-    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "{actor} shared as public link" : "{actor} hat einen öffentlichen Link geteilt",
-    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
     "{actor} removed public link" : "{actor} hat einen öffentlichen Link entfernt",
-    "You shared %1$s as public link" : "Sie haben %1$s über einen öffentlichen Link geteilt",
     "You shared {file} as public link" : "Sie haben {file} über einen öffentlichen Link geteilt",
-    "You removed public link for %1$s" : "Sie haben die öffentliche Freigabe für %1$s entfernt",
     "You removed public link for {file}" : "Sie haben die öffentliche Freigabe für {file} entfernt",
-    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
     "{actor} shared {file} as public link" : "{actor} hat {file} über einen öffentlichen Link geteilt",
-    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "{actor} removed public link for {file}" : "{actor} hat einen öffentlichen Link {file} entfernt",
-    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
     "{user} accepted the remote share" : "{user} hat die Remotefreigabe akzeptiert",
-    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
     "{user} declined the remote share" : "{user} hat die Remotefreigabe abgelehnt",
-    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
     "You received a new remote share {file} from {user}" : "Du hast eine neue Remotefreigabe {file} von {user} erhalten",
-    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
     "{user} accepted the remote share of {file}" : "{user} hat die Remotefreigabe von {file} akzeptiert",
-    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
     "{user} declined the remote share of {file}" : "{user} hat die Remotefreigabe von {file} abgelehnt",
-    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit Ihnen",
     "{user} unshared {file} from you" : "{user} teilt {file} nicht mehr mit Ihnen",
-    "Shared with %1$s" : "Geteilt mit %1$s",
     "Shared with {user}" : "Geteilt mit {user}",
-    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
     "Removed share for {user}" : "Freigabe für {user} entfernt",
-    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
     "{actor} shared with {user}" : "{actor} hat mit {user} geteilt",
-    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "{actor} removed share for {user}" : "{actor} hat die Freigabe für {user} entfernt",
-    "Shared by %1$s" : "Geteilt von %1$s",
     "Shared by {actor}" : "Geteilt von {actor}",
-    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
     "{actor} removed share" : "{actor} hat die Freigabe entfernt",
-    "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt",
     "You shared {file} with {user}" : "Sie haben {file} mit {user} geteilt",
-    "You removed %2$s from %1$s" : "Sie haben %2$s von %1$s entfernt",
     "You removed {user} from {file}" : "Sie haben {user} von {file} entfernt",
-    "%3$s shared %1$s with %2$s" : "%3$s hat %1$s mit %2$s geteilt",
     "{actor} removed {user} from {file}" : "{actor} hat {user} von {file} entfernt",
-    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
-    "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "{actor} shared {file} with you" : "{actor} hat {file} mit Ihnen geteilt",
-    "%2$s removed you from %1$s" : "Sie wurden durch %2$s von %1$s entfernt",
     "{actor} removed you from {file}" : "Sie wurden durch {actor} von {file} entfernt",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Eine Datei oder ein Ordner der per E-Mail oder öffentlich geteilt ist wurde <strong>heruntergeladen</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Sie entfernt",
     "Public shared folder %1$s was downloaded" : "Der öffentlich geteilte Ordner %1$s wurde heruntergeladen",
     "Public shared file %1$s was downloaded" : "Die öffentlich geteilte Datei %1$s wurde heruntergeladen",
+    "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt",
     "%2$s shared %1$s with %3$s" : "%2$s hat %1$s mit %3$s geteilt",
     "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s entfernt",
     "%2$s removed the share of %3$s for %1$s" : "%2$s hat die Freigabe von %3$s für %1$s entfernt",
+    "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt",
     "%2$s shared %1$s with group %3$s" : "%2$s hat %1$s mit der Gruppe %3$s geteilt",
     "You removed the share of group %2$s for %1$s" : "Sie haben die Freigabe der Gruppe %2$s für %1$s entfernt",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s hat die Freigabe der Gruppe %3$s für %1$s entfernt",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
     "Your public link for %1$s expired" : "Ihre Freigabe als Link für %1$s ist abgelaufen",
     "The public link of %2$s for %1$s expired" : "Die Freigabe als Link von %2$s für %1$s ist abgelaufen",
+    "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "%2$s removed the share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
     "Shared with %2$s" : "Geteilt mit %2$s",
     "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Geteilt durch einen Link von %2$s",
     "Shared via public link" : "Durch einen öffentlichen Link geteilt",
     "%2$s removed public link" : "%2$s hat die Freigabe als öffentlichen Link entfernt",
-    "Public link expired" : "öffentlicher Link ist abgelaufen",
     "Public link of %2$s expired" : "Öffentlicher Link von %2$s ist abgelaufen",
     "Shared by %2$s" : "Geteilt von %2$s",
-    "Shares" : "Geteiltes"
+    "Shares" : "Geteiltes",
+    "Downloaded by %1$s" : "Heruntergeladen von %1$s",
+    "%1$s downloaded via public link" : "%1$s heruntergeladen mittels öffentlichen Link",
+    "%1$s downloaded %2$s" : "%1$s hat %2$s heruntergeladen",
+    "Shared with group %1$s" : "Geteilt mit der Gruppe %1$s",
+    "Removed share for group %1$s" : "Freigabe für die Gruppe %1$s entfernt",
+    "%2$s shared with group %1$s" : "%2$s geteilt mit der Gruppe %1$s",
+    "%2$s removed share for group %1$s" : "%2$s hat die Freigabe für die Gruppe %1$s entfernt",
+    "You removed group %2$s from %1$s" : "Sie haben die Gruppe %2$s von %1$s entfernt",
+    "%3$s shared %1$s with group %2$s" : "%3$s hat %1$s mit der Gruppe %2$s geteilt",
+    "%3$s removed group %2$s from %1$s" : "%3$s hat die Gruppe %2$s von %1$s entfernt",
+    "%1$s shared as public link" : "%1$s hat einen öffentlichen Link geteilt",
+    "%1$s removed public link" : "%1$s hat einen öffentlichen Link entfernt",
+    "You shared %1$s as public link" : "Sie haben %1$s über einen öffentlichen Link geteilt",
+    "You removed public link for %1$s" : "Sie haben die öffentliche Freigabe für %1$s entfernt",
+    "%2$s shared %1$s as public link" : "%2$s hat %1$s über einen öffentlichen Link geteilt",
+    "%2$s removed public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt",
+    "%1$s accepted the remote share" : "%1$s hat die Remotefreigabe akzeptiert",
+    "%1$s declined the remote share" : "%1$s hat die Remotefreigabe abgelehnt",
+    "You received a new remote share %1$s from %2$s" : "Du hast eine neue Remotefreigabe %1$s von %2$s erhalten",
+    "%2$s accepted the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s akzeptiert",
+    "%2$s declined the remote share of %1$s" : "%2$s hat die Remotefreigabe von %1$s abgelehnt",
+    "%2$s unshared %1$s from you" : "%2$s teilt %1$s nicht mehr mit Ihnen",
+    "Shared with %1$s" : "Geteilt mit %1$s",
+    "Removed share for %1$s" : "Freigabe für %1$s entfernt",
+    "%2$s shared with %1$s" : "%2$s hat mit %1$s geteilt",
+    "%2$s removed share for %1$s" : "%2$s hat die Freigabe für %1$s entfernt",
+    "Shared by %1$s" : "Geteilt von %1$s",
+    "%1$s removed share" : "%1$s hat die Freigabe entfernt",
+    "You removed %2$s from %1$s" : "Sie haben %2$s von %1$s entfernt",
+    "%3$s shared %1$s with %2$s" : "%3$s hat %1$s mit %2$s geteilt",
+    "%3$s removed %2$s from %1$s" : "%3$s hat %2$s von %1$s entfernt",
+    "%2$s removed you from %1$s" : "Sie wurden durch %2$s von %1$s entfernt"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index abada5b6efb310b2c8f4e3ce6f3ee29a299b132a..81a6a1d6fce0765beafd09162478c62f4b617a63 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Compartiendo",
     "File shares" : "Archivos compartidos",
     "Downloaded via public link" : "Descargado vía enlace público",
-    "Downloaded by %1$s" : "Descargado por %1$s",
     "Downloaded by {email}" : "Descargado por {email}",
-    "%1$s downloaded via public link" : "%1$s descargado por vía enlace público",
     "{file} downloaded via public link" : "{file} descargado vía enlace público",
-    "%1$s downloaded %2$s" : "%1$s descargó %2$s",
     "{email} downloaded {file}" : "{email} descargó {file}",
-    "Shared with group %1$s" : "Compartido con el grupo %1$s",
     "Shared with group {group}" : "Compartido con el grupo {grupo}",
-    "Removed share for group %1$s" : "Eliminado el compartido para el grupo %1$s",
     "Removed share for group {group}" : "Eliminado el compartido para el grupo {group}",
-    "%2$s shared with group %1$s" : "%2$s compartido con el grupo %1$s",
     "{actor} shared with group {group}" : "{actor} compartió con el grupo {group}",
-    "%2$s removed share for group %1$s" : "%2$s removió archivo del grupo %1$s",
     "{actor} removed share for group {group}" : "{actor} eliminó el compartido para el grupo {group}",
-    "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
     "You shared {file} with group {group}" : "Ha compartido {file} con el grupo {group}",
-    "You removed group %2$s from %1$s" : "Ha eliminado el grupo %2$s de %1$s",
     "You removed group {group} from {file}" : "Ha eliminado el grupo  {group} del {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s compartió %1$s con el grupo %2$s",
     "{actor} shared {file} with group {group}" : "{actor} compartió {file} con el grupo {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s eliminó el grupo %2$s de %1$s",
     "{actor} removed group {group} from {file}" : "{actor} eliminó grupo {group} de {file}",
     "Shared as public link" : "Compartido como enlace público",
     "Removed public link" : "Eliminado enlace público",
-    "%1$s shared as public link" : "%1$s compartido como enlace público",
+    "Public link expired" : "El enlace público ha expirado",
     "{actor} shared as public link" : "{actor} compartió como enlace público",
-    "%1$s removed public link" : "%1$s eliminó el enlace público",
     "{actor} removed public link" : "{actor} eliminó el enlace público",
-    "You shared %1$s as public link" : "Compartió %1$s como un enlace público",
     "You shared {file} as public link" : "Compartió {file} como un enlace público",
-    "You removed public link for %1$s" : "Eliminó el enlace público para %1$s",
     "You removed public link for {file}" : "Eliminó el enlace público para {file}",
-    "%2$s shared %1$s as public link" : "%2$s compartió %1$s como un enlace público",
     "{actor} shared {file} as public link" : "{actor} compartió {file} como enlace público",
-    "%2$s removed public link for %1$s" : "%2$s eliminó el enlace público para %1$s",
     "{actor} removed public link for {file}" : "{actor} eliminó el enlace público para {file}",
-    "%1$s accepted the remote share" : "%1$s aceptó el recurso compartido remotamente",
     "{user} accepted the remote share" : "{user} aceptó el recurso compartido remotamente",
-    "%1$s declined the remote share" : "%1$s rechazó el recurso compartido",
     "{user} declined the remote share" : "{user} rechazó el recurso compartido",
-    "You received a new remote share %1$s from %2$s" : "Ha recibido un nuevo recurso compartido remoto %1$s de %2$s",
     "You received a new remote share {file} from {user}" : "Ha recibido un nuevo recurso compartido remoto {file} de {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s aceptó el recurso compartido de %1$s",
     "{user} accepted the remote share of {file}" : "{user} aceptó la compartición remota de {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s rechazó el recurso compartido de %1$s",
     "{user} declined the remote share of {file}" : "{user} rechazó el recurso compartido de {file}",
-    "%2$s unshared %1$s from you" : "%2$s dejó de compartir %1$s contigo",
     "{user} unshared {file} from you" : "{user} dejó de compartir {file} contigo",
-    "Shared with %1$s" : "Compartido con %1$s",
     "Shared with {user}" : "Compartido con {user}",
-    "Removed share for %1$s" : "Eliminó el recurso compartido a %1$s",
     "Removed share for {user}" : "Eliminó el recurso compartido a {user}",
-    "%2$s shared with %1$s" : "%2$s compartió con %1$s",
     "{actor} shared with {user}" : "{actor} compartió con {user}",
-    "%2$s removed share for %1$s" : "%2$s eliminó recurso compartido para %1$s",
     "{actor} removed share for {user}" : "{actor} eliminó recurso compartido para {user}",
-    "Shared by %1$s" : "Compartido por %1$s",
     "Shared by {actor}" : "Compartido por {actor}",
-    "%1$s removed share" : "%1$s eliminó el recurso compartido",
     "{actor} removed share" : "{actor} eliminó el recurso compartido",
-    "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
     "You shared {file} with {user}" : "Ha compartido {file} con {user}",
-    "You removed %2$s from %1$s" : "Ha eliminado %2$s de %1$s",
     "You removed {user} from {file}" : "Ha eliminado {user} de {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s compartió %1$s con %2$s",
     "{actor} removed {user} from {file}" : "{actor} eliminó a {user} de {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s eliminó a %2$s de %1$s",
-    "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "{actor} shared {file} with you" : "{actor} compartió {file} contigo",
-    "%2$s removed you from %1$s" : "%2$s lo ha eliminado de %1$s",
     "{actor} removed you from {file}" : "{actor} lo ha eliminado de {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Un archivo o carpeta compartida por correo o enlace público fue  <strong>descargado</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s dejó de compartirse %2$s por ti",
     "Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s",
     "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",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%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",
     "%2$s removed the share for %1$s" : "%2$s ha borrado el compartido %1$s",
     "Shared with %2$s" : "Compartido con %2$s",
     "Shared with %3$s by %2$s" : "Compartido con %3$s por %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Compartido vía enlace por %2$s",
     "Shared via public link" : "Compartido vía enlace público",
     "%2$s removed public link" : "%2$s ha borrado el enlace público",
-    "Public link expired" : "El enlace público ha expirado",
     "Public link of %2$s expired" : "El enlace público %2$s ha expirado",
     "Shared by %2$s" : "Compartido por %2$s",
-    "Shares" : "Compartidos"
+    "Shares" : "Compartidos",
+    "Downloaded by %1$s" : "Descargado por %1$s",
+    "%1$s downloaded via public link" : "%1$s descargado por vía enlace público",
+    "%1$s downloaded %2$s" : "%1$s descargó %2$s",
+    "Shared with group %1$s" : "Compartido con el grupo %1$s",
+    "Removed share for group %1$s" : "Eliminado el compartido para el grupo %1$s",
+    "%2$s shared with group %1$s" : "%2$s compartido con el grupo %1$s",
+    "%2$s removed share for group %1$s" : "%2$s removió archivo del grupo %1$s",
+    "You removed group %2$s from %1$s" : "Ha eliminado el grupo %2$s de %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s compartió %1$s con el grupo %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s eliminó el grupo %2$s de %1$s",
+    "%1$s shared as public link" : "%1$s compartido como enlace público",
+    "%1$s removed public link" : "%1$s eliminó el enlace público",
+    "You shared %1$s as public link" : "Compartió %1$s como un enlace público",
+    "You removed public link for %1$s" : "Eliminó el enlace público para %1$s",
+    "%2$s shared %1$s as public link" : "%2$s compartió %1$s como un enlace público",
+    "%2$s removed public link for %1$s" : "%2$s eliminó el enlace público para %1$s",
+    "%1$s accepted the remote share" : "%1$s aceptó el recurso compartido remotamente",
+    "%1$s declined the remote share" : "%1$s rechazó el recurso compartido",
+    "You received a new remote share %1$s from %2$s" : "Ha recibido un nuevo recurso compartido remoto %1$s de %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s aceptó el recurso compartido de %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s rechazó el recurso compartido de %1$s",
+    "%2$s unshared %1$s from you" : "%2$s dejó de compartir %1$s contigo",
+    "Shared with %1$s" : "Compartido con %1$s",
+    "Removed share for %1$s" : "Eliminó el recurso compartido a %1$s",
+    "%2$s shared with %1$s" : "%2$s compartió con %1$s",
+    "%2$s removed share for %1$s" : "%2$s eliminó recurso compartido para %1$s",
+    "Shared by %1$s" : "Compartido por %1$s",
+    "%1$s removed share" : "%1$s eliminó el recurso compartido",
+    "You removed %2$s from %1$s" : "Ha eliminado %2$s de %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s compartió %1$s con %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s eliminó a %2$s de %1$s",
+    "%2$s removed you from %1$s" : "%2$s lo ha eliminado de %1$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 64463b90054df24a9ddb4410d883e493b72abbbd..e776d9ba8ceedb5fa6a0768e64b8ede2cbf5c5f2 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -18,76 +18,42 @@
     "Sharing" : "Compartiendo",
     "File shares" : "Archivos compartidos",
     "Downloaded via public link" : "Descargado vía enlace público",
-    "Downloaded by %1$s" : "Descargado por %1$s",
     "Downloaded by {email}" : "Descargado por {email}",
-    "%1$s downloaded via public link" : "%1$s descargado por vía enlace público",
     "{file} downloaded via public link" : "{file} descargado vía enlace público",
-    "%1$s downloaded %2$s" : "%1$s descargó %2$s",
     "{email} downloaded {file}" : "{email} descargó {file}",
-    "Shared with group %1$s" : "Compartido con el grupo %1$s",
     "Shared with group {group}" : "Compartido con el grupo {grupo}",
-    "Removed share for group %1$s" : "Eliminado el compartido para el grupo %1$s",
     "Removed share for group {group}" : "Eliminado el compartido para el grupo {group}",
-    "%2$s shared with group %1$s" : "%2$s compartido con el grupo %1$s",
     "{actor} shared with group {group}" : "{actor} compartió con el grupo {group}",
-    "%2$s removed share for group %1$s" : "%2$s removió archivo del grupo %1$s",
     "{actor} removed share for group {group}" : "{actor} eliminó el compartido para el grupo {group}",
-    "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
     "You shared {file} with group {group}" : "Ha compartido {file} con el grupo {group}",
-    "You removed group %2$s from %1$s" : "Ha eliminado el grupo %2$s de %1$s",
     "You removed group {group} from {file}" : "Ha eliminado el grupo  {group} del {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s compartió %1$s con el grupo %2$s",
     "{actor} shared {file} with group {group}" : "{actor} compartió {file} con el grupo {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s eliminó el grupo %2$s de %1$s",
     "{actor} removed group {group} from {file}" : "{actor} eliminó grupo {group} de {file}",
     "Shared as public link" : "Compartido como enlace público",
     "Removed public link" : "Eliminado enlace público",
-    "%1$s shared as public link" : "%1$s compartido como enlace público",
+    "Public link expired" : "El enlace público ha expirado",
     "{actor} shared as public link" : "{actor} compartió como enlace público",
-    "%1$s removed public link" : "%1$s eliminó el enlace público",
     "{actor} removed public link" : "{actor} eliminó el enlace público",
-    "You shared %1$s as public link" : "Compartió %1$s como un enlace público",
     "You shared {file} as public link" : "Compartió {file} como un enlace público",
-    "You removed public link for %1$s" : "Eliminó el enlace público para %1$s",
     "You removed public link for {file}" : "Eliminó el enlace público para {file}",
-    "%2$s shared %1$s as public link" : "%2$s compartió %1$s como un enlace público",
     "{actor} shared {file} as public link" : "{actor} compartió {file} como enlace público",
-    "%2$s removed public link for %1$s" : "%2$s eliminó el enlace público para %1$s",
     "{actor} removed public link for {file}" : "{actor} eliminó el enlace público para {file}",
-    "%1$s accepted the remote share" : "%1$s aceptó el recurso compartido remotamente",
     "{user} accepted the remote share" : "{user} aceptó el recurso compartido remotamente",
-    "%1$s declined the remote share" : "%1$s rechazó el recurso compartido",
     "{user} declined the remote share" : "{user} rechazó el recurso compartido",
-    "You received a new remote share %1$s from %2$s" : "Ha recibido un nuevo recurso compartido remoto %1$s de %2$s",
     "You received a new remote share {file} from {user}" : "Ha recibido un nuevo recurso compartido remoto {file} de {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s aceptó el recurso compartido de %1$s",
     "{user} accepted the remote share of {file}" : "{user} aceptó la compartición remota de {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s rechazó el recurso compartido de %1$s",
     "{user} declined the remote share of {file}" : "{user} rechazó el recurso compartido de {file}",
-    "%2$s unshared %1$s from you" : "%2$s dejó de compartir %1$s contigo",
     "{user} unshared {file} from you" : "{user} dejó de compartir {file} contigo",
-    "Shared with %1$s" : "Compartido con %1$s",
     "Shared with {user}" : "Compartido con {user}",
-    "Removed share for %1$s" : "Eliminó el recurso compartido a %1$s",
     "Removed share for {user}" : "Eliminó el recurso compartido a {user}",
-    "%2$s shared with %1$s" : "%2$s compartió con %1$s",
     "{actor} shared with {user}" : "{actor} compartió con {user}",
-    "%2$s removed share for %1$s" : "%2$s eliminó recurso compartido para %1$s",
     "{actor} removed share for {user}" : "{actor} eliminó recurso compartido para {user}",
-    "Shared by %1$s" : "Compartido por %1$s",
     "Shared by {actor}" : "Compartido por {actor}",
-    "%1$s removed share" : "%1$s eliminó el recurso compartido",
     "{actor} removed share" : "{actor} eliminó el recurso compartido",
-    "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
     "You shared {file} with {user}" : "Ha compartido {file} con {user}",
-    "You removed %2$s from %1$s" : "Ha eliminado %2$s de %1$s",
     "You removed {user} from {file}" : "Ha eliminado {user} de {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s compartió %1$s con %2$s",
     "{actor} removed {user} from {file}" : "{actor} eliminó a {user} de {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s eliminó a %2$s de %1$s",
-    "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "{actor} shared {file} with you" : "{actor} compartió {file} contigo",
-    "%2$s removed you from %1$s" : "%2$s lo ha eliminado de %1$s",
     "{actor} removed you from {file}" : "{actor} lo ha eliminado de {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Un archivo o carpeta compartida por correo o enlace público fue  <strong>descargado</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s dejó de compartirse %2$s por ti",
     "Public shared folder %1$s was downloaded" : "Se descargó la carpeta pública compartida %1$s",
     "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",
@@ -156,6 +124,7 @@
     "%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",
     "%2$s removed the share for %1$s" : "%2$s ha borrado el compartido %1$s",
     "Shared with %2$s" : "Compartido con %2$s",
     "Shared with %3$s by %2$s" : "Compartido con %3$s por %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Compartido vía enlace por %2$s",
     "Shared via public link" : "Compartido vía enlace público",
     "%2$s removed public link" : "%2$s ha borrado el enlace público",
-    "Public link expired" : "El enlace público ha expirado",
     "Public link of %2$s expired" : "El enlace público %2$s ha expirado",
     "Shared by %2$s" : "Compartido por %2$s",
-    "Shares" : "Compartidos"
+    "Shares" : "Compartidos",
+    "Downloaded by %1$s" : "Descargado por %1$s",
+    "%1$s downloaded via public link" : "%1$s descargado por vía enlace público",
+    "%1$s downloaded %2$s" : "%1$s descargó %2$s",
+    "Shared with group %1$s" : "Compartido con el grupo %1$s",
+    "Removed share for group %1$s" : "Eliminado el compartido para el grupo %1$s",
+    "%2$s shared with group %1$s" : "%2$s compartido con el grupo %1$s",
+    "%2$s removed share for group %1$s" : "%2$s removió archivo del grupo %1$s",
+    "You removed group %2$s from %1$s" : "Ha eliminado el grupo %2$s de %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s compartió %1$s con el grupo %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s eliminó el grupo %2$s de %1$s",
+    "%1$s shared as public link" : "%1$s compartido como enlace público",
+    "%1$s removed public link" : "%1$s eliminó el enlace público",
+    "You shared %1$s as public link" : "Compartió %1$s como un enlace público",
+    "You removed public link for %1$s" : "Eliminó el enlace público para %1$s",
+    "%2$s shared %1$s as public link" : "%2$s compartió %1$s como un enlace público",
+    "%2$s removed public link for %1$s" : "%2$s eliminó el enlace público para %1$s",
+    "%1$s accepted the remote share" : "%1$s aceptó el recurso compartido remotamente",
+    "%1$s declined the remote share" : "%1$s rechazó el recurso compartido",
+    "You received a new remote share %1$s from %2$s" : "Ha recibido un nuevo recurso compartido remoto %1$s de %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s aceptó el recurso compartido de %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s rechazó el recurso compartido de %1$s",
+    "%2$s unshared %1$s from you" : "%2$s dejó de compartir %1$s contigo",
+    "Shared with %1$s" : "Compartido con %1$s",
+    "Removed share for %1$s" : "Eliminó el recurso compartido a %1$s",
+    "%2$s shared with %1$s" : "%2$s compartió con %1$s",
+    "%2$s removed share for %1$s" : "%2$s eliminó recurso compartido para %1$s",
+    "Shared by %1$s" : "Compartido por %1$s",
+    "%1$s removed share" : "%1$s eliminó el recurso compartido",
+    "You removed %2$s from %1$s" : "Ha eliminado %2$s de %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s compartió %1$s con %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s eliminó a %2$s de %1$s",
+    "%2$s removed you from %1$s" : "%2$s lo ha eliminado de %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 2f9b6c522f5a23f5a5f4c1ec6f2a46451896e54a..16b68eaa37a8c1a3f1cceadb956d59f64d3be954 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Partage",
     "File shares" : "Partages de fichiers",
     "Downloaded via public link" : "Téléchargé par lien public",
-    "Downloaded by %1$s" : "Téléchargé par %1$s",
     "Downloaded by {email}" : "Téléchargé par {email}",
-    "%1$s downloaded via public link" : "%1$s téléchargé par lien public",
     "{file} downloaded via public link" : "{file} téléchargé par lien public",
-    "%1$s downloaded %2$s" : "%1$s a téléchargé %2$s",
     "{email} downloaded {file}" : "{email} a téléchargé {file}",
-    "Shared with group %1$s" : "Partagé avec le groupe %1$s",
     "Shared with group {group}" : "Partagé avec le groupe {group}",
-    "Removed share for group %1$s" : "Partage supprimé avec le groupe %1$s",
     "Removed share for group {group}" : "Partage supprimé avec le groupe {group}",
-    "%2$s shared with group %1$s" : "%2$s a partagé avec le groupe %1$s",
     "{actor} shared with group {group}" : "{actor} a partagé avec le groupe {group}",
-    "%2$s removed share for group %1$s" : "%2$s a supprimé le partage avec le groupe %1$s",
     "{actor} removed share for group {group}" : "{actor} a supprimé le partage avec le groupe {group}",
-    "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
     "You shared {file} with group {group}" : "Vous avez partagé {file} avec le groupe {group}",
-    "You removed group %2$s from %1$s" : "Vous avez supprimé le group %2$s de %1$s",
     "You removed group {group} from {file}" : "Vous avez supprimé le groupe {group} de {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s a partagé %1$s avec le groupe %2$s",
     "{actor} shared {file} with group {group}" : "{actor} a partagé {file} avec le groupe {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s a supprimé le groupe %2$s de %1$s",
     "{actor} removed group {group} from {file}" : "{actor} a supprimé le groupe {group} de {file}",
     "Shared as public link" : "Partagé avec un lien public",
     "Removed public link" : "Lien public supprimé",
-    "%1$s shared as public link" : "%1$s a partagé avec un lien public",
+    "Public link expired" : "Lien public expiré",
     "{actor} shared as public link" : "{actor} a partagé avec un lien public",
-    "%1$s removed public link" : "%1$s a supprimé le lien public",
     "{actor} removed public link" : "{actor} a supprimé le lien public",
-    "You shared %1$s as public link" : "Vous avez partagé %1$s avec un lien public",
     "You shared {file} as public link" : "Vous avez partagé {file} avec un lien public",
-    "You removed public link for %1$s" : "Vous avez supprimé le lien public pour %1$s",
     "You removed public link for {file}" : "Vous avez supprimé le lien public pour {file}",
-    "%2$s shared %1$s as public link" : "%2$s a partagé %1$s avec un lien public",
     "{actor} shared {file} as public link" : "{actor} a partagé {file} avec un lien public",
-    "%2$s removed public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
     "{actor} removed public link for {file}" : "{actor} a supprimé le lien public pour {file}",
-    "%1$s accepted the remote share" : "%1$s a accepté le partage distant",
     "{user} accepted the remote share" : "{user} a accepté le partage distant",
-    "%1$s declined the remote share" : "%1$s a refusé le partage distant",
     "{user} declined the remote share" : "{user} a refusé le partage distant",
-    "You received a new remote share %1$s from %2$s" : "L'utilisateur %2$s a partagé la ressource distante %1$s avec vous",
     "You received a new remote share {file} from {user}" : "Vous avez reçu le partage distant {file} de {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s a accepté le partage distant de %1$s",
     "{user} accepted the remote share of {file}" : "{user} a accepté le partage distant de {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s a refusé le partage distant de %1$s",
     "{user} declined the remote share of {file}" : "{user} a refusé le partage distant de {file}",
-    "%2$s unshared %1$s from you" : "%2$s a cessé de partager %1$s avec vous",
     "{user} unshared {file} from you" : "{user} a cessé de partager {file} avec vous",
-    "Shared with %1$s" : "Partagé avec %1$s",
     "Shared with {user}" : "Partagé avec {user}",
-    "Removed share for %1$s" : "Partage supprimé pour %1$s",
     "Removed share for {user}" : "Partage supprimé pour {user}",
-    "%2$s shared with %1$s" : "%2$s a partagé avec %1$s",
     "{actor} shared with {user}" : "{actor} a partagé avec {user}",
-    "%2$s removed share for %1$s" : "%2$s a supprimé le partage pour %1$s",
     "{actor} removed share for {user}" : "{actor} a supprimé le partage pour {user}",
-    "Shared by %1$s" : "Partagé par %1$s",
     "Shared by {actor}" : "Partagé par {actor}",
-    "%1$s removed share" : "%1$s a supprimé le partage",
     "{actor} removed share" : "{actor} a supprimé le partage",
-    "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "You shared {file} with {user}" : "Vous avez partagé {file} avec {user}",
-    "You removed %2$s from %1$s" : "Vous avez supprimé %2$s de %1$s",
     "You removed {user} from {file}" : "Vous avez supprimé {user} de {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s a partagé %1$s avec %2$s",
     "{actor} removed {user} from {file}" : "{actor} a supprimé {user} de {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s a supprimé %2$s de %1$s",
-    "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "{actor} shared {file} with you" : "{actor} a partagé {file} avec vous",
-    "%2$s removed you from %1$s" : "%2$s vous a supprimé de %1$s",
     "{actor} removed you from {file}" : "{actor} vous a supprimé de {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Un fichier ou un dossier partagé par mail ou par lien public a été <strong>téléchargé</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un fichier ou un répertoire a été partagé depuis <strong>un autre serveur</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s a cessé de partager %2$s avec  vous",
     "Public shared folder %1$s was downloaded" : "Le dossier public %1$s a été téléchargé",
     "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
+    "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
     "You removed the share of %2$s for %1$s" : "Vous avez supprimé le partage de %2$s pour %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s a supprimé votre partage de %3$s pour %1$s",
+    "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "You removed the share of group %2$s for %1$s" : "Vous avez supprimé le partage du groupe %2$s pour %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s a supprimé le partage du groupe %3$s pour %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
     "Your public link for %1$s expired" : "Le lien public pour %1$s a expiré",
     "The public link of %2$s for %1$s expired" : "Le lien public de %2$s pour %1$s a expiré",
+    "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "%2$s removed the share for %1$s" : "%2$s a supprimé le partage pour %1$s",
     "Shared with %2$s" : "Partagé avec %2$s",
     "Shared with %3$s by %2$s" : "Partagé avec %3$s par %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Partagé via lien par %2$s",
     "Shared via public link" : "Partagé par lien public",
     "%2$s removed public link" : "%2$s a supprimé le lien public",
-    "Public link expired" : "Lien public expiré",
     "Public link of %2$s expired" : "Le lien public de %2$s a expiré",
     "Shared by %2$s" : "Partagé par %2$s",
-    "Shares" : "Partages"
+    "Shares" : "Partages",
+    "Downloaded by %1$s" : "Téléchargé par %1$s",
+    "%1$s downloaded via public link" : "%1$s téléchargé par lien public",
+    "%1$s downloaded %2$s" : "%1$s a téléchargé %2$s",
+    "Shared with group %1$s" : "Partagé avec le groupe %1$s",
+    "Removed share for group %1$s" : "Partage supprimé avec le groupe %1$s",
+    "%2$s shared with group %1$s" : "%2$s a partagé avec le groupe %1$s",
+    "%2$s removed share for group %1$s" : "%2$s a supprimé le partage avec le groupe %1$s",
+    "You removed group %2$s from %1$s" : "Vous avez supprimé le group %2$s de %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s a partagé %1$s avec le groupe %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s a supprimé le groupe %2$s de %1$s",
+    "%1$s shared as public link" : "%1$s a partagé avec un lien public",
+    "%1$s removed public link" : "%1$s a supprimé le lien public",
+    "You shared %1$s as public link" : "Vous avez partagé %1$s avec un lien public",
+    "You removed public link for %1$s" : "Vous avez supprimé le lien public pour %1$s",
+    "%2$s shared %1$s as public link" : "%2$s a partagé %1$s avec un lien public",
+    "%2$s removed public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
+    "%1$s accepted the remote share" : "%1$s a accepté le partage distant",
+    "%1$s declined the remote share" : "%1$s a refusé le partage distant",
+    "You received a new remote share %1$s from %2$s" : "L'utilisateur %2$s a partagé la ressource distante %1$s avec vous",
+    "%2$s accepted the remote share of %1$s" : "%2$s a accepté le partage distant de %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s a refusé le partage distant de %1$s",
+    "%2$s unshared %1$s from you" : "%2$s a cessé de partager %1$s avec vous",
+    "Shared with %1$s" : "Partagé avec %1$s",
+    "Removed share for %1$s" : "Partage supprimé pour %1$s",
+    "%2$s shared with %1$s" : "%2$s a partagé avec %1$s",
+    "%2$s removed share for %1$s" : "%2$s a supprimé le partage pour %1$s",
+    "Shared by %1$s" : "Partagé par %1$s",
+    "%1$s removed share" : "%1$s a supprimé le partage",
+    "You removed %2$s from %1$s" : "Vous avez supprimé %2$s de %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s a partagé %1$s avec %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s a supprimé %2$s de %1$s",
+    "%2$s removed you from %1$s" : "%2$s vous a supprimé de %1$s"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 85a2eae4870ad2c3db1ec2e80b768a1b75079d73..f9450eac1669bd3139fb3890c9282ff8830cab41 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -18,76 +18,42 @@
     "Sharing" : "Partage",
     "File shares" : "Partages de fichiers",
     "Downloaded via public link" : "Téléchargé par lien public",
-    "Downloaded by %1$s" : "Téléchargé par %1$s",
     "Downloaded by {email}" : "Téléchargé par {email}",
-    "%1$s downloaded via public link" : "%1$s téléchargé par lien public",
     "{file} downloaded via public link" : "{file} téléchargé par lien public",
-    "%1$s downloaded %2$s" : "%1$s a téléchargé %2$s",
     "{email} downloaded {file}" : "{email} a téléchargé {file}",
-    "Shared with group %1$s" : "Partagé avec le groupe %1$s",
     "Shared with group {group}" : "Partagé avec le groupe {group}",
-    "Removed share for group %1$s" : "Partage supprimé avec le groupe %1$s",
     "Removed share for group {group}" : "Partage supprimé avec le groupe {group}",
-    "%2$s shared with group %1$s" : "%2$s a partagé avec le groupe %1$s",
     "{actor} shared with group {group}" : "{actor} a partagé avec le groupe {group}",
-    "%2$s removed share for group %1$s" : "%2$s a supprimé le partage avec le groupe %1$s",
     "{actor} removed share for group {group}" : "{actor} a supprimé le partage avec le groupe {group}",
-    "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
     "You shared {file} with group {group}" : "Vous avez partagé {file} avec le groupe {group}",
-    "You removed group %2$s from %1$s" : "Vous avez supprimé le group %2$s de %1$s",
     "You removed group {group} from {file}" : "Vous avez supprimé le groupe {group} de {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s a partagé %1$s avec le groupe %2$s",
     "{actor} shared {file} with group {group}" : "{actor} a partagé {file} avec le groupe {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s a supprimé le groupe %2$s de %1$s",
     "{actor} removed group {group} from {file}" : "{actor} a supprimé le groupe {group} de {file}",
     "Shared as public link" : "Partagé avec un lien public",
     "Removed public link" : "Lien public supprimé",
-    "%1$s shared as public link" : "%1$s a partagé avec un lien public",
+    "Public link expired" : "Lien public expiré",
     "{actor} shared as public link" : "{actor} a partagé avec un lien public",
-    "%1$s removed public link" : "%1$s a supprimé le lien public",
     "{actor} removed public link" : "{actor} a supprimé le lien public",
-    "You shared %1$s as public link" : "Vous avez partagé %1$s avec un lien public",
     "You shared {file} as public link" : "Vous avez partagé {file} avec un lien public",
-    "You removed public link for %1$s" : "Vous avez supprimé le lien public pour %1$s",
     "You removed public link for {file}" : "Vous avez supprimé le lien public pour {file}",
-    "%2$s shared %1$s as public link" : "%2$s a partagé %1$s avec un lien public",
     "{actor} shared {file} as public link" : "{actor} a partagé {file} avec un lien public",
-    "%2$s removed public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
     "{actor} removed public link for {file}" : "{actor} a supprimé le lien public pour {file}",
-    "%1$s accepted the remote share" : "%1$s a accepté le partage distant",
     "{user} accepted the remote share" : "{user} a accepté le partage distant",
-    "%1$s declined the remote share" : "%1$s a refusé le partage distant",
     "{user} declined the remote share" : "{user} a refusé le partage distant",
-    "You received a new remote share %1$s from %2$s" : "L'utilisateur %2$s a partagé la ressource distante %1$s avec vous",
     "You received a new remote share {file} from {user}" : "Vous avez reçu le partage distant {file} de {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s a accepté le partage distant de %1$s",
     "{user} accepted the remote share of {file}" : "{user} a accepté le partage distant de {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s a refusé le partage distant de %1$s",
     "{user} declined the remote share of {file}" : "{user} a refusé le partage distant de {file}",
-    "%2$s unshared %1$s from you" : "%2$s a cessé de partager %1$s avec vous",
     "{user} unshared {file} from you" : "{user} a cessé de partager {file} avec vous",
-    "Shared with %1$s" : "Partagé avec %1$s",
     "Shared with {user}" : "Partagé avec {user}",
-    "Removed share for %1$s" : "Partage supprimé pour %1$s",
     "Removed share for {user}" : "Partage supprimé pour {user}",
-    "%2$s shared with %1$s" : "%2$s a partagé avec %1$s",
     "{actor} shared with {user}" : "{actor} a partagé avec {user}",
-    "%2$s removed share for %1$s" : "%2$s a supprimé le partage pour %1$s",
     "{actor} removed share for {user}" : "{actor} a supprimé le partage pour {user}",
-    "Shared by %1$s" : "Partagé par %1$s",
     "Shared by {actor}" : "Partagé par {actor}",
-    "%1$s removed share" : "%1$s a supprimé le partage",
     "{actor} removed share" : "{actor} a supprimé le partage",
-    "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "You shared {file} with {user}" : "Vous avez partagé {file} avec {user}",
-    "You removed %2$s from %1$s" : "Vous avez supprimé %2$s de %1$s",
     "You removed {user} from {file}" : "Vous avez supprimé {user} de {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s a partagé %1$s avec %2$s",
     "{actor} removed {user} from {file}" : "{actor} a supprimé {user} de {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s a supprimé %2$s de %1$s",
-    "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "{actor} shared {file} with you" : "{actor} a partagé {file} avec vous",
-    "%2$s removed you from %1$s" : "%2$s vous a supprimé de %1$s",
     "{actor} removed you from {file}" : "{actor} vous a supprimé de {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Un fichier ou un dossier partagé par mail ou par lien public a été <strong>téléchargé</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un fichier ou un répertoire a été partagé depuis <strong>un autre serveur</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s a cessé de partager %2$s avec  vous",
     "Public shared folder %1$s was downloaded" : "Le dossier public %1$s a été téléchargé",
     "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
+    "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
     "You removed the share of %2$s for %1$s" : "Vous avez supprimé le partage de %2$s pour %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s a supprimé votre partage de %3$s pour %1$s",
+    "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "You removed the share of group %2$s for %1$s" : "Vous avez supprimé le partage du groupe %2$s pour %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s a supprimé le partage du groupe %3$s pour %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
     "Your public link for %1$s expired" : "Le lien public pour %1$s a expiré",
     "The public link of %2$s for %1$s expired" : "Le lien public de %2$s pour %1$s a expiré",
+    "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "%2$s removed the share for %1$s" : "%2$s a supprimé le partage pour %1$s",
     "Shared with %2$s" : "Partagé avec %2$s",
     "Shared with %3$s by %2$s" : "Partagé avec %3$s par %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Partagé via lien par %2$s",
     "Shared via public link" : "Partagé par lien public",
     "%2$s removed public link" : "%2$s a supprimé le lien public",
-    "Public link expired" : "Lien public expiré",
     "Public link of %2$s expired" : "Le lien public de %2$s a expiré",
     "Shared by %2$s" : "Partagé par %2$s",
-    "Shares" : "Partages"
+    "Shares" : "Partages",
+    "Downloaded by %1$s" : "Téléchargé par %1$s",
+    "%1$s downloaded via public link" : "%1$s téléchargé par lien public",
+    "%1$s downloaded %2$s" : "%1$s a téléchargé %2$s",
+    "Shared with group %1$s" : "Partagé avec le groupe %1$s",
+    "Removed share for group %1$s" : "Partage supprimé avec le groupe %1$s",
+    "%2$s shared with group %1$s" : "%2$s a partagé avec le groupe %1$s",
+    "%2$s removed share for group %1$s" : "%2$s a supprimé le partage avec le groupe %1$s",
+    "You removed group %2$s from %1$s" : "Vous avez supprimé le group %2$s de %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s a partagé %1$s avec le groupe %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s a supprimé le groupe %2$s de %1$s",
+    "%1$s shared as public link" : "%1$s a partagé avec un lien public",
+    "%1$s removed public link" : "%1$s a supprimé le lien public",
+    "You shared %1$s as public link" : "Vous avez partagé %1$s avec un lien public",
+    "You removed public link for %1$s" : "Vous avez supprimé le lien public pour %1$s",
+    "%2$s shared %1$s as public link" : "%2$s a partagé %1$s avec un lien public",
+    "%2$s removed public link for %1$s" : "%2$s a supprimé le lien public pour %1$s",
+    "%1$s accepted the remote share" : "%1$s a accepté le partage distant",
+    "%1$s declined the remote share" : "%1$s a refusé le partage distant",
+    "You received a new remote share %1$s from %2$s" : "L'utilisateur %2$s a partagé la ressource distante %1$s avec vous",
+    "%2$s accepted the remote share of %1$s" : "%2$s a accepté le partage distant de %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s a refusé le partage distant de %1$s",
+    "%2$s unshared %1$s from you" : "%2$s a cessé de partager %1$s avec vous",
+    "Shared with %1$s" : "Partagé avec %1$s",
+    "Removed share for %1$s" : "Partage supprimé pour %1$s",
+    "%2$s shared with %1$s" : "%2$s a partagé avec %1$s",
+    "%2$s removed share for %1$s" : "%2$s a supprimé le partage pour %1$s",
+    "Shared by %1$s" : "Partagé par %1$s",
+    "%1$s removed share" : "%1$s a supprimé le partage",
+    "You removed %2$s from %1$s" : "Vous avez supprimé %2$s de %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s a partagé %1$s avec %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s a supprimé %2$s de %1$s",
+    "%2$s removed you from %1$s" : "%2$s vous a supprimé de %1$s"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index debb82f3254b80851b99075454709c82c2cb2d20..028837deba5f0592a73a30542cfee637cae00c16 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Megosztás",
     "File shares" : "Fájl megosztások",
     "Downloaded via public link" : "Letöltve nyilvános hivatkozással",
-    "Downloaded by %1$s" : "Letöltötte: %1$s",
     "Downloaded by {email}" : "Letöltötte: {email}",
-    "%1$s downloaded via public link" : "%1$s letöltve nyilvános hibatkozással",
     "{file} downloaded via public link" : "{file} letöltve nyilvános hibatkozással",
-    "%1$s downloaded %2$s" : "%1$s letöltötte ezt: %2$s",
     "{email} downloaded {file}" : "{email} letöltötte ezt: {file}",
-    "Shared with group %1$s" : "Megosztva ezzel a csoporttal: %1$s",
     "Shared with group {group}" : "Megosztva ezzel a csoporttal: {group}",
-    "Removed share for group %1$s" : "%1$s csoport megosztása eltávolítva",
     "Removed share for group {group}" : "{group} csoport megosztása eltávolítva",
-    "%2$s shared with group %1$s" : "%2$s megosztva ezzel a csoporttal: %1$s",
     "{actor} shared with group {group}" : "{actor} megosztva ezzel a csoporttal: {group}",
-    "%2$s removed share for group %1$s" : "%2$s eltávolította %1$s csoport megosztását",
     "{actor} removed share for group {group}" : "{actor} eltávolította {group} csoport megosztását",
-    "You shared %1$s with group %2$s" : "Megosztottad ezt: %1$s ezzel a csoporttal: %2$s",
     "You shared {file} with group {group}" : "Megosztottad ezt: {file} ezzel a csoporttal: {group}",
-    "You removed group %2$s from %1$s" : "Eltávolítottad ezt csoportot: %2$s innen: %1$s",
     "You removed group {group} from {file}" : "Eltávolítottad ezt csoportot:  {group} innen:  {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s megosztotta ezt: %1$s, ezzel a csoporttal: %2$s",
     "{actor} shared {file} with group {group}" : "{actor} megosztotta ezt: {file} ezzel a csoporttal: {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s eltávolította ezt a csoportot: %2$s innen: %1$s",
     "{actor} removed group {group} from {file}" : "{actor} eltávolította ezt a csoportot {group} innen: {file}",
     "Shared as public link" : "Megosztva nyilvános hivatkozásként",
     "Removed public link" : "Eltávolított nyilvános hivatkozás",
-    "%1$s shared as public link" : "%1$s megosztva nyilvános hivatkozásként",
+    "Public link expired" : "Nyilvános hivatkozás lejárt",
     "{actor} shared as public link" : "{actor} megosztva nyilvános hivatkozásként",
-    "%1$s removed public link" : "%1$s eltávolított egy nyilvános hivatkozást",
     "{actor} removed public link" : "{actor} eltávolított egy nyilvános hivatkozást",
-    "You shared %1$s as public link" : "Nyilvános hivatkozáskánt megosztottad ezt: %1$s",
     "You shared {file} as public link" : "Nyilvános hivatkozáskánt megosztottad ezt: {file}",
-    "You removed public link for %1$s" : "Eltávolítottad %1$s nyilvános hivatkozását",
     "You removed public link for {file}" : "Eltávolítottad {file} nyilvános hivatkozását",
-    "%2$s shared %1$s as public link" : "%2$s nyilvános hivatkozásként megosztotta ezt: %1$s",
     "{actor} shared {file} as public link" : "{actor}  nyilvános hivatkozásként megosztotta ezt: {file}",
-    "%2$s removed public link for %1$s" : "%2$s eltávolította %1$s nyilvános hivatkozását",
     "{actor} removed public link for {file}" : "{actor} eltávolította {file} nyilvános hivatkozását",
-    "%1$s accepted the remote share" : "%1$s elfogadta a távoli megosztást",
     "{user} accepted the remote share" : "{user} elfogadta a távoli megosztást",
-    "%1$s declined the remote share" : "%1$s visszautasította a távoli megosztást",
     "{user} declined the remote share" : "{user} visszautasította a távoli megosztást",
-    "You received a new remote share %1$s from %2$s" : "Egy új távoli megosztást kaptál ehhez: %1$s tőle: %2$s",
     "You received a new remote share {file} from {user}" : "Egy új távoli megosztást kaptál ehhez: {file} tőle: {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s elfogadta %1$s távoli megosztását",
     "{user} accepted the remote share of {file}" : "{user} elfogadta {file} távoli megosztását",
-    "%2$s declined the remote share of %1$s" : "%2$s visszautasította %1$s távoli megosztását",
     "{user} declined the remote share of {file}" : "{user} visszautasította {file} távoli megosztását",
-    "%2$s unshared %1$s from you" : "%2$s visszavonta tőled %1$s megosztását",
     "{user} unshared {file} from you" : "{user} visszavonta tőled {file} megosztását",
-    "Shared with %1$s" : "Megosztva vele: %1$s",
     "Shared with {user}" : "Megosztva vele: {user}",
-    "Removed share for %1$s" : "%1$s megosztása eltávolítva",
     "Removed share for {user}" : "{user} megosztása eltávolítva",
-    "%2$s shared with %1$s" : "%2$s megosztotta vele: %1$s",
     "{actor} shared with {user}" : "{actor} megosztotta vele: {user}",
-    "%2$s removed share for %1$s" : "%2$s eltávolította %1$s megosztását",
     "{actor} removed share for {user}" : "{actor} eltávolította {user} megosztását",
-    "Shared by %1$s" : "Megosztotta: %1$s",
     "Shared by {actor}" : "Megosztotta: {actor}",
-    "%1$s removed share" : "%1$s eltávolította a megosztást",
     "{actor} removed share" : "{actor} eltávolította a megosztást",
-    "You shared %1$s with %2$s" : "Megosztottad ezt: %1$s vele: %2$s",
     "You shared {file} with {user}" : "Megosztottad ezt: {file} vele: {user}",
-    "You removed %2$s from %1$s" : "Eltávolítottad ezt: %2$s tőle: %1$s",
     "You removed {user} from {file}" : "Eltávolítottad ezt: {user} tőle: {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s megosztotta ezt: %1$s vele: %2$s",
     "{actor} removed {user} from {file}" : "{actor} eltávolította ezt: {user} innen: {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s eltávolította ezt: %2$s innen: %1$s",
-    "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "{actor} shared {file} with you" : "{actor} megosztotta veled ezt: {file}",
-    "%2$s removed you from %1$s" : "%2$s eltívolított innen: %1$s",
     "{actor} removed you from {file}" : "{actor} eltávolított innen: {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Egy e-mailben vagy nyilvános hivatkozással megosztott fájl vagy mappa <strong>letöltve</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Egy fájl vagy mappa meg lett osztva egy <strong>másik szerverről</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s megosztás visszavonva %2$s által",
     "Public shared folder %1$s was downloaded" : "%1$s nyilvánosan megosztott mappa le lett töltve",
     "Public shared file %1$s was downloaded" : "Nyilvánosan megosztott fálj %1$s le lett töltve",
+    "You shared %1$s with %2$s" : "Megosztottad ezt: %1$s vele: %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s megosztotta ezt: %1$s, Å‘vele: %3$s",
     "You removed the share of %2$s for %1$s" : "Eltávolítottad %2$s következő megosztását: %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s eltávolította %3$s következő megosztását: %1$s",
+    "You shared %1$s with group %2$s" : "Megosztottad ezt: %1$s ezzel a csoporttal: %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s megosztotta ezt: %1$s, ezzel a csoporttal: %3$s",
     "You removed the share of group %2$s for %1$s" : "Eltávolítottad %2$s csoport %1$s megosztását",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s eltávolította %3$s csoport %1$s megosztását",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s eltávolította %1$s nyilvános hivatkozását",
     "Your public link for %1$s expired" : "%1$s nyilvános hivatkozásod lejárt",
     "The public link of %2$s for %1$s expired" : "%2$s %1$s nyilvános hivatkozása lejárt",
+    "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "%2$s removed the share for %1$s" : "%2$s eltávolította %1$s megosztását",
     "Shared with %2$s" : "Megosztva vele: %2$s",
     "Shared with %3$s by %2$s" : "Megosztva vele: %3$s, megosztó: %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Megosztva hivatkozással: %2$s",
     "Shared via public link" : "Megosztva nyilvános hivatkozással",
     "%2$s removed public link" : "%2$s eltávolított egy nyilvános hivatkozást",
-    "Public link expired" : "Nyilvános hivatkozás lejárt",
     "Public link of %2$s expired" : "%2$s nyilvános hivatkozása lejárt",
     "Shared by %2$s" : "Megosztó: %2$s",
-    "Shares" : "Megosztások"
+    "Shares" : "Megosztások",
+    "Downloaded by %1$s" : "Letöltötte: %1$s",
+    "%1$s downloaded via public link" : "%1$s letöltve nyilvános hibatkozással",
+    "%1$s downloaded %2$s" : "%1$s letöltötte ezt: %2$s",
+    "Shared with group %1$s" : "Megosztva ezzel a csoporttal: %1$s",
+    "Removed share for group %1$s" : "%1$s csoport megosztása eltávolítva",
+    "%2$s shared with group %1$s" : "%2$s megosztva ezzel a csoporttal: %1$s",
+    "%2$s removed share for group %1$s" : "%2$s eltávolította %1$s csoport megosztását",
+    "You removed group %2$s from %1$s" : "Eltávolítottad ezt csoportot: %2$s innen: %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s megosztotta ezt: %1$s, ezzel a csoporttal: %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s eltávolította ezt a csoportot: %2$s innen: %1$s",
+    "%1$s shared as public link" : "%1$s megosztva nyilvános hivatkozásként",
+    "%1$s removed public link" : "%1$s eltávolított egy nyilvános hivatkozást",
+    "You shared %1$s as public link" : "Nyilvános hivatkozáskánt megosztottad ezt: %1$s",
+    "You removed public link for %1$s" : "Eltávolítottad %1$s nyilvános hivatkozását",
+    "%2$s shared %1$s as public link" : "%2$s nyilvános hivatkozásként megosztotta ezt: %1$s",
+    "%2$s removed public link for %1$s" : "%2$s eltávolította %1$s nyilvános hivatkozását",
+    "%1$s accepted the remote share" : "%1$s elfogadta a távoli megosztást",
+    "%1$s declined the remote share" : "%1$s visszautasította a távoli megosztást",
+    "You received a new remote share %1$s from %2$s" : "Egy új távoli megosztást kaptál ehhez: %1$s tőle: %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s elfogadta %1$s távoli megosztását",
+    "%2$s declined the remote share of %1$s" : "%2$s visszautasította %1$s távoli megosztását",
+    "%2$s unshared %1$s from you" : "%2$s visszavonta tőled %1$s megosztását",
+    "Shared with %1$s" : "Megosztva vele: %1$s",
+    "Removed share for %1$s" : "%1$s megosztása eltávolítva",
+    "%2$s shared with %1$s" : "%2$s megosztotta vele: %1$s",
+    "%2$s removed share for %1$s" : "%2$s eltávolította %1$s megosztását",
+    "Shared by %1$s" : "Megosztotta: %1$s",
+    "%1$s removed share" : "%1$s eltávolította a megosztást",
+    "You removed %2$s from %1$s" : "Eltávolítottad ezt: %2$s tőle: %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s megosztotta ezt: %1$s vele: %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s eltávolította ezt: %2$s innen: %1$s",
+    "%2$s removed you from %1$s" : "%2$s eltívolított innen: %1$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index 75ec4969e69c416c19fe5113b62a45b40c4a3834..650d631e36565e09f07ae272d8fea1ddade5b60e 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -18,76 +18,42 @@
     "Sharing" : "Megosztás",
     "File shares" : "Fájl megosztások",
     "Downloaded via public link" : "Letöltve nyilvános hivatkozással",
-    "Downloaded by %1$s" : "Letöltötte: %1$s",
     "Downloaded by {email}" : "Letöltötte: {email}",
-    "%1$s downloaded via public link" : "%1$s letöltve nyilvános hibatkozással",
     "{file} downloaded via public link" : "{file} letöltve nyilvános hibatkozással",
-    "%1$s downloaded %2$s" : "%1$s letöltötte ezt: %2$s",
     "{email} downloaded {file}" : "{email} letöltötte ezt: {file}",
-    "Shared with group %1$s" : "Megosztva ezzel a csoporttal: %1$s",
     "Shared with group {group}" : "Megosztva ezzel a csoporttal: {group}",
-    "Removed share for group %1$s" : "%1$s csoport megosztása eltávolítva",
     "Removed share for group {group}" : "{group} csoport megosztása eltávolítva",
-    "%2$s shared with group %1$s" : "%2$s megosztva ezzel a csoporttal: %1$s",
     "{actor} shared with group {group}" : "{actor} megosztva ezzel a csoporttal: {group}",
-    "%2$s removed share for group %1$s" : "%2$s eltávolította %1$s csoport megosztását",
     "{actor} removed share for group {group}" : "{actor} eltávolította {group} csoport megosztását",
-    "You shared %1$s with group %2$s" : "Megosztottad ezt: %1$s ezzel a csoporttal: %2$s",
     "You shared {file} with group {group}" : "Megosztottad ezt: {file} ezzel a csoporttal: {group}",
-    "You removed group %2$s from %1$s" : "Eltávolítottad ezt csoportot: %2$s innen: %1$s",
     "You removed group {group} from {file}" : "Eltávolítottad ezt csoportot:  {group} innen:  {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s megosztotta ezt: %1$s, ezzel a csoporttal: %2$s",
     "{actor} shared {file} with group {group}" : "{actor} megosztotta ezt: {file} ezzel a csoporttal: {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s eltávolította ezt a csoportot: %2$s innen: %1$s",
     "{actor} removed group {group} from {file}" : "{actor} eltávolította ezt a csoportot {group} innen: {file}",
     "Shared as public link" : "Megosztva nyilvános hivatkozásként",
     "Removed public link" : "Eltávolított nyilvános hivatkozás",
-    "%1$s shared as public link" : "%1$s megosztva nyilvános hivatkozásként",
+    "Public link expired" : "Nyilvános hivatkozás lejárt",
     "{actor} shared as public link" : "{actor} megosztva nyilvános hivatkozásként",
-    "%1$s removed public link" : "%1$s eltávolított egy nyilvános hivatkozást",
     "{actor} removed public link" : "{actor} eltávolított egy nyilvános hivatkozást",
-    "You shared %1$s as public link" : "Nyilvános hivatkozáskánt megosztottad ezt: %1$s",
     "You shared {file} as public link" : "Nyilvános hivatkozáskánt megosztottad ezt: {file}",
-    "You removed public link for %1$s" : "Eltávolítottad %1$s nyilvános hivatkozását",
     "You removed public link for {file}" : "Eltávolítottad {file} nyilvános hivatkozását",
-    "%2$s shared %1$s as public link" : "%2$s nyilvános hivatkozásként megosztotta ezt: %1$s",
     "{actor} shared {file} as public link" : "{actor}  nyilvános hivatkozásként megosztotta ezt: {file}",
-    "%2$s removed public link for %1$s" : "%2$s eltávolította %1$s nyilvános hivatkozását",
     "{actor} removed public link for {file}" : "{actor} eltávolította {file} nyilvános hivatkozását",
-    "%1$s accepted the remote share" : "%1$s elfogadta a távoli megosztást",
     "{user} accepted the remote share" : "{user} elfogadta a távoli megosztást",
-    "%1$s declined the remote share" : "%1$s visszautasította a távoli megosztást",
     "{user} declined the remote share" : "{user} visszautasította a távoli megosztást",
-    "You received a new remote share %1$s from %2$s" : "Egy új távoli megosztást kaptál ehhez: %1$s tőle: %2$s",
     "You received a new remote share {file} from {user}" : "Egy új távoli megosztást kaptál ehhez: {file} tőle: {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s elfogadta %1$s távoli megosztását",
     "{user} accepted the remote share of {file}" : "{user} elfogadta {file} távoli megosztását",
-    "%2$s declined the remote share of %1$s" : "%2$s visszautasította %1$s távoli megosztását",
     "{user} declined the remote share of {file}" : "{user} visszautasította {file} távoli megosztását",
-    "%2$s unshared %1$s from you" : "%2$s visszavonta tőled %1$s megosztását",
     "{user} unshared {file} from you" : "{user} visszavonta tőled {file} megosztását",
-    "Shared with %1$s" : "Megosztva vele: %1$s",
     "Shared with {user}" : "Megosztva vele: {user}",
-    "Removed share for %1$s" : "%1$s megosztása eltávolítva",
     "Removed share for {user}" : "{user} megosztása eltávolítva",
-    "%2$s shared with %1$s" : "%2$s megosztotta vele: %1$s",
     "{actor} shared with {user}" : "{actor} megosztotta vele: {user}",
-    "%2$s removed share for %1$s" : "%2$s eltávolította %1$s megosztását",
     "{actor} removed share for {user}" : "{actor} eltávolította {user} megosztását",
-    "Shared by %1$s" : "Megosztotta: %1$s",
     "Shared by {actor}" : "Megosztotta: {actor}",
-    "%1$s removed share" : "%1$s eltávolította a megosztást",
     "{actor} removed share" : "{actor} eltávolította a megosztást",
-    "You shared %1$s with %2$s" : "Megosztottad ezt: %1$s vele: %2$s",
     "You shared {file} with {user}" : "Megosztottad ezt: {file} vele: {user}",
-    "You removed %2$s from %1$s" : "Eltávolítottad ezt: %2$s tőle: %1$s",
     "You removed {user} from {file}" : "Eltávolítottad ezt: {user} tőle: {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s megosztotta ezt: %1$s vele: %2$s",
     "{actor} removed {user} from {file}" : "{actor} eltávolította ezt: {user} innen: {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s eltávolította ezt: %2$s innen: %1$s",
-    "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "{actor} shared {file} with you" : "{actor} megosztotta veled ezt: {file}",
-    "%2$s removed you from %1$s" : "%2$s eltívolított innen: %1$s",
     "{actor} removed you from {file}" : "{actor} eltávolított innen: {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Egy e-mailben vagy nyilvános hivatkozással megosztott fájl vagy mappa <strong>letöltve</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Egy fájl vagy mappa meg lett osztva egy <strong>másik szerverről</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s megosztás visszavonva %2$s által",
     "Public shared folder %1$s was downloaded" : "%1$s nyilvánosan megosztott mappa le lett töltve",
     "Public shared file %1$s was downloaded" : "Nyilvánosan megosztott fálj %1$s le lett töltve",
+    "You shared %1$s with %2$s" : "Megosztottad ezt: %1$s vele: %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s megosztotta ezt: %1$s, Å‘vele: %3$s",
     "You removed the share of %2$s for %1$s" : "Eltávolítottad %2$s következő megosztását: %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s eltávolította %3$s következő megosztását: %1$s",
+    "You shared %1$s with group %2$s" : "Megosztottad ezt: %1$s ezzel a csoporttal: %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s megosztotta ezt: %1$s, ezzel a csoporttal: %3$s",
     "You removed the share of group %2$s for %1$s" : "Eltávolítottad %2$s csoport %1$s megosztását",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s eltávolította %3$s csoport %1$s megosztását",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s eltávolította %1$s nyilvános hivatkozását",
     "Your public link for %1$s expired" : "%1$s nyilvános hivatkozásod lejárt",
     "The public link of %2$s for %1$s expired" : "%2$s %1$s nyilvános hivatkozása lejárt",
+    "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "%2$s removed the share for %1$s" : "%2$s eltávolította %1$s megosztását",
     "Shared with %2$s" : "Megosztva vele: %2$s",
     "Shared with %3$s by %2$s" : "Megosztva vele: %3$s, megosztó: %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Megosztva hivatkozással: %2$s",
     "Shared via public link" : "Megosztva nyilvános hivatkozással",
     "%2$s removed public link" : "%2$s eltávolított egy nyilvános hivatkozást",
-    "Public link expired" : "Nyilvános hivatkozás lejárt",
     "Public link of %2$s expired" : "%2$s nyilvános hivatkozása lejárt",
     "Shared by %2$s" : "Megosztó: %2$s",
-    "Shares" : "Megosztások"
+    "Shares" : "Megosztások",
+    "Downloaded by %1$s" : "Letöltötte: %1$s",
+    "%1$s downloaded via public link" : "%1$s letöltve nyilvános hibatkozással",
+    "%1$s downloaded %2$s" : "%1$s letöltötte ezt: %2$s",
+    "Shared with group %1$s" : "Megosztva ezzel a csoporttal: %1$s",
+    "Removed share for group %1$s" : "%1$s csoport megosztása eltávolítva",
+    "%2$s shared with group %1$s" : "%2$s megosztva ezzel a csoporttal: %1$s",
+    "%2$s removed share for group %1$s" : "%2$s eltávolította %1$s csoport megosztását",
+    "You removed group %2$s from %1$s" : "Eltávolítottad ezt csoportot: %2$s innen: %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s megosztotta ezt: %1$s, ezzel a csoporttal: %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s eltávolította ezt a csoportot: %2$s innen: %1$s",
+    "%1$s shared as public link" : "%1$s megosztva nyilvános hivatkozásként",
+    "%1$s removed public link" : "%1$s eltávolított egy nyilvános hivatkozást",
+    "You shared %1$s as public link" : "Nyilvános hivatkozáskánt megosztottad ezt: %1$s",
+    "You removed public link for %1$s" : "Eltávolítottad %1$s nyilvános hivatkozását",
+    "%2$s shared %1$s as public link" : "%2$s nyilvános hivatkozásként megosztotta ezt: %1$s",
+    "%2$s removed public link for %1$s" : "%2$s eltávolította %1$s nyilvános hivatkozását",
+    "%1$s accepted the remote share" : "%1$s elfogadta a távoli megosztást",
+    "%1$s declined the remote share" : "%1$s visszautasította a távoli megosztást",
+    "You received a new remote share %1$s from %2$s" : "Egy új távoli megosztást kaptál ehhez: %1$s tőle: %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s elfogadta %1$s távoli megosztását",
+    "%2$s declined the remote share of %1$s" : "%2$s visszautasította %1$s távoli megosztását",
+    "%2$s unshared %1$s from you" : "%2$s visszavonta tőled %1$s megosztását",
+    "Shared with %1$s" : "Megosztva vele: %1$s",
+    "Removed share for %1$s" : "%1$s megosztása eltávolítva",
+    "%2$s shared with %1$s" : "%2$s megosztotta vele: %1$s",
+    "%2$s removed share for %1$s" : "%2$s eltávolította %1$s megosztását",
+    "Shared by %1$s" : "Megosztotta: %1$s",
+    "%1$s removed share" : "%1$s eltávolította a megosztást",
+    "You removed %2$s from %1$s" : "Eltávolítottad ezt: %2$s tőle: %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s megosztotta ezt: %1$s vele: %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s eltávolította ezt: %2$s innen: %1$s",
+    "%2$s removed you from %1$s" : "%2$s eltívolított innen: %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index b216a0ccacc39adad00ffdd11faa72802475d370..3b8d4e47d9435c6eccf5dc3668faad71aff1039c 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Condivisione",
     "File shares" : "Condivisioni dei file",
     "Downloaded via public link" : "Scaricata tramite collegamento pubblico",
-    "Downloaded by %1$s" : "Scaricato da %1$s",
     "Downloaded by {email}" : "Scaricato da {email}",
-    "%1$s downloaded via public link" : "%1$s scaricato tramite collegamento pubblico",
     "{file} downloaded via public link" : "{file} scaricato tramite collegamento pubblico",
-    "%1$s downloaded %2$s" : "%1$s ha scaricato %2$s",
     "{email} downloaded {file}" : "{email} ha scaricato {file}",
-    "Shared with group %1$s" : "Condivisa con il gruppo %1$s",
     "Shared with group {group}" : "Condivisa con il gruppo {group}",
-    "Removed share for group %1$s" : "Condivisione rimossa per %1$s",
     "Removed share for group {group}" : "Condivisione rimossa per il gruppo {group}",
-    "%2$s shared with group %1$s" : "%2$s ha condiviso con il gruppo %1$s",
     "{actor} shared with group {group}" : "{actor} ha condiviso con il gruppo {group}",
-    "%2$s removed share for group %1$s" : "%2$s ha rimosso la condivisione del gruppo %1$s",
     "{actor} removed share for group {group}" : "{actor} ha rimosso la condivisione del gruppo {group}",
-    "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
     "You shared {file} with group {group}" : "Hai condiviso {file} con il gruppo {group}",
-    "You removed group %2$s from %1$s" : "Hai rimosso il gruppo %2$s da %1$s",
     "You removed group {group} from {file}" : "Hai rimosso il gruppo {group} da {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s ha condiviso %1$s con il gruppo %2$s",
     "{actor} shared {file} with group {group}" : "{actor} ha condiviso {file} con il gruppo {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s ha rimosso il gruppo %2$s da %1$s",
     "{actor} removed group {group} from {file}" : "{actor} ha ti rimosso il gruppo {group} da {file}",
     "Shared as public link" : "Condivisa tramite collegamento pubblico",
     "Removed public link" : "Collegamento pubblico rimosso",
-    "%1$s shared as public link" : "%1$s condivisa tramite collegamento pubblico",
+    "Public link expired" : "Collegamento pubblico scaduto",
     "{actor} shared as public link" : "{actor} ha condiviso tramite collegamento pubblico",
-    "%1$s removed public link" : "%1$s ha rimosso il collegamento pubblico",
     "{actor} removed public link" : "{actor} ha rimosso il collegamento pubblico",
-    "You shared %1$s as public link" : "Hai condiviso %1$s tramite collegamento",
     "You shared {file} as public link" : "Hai condiviso {file} tramite collegamento",
-    "You removed public link for %1$s" : "Hai rimosso il collegamento pubblico per %1$s",
     "You removed public link for {file}" : "Hai rimosso il collegamento pubblico per {file}",
-    "%2$s shared %1$s as public link" : "%2$s ha condiviso %1$s tramite collegamento pubblico",
     "{actor} shared {file} as public link" : "{actor} ha condiviso {file} tramite collegamento pubblico",
-    "%2$s removed public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
     "{actor} removed public link for {file}" : "{actor} ha rimosso il collegamento pubblico per {file}",
-    "%1$s accepted the remote share" : "%1$s ha accettato la condivisione remota",
     "{user} accepted the remote share" : "{user} ha accettato la condivisione remota",
-    "%1$s declined the remote share" : "%1$s ha rifiutato la condivisione remota",
     "{user} declined the remote share" : "{user} ha rifiutato la condivisione remota",
-    "You received a new remote share %1$s from %2$s" : "Hai ricevuto una nuova condivisione remota %1$s da %2$s",
     "You received a new remote share {file} from {user}" : "Hai ricevuto una nuova condivisione remota {file} da {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s ha accettato la condivisione remota di %1$s",
     "{user} accepted the remote share of {file}" : "{user} ha accettato la condivisione remota di {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s ha rifiutato la condivisione remota %1$s",
     "{user} declined the remote share of {file}" : "{user} ha rifiutato la condivisione remota di {file}",
-    "%2$s unshared %1$s from you" : "%2$s ha rimosso la condivisione %1$s con te",
     "{user} unshared {file} from you" : "{user} ha rimosso la condivisione {file} con te",
-    "Shared with %1$s" : "Condivisa con %1$s",
     "Shared with {user}" : "Condivisa con {user}",
-    "Removed share for %1$s" : "Condivisione rimossa per %1$s",
     "Removed share for {user}" : "Condivisione rimossa per {user}",
-    "%2$s shared with %1$s" : "%2$s condivisa con %1$s",
     "{actor} shared with {user}" : "{actor} ha condiviso con {user}",
-    "%2$s removed share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
     "{actor} removed share for {user}" : "{actor} ha rimosso la condivisione con {user}",
-    "Shared by %1$s" : "Condivisa da %1$s",
     "Shared by {actor}" : "Condiviso da {actor}",
-    "%1$s removed share" : "%1$s ha rimosso la condivisione",
     "{actor} removed share" : "{actor} ha rimosso la condivisione",
-    "You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
     "You shared {file} with {user}" : "Hai condiviso {file} con {user}",
-    "You removed %2$s from %1$s" : "Hai rimosso %2$s da %1$s",
     "You removed {user} from {file}" : "Hai rimosso {user} da {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s ha condiviso %1$s con %2$s",
     "{actor} removed {user} from {file}" : "{actor} ha rimosso {user} da {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s ha rimosso %2$s da %1$s",
-    "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "{actor} shared {file} with you" : "{actor} ha condiviso {file} con te",
-    "%2$s removed you from %1$s" : "%2$s ti ha rimosso da %1$s",
     "{actor} removed you from {file}" : "{actor} ha ti rimosso da {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Un file o una cartella condiviso via posta elettronica o collegamento pubblico è stato <strong>scaricato</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un file o una cartella è stato condiviso da <strong>un altro server</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te",
     "Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
     "Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
+    "You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
     "You removed the share of %2$s for %1$s" : "Hai rimosso la condivisione di %2$s per %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s ha rimosso la condivisione di %3$s per %1$s",
+    "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
     "You removed the share of group %2$s for %1$s" : "Hai rimosso la condivisione del gruppo %2$s per %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s ha rimosso la condivisione del gruppo %3$s per %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
     "Your public link for %1$s expired" : "il tuo collegamento pubblico per %1$s è scaduto",
     "The public link of %2$s for %1$s expired" : "il collegamento pubblico di %2$s per %1$s è scaduto",
+    "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "%2$s removed the share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
     "Shared with %2$s" : "Condivisa con %2$s",
     "Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s",
     "Shared via public link" : "Condivisa tramite collegamento pubblico",
     "%2$s removed public link" : "%2$s ha rimosso il collegamento pubblico",
-    "Public link expired" : "Collegamento pubblico scaduto",
     "Public link of %2$s expired" : "il collegamento pubblico di %2$s è scaduto",
     "Shared by %2$s" : "Condivisa da %2$s",
-    "Shares" : "Condivisioni"
+    "Shares" : "Condivisioni",
+    "Downloaded by %1$s" : "Scaricato da %1$s",
+    "%1$s downloaded via public link" : "%1$s scaricato tramite collegamento pubblico",
+    "%1$s downloaded %2$s" : "%1$s ha scaricato %2$s",
+    "Shared with group %1$s" : "Condivisa con il gruppo %1$s",
+    "Removed share for group %1$s" : "Condivisione rimossa per %1$s",
+    "%2$s shared with group %1$s" : "%2$s ha condiviso con il gruppo %1$s",
+    "%2$s removed share for group %1$s" : "%2$s ha rimosso la condivisione del gruppo %1$s",
+    "You removed group %2$s from %1$s" : "Hai rimosso il gruppo %2$s da %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s ha condiviso %1$s con il gruppo %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s ha rimosso il gruppo %2$s da %1$s",
+    "%1$s shared as public link" : "%1$s condivisa tramite collegamento pubblico",
+    "%1$s removed public link" : "%1$s ha rimosso il collegamento pubblico",
+    "You shared %1$s as public link" : "Hai condiviso %1$s tramite collegamento",
+    "You removed public link for %1$s" : "Hai rimosso il collegamento pubblico per %1$s",
+    "%2$s shared %1$s as public link" : "%2$s ha condiviso %1$s tramite collegamento pubblico",
+    "%2$s removed public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
+    "%1$s accepted the remote share" : "%1$s ha accettato la condivisione remota",
+    "%1$s declined the remote share" : "%1$s ha rifiutato la condivisione remota",
+    "You received a new remote share %1$s from %2$s" : "Hai ricevuto una nuova condivisione remota %1$s da %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s ha accettato la condivisione remota di %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s ha rifiutato la condivisione remota %1$s",
+    "%2$s unshared %1$s from you" : "%2$s ha rimosso la condivisione %1$s con te",
+    "Shared with %1$s" : "Condivisa con %1$s",
+    "Removed share for %1$s" : "Condivisione rimossa per %1$s",
+    "%2$s shared with %1$s" : "%2$s condivisa con %1$s",
+    "%2$s removed share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
+    "Shared by %1$s" : "Condivisa da %1$s",
+    "%1$s removed share" : "%1$s ha rimosso la condivisione",
+    "You removed %2$s from %1$s" : "Hai rimosso %2$s da %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s ha condiviso %1$s con %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s ha rimosso %2$s da %1$s",
+    "%2$s removed you from %1$s" : "%2$s ti ha rimosso da %1$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index dc2f25f1676075d6f864eefc9d5037de277a5926..b1243cb8a77ac936991eb0f5a9d1bc62439b6a27 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -18,76 +18,42 @@
     "Sharing" : "Condivisione",
     "File shares" : "Condivisioni dei file",
     "Downloaded via public link" : "Scaricata tramite collegamento pubblico",
-    "Downloaded by %1$s" : "Scaricato da %1$s",
     "Downloaded by {email}" : "Scaricato da {email}",
-    "%1$s downloaded via public link" : "%1$s scaricato tramite collegamento pubblico",
     "{file} downloaded via public link" : "{file} scaricato tramite collegamento pubblico",
-    "%1$s downloaded %2$s" : "%1$s ha scaricato %2$s",
     "{email} downloaded {file}" : "{email} ha scaricato {file}",
-    "Shared with group %1$s" : "Condivisa con il gruppo %1$s",
     "Shared with group {group}" : "Condivisa con il gruppo {group}",
-    "Removed share for group %1$s" : "Condivisione rimossa per %1$s",
     "Removed share for group {group}" : "Condivisione rimossa per il gruppo {group}",
-    "%2$s shared with group %1$s" : "%2$s ha condiviso con il gruppo %1$s",
     "{actor} shared with group {group}" : "{actor} ha condiviso con il gruppo {group}",
-    "%2$s removed share for group %1$s" : "%2$s ha rimosso la condivisione del gruppo %1$s",
     "{actor} removed share for group {group}" : "{actor} ha rimosso la condivisione del gruppo {group}",
-    "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
     "You shared {file} with group {group}" : "Hai condiviso {file} con il gruppo {group}",
-    "You removed group %2$s from %1$s" : "Hai rimosso il gruppo %2$s da %1$s",
     "You removed group {group} from {file}" : "Hai rimosso il gruppo {group} da {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s ha condiviso %1$s con il gruppo %2$s",
     "{actor} shared {file} with group {group}" : "{actor} ha condiviso {file} con il gruppo {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s ha rimosso il gruppo %2$s da %1$s",
     "{actor} removed group {group} from {file}" : "{actor} ha ti rimosso il gruppo {group} da {file}",
     "Shared as public link" : "Condivisa tramite collegamento pubblico",
     "Removed public link" : "Collegamento pubblico rimosso",
-    "%1$s shared as public link" : "%1$s condivisa tramite collegamento pubblico",
+    "Public link expired" : "Collegamento pubblico scaduto",
     "{actor} shared as public link" : "{actor} ha condiviso tramite collegamento pubblico",
-    "%1$s removed public link" : "%1$s ha rimosso il collegamento pubblico",
     "{actor} removed public link" : "{actor} ha rimosso il collegamento pubblico",
-    "You shared %1$s as public link" : "Hai condiviso %1$s tramite collegamento",
     "You shared {file} as public link" : "Hai condiviso {file} tramite collegamento",
-    "You removed public link for %1$s" : "Hai rimosso il collegamento pubblico per %1$s",
     "You removed public link for {file}" : "Hai rimosso il collegamento pubblico per {file}",
-    "%2$s shared %1$s as public link" : "%2$s ha condiviso %1$s tramite collegamento pubblico",
     "{actor} shared {file} as public link" : "{actor} ha condiviso {file} tramite collegamento pubblico",
-    "%2$s removed public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
     "{actor} removed public link for {file}" : "{actor} ha rimosso il collegamento pubblico per {file}",
-    "%1$s accepted the remote share" : "%1$s ha accettato la condivisione remota",
     "{user} accepted the remote share" : "{user} ha accettato la condivisione remota",
-    "%1$s declined the remote share" : "%1$s ha rifiutato la condivisione remota",
     "{user} declined the remote share" : "{user} ha rifiutato la condivisione remota",
-    "You received a new remote share %1$s from %2$s" : "Hai ricevuto una nuova condivisione remota %1$s da %2$s",
     "You received a new remote share {file} from {user}" : "Hai ricevuto una nuova condivisione remota {file} da {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s ha accettato la condivisione remota di %1$s",
     "{user} accepted the remote share of {file}" : "{user} ha accettato la condivisione remota di {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s ha rifiutato la condivisione remota %1$s",
     "{user} declined the remote share of {file}" : "{user} ha rifiutato la condivisione remota di {file}",
-    "%2$s unshared %1$s from you" : "%2$s ha rimosso la condivisione %1$s con te",
     "{user} unshared {file} from you" : "{user} ha rimosso la condivisione {file} con te",
-    "Shared with %1$s" : "Condivisa con %1$s",
     "Shared with {user}" : "Condivisa con {user}",
-    "Removed share for %1$s" : "Condivisione rimossa per %1$s",
     "Removed share for {user}" : "Condivisione rimossa per {user}",
-    "%2$s shared with %1$s" : "%2$s condivisa con %1$s",
     "{actor} shared with {user}" : "{actor} ha condiviso con {user}",
-    "%2$s removed share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
     "{actor} removed share for {user}" : "{actor} ha rimosso la condivisione con {user}",
-    "Shared by %1$s" : "Condivisa da %1$s",
     "Shared by {actor}" : "Condiviso da {actor}",
-    "%1$s removed share" : "%1$s ha rimosso la condivisione",
     "{actor} removed share" : "{actor} ha rimosso la condivisione",
-    "You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
     "You shared {file} with {user}" : "Hai condiviso {file} con {user}",
-    "You removed %2$s from %1$s" : "Hai rimosso %2$s da %1$s",
     "You removed {user} from {file}" : "Hai rimosso {user} da {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s ha condiviso %1$s con %2$s",
     "{actor} removed {user} from {file}" : "{actor} ha rimosso {user} da {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s ha rimosso %2$s da %1$s",
-    "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "{actor} shared {file} with you" : "{actor} ha condiviso {file} con te",
-    "%2$s removed you from %1$s" : "%2$s ti ha rimosso da %1$s",
     "{actor} removed you from {file}" : "{actor} ha ti rimosso da {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Un file o una cartella condiviso via posta elettronica o collegamento pubblico è stato <strong>scaricato</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un file o una cartella è stato condiviso da <strong>un altro server</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te",
     "Public shared folder %1$s was downloaded" : "La cartella condivisa pubblicamente %1$s è stata scaricata",
     "Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
+    "You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
     "You removed the share of %2$s for %1$s" : "Hai rimosso la condivisione di %2$s per %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s ha rimosso la condivisione di %3$s per %1$s",
+    "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
     "You removed the share of group %2$s for %1$s" : "Hai rimosso la condivisione del gruppo %2$s per %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s ha rimosso la condivisione del gruppo %3$s per %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
     "Your public link for %1$s expired" : "il tuo collegamento pubblico per %1$s è scaduto",
     "The public link of %2$s for %1$s expired" : "il collegamento pubblico di %2$s per %1$s è scaduto",
+    "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "%2$s removed the share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
     "Shared with %2$s" : "Condivisa con %2$s",
     "Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s",
     "Shared via public link" : "Condivisa tramite collegamento pubblico",
     "%2$s removed public link" : "%2$s ha rimosso il collegamento pubblico",
-    "Public link expired" : "Collegamento pubblico scaduto",
     "Public link of %2$s expired" : "il collegamento pubblico di %2$s è scaduto",
     "Shared by %2$s" : "Condivisa da %2$s",
-    "Shares" : "Condivisioni"
+    "Shares" : "Condivisioni",
+    "Downloaded by %1$s" : "Scaricato da %1$s",
+    "%1$s downloaded via public link" : "%1$s scaricato tramite collegamento pubblico",
+    "%1$s downloaded %2$s" : "%1$s ha scaricato %2$s",
+    "Shared with group %1$s" : "Condivisa con il gruppo %1$s",
+    "Removed share for group %1$s" : "Condivisione rimossa per %1$s",
+    "%2$s shared with group %1$s" : "%2$s ha condiviso con il gruppo %1$s",
+    "%2$s removed share for group %1$s" : "%2$s ha rimosso la condivisione del gruppo %1$s",
+    "You removed group %2$s from %1$s" : "Hai rimosso il gruppo %2$s da %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s ha condiviso %1$s con il gruppo %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s ha rimosso il gruppo %2$s da %1$s",
+    "%1$s shared as public link" : "%1$s condivisa tramite collegamento pubblico",
+    "%1$s removed public link" : "%1$s ha rimosso il collegamento pubblico",
+    "You shared %1$s as public link" : "Hai condiviso %1$s tramite collegamento",
+    "You removed public link for %1$s" : "Hai rimosso il collegamento pubblico per %1$s",
+    "%2$s shared %1$s as public link" : "%2$s ha condiviso %1$s tramite collegamento pubblico",
+    "%2$s removed public link for %1$s" : "%2$s ha rimosso il collegamento pubblico per %1$s",
+    "%1$s accepted the remote share" : "%1$s ha accettato la condivisione remota",
+    "%1$s declined the remote share" : "%1$s ha rifiutato la condivisione remota",
+    "You received a new remote share %1$s from %2$s" : "Hai ricevuto una nuova condivisione remota %1$s da %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s ha accettato la condivisione remota di %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s ha rifiutato la condivisione remota %1$s",
+    "%2$s unshared %1$s from you" : "%2$s ha rimosso la condivisione %1$s con te",
+    "Shared with %1$s" : "Condivisa con %1$s",
+    "Removed share for %1$s" : "Condivisione rimossa per %1$s",
+    "%2$s shared with %1$s" : "%2$s condivisa con %1$s",
+    "%2$s removed share for %1$s" : "%2$s ha rimosso la condivisione per %1$s",
+    "Shared by %1$s" : "Condivisa da %1$s",
+    "%1$s removed share" : "%1$s ha rimosso la condivisione",
+    "You removed %2$s from %1$s" : "Hai rimosso %2$s da %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s ha condiviso %1$s con %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s ha rimosso %2$s da %1$s",
+    "%2$s removed you from %1$s" : "%2$s ti ha rimosso da %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index c9e842c5d8b40e45591d952b5f010dd08bbb8988..07692b58fe9b51fc0702c05648a2a0d48b22f9fb 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Deling",
     "File shares" : "Fildelinger",
     "Downloaded via public link" : "Nedlastet via offentlig lenke",
-    "Downloaded by %1$s" : "Lastet ned av %1$s",
     "Downloaded by {email}" : "Lastet ned av {email}",
-    "%1$s downloaded via public link" : "%1$s lastet ned via offentlig lenke",
     "{file} downloaded via public link" : "{file} lastet ned via offentlig lenke",
-    "%1$s downloaded %2$s" : "%1$s lastet ned %2$s",
     "{email} downloaded {file}" : "{email} lastet ned {file}",
-    "Shared with group %1$s" : "Delt med gruppen %1$s",
     "Shared with group {group}" : "Delt med gruppen {group}",
-    "Removed share for group %1$s" : "Fjernet deling for gruppen %1$s",
     "Removed share for group {group}" : "Fjernet deling for gruppen {group}",
-    "%2$s shared with group %1$s" : "%2$s delt med gruppen %1$s",
     "{actor} shared with group {group}" : "{actor} delt med gruppen {group}",
-    "%2$s removed share for group %1$s" : "%2$s fjernet deling for gruppen %1$s",
     "{actor} removed share for group {group}" : "{actor} fjernet deling for gruppen {group}",
-    "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
     "You shared {file} with group {group}" : "Du delte {file} med gruppen {group}",
-    "You removed group %2$s from %1$s" : "Du fjernet gruppen %2$s fra %1$s",
     "You removed group {group} from {file}" : "Du fjernet gruppen {group} fra {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s delte %1$s med gruppen %2$s",
     "{actor} shared {file} with group {group}" : "{actor} delte {file} med gruppen {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s fjernet gruppen %2$s fra %1$s",
     "{actor} removed group {group} from {file}" : "{actor} fjernet gruppen {group} fra {file}",
     "Shared as public link" : "Delt som offentlig lenke",
     "Removed public link" : "Fjernet offentlig lenke",
-    "%1$s shared as public link" : "%1$s delt som offentlig lenke",
+    "Public link expired" : "Offentlig lenke er utløpt",
     "{actor} shared as public link" : "{actor} delte som offentlig lenke",
-    "%1$s removed public link" : "%1$s fjernet offentlig lenke",
     "{actor} removed public link" : "{actor} fjernet offentlig lenke",
-    "You shared %1$s as public link" : "Du delte %1$s som offentlig lenke",
     "You shared {file} as public link" : "Du delte {file} som offentlig lenke",
-    "You removed public link for %1$s" : "Du fjernet offentlig lenke for %1$s",
     "You removed public link for {file}" : "Du fjernet offentlig lenke for {file}",
-    "%2$s shared %1$s as public link" : "%2$s delte %1$s som offentlig lenke",
     "{actor} shared {file} as public link" : "{actor} delte {file} som offentlig lenke",
-    "%2$s removed public link for %1$s" : "%2$s fjernet offentlig lenke for %1$s",
     "{actor} removed public link for {file}" : "{actor} fjernet offentlig lenke for {file}",
-    "%1$s accepted the remote share" : "%1$s godtok den offentlige delingen",
     "{user} accepted the remote share" : "{user} godtok fjerndelingen",
-    "%1$s declined the remote share" : "%1$s avslo fjerndelingen",
     "{user} declined the remote share" : "{user} avslo fjerndelingen",
-    "You received a new remote share %1$s from %2$s" : "Du har mottatt en ny fjerndeling %1$s fra %2$s",
     "You received a new remote share {file} from {user}" : "Du har mottatt en ny fjerndeling {file} fra {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s godtok fjerndelingen av %1$s",
     "{user} accepted the remote share of {file}" : "{user} godtok fjerndelingen av {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s avslo fjerndelingen av %1$s",
     "{user} declined the remote share of {file}" : "{user} avslo fjerndelingen av {file}",
-    "%2$s unshared %1$s from you" : "%2$s fjernet deling av %1$s med deg",
     "{user} unshared {file} from you" : "{user} fjernet deling av {file} med deg",
-    "Shared with %1$s" : "Delt med %1$s",
     "Shared with {user}" : "Delt med {user}",
-    "Removed share for %1$s" : "Fjernet deling med %1$s",
     "Removed share for {user}" : "Fjernet deling med {user}",
-    "%2$s shared with %1$s" : "%2$s delt med %1$s",
     "{actor} shared with {user}" : "{actor} delte med {user}",
-    "%2$s removed share for %1$s" : "%2$s fjernet deling med %1$s",
     "{actor} removed share for {user}" : "{actor} fjernet deling med {user}",
-    "Shared by %1$s" : "Delt av %1$s",
     "Shared by {actor}" : "Delt av {actor}",
-    "%1$s removed share" : "%1$s fjernet deling",
     "{actor} removed share" : "{actor} fjernet deling",
-    "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared {file} with {user}" : "Du delte {file} med {user}",
-    "You removed %2$s from %1$s" : "Du fjernet %2$s fra %1$s",
     "You removed {user} from {file}" : "Du fjernet {user} fra {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s delte %1$s med %2$s",
     "{actor} removed {user} from {file}" : "{actor} fjernet {user} fra {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s fjernet %2$s fra %1$s",
-    "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "{actor} shared {file} with you" : "{actor} delte {file} med deg",
-    "%2$s removed you from %1$s" : "%2$s fjernet deg fra %1$s",
     "{actor} removed you from {file}" : "{actor} fjernet deg fra {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "En fil eller mappe delt via e-post eller offentlig lenke ble <strong>lastet ned</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe ble delt fra <strong>en annen tjener</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s fjernet deling %2$s fra deg",
     "Public shared folder %1$s was downloaded" : "Offentlig delt mappe %1$s ble lastet ned",
     "Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
+    "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
     "You removed the share of %2$s for %1$s" : "Du fjernet deling av %2$s for %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s fjernet deling av %3$s for %1$s",
+    "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
     "You removed the share of group %2$s for %1$s" : "Du fjernet deling av gruppe %2$s for %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s fjernet deling av gruppe %3$s for %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s fjernet den offentlige lenken for %1$s",
     "Your public link for %1$s expired" : "Din offentlige lenke for %1$s er utløpt",
     "The public link of %2$s for %1$s expired" : "Den offentlige lenken til %2$s for %1$s er utløpt",
+    "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "%2$s removed the share for %1$s" : "%2$s fjernet delingen for %1$s",
     "Shared with %2$s" : "Delt med %2$s",
     "Shared with %3$s by %2$s" : "Delt med %3$s av %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Delt via lenke av %2$s",
     "Shared via public link" : "Delt via offentlig lenke",
     "%2$s removed public link" : "%2$s fjernet offentlig lenke",
-    "Public link expired" : "Offentlig lenke er utløpt",
     "Public link of %2$s expired" : "Offentlig lenke til %2$s er utløpt",
     "Shared by %2$s" : "Delt av %2$s",
-    "Shares" : "Delinger"
+    "Shares" : "Delinger",
+    "Downloaded by %1$s" : "Lastet ned av %1$s",
+    "%1$s downloaded via public link" : "%1$s lastet ned via offentlig lenke",
+    "%1$s downloaded %2$s" : "%1$s lastet ned %2$s",
+    "Shared with group %1$s" : "Delt med gruppen %1$s",
+    "Removed share for group %1$s" : "Fjernet deling for gruppen %1$s",
+    "%2$s shared with group %1$s" : "%2$s delt med gruppen %1$s",
+    "%2$s removed share for group %1$s" : "%2$s fjernet deling for gruppen %1$s",
+    "You removed group %2$s from %1$s" : "Du fjernet gruppen %2$s fra %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s delte %1$s med gruppen %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s fjernet gruppen %2$s fra %1$s",
+    "%1$s shared as public link" : "%1$s delt som offentlig lenke",
+    "%1$s removed public link" : "%1$s fjernet offentlig lenke",
+    "You shared %1$s as public link" : "Du delte %1$s som offentlig lenke",
+    "You removed public link for %1$s" : "Du fjernet offentlig lenke for %1$s",
+    "%2$s shared %1$s as public link" : "%2$s delte %1$s som offentlig lenke",
+    "%2$s removed public link for %1$s" : "%2$s fjernet offentlig lenke for %1$s",
+    "%1$s accepted the remote share" : "%1$s godtok den offentlige delingen",
+    "%1$s declined the remote share" : "%1$s avslo fjerndelingen",
+    "You received a new remote share %1$s from %2$s" : "Du har mottatt en ny fjerndeling %1$s fra %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s godtok fjerndelingen av %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s avslo fjerndelingen av %1$s",
+    "%2$s unshared %1$s from you" : "%2$s fjernet deling av %1$s med deg",
+    "Shared with %1$s" : "Delt med %1$s",
+    "Removed share for %1$s" : "Fjernet deling med %1$s",
+    "%2$s shared with %1$s" : "%2$s delt med %1$s",
+    "%2$s removed share for %1$s" : "%2$s fjernet deling med %1$s",
+    "Shared by %1$s" : "Delt av %1$s",
+    "%1$s removed share" : "%1$s fjernet deling",
+    "You removed %2$s from %1$s" : "Du fjernet %2$s fra %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s delte %1$s med %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s fjernet %2$s fra %1$s",
+    "%2$s removed you from %1$s" : "%2$s fjernet deg fra %1$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index bc829079db6f2b4d87fb1c191b55c7dd50ab4b02..7dac9de24afd26f0d9930159294e655dfeaaaab7 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -18,76 +18,42 @@
     "Sharing" : "Deling",
     "File shares" : "Fildelinger",
     "Downloaded via public link" : "Nedlastet via offentlig lenke",
-    "Downloaded by %1$s" : "Lastet ned av %1$s",
     "Downloaded by {email}" : "Lastet ned av {email}",
-    "%1$s downloaded via public link" : "%1$s lastet ned via offentlig lenke",
     "{file} downloaded via public link" : "{file} lastet ned via offentlig lenke",
-    "%1$s downloaded %2$s" : "%1$s lastet ned %2$s",
     "{email} downloaded {file}" : "{email} lastet ned {file}",
-    "Shared with group %1$s" : "Delt med gruppen %1$s",
     "Shared with group {group}" : "Delt med gruppen {group}",
-    "Removed share for group %1$s" : "Fjernet deling for gruppen %1$s",
     "Removed share for group {group}" : "Fjernet deling for gruppen {group}",
-    "%2$s shared with group %1$s" : "%2$s delt med gruppen %1$s",
     "{actor} shared with group {group}" : "{actor} delt med gruppen {group}",
-    "%2$s removed share for group %1$s" : "%2$s fjernet deling for gruppen %1$s",
     "{actor} removed share for group {group}" : "{actor} fjernet deling for gruppen {group}",
-    "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
     "You shared {file} with group {group}" : "Du delte {file} med gruppen {group}",
-    "You removed group %2$s from %1$s" : "Du fjernet gruppen %2$s fra %1$s",
     "You removed group {group} from {file}" : "Du fjernet gruppen {group} fra {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s delte %1$s med gruppen %2$s",
     "{actor} shared {file} with group {group}" : "{actor} delte {file} med gruppen {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s fjernet gruppen %2$s fra %1$s",
     "{actor} removed group {group} from {file}" : "{actor} fjernet gruppen {group} fra {file}",
     "Shared as public link" : "Delt som offentlig lenke",
     "Removed public link" : "Fjernet offentlig lenke",
-    "%1$s shared as public link" : "%1$s delt som offentlig lenke",
+    "Public link expired" : "Offentlig lenke er utløpt",
     "{actor} shared as public link" : "{actor} delte som offentlig lenke",
-    "%1$s removed public link" : "%1$s fjernet offentlig lenke",
     "{actor} removed public link" : "{actor} fjernet offentlig lenke",
-    "You shared %1$s as public link" : "Du delte %1$s som offentlig lenke",
     "You shared {file} as public link" : "Du delte {file} som offentlig lenke",
-    "You removed public link for %1$s" : "Du fjernet offentlig lenke for %1$s",
     "You removed public link for {file}" : "Du fjernet offentlig lenke for {file}",
-    "%2$s shared %1$s as public link" : "%2$s delte %1$s som offentlig lenke",
     "{actor} shared {file} as public link" : "{actor} delte {file} som offentlig lenke",
-    "%2$s removed public link for %1$s" : "%2$s fjernet offentlig lenke for %1$s",
     "{actor} removed public link for {file}" : "{actor} fjernet offentlig lenke for {file}",
-    "%1$s accepted the remote share" : "%1$s godtok den offentlige delingen",
     "{user} accepted the remote share" : "{user} godtok fjerndelingen",
-    "%1$s declined the remote share" : "%1$s avslo fjerndelingen",
     "{user} declined the remote share" : "{user} avslo fjerndelingen",
-    "You received a new remote share %1$s from %2$s" : "Du har mottatt en ny fjerndeling %1$s fra %2$s",
     "You received a new remote share {file} from {user}" : "Du har mottatt en ny fjerndeling {file} fra {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s godtok fjerndelingen av %1$s",
     "{user} accepted the remote share of {file}" : "{user} godtok fjerndelingen av {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s avslo fjerndelingen av %1$s",
     "{user} declined the remote share of {file}" : "{user} avslo fjerndelingen av {file}",
-    "%2$s unshared %1$s from you" : "%2$s fjernet deling av %1$s med deg",
     "{user} unshared {file} from you" : "{user} fjernet deling av {file} med deg",
-    "Shared with %1$s" : "Delt med %1$s",
     "Shared with {user}" : "Delt med {user}",
-    "Removed share for %1$s" : "Fjernet deling med %1$s",
     "Removed share for {user}" : "Fjernet deling med {user}",
-    "%2$s shared with %1$s" : "%2$s delt med %1$s",
     "{actor} shared with {user}" : "{actor} delte med {user}",
-    "%2$s removed share for %1$s" : "%2$s fjernet deling med %1$s",
     "{actor} removed share for {user}" : "{actor} fjernet deling med {user}",
-    "Shared by %1$s" : "Delt av %1$s",
     "Shared by {actor}" : "Delt av {actor}",
-    "%1$s removed share" : "%1$s fjernet deling",
     "{actor} removed share" : "{actor} fjernet deling",
-    "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared {file} with {user}" : "Du delte {file} med {user}",
-    "You removed %2$s from %1$s" : "Du fjernet %2$s fra %1$s",
     "You removed {user} from {file}" : "Du fjernet {user} fra {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s delte %1$s med %2$s",
     "{actor} removed {user} from {file}" : "{actor} fjernet {user} fra {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s fjernet %2$s fra %1$s",
-    "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "{actor} shared {file} with you" : "{actor} delte {file} med deg",
-    "%2$s removed you from %1$s" : "%2$s fjernet deg fra %1$s",
     "{actor} removed you from {file}" : "{actor} fjernet deg fra {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "En fil eller mappe delt via e-post eller offentlig lenke ble <strong>lastet ned</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe ble delt fra <strong>en annen tjener</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s fjernet deling %2$s fra deg",
     "Public shared folder %1$s was downloaded" : "Offentlig delt mappe %1$s ble lastet ned",
     "Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
+    "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
     "You removed the share of %2$s for %1$s" : "Du fjernet deling av %2$s for %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s fjernet deling av %3$s for %1$s",
+    "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
     "You removed the share of group %2$s for %1$s" : "Du fjernet deling av gruppe %2$s for %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s fjernet deling av gruppe %3$s for %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s fjernet den offentlige lenken for %1$s",
     "Your public link for %1$s expired" : "Din offentlige lenke for %1$s er utløpt",
     "The public link of %2$s for %1$s expired" : "Den offentlige lenken til %2$s for %1$s er utløpt",
+    "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "%2$s removed the share for %1$s" : "%2$s fjernet delingen for %1$s",
     "Shared with %2$s" : "Delt med %2$s",
     "Shared with %3$s by %2$s" : "Delt med %3$s av %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Delt via lenke av %2$s",
     "Shared via public link" : "Delt via offentlig lenke",
     "%2$s removed public link" : "%2$s fjernet offentlig lenke",
-    "Public link expired" : "Offentlig lenke er utløpt",
     "Public link of %2$s expired" : "Offentlig lenke til %2$s er utløpt",
     "Shared by %2$s" : "Delt av %2$s",
-    "Shares" : "Delinger"
+    "Shares" : "Delinger",
+    "Downloaded by %1$s" : "Lastet ned av %1$s",
+    "%1$s downloaded via public link" : "%1$s lastet ned via offentlig lenke",
+    "%1$s downloaded %2$s" : "%1$s lastet ned %2$s",
+    "Shared with group %1$s" : "Delt med gruppen %1$s",
+    "Removed share for group %1$s" : "Fjernet deling for gruppen %1$s",
+    "%2$s shared with group %1$s" : "%2$s delt med gruppen %1$s",
+    "%2$s removed share for group %1$s" : "%2$s fjernet deling for gruppen %1$s",
+    "You removed group %2$s from %1$s" : "Du fjernet gruppen %2$s fra %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s delte %1$s med gruppen %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s fjernet gruppen %2$s fra %1$s",
+    "%1$s shared as public link" : "%1$s delt som offentlig lenke",
+    "%1$s removed public link" : "%1$s fjernet offentlig lenke",
+    "You shared %1$s as public link" : "Du delte %1$s som offentlig lenke",
+    "You removed public link for %1$s" : "Du fjernet offentlig lenke for %1$s",
+    "%2$s shared %1$s as public link" : "%2$s delte %1$s som offentlig lenke",
+    "%2$s removed public link for %1$s" : "%2$s fjernet offentlig lenke for %1$s",
+    "%1$s accepted the remote share" : "%1$s godtok den offentlige delingen",
+    "%1$s declined the remote share" : "%1$s avslo fjerndelingen",
+    "You received a new remote share %1$s from %2$s" : "Du har mottatt en ny fjerndeling %1$s fra %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s godtok fjerndelingen av %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s avslo fjerndelingen av %1$s",
+    "%2$s unshared %1$s from you" : "%2$s fjernet deling av %1$s med deg",
+    "Shared with %1$s" : "Delt med %1$s",
+    "Removed share for %1$s" : "Fjernet deling med %1$s",
+    "%2$s shared with %1$s" : "%2$s delt med %1$s",
+    "%2$s removed share for %1$s" : "%2$s fjernet deling med %1$s",
+    "Shared by %1$s" : "Delt av %1$s",
+    "%1$s removed share" : "%1$s fjernet deling",
+    "You removed %2$s from %1$s" : "Du fjernet %2$s fra %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s delte %1$s med %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s fjernet %2$s fra %1$s",
+    "%2$s removed you from %1$s" : "%2$s fjernet deg fra %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index e5ba0ad7c21680ce10bd360e8170577ac482ba22..5bda54d67f0346f8a297ded90353e217eab04d8d 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Delen",
     "File shares" : "File shares",
     "Downloaded via public link" : "Gedownload via een openbare link",
-    "Downloaded by %1$s" : "Gedownload door %1$s",
     "Downloaded by {email}" : "Gedownload via {email}",
-    "%1$s downloaded via public link" : "%1$s gedownload via openbare link",
     "{file} downloaded via public link" : "{file} gedownload via openbare link",
-    "%1$s downloaded %2$s" : "%1$s downloadde %2$s",
     "{email} downloaded {file}" : "{email} downloadde {file}",
-    "Shared with group %1$s" : "Deelde met groep %1$s",
     "Shared with group {group}" : "Deelde met groep {group}",
-    "Removed share for group %1$s" : "Share van de groep %1$s verwijderd",
     "Removed share for group {group}" : "Share van de groep {group} verwijderd",
-    "%2$s shared with group %1$s" : "%2$s deelde met groep %1$s",
     "{actor} shared with group {group}" : "{actor} deelde met groep {group}",
-    "%2$s removed share for group %1$s" : "%2$s verwijderde share voor groep %1$s",
     "{actor} removed share for group {group}" : "{actor} verwijderde de share voor groep {group}",
-    "You shared %1$s with group %2$s" : "Je deelde %1$s met groep %2$s",
     "You shared {file} with group {group}" : "Je deelde {file} met groep {group}",
-    "You removed group %2$s from %1$s" : "Je verwijderde groep %2$s van %1$s",
     "You removed group {group} from {file}" : "Je verwijderde groep  {group} van {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s deelde %1$s met groep %2$s",
     "{actor} shared {file} with group {group}" : "{actor} deelde {file} met groep {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s verwijderde groep %2$s van %1$s",
     "{actor} removed group {group} from {file}" : "{actor} verwijderde groep {group} van {file}",
     "Shared as public link" : "Gedeeld als een openbare link",
     "Removed public link" : "Openbare link verwijderd",
-    "%1$s shared as public link" : "%1$s deelde als een openbare link",
+    "Public link expired" : "Openbare link is verlopen",
     "{actor} shared as public link" : "{actor} deelde als een openbare link",
-    "%1$s removed public link" : "%1$s verwijderde openbare link",
     "{actor} removed public link" : "{actor} verwijderde openbare link",
-    "You shared %1$s as public link" : "Je deelde %1$s als openbare link",
     "You shared {file} as public link" : "Je deelde {file} als openbare link",
-    "You removed public link for %1$s" : "Je verwijderde de openbare link voor %1$s",
     "You removed public link for {file}" : "Je verwijderde de openbare link voor {file}",
-    "%2$s shared %1$s as public link" : "%2$s deelde %1$s als een openbare link",
     "{actor} shared {file} as public link" : "{actor} deelde {file} als openbare link",
-    "%2$s removed public link for %1$s" : "%2$s verwijderde openbare link voor %1$s",
     "{actor} removed public link for {file}" : "{actor} verwijderde openbare link voor {file}",
-    "%1$s accepted the remote share" : "%1$s accepteerde externe share",
     "{user} accepted the remote share" : "{user} accepteerde externe share",
-    "%1$s declined the remote share" : "%1$s weigerde externe share",
     "{user} declined the remote share" : "{user} weigerde externe share",
-    "You received a new remote share %1$s from %2$s" : "Je ontving een nieuwe externe share voor %1$s van %2$s",
     "You received a new remote share {file} from {user}" : "Je ontving een nieuwe externe share voor {file} van {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s accepteerde externe share van %1$s",
     "{user} accepted the remote share of {file}" : "{user} accepteerde externe share van {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s weigerde de externe share van %1$s",
     "{user} declined the remote share of {file}" : "{user} weigerde de externe share van {file}",
-    "%2$s unshared %1$s from you" : "%2$s stopte met delen van %1$s met jou",
     "{user} unshared {file} from you" : "{user} stopte met delen van {file} met jou",
-    "Shared with %1$s" : "Gedeeld met %1$s",
     "Shared with {user}" : "Gedeeld met {user}",
-    "Removed share for %1$s" : "Verwijderde share voor %1$s",
     "Removed share for {user}" : "Verwijderde share voor {user}",
-    "%2$s shared with %1$s" : "%2$s deelde met %1$s",
     "{actor} shared with {user}" : "{actor} deelde met {user}",
-    "%2$s removed share for %1$s" : "%2$s verwijderde de share voor %1$s",
     "{actor} removed share for {user}" : "{actor} verwijderde de share voor {user}",
-    "Shared by %1$s" : "Gedeeld door %1$s",
     "Shared by {actor}" : "Gedeeld door {actor}",
-    "%1$s removed share" : "%1$s verwijderde de share",
     "{actor} removed share" : "{actor} verwijderde de share",
-    "You shared %1$s with %2$s" : "Je deelde %1$s met %2$s",
     "You shared {file} with {user}" : "Je deelde {file} mey {user}",
-    "You removed %2$s from %1$s" : "Je verwijderde %2$s van %1$s",
     "You removed {user} from {file}" : "Je verwijderde {user} van {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s deelde %1$s met %2$s",
     "{actor} removed {user} from {file}" : "{actor} verwijderde {user} van {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s verwijderde %2$s van %1$s",
-    "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "{actor} shared {file} with you" : "{actor} deelde {file} met jou",
-    "%2$s removed you from %1$s" : "%2$s verwijderde jou van %1$s",
     "{actor} removed you from {file}" : "{actor} verwijderde jou van {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Een bestand of map gedeeld via mail of publieke link werd <strong>gedownload</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s stopte met delen van %2$s met je",
     "Public shared folder %1$s was downloaded" : "Openbaar gedeelde map %1$s werd gedownloaded",
     "Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
+    "You shared %1$s with %2$s" : "Je deelde %1$s met %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
     "You removed the share of %2$s for %1$s" : "Je hebt de share van %1$s met %2$s verwijderd",
     "%2$s removed the share of %3$s for %1$s" : "%2$s heeft de share van %1$s met %3$s verwijderd",
+    "You shared %1$s with group %2$s" : "Je deelde %1$s met groep %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
     "You removed the share of group %2$s for %1$s" : "Je hebt de share van %1$s met de groep %2$s verwijderd",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s heeft de share van %1$s met de groep %3$s verwijderd",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s heeft de openbare link voor %1$s verwijderd",
     "Your public link for %1$s expired" : "Je openbare link voor %1$s is verlopen",
     "The public link of %2$s for %1$s expired" : "De openbare link van %2$s voor %1$s is verlopen",
+    "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "%2$s removed the share for %1$s" : "%2$s heeft de share van %1$s verwijderd",
     "Shared with %2$s" : "Gedeeld met %2$s",
     "Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Gedeeld via link door %2$s",
     "Shared via public link" : "Gedeeld via een openbare link",
     "%2$s removed public link" : "%2$s verwijderede openbare link",
-    "Public link expired" : "Openbare link is verlopen",
     "Public link of %2$s expired" : "Openbare link van %2$s is verlopen",
     "Shared by %2$s" : "Gedeeld door %2$s",
-    "Shares" : "Gedeeld"
+    "Shares" : "Gedeeld",
+    "Downloaded by %1$s" : "Gedownload door %1$s",
+    "%1$s downloaded via public link" : "%1$s gedownload via openbare link",
+    "%1$s downloaded %2$s" : "%1$s downloadde %2$s",
+    "Shared with group %1$s" : "Deelde met groep %1$s",
+    "Removed share for group %1$s" : "Share van de groep %1$s verwijderd",
+    "%2$s shared with group %1$s" : "%2$s deelde met groep %1$s",
+    "%2$s removed share for group %1$s" : "%2$s verwijderde share voor groep %1$s",
+    "You removed group %2$s from %1$s" : "Je verwijderde groep %2$s van %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s deelde %1$s met groep %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s verwijderde groep %2$s van %1$s",
+    "%1$s shared as public link" : "%1$s deelde als een openbare link",
+    "%1$s removed public link" : "%1$s verwijderde openbare link",
+    "You shared %1$s as public link" : "Je deelde %1$s als openbare link",
+    "You removed public link for %1$s" : "Je verwijderde de openbare link voor %1$s",
+    "%2$s shared %1$s as public link" : "%2$s deelde %1$s als een openbare link",
+    "%2$s removed public link for %1$s" : "%2$s verwijderde openbare link voor %1$s",
+    "%1$s accepted the remote share" : "%1$s accepteerde externe share",
+    "%1$s declined the remote share" : "%1$s weigerde externe share",
+    "You received a new remote share %1$s from %2$s" : "Je ontving een nieuwe externe share voor %1$s van %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s accepteerde externe share van %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s weigerde de externe share van %1$s",
+    "%2$s unshared %1$s from you" : "%2$s stopte met delen van %1$s met jou",
+    "Shared with %1$s" : "Gedeeld met %1$s",
+    "Removed share for %1$s" : "Verwijderde share voor %1$s",
+    "%2$s shared with %1$s" : "%2$s deelde met %1$s",
+    "%2$s removed share for %1$s" : "%2$s verwijderde de share voor %1$s",
+    "Shared by %1$s" : "Gedeeld door %1$s",
+    "%1$s removed share" : "%1$s verwijderde de share",
+    "You removed %2$s from %1$s" : "Je verwijderde %2$s van %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s deelde %1$s met %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s verwijderde %2$s van %1$s",
+    "%2$s removed you from %1$s" : "%2$s verwijderde jou van %1$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index b3ceedff6be55270dd30c475b37b900e314b4d49..78895e4b7f9179e7de6bb68ceb9363e9d581b70a 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -18,76 +18,42 @@
     "Sharing" : "Delen",
     "File shares" : "File shares",
     "Downloaded via public link" : "Gedownload via een openbare link",
-    "Downloaded by %1$s" : "Gedownload door %1$s",
     "Downloaded by {email}" : "Gedownload via {email}",
-    "%1$s downloaded via public link" : "%1$s gedownload via openbare link",
     "{file} downloaded via public link" : "{file} gedownload via openbare link",
-    "%1$s downloaded %2$s" : "%1$s downloadde %2$s",
     "{email} downloaded {file}" : "{email} downloadde {file}",
-    "Shared with group %1$s" : "Deelde met groep %1$s",
     "Shared with group {group}" : "Deelde met groep {group}",
-    "Removed share for group %1$s" : "Share van de groep %1$s verwijderd",
     "Removed share for group {group}" : "Share van de groep {group} verwijderd",
-    "%2$s shared with group %1$s" : "%2$s deelde met groep %1$s",
     "{actor} shared with group {group}" : "{actor} deelde met groep {group}",
-    "%2$s removed share for group %1$s" : "%2$s verwijderde share voor groep %1$s",
     "{actor} removed share for group {group}" : "{actor} verwijderde de share voor groep {group}",
-    "You shared %1$s with group %2$s" : "Je deelde %1$s met groep %2$s",
     "You shared {file} with group {group}" : "Je deelde {file} met groep {group}",
-    "You removed group %2$s from %1$s" : "Je verwijderde groep %2$s van %1$s",
     "You removed group {group} from {file}" : "Je verwijderde groep  {group} van {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s deelde %1$s met groep %2$s",
     "{actor} shared {file} with group {group}" : "{actor} deelde {file} met groep {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s verwijderde groep %2$s van %1$s",
     "{actor} removed group {group} from {file}" : "{actor} verwijderde groep {group} van {file}",
     "Shared as public link" : "Gedeeld als een openbare link",
     "Removed public link" : "Openbare link verwijderd",
-    "%1$s shared as public link" : "%1$s deelde als een openbare link",
+    "Public link expired" : "Openbare link is verlopen",
     "{actor} shared as public link" : "{actor} deelde als een openbare link",
-    "%1$s removed public link" : "%1$s verwijderde openbare link",
     "{actor} removed public link" : "{actor} verwijderde openbare link",
-    "You shared %1$s as public link" : "Je deelde %1$s als openbare link",
     "You shared {file} as public link" : "Je deelde {file} als openbare link",
-    "You removed public link for %1$s" : "Je verwijderde de openbare link voor %1$s",
     "You removed public link for {file}" : "Je verwijderde de openbare link voor {file}",
-    "%2$s shared %1$s as public link" : "%2$s deelde %1$s als een openbare link",
     "{actor} shared {file} as public link" : "{actor} deelde {file} als openbare link",
-    "%2$s removed public link for %1$s" : "%2$s verwijderde openbare link voor %1$s",
     "{actor} removed public link for {file}" : "{actor} verwijderde openbare link voor {file}",
-    "%1$s accepted the remote share" : "%1$s accepteerde externe share",
     "{user} accepted the remote share" : "{user} accepteerde externe share",
-    "%1$s declined the remote share" : "%1$s weigerde externe share",
     "{user} declined the remote share" : "{user} weigerde externe share",
-    "You received a new remote share %1$s from %2$s" : "Je ontving een nieuwe externe share voor %1$s van %2$s",
     "You received a new remote share {file} from {user}" : "Je ontving een nieuwe externe share voor {file} van {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s accepteerde externe share van %1$s",
     "{user} accepted the remote share of {file}" : "{user} accepteerde externe share van {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s weigerde de externe share van %1$s",
     "{user} declined the remote share of {file}" : "{user} weigerde de externe share van {file}",
-    "%2$s unshared %1$s from you" : "%2$s stopte met delen van %1$s met jou",
     "{user} unshared {file} from you" : "{user} stopte met delen van {file} met jou",
-    "Shared with %1$s" : "Gedeeld met %1$s",
     "Shared with {user}" : "Gedeeld met {user}",
-    "Removed share for %1$s" : "Verwijderde share voor %1$s",
     "Removed share for {user}" : "Verwijderde share voor {user}",
-    "%2$s shared with %1$s" : "%2$s deelde met %1$s",
     "{actor} shared with {user}" : "{actor} deelde met {user}",
-    "%2$s removed share for %1$s" : "%2$s verwijderde de share voor %1$s",
     "{actor} removed share for {user}" : "{actor} verwijderde de share voor {user}",
-    "Shared by %1$s" : "Gedeeld door %1$s",
     "Shared by {actor}" : "Gedeeld door {actor}",
-    "%1$s removed share" : "%1$s verwijderde de share",
     "{actor} removed share" : "{actor} verwijderde de share",
-    "You shared %1$s with %2$s" : "Je deelde %1$s met %2$s",
     "You shared {file} with {user}" : "Je deelde {file} mey {user}",
-    "You removed %2$s from %1$s" : "Je verwijderde %2$s van %1$s",
     "You removed {user} from {file}" : "Je verwijderde {user} van {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s deelde %1$s met %2$s",
     "{actor} removed {user} from {file}" : "{actor} verwijderde {user} van {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s verwijderde %2$s van %1$s",
-    "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "{actor} shared {file} with you" : "{actor} deelde {file} met jou",
-    "%2$s removed you from %1$s" : "%2$s verwijderde jou van %1$s",
     "{actor} removed you from {file}" : "{actor} verwijderde jou van {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Een bestand of map gedeeld via mail of publieke link werd <strong>gedownload</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s stopte met delen van %2$s met je",
     "Public shared folder %1$s was downloaded" : "Openbaar gedeelde map %1$s werd gedownloaded",
     "Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
+    "You shared %1$s with %2$s" : "Je deelde %1$s met %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
     "You removed the share of %2$s for %1$s" : "Je hebt de share van %1$s met %2$s verwijderd",
     "%2$s removed the share of %3$s for %1$s" : "%2$s heeft de share van %1$s met %3$s verwijderd",
+    "You shared %1$s with group %2$s" : "Je deelde %1$s met groep %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
     "You removed the share of group %2$s for %1$s" : "Je hebt de share van %1$s met de groep %2$s verwijderd",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s heeft de share van %1$s met de groep %3$s verwijderd",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s heeft de openbare link voor %1$s verwijderd",
     "Your public link for %1$s expired" : "Je openbare link voor %1$s is verlopen",
     "The public link of %2$s for %1$s expired" : "De openbare link van %2$s voor %1$s is verlopen",
+    "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "%2$s removed the share for %1$s" : "%2$s heeft de share van %1$s verwijderd",
     "Shared with %2$s" : "Gedeeld met %2$s",
     "Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Gedeeld via link door %2$s",
     "Shared via public link" : "Gedeeld via een openbare link",
     "%2$s removed public link" : "%2$s verwijderede openbare link",
-    "Public link expired" : "Openbare link is verlopen",
     "Public link of %2$s expired" : "Openbare link van %2$s is verlopen",
     "Shared by %2$s" : "Gedeeld door %2$s",
-    "Shares" : "Gedeeld"
+    "Shares" : "Gedeeld",
+    "Downloaded by %1$s" : "Gedownload door %1$s",
+    "%1$s downloaded via public link" : "%1$s gedownload via openbare link",
+    "%1$s downloaded %2$s" : "%1$s downloadde %2$s",
+    "Shared with group %1$s" : "Deelde met groep %1$s",
+    "Removed share for group %1$s" : "Share van de groep %1$s verwijderd",
+    "%2$s shared with group %1$s" : "%2$s deelde met groep %1$s",
+    "%2$s removed share for group %1$s" : "%2$s verwijderde share voor groep %1$s",
+    "You removed group %2$s from %1$s" : "Je verwijderde groep %2$s van %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s deelde %1$s met groep %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s verwijderde groep %2$s van %1$s",
+    "%1$s shared as public link" : "%1$s deelde als een openbare link",
+    "%1$s removed public link" : "%1$s verwijderde openbare link",
+    "You shared %1$s as public link" : "Je deelde %1$s als openbare link",
+    "You removed public link for %1$s" : "Je verwijderde de openbare link voor %1$s",
+    "%2$s shared %1$s as public link" : "%2$s deelde %1$s als een openbare link",
+    "%2$s removed public link for %1$s" : "%2$s verwijderde openbare link voor %1$s",
+    "%1$s accepted the remote share" : "%1$s accepteerde externe share",
+    "%1$s declined the remote share" : "%1$s weigerde externe share",
+    "You received a new remote share %1$s from %2$s" : "Je ontving een nieuwe externe share voor %1$s van %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s accepteerde externe share van %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s weigerde de externe share van %1$s",
+    "%2$s unshared %1$s from you" : "%2$s stopte met delen van %1$s met jou",
+    "Shared with %1$s" : "Gedeeld met %1$s",
+    "Removed share for %1$s" : "Verwijderde share voor %1$s",
+    "%2$s shared with %1$s" : "%2$s deelde met %1$s",
+    "%2$s removed share for %1$s" : "%2$s verwijderde de share voor %1$s",
+    "Shared by %1$s" : "Gedeeld door %1$s",
+    "%1$s removed share" : "%1$s verwijderde de share",
+    "You removed %2$s from %1$s" : "Je verwijderde %2$s van %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s deelde %1$s met %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s verwijderde %2$s van %1$s",
+    "%2$s removed you from %1$s" : "%2$s verwijderde jou van %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js
index 0e2339b6581baa88952c13f3e3e25a502075e150..8b30859a00d9226b0d41ab98a7dd88e2efd92034 100644
--- a/apps/files_sharing/l10n/pl.js
+++ b/apps/files_sharing/l10n/pl.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Udostępnianie",
     "File shares" : "Udziały",
     "Downloaded via public link" : "Pobierane poprzez link publiczny",
-    "Downloaded by %1$s" : "Pobierane przez %1$s",
     "Downloaded by {email}" : "Pobierane przez {email}",
-    "%1$s downloaded via public link" : "%1$s pobierane za pośrednictwem łącza publicznego",
     "{file} downloaded via public link" : "{file} pobierane za pośrednictwem łącza publicznego",
-    "%1$s downloaded %2$s" : "%1$s pobierane %2$s",
     "{email} downloaded {file}" : "{email} pobierane {file}",
-    "Shared with group %1$s" : "Udostępnione grupie %1$s",
     "Shared with group {group}" : "Udostępnione grupie {group}",
-    "Removed share for group %1$s" : "Zakończono udostępnianie grupie %1$s",
     "Removed share for group {group}" : "Zakończono udostępnianie grupie {group}",
-    "%2$s shared with group %1$s" : "%2$s jest udostępniane grupie %1$s",
     "{actor} shared with group {group}" : "{actor} udostępnił grupie {group}",
-    "%2$s removed share for group %1$s" : "%2$s zakończył udostępnianie grupie %1$s",
     "{actor} removed share for group {group}" : "{actor} zakończył udostępnianie grupie {group}",
-    "You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
     "You shared {file} with group {group}" : "Udostępniasz {file} grupie {group}",
-    "You removed group %2$s from %1$s" : "UsunÄ…Å‚eÅ› grupÄ™ %2$s z %1$s",
     "You removed group {group} from {file}" : "UsunÄ…Å‚eÅ› grupÄ™ {group} z {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s udostępnił %1$s grupie %2$s",
     "{actor} shared {file} with group {group}" : "{actor} udostępnił {file} grupie {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s usunÄ…Å‚ grupÄ™ %2$s z %1$s",
     "{actor} removed group {group} from {file}" : "{actor} usunÄ…Å‚ grupÄ™ {group} z {file}",
     "Shared as public link" : "Udostępnione jako publiczny link",
     "Removed public link" : "Usunięto link publiczny",
-    "%1$s shared as public link" : "%1$s udostępnione jako publiczny link",
+    "Public link expired" : "Link publiczny wygasł",
     "{actor} shared as public link" : "{actor} udostępniony jako publiczny link",
-    "%1$s removed public link" : "%1$s usunÄ…Å‚eÅ› publiczny link",
     "{actor} removed public link" : "{actor} usunÄ…Å‚ publiczny link",
-    "You shared %1$s as public link" : "Udostępniasz %1$s jako publiczny link",
     "You shared {file} as public link" : "Udostępniasz {file} jako publiczny link",
-    "You removed public link for %1$s" : "Usuwasz link publiczny dla %1$s",
     "You removed public link for {file}" : "Usuwasz link publiczny dla {file}",
-    "%2$s shared %1$s as public link" : "%2$s udostępnił %1$s jako publiczne łącze",
     "{actor} shared {file} as public link" : "{actor} udostępnił {file} jako publiczne łącze",
-    "%2$s removed public link for %1$s" : "%2$s usunÄ…Å‚ publiczne Å‚Ä…cze do %1$s",
     "{actor} removed public link for {file}" : "{actor} usunÄ…Å‚ publiczne Å‚Ä…cze do {file}",
-    "%1$s accepted the remote share" : "%1$s zaakceptował zdalny udział",
     "{user} accepted the remote share" : "{user} zaakceptował zdalny udział",
-    "%1$s declined the remote share" : "%1$s odrzucił zdalny udział",
     "{user} declined the remote share" : "{user} odrzucił zdalny udział",
-    "You received a new remote share %1$s from %2$s" : "Otrzymałeś nowy zdalny udział %1$s od użytkownika %2$s",
     "You received a new remote share {file} from {user}" : "Otrzymałeś nowy zdalny udział {file} od użytkownika {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s zaakceptował zdalny udział %1$s",
     "{user} accepted the remote share of {file}" : "{user} zaakceptował zdalny udział {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s odrzucił zdalny udział %1$s",
     "{user} declined the remote share of {file}" : "{user} odrzucił zadalny udział {file}",
-    "%2$s unshared %1$s from you" : "%2$s przestał ci udostępniać %1$s",
     "{user} unshared {file} from you" : "{user} przestał ci udostępniać {file}",
-    "Shared with %1$s" : "Udostępnione %1$s",
     "Shared with {user}" : "Udostępnione użytkownikowi {user}",
-    "Removed share for %1$s" : "Zakończono udostępnianie użytkownikowi %1$s",
     "Removed share for {user}" : "Zakończono udostępnianie użytkownikowi {user}",
-    "%2$s shared with %1$s" : "%2$s udostępnia użytkownikowi %1$s",
     "{actor} shared with {user}" : "{actor} udostępnia użytkownikowi {user}",
-    "%2$s removed share for %1$s" : "%2$s usuwa udostępnienie dla użytkownika %1$s",
     "{actor} removed share for {user}" : "{actor} usuwa udostępnienie dla użytkownika {user}",
-    "Shared by %1$s" : "Udostępnione przez użytkownika %1$s",
     "Shared by {actor}" : "Udostępnione przez użytkownika {actor}",
-    "%1$s removed share" : "%1$s usunął udostępnienie",
     "{actor} removed share" : "{actor} usunął udostępnienie",
-    "You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
     "You shared {file} with {user}" : "Współdzielisz {file} z {user}",
-    "You removed %2$s from %1$s" : "Usunąłeś użytkownika %2$s z %1$s",
     "You removed {user} from {file}" : "Usunąłeś użytkownika {user} z {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s udostępnił %1$s użytkownikowi %2$s",
     "{actor} removed {user} from {file}" : "{actor} usunął użytkownika {user} z {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s usunął użytkownika %2$s z %1$s",
-    "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "{actor} shared {file} with you" : "{actor} udostępnił ci {file}",
-    "%2$s removed you from %1$s" : "%2$s usunÄ…Å‚ ciÄ™ z %1$s",
     "{actor} removed you from {file}" : "{actor} usunÄ…Å‚ cie z {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Plik lub folder udostępniony za pomocą maila lub publicznego łącza został <strong>pobrany</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Plik lub folder został udostępniony z <strong>innego serwera</strong>",
@@ -146,13 +112,16 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s zakończył udostępnianie Ci %2$s",
     "Public shared folder %1$s was downloaded" : "Udostępniony publicznie folder %1$s został pobrany",
     "Public shared file %1$s was downloaded" : "Udostępniony publicznie plik %1$s został pobrany",
+    "You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s udostępnił %1$s użytkownikowi %3$s",
     "You removed the share of %2$s for %1$s" : "Zakończyłeś udostępnianie %2$s użytkownikowi %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s zakończył udostępnianie %3$s użytkownikowi %1$s",
+    "You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s udostępnił %1$s grupie %3$s",
     "%2$s shared %1$s via link" : "%2$s udostępnił %1$s poprzez łącze",
     "You shared %1$s via link" : "Udostępniasz %1$s przez link",
     "Your public link for %1$s expired" : "Twoje publiczne łącze do %1$s wygasło",
+    "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "%2$s removed the share for %1$s" : "%2$s usunął udział dla %1$s",
     "Shared with %2$s" : "Współdzielone z %2$s",
     "Shared with %3$s by %2$s" : "Udostępniono użytkownikowi %3$s przez %2$s",
@@ -161,8 +130,39 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Udostępniono za pomocą łącza przez użytkownika %2$s",
     "Shared via public link" : "Udostępniono przez publiczne łącze",
     "%2$s removed public link" : "%2$s usunÄ…Å‚ publiczne Å‚Ä…cze",
-    "Public link expired" : "Link publiczny wygasł",
     "Shared by %2$s" : "Udostępniane przez %2$s",
-    "Shares" : "Udziały"
+    "Shares" : "Udziały",
+    "Downloaded by %1$s" : "Pobierane przez %1$s",
+    "%1$s downloaded via public link" : "%1$s pobierane za pośrednictwem łącza publicznego",
+    "%1$s downloaded %2$s" : "%1$s pobierane %2$s",
+    "Shared with group %1$s" : "Udostępnione grupie %1$s",
+    "Removed share for group %1$s" : "Zakończono udostępnianie grupie %1$s",
+    "%2$s shared with group %1$s" : "%2$s jest udostępniane grupie %1$s",
+    "%2$s removed share for group %1$s" : "%2$s zakończył udostępnianie grupie %1$s",
+    "You removed group %2$s from %1$s" : "UsunÄ…Å‚eÅ› grupÄ™ %2$s z %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s udostępnił %1$s grupie %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s usunÄ…Å‚ grupÄ™ %2$s z %1$s",
+    "%1$s shared as public link" : "%1$s udostępnione jako publiczny link",
+    "%1$s removed public link" : "%1$s usunÄ…Å‚eÅ› publiczny link",
+    "You shared %1$s as public link" : "Udostępniasz %1$s jako publiczny link",
+    "You removed public link for %1$s" : "Usuwasz link publiczny dla %1$s",
+    "%2$s shared %1$s as public link" : "%2$s udostępnił %1$s jako publiczne łącze",
+    "%2$s removed public link for %1$s" : "%2$s usunÄ…Å‚ publiczne Å‚Ä…cze do %1$s",
+    "%1$s accepted the remote share" : "%1$s zaakceptował zdalny udział",
+    "%1$s declined the remote share" : "%1$s odrzucił zdalny udział",
+    "You received a new remote share %1$s from %2$s" : "Otrzymałeś nowy zdalny udział %1$s od użytkownika %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s zaakceptował zdalny udział %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s odrzucił zdalny udział %1$s",
+    "%2$s unshared %1$s from you" : "%2$s przestał ci udostępniać %1$s",
+    "Shared with %1$s" : "Udostępnione %1$s",
+    "Removed share for %1$s" : "Zakończono udostępnianie użytkownikowi %1$s",
+    "%2$s shared with %1$s" : "%2$s udostępnia użytkownikowi %1$s",
+    "%2$s removed share for %1$s" : "%2$s usuwa udostępnienie dla użytkownika %1$s",
+    "Shared by %1$s" : "Udostępnione przez użytkownika %1$s",
+    "%1$s removed share" : "%1$s usunął udostępnienie",
+    "You removed %2$s from %1$s" : "Usunąłeś użytkownika %2$s z %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s udostępnił %1$s użytkownikowi %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s usunął użytkownika %2$s z %1$s",
+    "%2$s removed you from %1$s" : "%2$s usunÄ…Å‚ ciÄ™ z %1$s"
 },
 "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json
index 955222647b3c45bc28f0a82ac4a4473b5937c0d6..5cbdbcb85e66205c456f26cab1867271cff73a60 100644
--- a/apps/files_sharing/l10n/pl.json
+++ b/apps/files_sharing/l10n/pl.json
@@ -18,76 +18,42 @@
     "Sharing" : "Udostępnianie",
     "File shares" : "Udziały",
     "Downloaded via public link" : "Pobierane poprzez link publiczny",
-    "Downloaded by %1$s" : "Pobierane przez %1$s",
     "Downloaded by {email}" : "Pobierane przez {email}",
-    "%1$s downloaded via public link" : "%1$s pobierane za pośrednictwem łącza publicznego",
     "{file} downloaded via public link" : "{file} pobierane za pośrednictwem łącza publicznego",
-    "%1$s downloaded %2$s" : "%1$s pobierane %2$s",
     "{email} downloaded {file}" : "{email} pobierane {file}",
-    "Shared with group %1$s" : "Udostępnione grupie %1$s",
     "Shared with group {group}" : "Udostępnione grupie {group}",
-    "Removed share for group %1$s" : "Zakończono udostępnianie grupie %1$s",
     "Removed share for group {group}" : "Zakończono udostępnianie grupie {group}",
-    "%2$s shared with group %1$s" : "%2$s jest udostępniane grupie %1$s",
     "{actor} shared with group {group}" : "{actor} udostępnił grupie {group}",
-    "%2$s removed share for group %1$s" : "%2$s zakończył udostępnianie grupie %1$s",
     "{actor} removed share for group {group}" : "{actor} zakończył udostępnianie grupie {group}",
-    "You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
     "You shared {file} with group {group}" : "Udostępniasz {file} grupie {group}",
-    "You removed group %2$s from %1$s" : "UsunÄ…Å‚eÅ› grupÄ™ %2$s z %1$s",
     "You removed group {group} from {file}" : "UsunÄ…Å‚eÅ› grupÄ™ {group} z {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s udostępnił %1$s grupie %2$s",
     "{actor} shared {file} with group {group}" : "{actor} udostępnił {file} grupie {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s usunÄ…Å‚ grupÄ™ %2$s z %1$s",
     "{actor} removed group {group} from {file}" : "{actor} usunÄ…Å‚ grupÄ™ {group} z {file}",
     "Shared as public link" : "Udostępnione jako publiczny link",
     "Removed public link" : "Usunięto link publiczny",
-    "%1$s shared as public link" : "%1$s udostępnione jako publiczny link",
+    "Public link expired" : "Link publiczny wygasł",
     "{actor} shared as public link" : "{actor} udostępniony jako publiczny link",
-    "%1$s removed public link" : "%1$s usunÄ…Å‚eÅ› publiczny link",
     "{actor} removed public link" : "{actor} usunÄ…Å‚ publiczny link",
-    "You shared %1$s as public link" : "Udostępniasz %1$s jako publiczny link",
     "You shared {file} as public link" : "Udostępniasz {file} jako publiczny link",
-    "You removed public link for %1$s" : "Usuwasz link publiczny dla %1$s",
     "You removed public link for {file}" : "Usuwasz link publiczny dla {file}",
-    "%2$s shared %1$s as public link" : "%2$s udostępnił %1$s jako publiczne łącze",
     "{actor} shared {file} as public link" : "{actor} udostępnił {file} jako publiczne łącze",
-    "%2$s removed public link for %1$s" : "%2$s usunÄ…Å‚ publiczne Å‚Ä…cze do %1$s",
     "{actor} removed public link for {file}" : "{actor} usunÄ…Å‚ publiczne Å‚Ä…cze do {file}",
-    "%1$s accepted the remote share" : "%1$s zaakceptował zdalny udział",
     "{user} accepted the remote share" : "{user} zaakceptował zdalny udział",
-    "%1$s declined the remote share" : "%1$s odrzucił zdalny udział",
     "{user} declined the remote share" : "{user} odrzucił zdalny udział",
-    "You received a new remote share %1$s from %2$s" : "Otrzymałeś nowy zdalny udział %1$s od użytkownika %2$s",
     "You received a new remote share {file} from {user}" : "Otrzymałeś nowy zdalny udział {file} od użytkownika {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s zaakceptował zdalny udział %1$s",
     "{user} accepted the remote share of {file}" : "{user} zaakceptował zdalny udział {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s odrzucił zdalny udział %1$s",
     "{user} declined the remote share of {file}" : "{user} odrzucił zadalny udział {file}",
-    "%2$s unshared %1$s from you" : "%2$s przestał ci udostępniać %1$s",
     "{user} unshared {file} from you" : "{user} przestał ci udostępniać {file}",
-    "Shared with %1$s" : "Udostępnione %1$s",
     "Shared with {user}" : "Udostępnione użytkownikowi {user}",
-    "Removed share for %1$s" : "Zakończono udostępnianie użytkownikowi %1$s",
     "Removed share for {user}" : "Zakończono udostępnianie użytkownikowi {user}",
-    "%2$s shared with %1$s" : "%2$s udostępnia użytkownikowi %1$s",
     "{actor} shared with {user}" : "{actor} udostępnia użytkownikowi {user}",
-    "%2$s removed share for %1$s" : "%2$s usuwa udostępnienie dla użytkownika %1$s",
     "{actor} removed share for {user}" : "{actor} usuwa udostępnienie dla użytkownika {user}",
-    "Shared by %1$s" : "Udostępnione przez użytkownika %1$s",
     "Shared by {actor}" : "Udostępnione przez użytkownika {actor}",
-    "%1$s removed share" : "%1$s usunął udostępnienie",
     "{actor} removed share" : "{actor} usunął udostępnienie",
-    "You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
     "You shared {file} with {user}" : "Współdzielisz {file} z {user}",
-    "You removed %2$s from %1$s" : "Usunąłeś użytkownika %2$s z %1$s",
     "You removed {user} from {file}" : "Usunąłeś użytkownika {user} z {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s udostępnił %1$s użytkownikowi %2$s",
     "{actor} removed {user} from {file}" : "{actor} usunął użytkownika {user} z {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s usunął użytkownika %2$s z %1$s",
-    "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "{actor} shared {file} with you" : "{actor} udostępnił ci {file}",
-    "%2$s removed you from %1$s" : "%2$s usunÄ…Å‚ ciÄ™ z %1$s",
     "{actor} removed you from {file}" : "{actor} usunÄ…Å‚ cie z {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Plik lub folder udostępniony za pomocą maila lub publicznego łącza został <strong>pobrany</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Plik lub folder został udostępniony z <strong>innego serwera</strong>",
@@ -144,13 +110,16 @@
     "%1$s unshared %2$s from you" : "%1$s zakończył udostępnianie Ci %2$s",
     "Public shared folder %1$s was downloaded" : "Udostępniony publicznie folder %1$s został pobrany",
     "Public shared file %1$s was downloaded" : "Udostępniony publicznie plik %1$s został pobrany",
+    "You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s udostępnił %1$s użytkownikowi %3$s",
     "You removed the share of %2$s for %1$s" : "Zakończyłeś udostępnianie %2$s użytkownikowi %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s zakończył udostępnianie %3$s użytkownikowi %1$s",
+    "You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s udostępnił %1$s grupie %3$s",
     "%2$s shared %1$s via link" : "%2$s udostępnił %1$s poprzez łącze",
     "You shared %1$s via link" : "Udostępniasz %1$s przez link",
     "Your public link for %1$s expired" : "Twoje publiczne łącze do %1$s wygasło",
+    "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "%2$s removed the share for %1$s" : "%2$s usunął udział dla %1$s",
     "Shared with %2$s" : "Współdzielone z %2$s",
     "Shared with %3$s by %2$s" : "Udostępniono użytkownikowi %3$s przez %2$s",
@@ -159,8 +128,39 @@
     "Shared via link by %2$s" : "Udostępniono za pomocą łącza przez użytkownika %2$s",
     "Shared via public link" : "Udostępniono przez publiczne łącze",
     "%2$s removed public link" : "%2$s usunÄ…Å‚ publiczne Å‚Ä…cze",
-    "Public link expired" : "Link publiczny wygasł",
     "Shared by %2$s" : "Udostępniane przez %2$s",
-    "Shares" : "Udziały"
+    "Shares" : "Udziały",
+    "Downloaded by %1$s" : "Pobierane przez %1$s",
+    "%1$s downloaded via public link" : "%1$s pobierane za pośrednictwem łącza publicznego",
+    "%1$s downloaded %2$s" : "%1$s pobierane %2$s",
+    "Shared with group %1$s" : "Udostępnione grupie %1$s",
+    "Removed share for group %1$s" : "Zakończono udostępnianie grupie %1$s",
+    "%2$s shared with group %1$s" : "%2$s jest udostępniane grupie %1$s",
+    "%2$s removed share for group %1$s" : "%2$s zakończył udostępnianie grupie %1$s",
+    "You removed group %2$s from %1$s" : "UsunÄ…Å‚eÅ› grupÄ™ %2$s z %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s udostępnił %1$s grupie %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s usunÄ…Å‚ grupÄ™ %2$s z %1$s",
+    "%1$s shared as public link" : "%1$s udostępnione jako publiczny link",
+    "%1$s removed public link" : "%1$s usunÄ…Å‚eÅ› publiczny link",
+    "You shared %1$s as public link" : "Udostępniasz %1$s jako publiczny link",
+    "You removed public link for %1$s" : "Usuwasz link publiczny dla %1$s",
+    "%2$s shared %1$s as public link" : "%2$s udostępnił %1$s jako publiczne łącze",
+    "%2$s removed public link for %1$s" : "%2$s usunÄ…Å‚ publiczne Å‚Ä…cze do %1$s",
+    "%1$s accepted the remote share" : "%1$s zaakceptował zdalny udział",
+    "%1$s declined the remote share" : "%1$s odrzucił zdalny udział",
+    "You received a new remote share %1$s from %2$s" : "Otrzymałeś nowy zdalny udział %1$s od użytkownika %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s zaakceptował zdalny udział %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s odrzucił zdalny udział %1$s",
+    "%2$s unshared %1$s from you" : "%2$s przestał ci udostępniać %1$s",
+    "Shared with %1$s" : "Udostępnione %1$s",
+    "Removed share for %1$s" : "Zakończono udostępnianie użytkownikowi %1$s",
+    "%2$s shared with %1$s" : "%2$s udostępnia użytkownikowi %1$s",
+    "%2$s removed share for %1$s" : "%2$s usuwa udostępnienie dla użytkownika %1$s",
+    "Shared by %1$s" : "Udostępnione przez użytkownika %1$s",
+    "%1$s removed share" : "%1$s usunął udostępnienie",
+    "You removed %2$s from %1$s" : "Usunąłeś użytkownika %2$s z %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s udostępnił %1$s użytkownikowi %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s usunął użytkownika %2$s z %1$s",
+    "%2$s removed you from %1$s" : "%2$s usunÄ…Å‚ ciÄ™ z %1$s"
 },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 6fe2b4ce50bd99f48839de626b4fdda872670da1..e224d405bb52c64c0ac79300c452a992ee0c2126 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Compartilhamento",
     "File shares" : "Compartilhamentos de arquivos",
     "Downloaded via public link" : "Baixar via link público",
-    "Downloaded by %1$s" : "Baixado por %1$s",
     "Downloaded by {email}" : "Baixado por {email}",
-    "%1$s downloaded via public link" : "%1$s baixado via link público",
     "{file} downloaded via public link" : "{file} baixado via link público",
-    "%1$s downloaded %2$s" : "%1$s baixado %2$s",
     "{email} downloaded {file}" : "{email} baixado {file}",
-    "Shared with group %1$s" : "Compartilhado com o grupo %1$s",
     "Shared with group {group}" : "Compartilhado com o grupo {group}",
-    "Removed share for group %1$s" : "Compartilhamento removido para o grupo %1$s",
     "Removed share for group {group}" : "Compartilhamento removido para o grupo {group}",
-    "%2$s shared with group %1$s" : "%2$s compartilhado do o grupo %1$s",
     "{actor} shared with group {group}" : "{actor} compartilhado com o grupo {group}",
-    "%2$s removed share for group %1$s" : "%2$s compartilhamento removido para o grupo %1$s",
     "{actor} removed share for group {group}" : "{actor} removeu compartilhamento para o grupo {group}",
-    "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
     "You shared {file} with group {group}" : "Você compartilhou {file} com o grupo {group} ",
-    "You removed group %2$s from %1$s" : "Voce removeu o grupo %2$s de %1$s",
     "You removed group {group} from {file}" : "Voce removeu o grupo {group} de {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s compartilhado %1$s com o grupo %2$s",
     "{actor} shared {file} with group {group}" : "{actor} compartilhado {file} com o grupo {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s removido grupo %2$s de %1$s",
     "{actor} removed group {group} from {file}" : "{actor} removido grupo {group} de {file}",
     "Shared as public link" : "Compartilhado como um link publico",
     "Removed public link" : "Removido o link público",
-    "%1$s shared as public link" : "%1$s compartilhado como um link publico",
+    "Public link expired" : "O link público expirou",
     "{actor} shared as public link" : "{actor} compartilhado como um link publico",
-    "%1$s removed public link" : "%1$s removido link publico",
     "{actor} removed public link" : "{actor} removido link publico",
-    "You shared %1$s as public link" : "Voce compartilhou %1$s como um link publico",
     "You shared {file} as public link" : "Voce compartilhou {file} como um link publico",
-    "You removed public link for %1$s" : "Voce removeu o link publico para %1$s",
     "You removed public link for {file}" : "Voce removeu o link publico para {file}",
-    "%2$s shared %1$s as public link" : "%2$s compartilhado %1$s como um link publico",
     "{actor} shared {file} as public link" : "{actor} compartilhado {file} como um link publico",
-    "%2$s removed public link for %1$s" : "%2$s removido link publico para %1$s",
     "{actor} removed public link for {file}" : "{actor} removido link publico para {file}",
-    "%1$s accepted the remote share" : "%1$s aceitou o compartilhamento remoto",
     "{user} accepted the remote share" : "{user} aceitou o compartilhamento remoto",
-    "%1$s declined the remote share" : "%1$s declinou do compartilhamento remoto",
     "{user} declined the remote share" : "{user} declinou do compartilhamento remoto",
-    "You received a new remote share %1$s from %2$s" : "Voce recebeu um novo compartilhamento remoto %1$s de %2$s",
     "You received a new remote share {file} from {user}" : "Voce recebeu um novo compartilhamento remoto {file} de {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s aceitou o compartilhamento remoto de %1$s",
     "{user} accepted the remote share of {file}" : "{user} aceitou o compartilhamento remoto de {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s declinou o compartilhamento remoto de %1$s",
     "{user} declined the remote share of {file}" : "{user} declinou o compartilhamento remoto de {file}",
-    "%2$s unshared %1$s from you" : "%2$s descompartilhou %1$s de voce",
     "{user} unshared {file} from you" : "{user} descompartilhou {file} de voce",
-    "Shared with %1$s" : "Compartilhado com %1$s",
     "Shared with {user}" : "Compartilhado com {user}",
-    "Removed share for %1$s" : "Compartilhamento removido para %1$s",
     "Removed share for {user}" : "Compartilhamento removido para {user}",
-    "%2$s shared with %1$s" : "%2$s compartilhado com %1$s",
     "{actor} shared with {user}" : "{actor} compartilhado com {user}",
-    "%2$s removed share for %1$s" : "%2$s compartilhamento removido para %1$s",
     "{actor} removed share for {user}" : "{actor} compartilhamento removido para {user}",
-    "Shared by %1$s" : "Compartilhado por %1$s",
     "Shared by {actor}" : "Compartilhado por {actor}",
-    "%1$s removed share" : "%1$s compartilhamento removido",
     "{actor} removed share" : "{actor} compartilhamento removido",
-    "You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
     "You shared {file} with {user}" : "Voce compartilhou {arquivo} com {user}",
-    "You removed %2$s from %1$s" : "Voce removeu %2$s de %1$s",
     "You removed {user} from {file}" : "Voce removeu {user} de {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s compartilhado %1$s com %2$s",
     "{actor} removed {user} from {file}" : "{actor} removido {user} de {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s removido %2$s de %1$s",
-    "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "{actor} shared {file} with you" : "{actor} compartilhado {file} com voce",
-    "%2$s removed you from %1$s" : "%2$s removeu voce de %1$s",
     "{actor} removed you from {file}" : "{actor} removeu voce de {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Um arquivo ou pasta compartilhado por email ou por link publico foi <strong>baixado</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Um arquivo ou pasta foi compartilhado a partir de <strong>outro servidor</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s não compartilhados %2$s de você",
     "Public shared folder %1$s was downloaded" : "A pasta %1$s compartilhada publicamente foi baixada",
     "Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
+    "You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
     "You removed the share of %2$s for %1$s" : "Você removeu o compartilhamento de %2$s para %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s removido o compartilhamento de %3$s para %1$s",
+    "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
     "You removed the share of group %2$s for %1$s" : "Você removeu o compartilhamento de %2$s para %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s removido o compartilhamento do grupo %3$s para %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s removeu o link público de %1$s",
     "Your public link for %1$s expired" : "O seu link público para %1$s expirou",
     "The public link of %2$s for %1$s expired" : "O link público de %2$s para %1$s expirou",
+    "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "%2$s removed the share for %1$s" : "%2$s removeu o compartilhamento para %1$s",
     "Shared with %2$s" : "Compartilhado com %2$s",
     "Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Compartilhado via link por %2$s",
     "Shared via public link" : "Compartilhado via link público",
     "%2$s removed public link" : "%2$s removeu o link público",
-    "Public link expired" : "O link público expirou",
     "Public link of %2$s expired" : "O link público de %2$s expirou",
     "Shared by %2$s" : "Compartilhado por %2$s",
-    "Shares" : "Compartilhamentos"
+    "Shares" : "Compartilhamentos",
+    "Downloaded by %1$s" : "Baixado por %1$s",
+    "%1$s downloaded via public link" : "%1$s baixado via link público",
+    "%1$s downloaded %2$s" : "%1$s baixado %2$s",
+    "Shared with group %1$s" : "Compartilhado com o grupo %1$s",
+    "Removed share for group %1$s" : "Compartilhamento removido para o grupo %1$s",
+    "%2$s shared with group %1$s" : "%2$s compartilhado do o grupo %1$s",
+    "%2$s removed share for group %1$s" : "%2$s compartilhamento removido para o grupo %1$s",
+    "You removed group %2$s from %1$s" : "Voce removeu o grupo %2$s de %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s compartilhado %1$s com o grupo %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s removido grupo %2$s de %1$s",
+    "%1$s shared as public link" : "%1$s compartilhado como um link publico",
+    "%1$s removed public link" : "%1$s removido link publico",
+    "You shared %1$s as public link" : "Voce compartilhou %1$s como um link publico",
+    "You removed public link for %1$s" : "Voce removeu o link publico para %1$s",
+    "%2$s shared %1$s as public link" : "%2$s compartilhado %1$s como um link publico",
+    "%2$s removed public link for %1$s" : "%2$s removido link publico para %1$s",
+    "%1$s accepted the remote share" : "%1$s aceitou o compartilhamento remoto",
+    "%1$s declined the remote share" : "%1$s declinou do compartilhamento remoto",
+    "You received a new remote share %1$s from %2$s" : "Voce recebeu um novo compartilhamento remoto %1$s de %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s aceitou o compartilhamento remoto de %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s declinou o compartilhamento remoto de %1$s",
+    "%2$s unshared %1$s from you" : "%2$s descompartilhou %1$s de voce",
+    "Shared with %1$s" : "Compartilhado com %1$s",
+    "Removed share for %1$s" : "Compartilhamento removido para %1$s",
+    "%2$s shared with %1$s" : "%2$s compartilhado com %1$s",
+    "%2$s removed share for %1$s" : "%2$s compartilhamento removido para %1$s",
+    "Shared by %1$s" : "Compartilhado por %1$s",
+    "%1$s removed share" : "%1$s compartilhamento removido",
+    "You removed %2$s from %1$s" : "Voce removeu %2$s de %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s compartilhado %1$s com %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s removido %2$s de %1$s",
+    "%2$s removed you from %1$s" : "%2$s removeu voce de %1$s"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 59536fa6e158871efce4c9fff0acd871f6a4f9dc..ebce911918529a3a919eb51deb2fe62a568dd7a3 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -18,76 +18,42 @@
     "Sharing" : "Compartilhamento",
     "File shares" : "Compartilhamentos de arquivos",
     "Downloaded via public link" : "Baixar via link público",
-    "Downloaded by %1$s" : "Baixado por %1$s",
     "Downloaded by {email}" : "Baixado por {email}",
-    "%1$s downloaded via public link" : "%1$s baixado via link público",
     "{file} downloaded via public link" : "{file} baixado via link público",
-    "%1$s downloaded %2$s" : "%1$s baixado %2$s",
     "{email} downloaded {file}" : "{email} baixado {file}",
-    "Shared with group %1$s" : "Compartilhado com o grupo %1$s",
     "Shared with group {group}" : "Compartilhado com o grupo {group}",
-    "Removed share for group %1$s" : "Compartilhamento removido para o grupo %1$s",
     "Removed share for group {group}" : "Compartilhamento removido para o grupo {group}",
-    "%2$s shared with group %1$s" : "%2$s compartilhado do o grupo %1$s",
     "{actor} shared with group {group}" : "{actor} compartilhado com o grupo {group}",
-    "%2$s removed share for group %1$s" : "%2$s compartilhamento removido para o grupo %1$s",
     "{actor} removed share for group {group}" : "{actor} removeu compartilhamento para o grupo {group}",
-    "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
     "You shared {file} with group {group}" : "Você compartilhou {file} com o grupo {group} ",
-    "You removed group %2$s from %1$s" : "Voce removeu o grupo %2$s de %1$s",
     "You removed group {group} from {file}" : "Voce removeu o grupo {group} de {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s compartilhado %1$s com o grupo %2$s",
     "{actor} shared {file} with group {group}" : "{actor} compartilhado {file} com o grupo {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s removido grupo %2$s de %1$s",
     "{actor} removed group {group} from {file}" : "{actor} removido grupo {group} de {file}",
     "Shared as public link" : "Compartilhado como um link publico",
     "Removed public link" : "Removido o link público",
-    "%1$s shared as public link" : "%1$s compartilhado como um link publico",
+    "Public link expired" : "O link público expirou",
     "{actor} shared as public link" : "{actor} compartilhado como um link publico",
-    "%1$s removed public link" : "%1$s removido link publico",
     "{actor} removed public link" : "{actor} removido link publico",
-    "You shared %1$s as public link" : "Voce compartilhou %1$s como um link publico",
     "You shared {file} as public link" : "Voce compartilhou {file} como um link publico",
-    "You removed public link for %1$s" : "Voce removeu o link publico para %1$s",
     "You removed public link for {file}" : "Voce removeu o link publico para {file}",
-    "%2$s shared %1$s as public link" : "%2$s compartilhado %1$s como um link publico",
     "{actor} shared {file} as public link" : "{actor} compartilhado {file} como um link publico",
-    "%2$s removed public link for %1$s" : "%2$s removido link publico para %1$s",
     "{actor} removed public link for {file}" : "{actor} removido link publico para {file}",
-    "%1$s accepted the remote share" : "%1$s aceitou o compartilhamento remoto",
     "{user} accepted the remote share" : "{user} aceitou o compartilhamento remoto",
-    "%1$s declined the remote share" : "%1$s declinou do compartilhamento remoto",
     "{user} declined the remote share" : "{user} declinou do compartilhamento remoto",
-    "You received a new remote share %1$s from %2$s" : "Voce recebeu um novo compartilhamento remoto %1$s de %2$s",
     "You received a new remote share {file} from {user}" : "Voce recebeu um novo compartilhamento remoto {file} de {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s aceitou o compartilhamento remoto de %1$s",
     "{user} accepted the remote share of {file}" : "{user} aceitou o compartilhamento remoto de {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s declinou o compartilhamento remoto de %1$s",
     "{user} declined the remote share of {file}" : "{user} declinou o compartilhamento remoto de {file}",
-    "%2$s unshared %1$s from you" : "%2$s descompartilhou %1$s de voce",
     "{user} unshared {file} from you" : "{user} descompartilhou {file} de voce",
-    "Shared with %1$s" : "Compartilhado com %1$s",
     "Shared with {user}" : "Compartilhado com {user}",
-    "Removed share for %1$s" : "Compartilhamento removido para %1$s",
     "Removed share for {user}" : "Compartilhamento removido para {user}",
-    "%2$s shared with %1$s" : "%2$s compartilhado com %1$s",
     "{actor} shared with {user}" : "{actor} compartilhado com {user}",
-    "%2$s removed share for %1$s" : "%2$s compartilhamento removido para %1$s",
     "{actor} removed share for {user}" : "{actor} compartilhamento removido para {user}",
-    "Shared by %1$s" : "Compartilhado por %1$s",
     "Shared by {actor}" : "Compartilhado por {actor}",
-    "%1$s removed share" : "%1$s compartilhamento removido",
     "{actor} removed share" : "{actor} compartilhamento removido",
-    "You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
     "You shared {file} with {user}" : "Voce compartilhou {arquivo} com {user}",
-    "You removed %2$s from %1$s" : "Voce removeu %2$s de %1$s",
     "You removed {user} from {file}" : "Voce removeu {user} de {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s compartilhado %1$s com %2$s",
     "{actor} removed {user} from {file}" : "{actor} removido {user} de {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s removido %2$s de %1$s",
-    "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "{actor} shared {file} with you" : "{actor} compartilhado {file} com voce",
-    "%2$s removed you from %1$s" : "%2$s removeu voce de %1$s",
     "{actor} removed you from {file}" : "{actor} removeu voce de {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Um arquivo ou pasta compartilhado por email ou por link publico foi <strong>baixado</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Um arquivo ou pasta foi compartilhado a partir de <strong>outro servidor</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s não compartilhados %2$s de você",
     "Public shared folder %1$s was downloaded" : "A pasta %1$s compartilhada publicamente foi baixada",
     "Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
+    "You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
     "You removed the share of %2$s for %1$s" : "Você removeu o compartilhamento de %2$s para %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s removido o compartilhamento de %3$s para %1$s",
+    "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
     "You removed the share of group %2$s for %1$s" : "Você removeu o compartilhamento de %2$s para %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s removido o compartilhamento do grupo %3$s para %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s removeu o link público de %1$s",
     "Your public link for %1$s expired" : "O seu link público para %1$s expirou",
     "The public link of %2$s for %1$s expired" : "O link público de %2$s para %1$s expirou",
+    "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "%2$s removed the share for %1$s" : "%2$s removeu o compartilhamento para %1$s",
     "Shared with %2$s" : "Compartilhado com %2$s",
     "Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Compartilhado via link por %2$s",
     "Shared via public link" : "Compartilhado via link público",
     "%2$s removed public link" : "%2$s removeu o link público",
-    "Public link expired" : "O link público expirou",
     "Public link of %2$s expired" : "O link público de %2$s expirou",
     "Shared by %2$s" : "Compartilhado por %2$s",
-    "Shares" : "Compartilhamentos"
+    "Shares" : "Compartilhamentos",
+    "Downloaded by %1$s" : "Baixado por %1$s",
+    "%1$s downloaded via public link" : "%1$s baixado via link público",
+    "%1$s downloaded %2$s" : "%1$s baixado %2$s",
+    "Shared with group %1$s" : "Compartilhado com o grupo %1$s",
+    "Removed share for group %1$s" : "Compartilhamento removido para o grupo %1$s",
+    "%2$s shared with group %1$s" : "%2$s compartilhado do o grupo %1$s",
+    "%2$s removed share for group %1$s" : "%2$s compartilhamento removido para o grupo %1$s",
+    "You removed group %2$s from %1$s" : "Voce removeu o grupo %2$s de %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s compartilhado %1$s com o grupo %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s removido grupo %2$s de %1$s",
+    "%1$s shared as public link" : "%1$s compartilhado como um link publico",
+    "%1$s removed public link" : "%1$s removido link publico",
+    "You shared %1$s as public link" : "Voce compartilhou %1$s como um link publico",
+    "You removed public link for %1$s" : "Voce removeu o link publico para %1$s",
+    "%2$s shared %1$s as public link" : "%2$s compartilhado %1$s como um link publico",
+    "%2$s removed public link for %1$s" : "%2$s removido link publico para %1$s",
+    "%1$s accepted the remote share" : "%1$s aceitou o compartilhamento remoto",
+    "%1$s declined the remote share" : "%1$s declinou do compartilhamento remoto",
+    "You received a new remote share %1$s from %2$s" : "Voce recebeu um novo compartilhamento remoto %1$s de %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s aceitou o compartilhamento remoto de %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s declinou o compartilhamento remoto de %1$s",
+    "%2$s unshared %1$s from you" : "%2$s descompartilhou %1$s de voce",
+    "Shared with %1$s" : "Compartilhado com %1$s",
+    "Removed share for %1$s" : "Compartilhamento removido para %1$s",
+    "%2$s shared with %1$s" : "%2$s compartilhado com %1$s",
+    "%2$s removed share for %1$s" : "%2$s compartilhamento removido para %1$s",
+    "Shared by %1$s" : "Compartilhado por %1$s",
+    "%1$s removed share" : "%1$s compartilhamento removido",
+    "You removed %2$s from %1$s" : "Voce removeu %2$s de %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s compartilhado %1$s com %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s removido %2$s de %1$s",
+    "%2$s removed you from %1$s" : "%2$s removeu voce de %1$s"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index e12622cd00e9dded6cdc8ea95869279a604e3ec3..71f1c6f92f379169490b6d43219b5a05b8d0350f 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Общий доступ",
     "File shares" : "Файловые ресурсы общего доступа",
     "Downloaded via public link" : "Скачано по открытой ссылке",
-    "Downloaded by %1$s" : "Скачано %1$s",
     "Downloaded by {email}" : "Скачано {email}",
-    "%1$s downloaded via public link" : "%1$s скачано по общедоступной ссылке",
     "{file} downloaded via public link" : "{file} скачан по общедоступной ссылке",
-    "%1$s downloaded %2$s" : "%1$s скачан %2$s",
     "{email} downloaded {file}" : "{email} скачал {file}",
-    "Shared with group %1$s" : "Поделился с группой %1$s",
     "Shared with group {group}" : "Поделился с группой {group}",
-    "Removed share for group %1$s" : "Закрыт общий доступ для группы %1$s",
     "Removed share for group {group}" : "Закрыт общий доступ для группы {group}",
-    "%2$s shared with group %1$s" : "%2$s поделился с группой %1$s",
     "{actor} shared with group {group}" : "{actor} поделился с группой {group}",
-    "%2$s removed share for group %1$s" : "%2$s удалил общий доступ для группы %1$s",
     "{actor} removed share for group {group}" : "{actor} закрыл общий доступ для группы {group}",
-    "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
     "You shared {file} with group {group}" : "Вы поделились {file} с группой {group}",
-    "You removed group %2$s from %1$s" : "Вы удалили группу %2$s из %1$s",
     "You removed group {group} from {file}" : "Вы удалили группу {group} из {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s поделился %1$s с группой %2$s",
     "{actor} shared {file} with group {group}" : "{actor} поделился {file} с группой {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s удалил группу %2$s из %1$s",
     "{actor} removed group {group} from {file}" : "{actor} удалил группу {group} из {file}",
     "Shared as public link" : "Поделился общедоступной ссылкой",
     "Removed public link" : "Удалена общедоступная ссылка",
-    "%1$s shared as public link" : "%1$s поделился общедоступной ссылкой",
+    "Public link expired" : "Срок действия общедоступнной ссылки закончился",
     "{actor} shared as public link" : "{actor} поделился общедоступной ссылкой",
-    "%1$s removed public link" : "%1$s удалил общедоступной сслыку",
     "{actor} removed public link" : "{actor} удалил общедоступной ссылку",
-    "You shared %1$s as public link" : "Вы поделись %1$s в виде общедоступной ссылки",
     "You shared {file} as public link" : "Вы поделись  {file} в виде общедоступной ссылки",
-    "You removed public link for %1$s" : "Вы удалили общедоступную ссылку к %1$s",
     "You removed public link for {file}" : "Вы удалили общедоступную ссылку к {file}",
-    "%2$s shared %1$s as public link" : "%2$s поделился %1$s в виде общедоступной ссылки",
     "{actor} shared {file} as public link" : "{actor} поделился {file} в виде общедоступной ссылки",
-    "%2$s removed public link for %1$s" : "%2$s удалил общедоступную ссылку к %1$s",
     "{actor} removed public link for {file}" : "{actor} удалил общедоступную ссылку к {file}",
-    "%1$s accepted the remote share" : "%1$s принял удаленный общий ресурс",
     "{user} accepted the remote share" : "{user} принял удаленный общий ресурс",
-    "%1$s declined the remote share" : "%1$s отклонил удаленный общий ресурс",
     "{user} declined the remote share" : "{user} отклонил удаленный общий ресурс",
-    "You received a new remote share %1$s from %2$s" : "Вы получили новый удаленный общий ресурс %1$s от %2$s",
     "You received a new remote share {file} from {user}" : "Вы получили новый удаленный общий ресурс {file} от {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s принял удаленный общий ресурс %1$s",
     "{user} accepted the remote share of {file}" : "{user} принял удаленный общий ресурс {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s отклонил удаленный общий ресурс %1$s",
     "{user} declined the remote share of {file}" : "{user} отклонил удаленный общий ресурс {file}",
-    "%2$s unshared %1$s from you" : "%2$s закрыл для вас доступ к %1$s ",
     "{user} unshared {file} from you" : "{user} закрыл для вас доступ к {file}",
-    "Shared with %1$s" : "Поделился с %1$s",
     "Shared with {user}" : "Поделился с {user}",
-    "Removed share for %1$s" : "Закрыт общий доступ для %1$s",
     "Removed share for {user}" : "Закрыт общий доступ для {user}",
-    "%2$s shared with %1$s" : "%2$s поделился с %1$s",
     "{actor} shared with {user}" : "{actor} поделился с {user}",
-    "%2$s removed share for %1$s" : "%2$s закрыл общий доступ к %1$s",
     "{actor} removed share for {user}" : "{actor} закрыл общий доступ для {user}",
-    "Shared by %1$s" : "Поделился через %1$s",
     "Shared by {actor}" : "Поделился через {actor}",
-    "%1$s removed share" : "%1$s закрыл общий доступ",
     "{actor} removed share" : "{actor} закрыл общий доступ",
-    "You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
     "You shared {file} with {user}" : "Вы поделились {file} с {user}",
-    "You removed %2$s from %1$s" : "Вы удалили %2$s из %1$s",
     "You removed {user} from {file}" : "Вы удалили {user} из {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s поделился %1$s с %2$s",
     "{actor} removed {user} from {file}" : "{actor} удалил {user} из {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s удалил %2$s из %1$s",
-    "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "{actor} shared {file} with you" : "{actor} поделился {file} с вами",
-    "%2$s removed you from %1$s" : "%2$s удалил вас из %1$s",
     "{actor} removed you from {file}" : "{actor} удалил вас из {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Файл или папка, которыми поделились по электронной почте или общедоступной ссылке, были <strong>скачаны</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Файлом или каталогом поделились с <strong>удаленного сервера</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s закрыл для вас доступ к %2$s ",
     "Public shared folder %1$s was downloaded" : "Общий каталог %1$s был скачан",
     "Public shared file %1$s was downloaded" : "Общий файл %1$s, был скачан",
+    "You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s поделился %1$s с %3$s",
     "You removed the share of %2$s for %1$s" : "Вы удалили общий доступ к %2$s для %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s удалил общий доступ к %3$s для %1$s",
+    "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s поделился %1$s с группой %3$s",
     "You removed the share of group %2$s for %1$s" : "Вы удалили общий доступ к группе %2$s для %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s удалил общий доступ к группе %3$s для %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s удалил общедоступную ссылку к %1$s",
     "Your public link for %1$s expired" : "Срок действия Вашей общедоступной ссылки к %1$s закончился",
     "The public link of %2$s for %1$s expired" : "Срок действия общедоступной ссылки к %2$s для %1$s закончился",
+    "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "%2$s removed the share for %1$s" : "%2$s удалил общий доступ к %1$s",
     "Shared with %2$s" : "Поделился с %2$s",
     "Shared with %3$s by %2$s" : "Поделился %2$s с %3$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Поделился ссылкой %2$s",
     "Shared via public link" : "Поделился открытой ссылкой",
     "%2$s removed public link" : "%2$s удалил общедоступную ссылку",
-    "Public link expired" : "Срок действия общедоступнной ссылки закончился",
     "Public link of %2$s expired" : "Срок действия общедоступной ссылки к %2$s закончился",
     "Shared by %2$s" : "Поделился %2$s",
-    "Shares" : "События обмена файлами"
+    "Shares" : "События обмена файлами",
+    "Downloaded by %1$s" : "Скачано %1$s",
+    "%1$s downloaded via public link" : "%1$s скачано по общедоступной ссылке",
+    "%1$s downloaded %2$s" : "%1$s скачан %2$s",
+    "Shared with group %1$s" : "Поделился с группой %1$s",
+    "Removed share for group %1$s" : "Закрыт общий доступ для группы %1$s",
+    "%2$s shared with group %1$s" : "%2$s поделился с группой %1$s",
+    "%2$s removed share for group %1$s" : "%2$s удалил общий доступ для группы %1$s",
+    "You removed group %2$s from %1$s" : "Вы удалили группу %2$s из %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s поделился %1$s с группой %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s удалил группу %2$s из %1$s",
+    "%1$s shared as public link" : "%1$s поделился общедоступной ссылкой",
+    "%1$s removed public link" : "%1$s удалил общедоступной сслыку",
+    "You shared %1$s as public link" : "Вы поделись %1$s в виде общедоступной ссылки",
+    "You removed public link for %1$s" : "Вы удалили общедоступную ссылку к %1$s",
+    "%2$s shared %1$s as public link" : "%2$s поделился %1$s в виде общедоступной ссылки",
+    "%2$s removed public link for %1$s" : "%2$s удалил общедоступную ссылку к %1$s",
+    "%1$s accepted the remote share" : "%1$s принял удаленный общий ресурс",
+    "%1$s declined the remote share" : "%1$s отклонил удаленный общий ресурс",
+    "You received a new remote share %1$s from %2$s" : "Вы получили новый удаленный общий ресурс %1$s от %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s принял удаленный общий ресурс %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s отклонил удаленный общий ресурс %1$s",
+    "%2$s unshared %1$s from you" : "%2$s закрыл для вас доступ к %1$s ",
+    "Shared with %1$s" : "Поделился с %1$s",
+    "Removed share for %1$s" : "Закрыт общий доступ для %1$s",
+    "%2$s shared with %1$s" : "%2$s поделился с %1$s",
+    "%2$s removed share for %1$s" : "%2$s закрыл общий доступ к %1$s",
+    "Shared by %1$s" : "Поделился через %1$s",
+    "%1$s removed share" : "%1$s закрыл общий доступ",
+    "You removed %2$s from %1$s" : "Вы удалили %2$s из %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s поделился %1$s с %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s удалил %2$s из %1$s",
+    "%2$s removed you from %1$s" : "%2$s удалил вас из %1$s"
 },
 "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/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index fe9b16602922a7e6c7d366387c32721cef4459cc..d159503041e15f951116a5e7fc18622412a68723 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -18,76 +18,42 @@
     "Sharing" : "Общий доступ",
     "File shares" : "Файловые ресурсы общего доступа",
     "Downloaded via public link" : "Скачано по открытой ссылке",
-    "Downloaded by %1$s" : "Скачано %1$s",
     "Downloaded by {email}" : "Скачано {email}",
-    "%1$s downloaded via public link" : "%1$s скачано по общедоступной ссылке",
     "{file} downloaded via public link" : "{file} скачан по общедоступной ссылке",
-    "%1$s downloaded %2$s" : "%1$s скачан %2$s",
     "{email} downloaded {file}" : "{email} скачал {file}",
-    "Shared with group %1$s" : "Поделился с группой %1$s",
     "Shared with group {group}" : "Поделился с группой {group}",
-    "Removed share for group %1$s" : "Закрыт общий доступ для группы %1$s",
     "Removed share for group {group}" : "Закрыт общий доступ для группы {group}",
-    "%2$s shared with group %1$s" : "%2$s поделился с группой %1$s",
     "{actor} shared with group {group}" : "{actor} поделился с группой {group}",
-    "%2$s removed share for group %1$s" : "%2$s удалил общий доступ для группы %1$s",
     "{actor} removed share for group {group}" : "{actor} закрыл общий доступ для группы {group}",
-    "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
     "You shared {file} with group {group}" : "Вы поделились {file} с группой {group}",
-    "You removed group %2$s from %1$s" : "Вы удалили группу %2$s из %1$s",
     "You removed group {group} from {file}" : "Вы удалили группу {group} из {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s поделился %1$s с группой %2$s",
     "{actor} shared {file} with group {group}" : "{actor} поделился {file} с группой {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s удалил группу %2$s из %1$s",
     "{actor} removed group {group} from {file}" : "{actor} удалил группу {group} из {file}",
     "Shared as public link" : "Поделился общедоступной ссылкой",
     "Removed public link" : "Удалена общедоступная ссылка",
-    "%1$s shared as public link" : "%1$s поделился общедоступной ссылкой",
+    "Public link expired" : "Срок действия общедоступнной ссылки закончился",
     "{actor} shared as public link" : "{actor} поделился общедоступной ссылкой",
-    "%1$s removed public link" : "%1$s удалил общедоступной сслыку",
     "{actor} removed public link" : "{actor} удалил общедоступной ссылку",
-    "You shared %1$s as public link" : "Вы поделись %1$s в виде общедоступной ссылки",
     "You shared {file} as public link" : "Вы поделись  {file} в виде общедоступной ссылки",
-    "You removed public link for %1$s" : "Вы удалили общедоступную ссылку к %1$s",
     "You removed public link for {file}" : "Вы удалили общедоступную ссылку к {file}",
-    "%2$s shared %1$s as public link" : "%2$s поделился %1$s в виде общедоступной ссылки",
     "{actor} shared {file} as public link" : "{actor} поделился {file} в виде общедоступной ссылки",
-    "%2$s removed public link for %1$s" : "%2$s удалил общедоступную ссылку к %1$s",
     "{actor} removed public link for {file}" : "{actor} удалил общедоступную ссылку к {file}",
-    "%1$s accepted the remote share" : "%1$s принял удаленный общий ресурс",
     "{user} accepted the remote share" : "{user} принял удаленный общий ресурс",
-    "%1$s declined the remote share" : "%1$s отклонил удаленный общий ресурс",
     "{user} declined the remote share" : "{user} отклонил удаленный общий ресурс",
-    "You received a new remote share %1$s from %2$s" : "Вы получили новый удаленный общий ресурс %1$s от %2$s",
     "You received a new remote share {file} from {user}" : "Вы получили новый удаленный общий ресурс {file} от {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s принял удаленный общий ресурс %1$s",
     "{user} accepted the remote share of {file}" : "{user} принял удаленный общий ресурс {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s отклонил удаленный общий ресурс %1$s",
     "{user} declined the remote share of {file}" : "{user} отклонил удаленный общий ресурс {file}",
-    "%2$s unshared %1$s from you" : "%2$s закрыл для вас доступ к %1$s ",
     "{user} unshared {file} from you" : "{user} закрыл для вас доступ к {file}",
-    "Shared with %1$s" : "Поделился с %1$s",
     "Shared with {user}" : "Поделился с {user}",
-    "Removed share for %1$s" : "Закрыт общий доступ для %1$s",
     "Removed share for {user}" : "Закрыт общий доступ для {user}",
-    "%2$s shared with %1$s" : "%2$s поделился с %1$s",
     "{actor} shared with {user}" : "{actor} поделился с {user}",
-    "%2$s removed share for %1$s" : "%2$s закрыл общий доступ к %1$s",
     "{actor} removed share for {user}" : "{actor} закрыл общий доступ для {user}",
-    "Shared by %1$s" : "Поделился через %1$s",
     "Shared by {actor}" : "Поделился через {actor}",
-    "%1$s removed share" : "%1$s закрыл общий доступ",
     "{actor} removed share" : "{actor} закрыл общий доступ",
-    "You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
     "You shared {file} with {user}" : "Вы поделились {file} с {user}",
-    "You removed %2$s from %1$s" : "Вы удалили %2$s из %1$s",
     "You removed {user} from {file}" : "Вы удалили {user} из {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s поделился %1$s с %2$s",
     "{actor} removed {user} from {file}" : "{actor} удалил {user} из {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s удалил %2$s из %1$s",
-    "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "{actor} shared {file} with you" : "{actor} поделился {file} с вами",
-    "%2$s removed you from %1$s" : "%2$s удалил вас из %1$s",
     "{actor} removed you from {file}" : "{actor} удалил вас из {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Файл или папка, которыми поделились по электронной почте или общедоступной ссылке, были <strong>скачаны</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Файлом или каталогом поделились с <strong>удаленного сервера</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s закрыл для вас доступ к %2$s ",
     "Public shared folder %1$s was downloaded" : "Общий каталог %1$s был скачан",
     "Public shared file %1$s was downloaded" : "Общий файл %1$s, был скачан",
+    "You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s поделился %1$s с %3$s",
     "You removed the share of %2$s for %1$s" : "Вы удалили общий доступ к %2$s для %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s удалил общий доступ к %3$s для %1$s",
+    "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s поделился %1$s с группой %3$s",
     "You removed the share of group %2$s for %1$s" : "Вы удалили общий доступ к группе %2$s для %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s удалил общий доступ к группе %3$s для %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s удалил общедоступную ссылку к %1$s",
     "Your public link for %1$s expired" : "Срок действия Вашей общедоступной ссылки к %1$s закончился",
     "The public link of %2$s for %1$s expired" : "Срок действия общедоступной ссылки к %2$s для %1$s закончился",
+    "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "%2$s removed the share for %1$s" : "%2$s удалил общий доступ к %1$s",
     "Shared with %2$s" : "Поделился с %2$s",
     "Shared with %3$s by %2$s" : "Поделился %2$s с %3$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Поделился ссылкой %2$s",
     "Shared via public link" : "Поделился открытой ссылкой",
     "%2$s removed public link" : "%2$s удалил общедоступную ссылку",
-    "Public link expired" : "Срок действия общедоступнной ссылки закончился",
     "Public link of %2$s expired" : "Срок действия общедоступной ссылки к %2$s закончился",
     "Shared by %2$s" : "Поделился %2$s",
-    "Shares" : "События обмена файлами"
+    "Shares" : "События обмена файлами",
+    "Downloaded by %1$s" : "Скачано %1$s",
+    "%1$s downloaded via public link" : "%1$s скачано по общедоступной ссылке",
+    "%1$s downloaded %2$s" : "%1$s скачан %2$s",
+    "Shared with group %1$s" : "Поделился с группой %1$s",
+    "Removed share for group %1$s" : "Закрыт общий доступ для группы %1$s",
+    "%2$s shared with group %1$s" : "%2$s поделился с группой %1$s",
+    "%2$s removed share for group %1$s" : "%2$s удалил общий доступ для группы %1$s",
+    "You removed group %2$s from %1$s" : "Вы удалили группу %2$s из %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s поделился %1$s с группой %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s удалил группу %2$s из %1$s",
+    "%1$s shared as public link" : "%1$s поделился общедоступной ссылкой",
+    "%1$s removed public link" : "%1$s удалил общедоступной сслыку",
+    "You shared %1$s as public link" : "Вы поделись %1$s в виде общедоступной ссылки",
+    "You removed public link for %1$s" : "Вы удалили общедоступную ссылку к %1$s",
+    "%2$s shared %1$s as public link" : "%2$s поделился %1$s в виде общедоступной ссылки",
+    "%2$s removed public link for %1$s" : "%2$s удалил общедоступную ссылку к %1$s",
+    "%1$s accepted the remote share" : "%1$s принял удаленный общий ресурс",
+    "%1$s declined the remote share" : "%1$s отклонил удаленный общий ресурс",
+    "You received a new remote share %1$s from %2$s" : "Вы получили новый удаленный общий ресурс %1$s от %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s принял удаленный общий ресурс %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s отклонил удаленный общий ресурс %1$s",
+    "%2$s unshared %1$s from you" : "%2$s закрыл для вас доступ к %1$s ",
+    "Shared with %1$s" : "Поделился с %1$s",
+    "Removed share for %1$s" : "Закрыт общий доступ для %1$s",
+    "%2$s shared with %1$s" : "%2$s поделился с %1$s",
+    "%2$s removed share for %1$s" : "%2$s закрыл общий доступ к %1$s",
+    "Shared by %1$s" : "Поделился через %1$s",
+    "%1$s removed share" : "%1$s закрыл общий доступ",
+    "You removed %2$s from %1$s" : "Вы удалили %2$s из %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s поделился %1$s с %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s удалил %2$s из %1$s",
+    "%2$s removed you from %1$s" : "%2$s удалил вас из %1$s"
 },"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/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js
index b4872abb55b3254237234c82fd79ba3d03f5b22b..64c49392735fb1cc25dc5f76d1993f809a5135ef 100644
--- a/apps/files_sharing/l10n/sq.js
+++ b/apps/files_sharing/l10n/sq.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Ndarje",
     "File shares" : "Ndarja e skedarëve",
     "Downloaded via public link" : "Shkarkuar përmes një lidhjeje publike",
-    "Downloaded by %1$s" : "Shkarkuar nga %1$s",
     "Downloaded by {email}" : "Shkarkuar nga {email}",
-    "%1$s downloaded via public link" : "%1$s shkarkuar nga një lidhje publike",
     "{file} downloaded via public link" : "{file} shkarkuar përmes një lidhjeje publike",
-    "%1$s downloaded %2$s" : "%1$s shkarkuar nga %2$s",
     "{email} downloaded {file}" : "{email} shkarkuar {file}",
-    "Shared with group %1$s" : "U nda me grupin %1$s",
     "Shared with group {group}" : "U nda me grupin {group}",
-    "Removed share for group %1$s" : "Hoqi ndarjen për grupin %1$s",
     "Removed share for group {group}" : "Hoqi ndarjen për grupin {group}",
-    "%2$s shared with group %1$s" : "%2$s u nda e grupin %1$s",
     "{actor} shared with group {group}" : "{actor} u nda me grupin {group}",
-    "%2$s removed share for group %1$s" : "%2$s hoqi ndarjen për grupin %1$s",
     "{actor} removed share for group {group}" : "{actor} hoqi ndarjen për grupin {group}",
-    "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
     "You shared {file} with group {group}" : "Ndatë {file} me grupin {group}",
-    "You removed group %2$s from %1$s" : "Hoqët grupin %2$s nga %1$s",
     "You removed group {group} from {file}" : "Hoqët grupin {group} nga {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s ndau %1$s me grupin %2$s",
     "{actor} shared {file} with group {group}" : "{actor} ndau {file} me grupin {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s hoqi grupin %2$s nga %1$s",
     "{actor} removed group {group} from {file}" : "{actor} hoqi grupin {group} nga {file}",
     "Shared as public link" : "U nda si një lidhje publike",
     "Removed public link" : "Hoqi lidhje publike",
-    "%1$s shared as public link" : "%1$s u nda si një lidhje publike",
+    "Public link expired" : "Lidhja publike skadoi",
     "{actor} shared as public link" : "{actor} u nda si një lidhje publike",
-    "%1$s removed public link" : "%1$s hoqi lidhje publike",
     "{actor} removed public link" : "{actor} hoqi lidhje publike",
-    "You shared %1$s as public link" : "Ndatë %1$s si një lidhje publike",
     "You shared {file} as public link" : "Ndatë {file} si një lidhje publike",
-    "You removed public link for %1$s" : "Hoqët lidhje publike për %1$s",
     "You removed public link for {file}" : "Hoqët lidhje publike për {file}",
-    "%2$s shared %1$s as public link" : "%2$s u nda %1$s si një lidhje publike",
     "{actor} shared {file} as public link" : "{actor} u nda {file} si një lidhje publike",
-    "%2$s removed public link for %1$s" : "%2$s hoqi lidhje publike për %1$s",
     "{actor} removed public link for {file}" : "{actor} hoqi lidhje publike për {file}",
-    "%1$s accepted the remote share" : "%1$s pranoi ndarjen e largët",
     "{user} accepted the remote share" : "{user} pranoi ndarjen e largët",
-    "%1$s declined the remote share" : "%1$s hodhi tej ndarjen e largët",
     "{user} declined the remote share" : "{user} hodhi tej ndarjen e largët",
-    "You received a new remote share %1$s from %2$s" : "Morët një ndarje të largët %1$s nga %2$s",
     "You received a new remote share {file} from {user}" : "Morët një ndarje të largët {file} nga {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s pranoi ndarjen e largët e %1$s",
     "{user} accepted the remote share of {file}" : "{user} pranoi ndarjen e largët të {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s hodhi tej ndarjen e largët të %1$s",
     "{user} declined the remote share of {file}" : "{user} hodhi tej ndarjen e largët të {file}",
-    "%2$s unshared %1$s from you" : "%2$s nuk ndau %1$s nga ju",
     "{user} unshared {file} from you" : "{user} nuk ndau {file} nga ju",
-    "Shared with %1$s" : "Ndarë me %1$s",
     "Shared with {user}" : "Ndarë me {user}",
-    "Removed share for %1$s" : "Hoqi ndarjen për %1$s",
     "Removed share for {user}" : "Hoqi ndarjen për {user}",
-    "%2$s shared with %1$s" : "%2$s ndau me %1$s",
     "{actor} shared with {user}" : "{actor} ndau me {user}",
-    "%2$s removed share for %1$s" : "%2$s hoqi ndarjen për %1$s",
     "{actor} removed share for {user}" : "{actor} hoqi ndarjen për {user}",
-    "Shared by %1$s" : "U nda nga %1$s",
     "Shared by {actor}" : "U nda nga {actor}",
-    "%1$s removed share" : "%1$s hoqi ndarjen",
     "{actor} removed share" : "{actor} hoqi ndarjen",
-    "You shared %1$s with %2$s" : "Ndatë %1$s me %2$s",
     "You shared {file} with {user}" : "Ndatë {file} me {user}",
-    "You removed %2$s from %1$s" : "Hoqët %2$s nga %1$s ",
     "You removed {user} from {file}" : "Hoqët {user} nga {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s ndau %1$s me %2$s",
     "{actor} removed {user} from {file}" : "{actor} hoqi {user} nga {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s hoqi %2$s nga %1$s",
-    "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
     "{actor} shared {file} with you" : "{actor} ndau {file} me ju",
-    "%2$s removed you from %1$s" : "%2$s iu hoqi nga %1$s",
     "{actor} removed you from {file}" : "{actor} iu hoqi nga {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Një skedar ose dosje e ndarë nga posta ose lidhja publike ishte <strong> shkarkuar</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Një kartelë ose dosje u nda prej një <strong>shërbyesi tjetër</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s shndau me ju %2$s",
     "Public shared folder %1$s was downloaded" : "U shkarkua dosja e ndarë publikisht %1$s",
     "Public shared file %1$s was downloaded" : "U shkarkua kartela e ndarë publikisht %1$s",
+    "You shared %1$s with %2$s" : "Ndatë %1$s me %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s ndau %1$s me %3$s",
     "You removed the share of %2$s for %1$s" : "Hoqët ndarjen e %2$s për %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s hoqi ndarjen e %3$s për %1$s",
+    "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s ndau %1$s me grupin %3$s",
     "You removed the share of group %2$s for %1$s" : "Hoqët ndarjen e grupit %2$s për %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s hoqi ndarjen e grupit %3$s për %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s hoqi lidhjen publike për %1$s",
     "Your public link for %1$s expired" : "Lidhja juaj publike për %1$s skadoi",
     "The public link of %2$s for %1$s expired" : "Lidhja publike e %2$s për %1$s skadoi",
+    "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
     "%2$s removed the share for %1$s" : "%2$s hoqi ndarjen për %1$s",
     "Shared with %2$s" : "U nda me %2$s",
     "Shared with %3$s by %2$s" : "U nda me %3$s nga %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "U nda përmes një lidhje nga %2$s",
     "Shared via public link" : "U nda përmes një lidhje publike",
     "%2$s removed public link" : "%2$s hoqi lidhje publike",
-    "Public link expired" : "Lidhja publike skadoi",
     "Public link of %2$s expired" : "Lidhja publike e %2$s skadoi",
     "Shared by %2$s" : "U nda nga %2$s",
-    "Shares" : "Ndarje"
+    "Shares" : "Ndarje",
+    "Downloaded by %1$s" : "Shkarkuar nga %1$s",
+    "%1$s downloaded via public link" : "%1$s shkarkuar nga një lidhje publike",
+    "%1$s downloaded %2$s" : "%1$s shkarkuar nga %2$s",
+    "Shared with group %1$s" : "U nda me grupin %1$s",
+    "Removed share for group %1$s" : "Hoqi ndarjen për grupin %1$s",
+    "%2$s shared with group %1$s" : "%2$s u nda e grupin %1$s",
+    "%2$s removed share for group %1$s" : "%2$s hoqi ndarjen për grupin %1$s",
+    "You removed group %2$s from %1$s" : "Hoqët grupin %2$s nga %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s ndau %1$s me grupin %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s hoqi grupin %2$s nga %1$s",
+    "%1$s shared as public link" : "%1$s u nda si një lidhje publike",
+    "%1$s removed public link" : "%1$s hoqi lidhje publike",
+    "You shared %1$s as public link" : "Ndatë %1$s si një lidhje publike",
+    "You removed public link for %1$s" : "Hoqët lidhje publike për %1$s",
+    "%2$s shared %1$s as public link" : "%2$s u nda %1$s si një lidhje publike",
+    "%2$s removed public link for %1$s" : "%2$s hoqi lidhje publike për %1$s",
+    "%1$s accepted the remote share" : "%1$s pranoi ndarjen e largët",
+    "%1$s declined the remote share" : "%1$s hodhi tej ndarjen e largët",
+    "You received a new remote share %1$s from %2$s" : "Morët një ndarje të largët %1$s nga %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s pranoi ndarjen e largët e %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s hodhi tej ndarjen e largët të %1$s",
+    "%2$s unshared %1$s from you" : "%2$s nuk ndau %1$s nga ju",
+    "Shared with %1$s" : "Ndarë me %1$s",
+    "Removed share for %1$s" : "Hoqi ndarjen për %1$s",
+    "%2$s shared with %1$s" : "%2$s ndau me %1$s",
+    "%2$s removed share for %1$s" : "%2$s hoqi ndarjen për %1$s",
+    "Shared by %1$s" : "U nda nga %1$s",
+    "%1$s removed share" : "%1$s hoqi ndarjen",
+    "You removed %2$s from %1$s" : "Hoqët %2$s nga %1$s ",
+    "%3$s shared %1$s with %2$s" : "%3$s ndau %1$s me %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s hoqi %2$s nga %1$s",
+    "%2$s removed you from %1$s" : "%2$s iu hoqi nga %1$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json
index c1323784cf1fe255987ff42a62d7620c5423e67b..2206d5019a3dc1b0b08bb0ca87b8f437a89e0042 100644
--- a/apps/files_sharing/l10n/sq.json
+++ b/apps/files_sharing/l10n/sq.json
@@ -18,76 +18,42 @@
     "Sharing" : "Ndarje",
     "File shares" : "Ndarja e skedarëve",
     "Downloaded via public link" : "Shkarkuar përmes një lidhjeje publike",
-    "Downloaded by %1$s" : "Shkarkuar nga %1$s",
     "Downloaded by {email}" : "Shkarkuar nga {email}",
-    "%1$s downloaded via public link" : "%1$s shkarkuar nga një lidhje publike",
     "{file} downloaded via public link" : "{file} shkarkuar përmes një lidhjeje publike",
-    "%1$s downloaded %2$s" : "%1$s shkarkuar nga %2$s",
     "{email} downloaded {file}" : "{email} shkarkuar {file}",
-    "Shared with group %1$s" : "U nda me grupin %1$s",
     "Shared with group {group}" : "U nda me grupin {group}",
-    "Removed share for group %1$s" : "Hoqi ndarjen për grupin %1$s",
     "Removed share for group {group}" : "Hoqi ndarjen për grupin {group}",
-    "%2$s shared with group %1$s" : "%2$s u nda e grupin %1$s",
     "{actor} shared with group {group}" : "{actor} u nda me grupin {group}",
-    "%2$s removed share for group %1$s" : "%2$s hoqi ndarjen për grupin %1$s",
     "{actor} removed share for group {group}" : "{actor} hoqi ndarjen për grupin {group}",
-    "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
     "You shared {file} with group {group}" : "Ndatë {file} me grupin {group}",
-    "You removed group %2$s from %1$s" : "Hoqët grupin %2$s nga %1$s",
     "You removed group {group} from {file}" : "Hoqët grupin {group} nga {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s ndau %1$s me grupin %2$s",
     "{actor} shared {file} with group {group}" : "{actor} ndau {file} me grupin {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s hoqi grupin %2$s nga %1$s",
     "{actor} removed group {group} from {file}" : "{actor} hoqi grupin {group} nga {file}",
     "Shared as public link" : "U nda si një lidhje publike",
     "Removed public link" : "Hoqi lidhje publike",
-    "%1$s shared as public link" : "%1$s u nda si një lidhje publike",
+    "Public link expired" : "Lidhja publike skadoi",
     "{actor} shared as public link" : "{actor} u nda si një lidhje publike",
-    "%1$s removed public link" : "%1$s hoqi lidhje publike",
     "{actor} removed public link" : "{actor} hoqi lidhje publike",
-    "You shared %1$s as public link" : "Ndatë %1$s si një lidhje publike",
     "You shared {file} as public link" : "Ndatë {file} si një lidhje publike",
-    "You removed public link for %1$s" : "Hoqët lidhje publike për %1$s",
     "You removed public link for {file}" : "Hoqët lidhje publike për {file}",
-    "%2$s shared %1$s as public link" : "%2$s u nda %1$s si një lidhje publike",
     "{actor} shared {file} as public link" : "{actor} u nda {file} si një lidhje publike",
-    "%2$s removed public link for %1$s" : "%2$s hoqi lidhje publike për %1$s",
     "{actor} removed public link for {file}" : "{actor} hoqi lidhje publike për {file}",
-    "%1$s accepted the remote share" : "%1$s pranoi ndarjen e largët",
     "{user} accepted the remote share" : "{user} pranoi ndarjen e largët",
-    "%1$s declined the remote share" : "%1$s hodhi tej ndarjen e largët",
     "{user} declined the remote share" : "{user} hodhi tej ndarjen e largët",
-    "You received a new remote share %1$s from %2$s" : "Morët një ndarje të largët %1$s nga %2$s",
     "You received a new remote share {file} from {user}" : "Morët një ndarje të largët {file} nga {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s pranoi ndarjen e largët e %1$s",
     "{user} accepted the remote share of {file}" : "{user} pranoi ndarjen e largët të {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s hodhi tej ndarjen e largët të %1$s",
     "{user} declined the remote share of {file}" : "{user} hodhi tej ndarjen e largët të {file}",
-    "%2$s unshared %1$s from you" : "%2$s nuk ndau %1$s nga ju",
     "{user} unshared {file} from you" : "{user} nuk ndau {file} nga ju",
-    "Shared with %1$s" : "Ndarë me %1$s",
     "Shared with {user}" : "Ndarë me {user}",
-    "Removed share for %1$s" : "Hoqi ndarjen për %1$s",
     "Removed share for {user}" : "Hoqi ndarjen për {user}",
-    "%2$s shared with %1$s" : "%2$s ndau me %1$s",
     "{actor} shared with {user}" : "{actor} ndau me {user}",
-    "%2$s removed share for %1$s" : "%2$s hoqi ndarjen për %1$s",
     "{actor} removed share for {user}" : "{actor} hoqi ndarjen për {user}",
-    "Shared by %1$s" : "U nda nga %1$s",
     "Shared by {actor}" : "U nda nga {actor}",
-    "%1$s removed share" : "%1$s hoqi ndarjen",
     "{actor} removed share" : "{actor} hoqi ndarjen",
-    "You shared %1$s with %2$s" : "Ndatë %1$s me %2$s",
     "You shared {file} with {user}" : "Ndatë {file} me {user}",
-    "You removed %2$s from %1$s" : "Hoqët %2$s nga %1$s ",
     "You removed {user} from {file}" : "Hoqët {user} nga {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s ndau %1$s me %2$s",
     "{actor} removed {user} from {file}" : "{actor} hoqi {user} nga {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s hoqi %2$s nga %1$s",
-    "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
     "{actor} shared {file} with you" : "{actor} ndau {file} me ju",
-    "%2$s removed you from %1$s" : "%2$s iu hoqi nga %1$s",
     "{actor} removed you from {file}" : "{actor} iu hoqi nga {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Një skedar ose dosje e ndarë nga posta ose lidhja publike ishte <strong> shkarkuar</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Një kartelë ose dosje u nda prej një <strong>shërbyesi tjetër</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s shndau me ju %2$s",
     "Public shared folder %1$s was downloaded" : "U shkarkua dosja e ndarë publikisht %1$s",
     "Public shared file %1$s was downloaded" : "U shkarkua kartela e ndarë publikisht %1$s",
+    "You shared %1$s with %2$s" : "Ndatë %1$s me %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s ndau %1$s me %3$s",
     "You removed the share of %2$s for %1$s" : "Hoqët ndarjen e %2$s për %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s hoqi ndarjen e %3$s për %1$s",
+    "You shared %1$s with group %2$s" : "Ndatë %1$s me grupin %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s ndau %1$s me grupin %3$s",
     "You removed the share of group %2$s for %1$s" : "Hoqët ndarjen e grupit %2$s për %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s hoqi ndarjen e grupit %3$s për %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s hoqi lidhjen publike për %1$s",
     "Your public link for %1$s expired" : "Lidhja juaj publike për %1$s skadoi",
     "The public link of %2$s for %1$s expired" : "Lidhja publike e %2$s për %1$s skadoi",
+    "%2$s shared %1$s with you" : "%2$s ndau %1$s me ju",
     "%2$s removed the share for %1$s" : "%2$s hoqi ndarjen për %1$s",
     "Shared with %2$s" : "U nda me %2$s",
     "Shared with %3$s by %2$s" : "U nda me %3$s nga %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "U nda përmes një lidhje nga %2$s",
     "Shared via public link" : "U nda përmes një lidhje publike",
     "%2$s removed public link" : "%2$s hoqi lidhje publike",
-    "Public link expired" : "Lidhja publike skadoi",
     "Public link of %2$s expired" : "Lidhja publike e %2$s skadoi",
     "Shared by %2$s" : "U nda nga %2$s",
-    "Shares" : "Ndarje"
+    "Shares" : "Ndarje",
+    "Downloaded by %1$s" : "Shkarkuar nga %1$s",
+    "%1$s downloaded via public link" : "%1$s shkarkuar nga një lidhje publike",
+    "%1$s downloaded %2$s" : "%1$s shkarkuar nga %2$s",
+    "Shared with group %1$s" : "U nda me grupin %1$s",
+    "Removed share for group %1$s" : "Hoqi ndarjen për grupin %1$s",
+    "%2$s shared with group %1$s" : "%2$s u nda e grupin %1$s",
+    "%2$s removed share for group %1$s" : "%2$s hoqi ndarjen për grupin %1$s",
+    "You removed group %2$s from %1$s" : "Hoqët grupin %2$s nga %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s ndau %1$s me grupin %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s hoqi grupin %2$s nga %1$s",
+    "%1$s shared as public link" : "%1$s u nda si një lidhje publike",
+    "%1$s removed public link" : "%1$s hoqi lidhje publike",
+    "You shared %1$s as public link" : "Ndatë %1$s si një lidhje publike",
+    "You removed public link for %1$s" : "Hoqët lidhje publike për %1$s",
+    "%2$s shared %1$s as public link" : "%2$s u nda %1$s si një lidhje publike",
+    "%2$s removed public link for %1$s" : "%2$s hoqi lidhje publike për %1$s",
+    "%1$s accepted the remote share" : "%1$s pranoi ndarjen e largët",
+    "%1$s declined the remote share" : "%1$s hodhi tej ndarjen e largët",
+    "You received a new remote share %1$s from %2$s" : "Morët një ndarje të largët %1$s nga %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s pranoi ndarjen e largët e %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s hodhi tej ndarjen e largët të %1$s",
+    "%2$s unshared %1$s from you" : "%2$s nuk ndau %1$s nga ju",
+    "Shared with %1$s" : "Ndarë me %1$s",
+    "Removed share for %1$s" : "Hoqi ndarjen për %1$s",
+    "%2$s shared with %1$s" : "%2$s ndau me %1$s",
+    "%2$s removed share for %1$s" : "%2$s hoqi ndarjen për %1$s",
+    "Shared by %1$s" : "U nda nga %1$s",
+    "%1$s removed share" : "%1$s hoqi ndarjen",
+    "You removed %2$s from %1$s" : "Hoqët %2$s nga %1$s ",
+    "%3$s shared %1$s with %2$s" : "%3$s ndau %1$s me %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s hoqi %2$s nga %1$s",
+    "%2$s removed you from %1$s" : "%2$s iu hoqi nga %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js
index fb6d04c52c28f21577fdd2c6cca9c461373c285c..8c8e16de8d01b881329a00a41ee836e8f3f05150 100644
--- a/apps/files_sharing/l10n/sv.js
+++ b/apps/files_sharing/l10n/sv.js
@@ -20,76 +20,42 @@ OC.L10N.register(
     "Sharing" : "Delning",
     "File shares" : "Fildelningar",
     "Downloaded via public link" : "Nedladdad via offentlig länk",
-    "Downloaded by %1$s" : "Nedladdad av %1$s",
     "Downloaded by {email}" : "Nedladdad av {email}",
-    "%1$s downloaded via public link" : "%1$s nedladdad via offentlig länk",
     "{file} downloaded via public link" : "{file} nedladdad via offentlig länk",
-    "%1$s downloaded %2$s" : "%1$s laddade ned %2$s",
     "{email} downloaded {file}" : "{email} laddade ned {file}",
-    "Shared with group %1$s" : "Delad med grupp %1$s",
     "Shared with group {group}" : "Delad med grupp {group}",
-    "Removed share for group %1$s" : "Tog bort delning för grupp %1$s",
     "Removed share for group {group}" : "Tog bort delning för grupp {group}",
-    "%2$s shared with group %1$s" : "%2$s delad med grupp %1$s",
     "{actor} shared with group {group}" : "{actor} delade med gruppen {group}",
-    "%2$s removed share for group %1$s" : "%2$s tog bort delningen för gruppen %1$s",
     "{actor} removed share for group {group}" : "{actor} tog bort delningen för gruppen {group}",
-    "You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s",
     "You shared {file} with group {group}" : "Du delade {file} med gruppen {group}",
-    "You removed group %2$s from %1$s" : "Du tog bort gruppen %2$s från %1$s",
     "You removed group {group} from {file}" : "Du tog bort gruppen {group} från {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s delade %1$s med gruppen %2$s",
     "{actor} shared {file} with group {group}" : "{actor} delade {file} med gruppen {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s tog bort gruppen %2$s från %1$s",
     "{actor} removed group {group} from {file}" : "{actor} tog bort gruppen {group} från {file}",
     "Shared as public link" : "Delades offentligt",
     "Removed public link" : "Tog bort offentlig länk",
-    "%1$s shared as public link" : "%1$s delade offentligt",
+    "Public link expired" : "Tidsgräns för offentlig länk har löpt ut",
     "{actor} shared as public link" : "{actor} delade offentligt",
-    "%1$s removed public link" : "%1$s tog bort offentlig länk",
     "{actor} removed public link" : "{actor} tog bort offentlig länk",
-    "You shared %1$s as public link" : "Du delade %1$s offentligt",
     "You shared {file} as public link" : "Du delade {file} offentligt",
-    "You removed public link for %1$s" : "Du tog bort den offentliga länken för %1$s",
     "You removed public link for {file}" : "Du tog bort den offentliga länken för {file}",
-    "%2$s shared %1$s as public link" : "%2$s delade %1$s offentligt",
     "{actor} shared {file} as public link" : "{actor} delade {file} offentligt",
-    "%2$s removed public link for %1$s" : "%2$s tog bort den offentliga länken för %1$s",
     "{actor} removed public link for {file}" : "{actor} tog bort den offentliga länken för {file}",
-    "%1$s accepted the remote share" : "%1$s accepterade extern delning",
     "{user} accepted the remote share" : "{user} accepterade extern delning",
-    "%1$s declined the remote share" : "%1$s nekade extern delning",
     "{user} declined the remote share" : "{user} nekade extern delning",
-    "You received a new remote share %1$s from %2$s" : "Du har fått en ny extern delning %1$s från %2$s",
     "You received a new remote share {file} from {user}" : "Du har fått en ny extern delning {file} från {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s accepterade extern delning av %1$s",
     "{user} accepted the remote share of {file}" : "{user} accepterade extern delning av {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s nekade extern delning av %1$s",
     "{user} declined the remote share of {file}" : "{user} nekade extern delning av {file}",
-    "%2$s unshared %1$s from you" : "%2$s slutade dela %1$s med dig",
     "{user} unshared {file} from you" : "{user} slutade dela {file} med dig",
-    "Shared with %1$s" : "Delade med %1$s",
     "Shared with {user}" : "Delade med {user}",
-    "Removed share for %1$s" : "Tog bort delningen för %1$s",
     "Removed share for {user}" : "Tog bort delningen för {user}",
-    "%2$s shared with %1$s" : "%2$s delade med %1$s",
     "{actor} shared with {user}" : "{actor} delade med {user}",
-    "%2$s removed share for %1$s" : "%2$s tog bort delningen för %1$s",
     "{actor} removed share for {user}" : "{actor} tog bort delningen för {user}",
-    "Shared by %1$s" : "Delad av %1$s",
     "Shared by {actor}" : "Delad av {actor}",
-    "%1$s removed share" : "%1$s tog bort delning",
     "{actor} removed share" : "{actor} tog bort delning",
-    "You shared %1$s with %2$s" : "Du delade %1$s med %2$s",
     "You shared {file} with {user}" : "Du delade {file} med {user}",
-    "You removed %2$s from %1$s" : "Du tog bort %2$s från %1$s",
     "You removed {user} from {file}" : "Du tog bort {user} från {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s delade %1$s med %2$s",
     "{actor} removed {user} from {file}" : "{actor} tog bort {user} från {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s tog bort %2$s från %1$s",
-    "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "{actor} shared {file} with you" : "{actor} delade {file} med dig",
-    "%2$s removed you from %1$s" : "%2$s tog bort dig från %1$s",
     "{actor} removed you from {file}" : "{actor} tog bort dig från {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "En fil eller mapp som delats via mejl eller offentlig länk har blivit <strong>nedladdad</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>",
@@ -146,9 +112,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s tog bort delningen %2$s från dig",
     "Public shared folder %1$s was downloaded" : "Offentligt delad mapp %1$s blev nedladdad",
     "Public shared file %1$s was downloaded" : "Offentligt delad fil %1$s blev nedladdad",
+    "You shared %1$s with %2$s" : "Du delade %1$s med %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s delade %1$s med %3$s",
     "You removed the share of %2$s for %1$s" : "Du tog bort delning av %2$s för %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s tog bort delningen av %3$s för %1$s",
+    "You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s delade %1$s med gruppen %3$s",
     "You removed the share of group %2$s for %1$s" : "Du tog bort delningen av gruppen %2$s för %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s tog bort delningen av grupp %3$s för %1$s",
@@ -158,6 +126,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s tog bort den offentliga länken för %1$s",
     "Your public link for %1$s expired" : "Din offentliga länk för %1$s har löpt ut",
     "The public link of %2$s for %1$s expired" : "Den offentliga länken för %2$s av %1$s har löpt ut",
+    "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "%2$s removed the share for %1$s" : "%2$s tog bort delningen av %1$s",
     "Shared with %2$s" : "Delad med %2$s",
     "Shared with %3$s by %2$s" : "Delad med %3$s av %2$s",
@@ -170,9 +139,40 @@ OC.L10N.register(
     "Shared via link by %2$s" : "Delad via länk av %2$s",
     "Shared via public link" : "Delad via offentlig länk",
     "%2$s removed public link" : "%2$s tog bort offentlig länk",
-    "Public link expired" : "Tidsgräns för offentlig länk har löpt ut",
     "Public link of %2$s expired" : "Tidsgräns för offentlig länk för %2$s har löpt ut",
     "Shared by %2$s" : "Delad av %2$s",
-    "Shares" : "Delningar"
+    "Shares" : "Delningar",
+    "Downloaded by %1$s" : "Nedladdad av %1$s",
+    "%1$s downloaded via public link" : "%1$s nedladdad via offentlig länk",
+    "%1$s downloaded %2$s" : "%1$s laddade ned %2$s",
+    "Shared with group %1$s" : "Delad med grupp %1$s",
+    "Removed share for group %1$s" : "Tog bort delning för grupp %1$s",
+    "%2$s shared with group %1$s" : "%2$s delad med grupp %1$s",
+    "%2$s removed share for group %1$s" : "%2$s tog bort delningen för gruppen %1$s",
+    "You removed group %2$s from %1$s" : "Du tog bort gruppen %2$s från %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s delade %1$s med gruppen %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s tog bort gruppen %2$s från %1$s",
+    "%1$s shared as public link" : "%1$s delade offentligt",
+    "%1$s removed public link" : "%1$s tog bort offentlig länk",
+    "You shared %1$s as public link" : "Du delade %1$s offentligt",
+    "You removed public link for %1$s" : "Du tog bort den offentliga länken för %1$s",
+    "%2$s shared %1$s as public link" : "%2$s delade %1$s offentligt",
+    "%2$s removed public link for %1$s" : "%2$s tog bort den offentliga länken för %1$s",
+    "%1$s accepted the remote share" : "%1$s accepterade extern delning",
+    "%1$s declined the remote share" : "%1$s nekade extern delning",
+    "You received a new remote share %1$s from %2$s" : "Du har fått en ny extern delning %1$s från %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s accepterade extern delning av %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s nekade extern delning av %1$s",
+    "%2$s unshared %1$s from you" : "%2$s slutade dela %1$s med dig",
+    "Shared with %1$s" : "Delade med %1$s",
+    "Removed share for %1$s" : "Tog bort delningen för %1$s",
+    "%2$s shared with %1$s" : "%2$s delade med %1$s",
+    "%2$s removed share for %1$s" : "%2$s tog bort delningen för %1$s",
+    "Shared by %1$s" : "Delad av %1$s",
+    "%1$s removed share" : "%1$s tog bort delning",
+    "You removed %2$s from %1$s" : "Du tog bort %2$s från %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s delade %1$s med %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s tog bort %2$s från %1$s",
+    "%2$s removed you from %1$s" : "%2$s tog bort dig från %1$s"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json
index 84a1e4a83bfaca92aadf47beb70da736dd84df38..dfe0cf3f25af7f2e39c8bd7422637f41ab32479d 100644
--- a/apps/files_sharing/l10n/sv.json
+++ b/apps/files_sharing/l10n/sv.json
@@ -18,76 +18,42 @@
     "Sharing" : "Delning",
     "File shares" : "Fildelningar",
     "Downloaded via public link" : "Nedladdad via offentlig länk",
-    "Downloaded by %1$s" : "Nedladdad av %1$s",
     "Downloaded by {email}" : "Nedladdad av {email}",
-    "%1$s downloaded via public link" : "%1$s nedladdad via offentlig länk",
     "{file} downloaded via public link" : "{file} nedladdad via offentlig länk",
-    "%1$s downloaded %2$s" : "%1$s laddade ned %2$s",
     "{email} downloaded {file}" : "{email} laddade ned {file}",
-    "Shared with group %1$s" : "Delad med grupp %1$s",
     "Shared with group {group}" : "Delad med grupp {group}",
-    "Removed share for group %1$s" : "Tog bort delning för grupp %1$s",
     "Removed share for group {group}" : "Tog bort delning för grupp {group}",
-    "%2$s shared with group %1$s" : "%2$s delad med grupp %1$s",
     "{actor} shared with group {group}" : "{actor} delade med gruppen {group}",
-    "%2$s removed share for group %1$s" : "%2$s tog bort delningen för gruppen %1$s",
     "{actor} removed share for group {group}" : "{actor} tog bort delningen för gruppen {group}",
-    "You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s",
     "You shared {file} with group {group}" : "Du delade {file} med gruppen {group}",
-    "You removed group %2$s from %1$s" : "Du tog bort gruppen %2$s från %1$s",
     "You removed group {group} from {file}" : "Du tog bort gruppen {group} från {file}",
-    "%3$s shared %1$s with group %2$s" : "%3$s delade %1$s med gruppen %2$s",
     "{actor} shared {file} with group {group}" : "{actor} delade {file} med gruppen {group}",
-    "%3$s removed group %2$s from %1$s" : "%3$s tog bort gruppen %2$s från %1$s",
     "{actor} removed group {group} from {file}" : "{actor} tog bort gruppen {group} från {file}",
     "Shared as public link" : "Delades offentligt",
     "Removed public link" : "Tog bort offentlig länk",
-    "%1$s shared as public link" : "%1$s delade offentligt",
+    "Public link expired" : "Tidsgräns för offentlig länk har löpt ut",
     "{actor} shared as public link" : "{actor} delade offentligt",
-    "%1$s removed public link" : "%1$s tog bort offentlig länk",
     "{actor} removed public link" : "{actor} tog bort offentlig länk",
-    "You shared %1$s as public link" : "Du delade %1$s offentligt",
     "You shared {file} as public link" : "Du delade {file} offentligt",
-    "You removed public link for %1$s" : "Du tog bort den offentliga länken för %1$s",
     "You removed public link for {file}" : "Du tog bort den offentliga länken för {file}",
-    "%2$s shared %1$s as public link" : "%2$s delade %1$s offentligt",
     "{actor} shared {file} as public link" : "{actor} delade {file} offentligt",
-    "%2$s removed public link for %1$s" : "%2$s tog bort den offentliga länken för %1$s",
     "{actor} removed public link for {file}" : "{actor} tog bort den offentliga länken för {file}",
-    "%1$s accepted the remote share" : "%1$s accepterade extern delning",
     "{user} accepted the remote share" : "{user} accepterade extern delning",
-    "%1$s declined the remote share" : "%1$s nekade extern delning",
     "{user} declined the remote share" : "{user} nekade extern delning",
-    "You received a new remote share %1$s from %2$s" : "Du har fått en ny extern delning %1$s från %2$s",
     "You received a new remote share {file} from {user}" : "Du har fått en ny extern delning {file} från {user}",
-    "%2$s accepted the remote share of %1$s" : "%2$s accepterade extern delning av %1$s",
     "{user} accepted the remote share of {file}" : "{user} accepterade extern delning av {file}",
-    "%2$s declined the remote share of %1$s" : "%2$s nekade extern delning av %1$s",
     "{user} declined the remote share of {file}" : "{user} nekade extern delning av {file}",
-    "%2$s unshared %1$s from you" : "%2$s slutade dela %1$s med dig",
     "{user} unshared {file} from you" : "{user} slutade dela {file} med dig",
-    "Shared with %1$s" : "Delade med %1$s",
     "Shared with {user}" : "Delade med {user}",
-    "Removed share for %1$s" : "Tog bort delningen för %1$s",
     "Removed share for {user}" : "Tog bort delningen för {user}",
-    "%2$s shared with %1$s" : "%2$s delade med %1$s",
     "{actor} shared with {user}" : "{actor} delade med {user}",
-    "%2$s removed share for %1$s" : "%2$s tog bort delningen för %1$s",
     "{actor} removed share for {user}" : "{actor} tog bort delningen för {user}",
-    "Shared by %1$s" : "Delad av %1$s",
     "Shared by {actor}" : "Delad av {actor}",
-    "%1$s removed share" : "%1$s tog bort delning",
     "{actor} removed share" : "{actor} tog bort delning",
-    "You shared %1$s with %2$s" : "Du delade %1$s med %2$s",
     "You shared {file} with {user}" : "Du delade {file} med {user}",
-    "You removed %2$s from %1$s" : "Du tog bort %2$s från %1$s",
     "You removed {user} from {file}" : "Du tog bort {user} från {file}",
-    "%3$s shared %1$s with %2$s" : "%3$s delade %1$s med %2$s",
     "{actor} removed {user} from {file}" : "{actor} tog bort {user} från {file}",
-    "%3$s removed %2$s from %1$s" : "%3$s tog bort %2$s från %1$s",
-    "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "{actor} shared {file} with you" : "{actor} delade {file} med dig",
-    "%2$s removed you from %1$s" : "%2$s tog bort dig från %1$s",
     "{actor} removed you from {file}" : "{actor} tog bort dig från {file}",
     "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "En fil eller mapp som delats via mejl eller offentlig länk har blivit <strong>nedladdad</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>",
@@ -144,9 +110,11 @@
     "%1$s unshared %2$s from you" : "%1$s tog bort delningen %2$s från dig",
     "Public shared folder %1$s was downloaded" : "Offentligt delad mapp %1$s blev nedladdad",
     "Public shared file %1$s was downloaded" : "Offentligt delad fil %1$s blev nedladdad",
+    "You shared %1$s with %2$s" : "Du delade %1$s med %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s delade %1$s med %3$s",
     "You removed the share of %2$s for %1$s" : "Du tog bort delning av %2$s för %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s tog bort delningen av %3$s för %1$s",
+    "You shared %1$s with group %2$s" : "Du delade %1$s med grupp %2$s",
     "%2$s shared %1$s with group %3$s" : "%2$s delade %1$s med gruppen %3$s",
     "You removed the share of group %2$s for %1$s" : "Du tog bort delningen av gruppen %2$s för %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s tog bort delningen av grupp %3$s för %1$s",
@@ -156,6 +124,7 @@
     "%2$s removed the public link for %1$s" : "%2$s tog bort den offentliga länken för %1$s",
     "Your public link for %1$s expired" : "Din offentliga länk för %1$s har löpt ut",
     "The public link of %2$s for %1$s expired" : "Den offentliga länken för %2$s av %1$s har löpt ut",
+    "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "%2$s removed the share for %1$s" : "%2$s tog bort delningen av %1$s",
     "Shared with %2$s" : "Delad med %2$s",
     "Shared with %3$s by %2$s" : "Delad med %3$s av %2$s",
@@ -168,9 +137,40 @@
     "Shared via link by %2$s" : "Delad via länk av %2$s",
     "Shared via public link" : "Delad via offentlig länk",
     "%2$s removed public link" : "%2$s tog bort offentlig länk",
-    "Public link expired" : "Tidsgräns för offentlig länk har löpt ut",
     "Public link of %2$s expired" : "Tidsgräns för offentlig länk för %2$s har löpt ut",
     "Shared by %2$s" : "Delad av %2$s",
-    "Shares" : "Delningar"
+    "Shares" : "Delningar",
+    "Downloaded by %1$s" : "Nedladdad av %1$s",
+    "%1$s downloaded via public link" : "%1$s nedladdad via offentlig länk",
+    "%1$s downloaded %2$s" : "%1$s laddade ned %2$s",
+    "Shared with group %1$s" : "Delad med grupp %1$s",
+    "Removed share for group %1$s" : "Tog bort delning för grupp %1$s",
+    "%2$s shared with group %1$s" : "%2$s delad med grupp %1$s",
+    "%2$s removed share for group %1$s" : "%2$s tog bort delningen för gruppen %1$s",
+    "You removed group %2$s from %1$s" : "Du tog bort gruppen %2$s från %1$s",
+    "%3$s shared %1$s with group %2$s" : "%3$s delade %1$s med gruppen %2$s",
+    "%3$s removed group %2$s from %1$s" : "%3$s tog bort gruppen %2$s från %1$s",
+    "%1$s shared as public link" : "%1$s delade offentligt",
+    "%1$s removed public link" : "%1$s tog bort offentlig länk",
+    "You shared %1$s as public link" : "Du delade %1$s offentligt",
+    "You removed public link for %1$s" : "Du tog bort den offentliga länken för %1$s",
+    "%2$s shared %1$s as public link" : "%2$s delade %1$s offentligt",
+    "%2$s removed public link for %1$s" : "%2$s tog bort den offentliga länken för %1$s",
+    "%1$s accepted the remote share" : "%1$s accepterade extern delning",
+    "%1$s declined the remote share" : "%1$s nekade extern delning",
+    "You received a new remote share %1$s from %2$s" : "Du har fått en ny extern delning %1$s från %2$s",
+    "%2$s accepted the remote share of %1$s" : "%2$s accepterade extern delning av %1$s",
+    "%2$s declined the remote share of %1$s" : "%2$s nekade extern delning av %1$s",
+    "%2$s unshared %1$s from you" : "%2$s slutade dela %1$s med dig",
+    "Shared with %1$s" : "Delade med %1$s",
+    "Removed share for %1$s" : "Tog bort delningen för %1$s",
+    "%2$s shared with %1$s" : "%2$s delade med %1$s",
+    "%2$s removed share for %1$s" : "%2$s tog bort delningen för %1$s",
+    "Shared by %1$s" : "Delad av %1$s",
+    "%1$s removed share" : "%1$s tog bort delning",
+    "You removed %2$s from %1$s" : "Du tog bort %2$s från %1$s",
+    "%3$s shared %1$s with %2$s" : "%3$s delade %1$s med %2$s",
+    "%3$s removed %2$s from %1$s" : "%3$s tog bort %2$s från %1$s",
+    "%2$s removed you from %1$s" : "%2$s tog bort dig från %1$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js
index 93bed366572e7e70764000889e8739e190bd1fed..f79d080f90760267af9431cbd692a298eb40c2c6 100644
--- a/apps/files_sharing/l10n/zh_CN.js
+++ b/apps/files_sharing/l10n/zh_CN.js
@@ -20,40 +20,24 @@ OC.L10N.register(
     "Sharing" : "共享",
     "File shares" : "文件共享",
     "Downloaded via public link" : "通过公开链接下载",
-    "Downloaded by %1$s" : "已被 %1$s 下载",
     "Downloaded by {email}" : "已被 {email} 下载",
-    "%1$s downloaded via public link" : "已被 %1$s 通过公开链接下载",
     "{file} downloaded via public link" : "{file} 被通过公开链接下载",
-    "%1$s downloaded %2$s" : "%1$s 已下载 %2$s",
     "{email} downloaded {file}" : "{email} 已下载 {file}",
-    "Shared with group %1$s" : "分享到群组 %1$s",
     "Shared with group {group}" : "分享到群组 {group}",
-    "Removed share for group %1$s" : "到群组 %1$s 的分享已被移除",
     "Removed share for group {group}" : "到群组 {group} 的分享已被移除 ",
-    "%2$s shared with group %1$s" : "%2$s 被分享到群组 %1$s",
     "{actor} shared with group {group}" : "{actor}  被分享到群组 {group}",
-    "You shared %1$s with group %2$s" : "您把 %1$s 分享给了 %2$s 组",
-    "You removed group %2$s from %1$s" : "你移除了群组 %2$s 在 %1$s",
     "Shared as public link" : "共享为公开链接",
     "Removed public link" : "移除公开链接",
-    "%1$s shared as public link" : "%1$s 公共链接分享",
+    "Public link expired" : "公开链接已过期",
     "{actor} shared as public link" : "{actor} 公共链接分享",
-    "%1$s removed public link" : "%1$s 删除公共链接",
     "{actor} removed public link" : "{actor} 删除公共链接",
-    "You shared %1$s as public link" : "你共享了 %1$s 为公开链接",
     "You shared {file} as public link" : "你共享了 {file} 为公开链接",
-    "You removed public link for %1$s" : "你移除了 %1$s 的公开链接",
     "You removed public link for {file}" : "你移除了 {file} 的公开链接",
     "{user} accepted the remote share" : "{user} 接受了远程共享",
-    "Shared with %1$s" : "与 %1$s 分享",
     "Shared with {user}" : "与 {user} 分享",
     "Removed share for {user}" : "移除给 {user} 的共享",
-    "Shared by %1$s" : "由 %1$s 共享",
     "Shared by {actor}" : "由 {actor} 共享",
-    "%1$s removed share" : "%1$s 移除共享",
-    "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
     "{actor} removed {user} from {file}" : "{actor} 移除 {user} 从 {file}",
-    "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ",
     "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。",
     "Wrong share ID, share doesn't exist" : "错误的共享 ID，共享不存在",
@@ -108,9 +92,11 @@ OC.L10N.register(
     "%1$s unshared %2$s from you" : "%1$s 未共享你的 %2$s ",
     "Public shared folder %1$s was downloaded" : "公共共享文件夹 %1$s 已被下载",
     "Public shared file %1$s was downloaded" : "公共共享文件 %1$s 已被下载",
+    "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s 共享 %1$s 给 %3$s",
     "You removed the share of %2$s for %1$s" : "你移除了 %2$s 的共享 %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s 移除了 %3$s 的共享 %1$s",
+    "You shared %1$s with group %2$s" : "您把 %1$s 分享给了 %2$s 组",
     "%2$s shared %1$s with group %3$s" : "%2$s 共享 %1$s 给群组 %3$s",
     "You removed the share of group %2$s for %1$s" : "你移除了组 %2$s 的共享 %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s 移除了组 %3$s 的共享 %1$s",
@@ -120,6 +106,7 @@ OC.L10N.register(
     "%2$s removed the public link for %1$s" : "%2$s 移除了公共链接 %1$s",
     "Your public link for %1$s expired" : "你的公开链接 %1$s 已过期",
     "The public link of %2$s for %1$s expired" : "%2$s 的公开链接 %1$s 已过期",
+    "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
     "%2$s removed the share for %1$s" : "%2$s 移除了共享 %1$s",
     "Shared with %2$s" : "共享给 %2$s",
     "Shared with %3$s by %2$s" : "由 %2$s 共享给 %3$s",
@@ -132,9 +119,22 @@ OC.L10N.register(
     "Shared via link by %2$s" : "%2$s 以链接方式共享",
     "Shared via public link" : "通过公开链接共享",
     "%2$s removed public link" : "%2$s 移除了公共链接",
-    "Public link expired" : "公开链接已过期",
     "Public link of %2$s expired" : "%2$s 的公开链接已过期",
     "Shared by %2$s" : "由 %2$s 共享",
-    "Shares" : "共享"
+    "Shares" : "共享",
+    "Downloaded by %1$s" : "已被 %1$s 下载",
+    "%1$s downloaded via public link" : "已被 %1$s 通过公开链接下载",
+    "%1$s downloaded %2$s" : "%1$s 已下载 %2$s",
+    "Shared with group %1$s" : "分享到群组 %1$s",
+    "Removed share for group %1$s" : "到群组 %1$s 的分享已被移除",
+    "%2$s shared with group %1$s" : "%2$s 被分享到群组 %1$s",
+    "You removed group %2$s from %1$s" : "你移除了群组 %2$s 在 %1$s",
+    "%1$s shared as public link" : "%1$s 公共链接分享",
+    "%1$s removed public link" : "%1$s 删除公共链接",
+    "You shared %1$s as public link" : "你共享了 %1$s 为公开链接",
+    "You removed public link for %1$s" : "你移除了 %1$s 的公开链接",
+    "Shared with %1$s" : "与 %1$s 分享",
+    "Shared by %1$s" : "由 %1$s 共享",
+    "%1$s removed share" : "%1$s 移除共享"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json
index 38e3b36040e3cc6fef7de486b56d4f84486e0b20..a630bb5b77e8f6dbca27de70856029e5154d6fd7 100644
--- a/apps/files_sharing/l10n/zh_CN.json
+++ b/apps/files_sharing/l10n/zh_CN.json
@@ -18,40 +18,24 @@
     "Sharing" : "共享",
     "File shares" : "文件共享",
     "Downloaded via public link" : "通过公开链接下载",
-    "Downloaded by %1$s" : "已被 %1$s 下载",
     "Downloaded by {email}" : "已被 {email} 下载",
-    "%1$s downloaded via public link" : "已被 %1$s 通过公开链接下载",
     "{file} downloaded via public link" : "{file} 被通过公开链接下载",
-    "%1$s downloaded %2$s" : "%1$s 已下载 %2$s",
     "{email} downloaded {file}" : "{email} 已下载 {file}",
-    "Shared with group %1$s" : "分享到群组 %1$s",
     "Shared with group {group}" : "分享到群组 {group}",
-    "Removed share for group %1$s" : "到群组 %1$s 的分享已被移除",
     "Removed share for group {group}" : "到群组 {group} 的分享已被移除 ",
-    "%2$s shared with group %1$s" : "%2$s 被分享到群组 %1$s",
     "{actor} shared with group {group}" : "{actor}  被分享到群组 {group}",
-    "You shared %1$s with group %2$s" : "您把 %1$s 分享给了 %2$s 组",
-    "You removed group %2$s from %1$s" : "你移除了群组 %2$s 在 %1$s",
     "Shared as public link" : "共享为公开链接",
     "Removed public link" : "移除公开链接",
-    "%1$s shared as public link" : "%1$s 公共链接分享",
+    "Public link expired" : "公开链接已过期",
     "{actor} shared as public link" : "{actor} 公共链接分享",
-    "%1$s removed public link" : "%1$s 删除公共链接",
     "{actor} removed public link" : "{actor} 删除公共链接",
-    "You shared %1$s as public link" : "你共享了 %1$s 为公开链接",
     "You shared {file} as public link" : "你共享了 {file} 为公开链接",
-    "You removed public link for %1$s" : "你移除了 %1$s 的公开链接",
     "You removed public link for {file}" : "你移除了 {file} 的公开链接",
     "{user} accepted the remote share" : "{user} 接受了远程共享",
-    "Shared with %1$s" : "与 %1$s 分享",
     "Shared with {user}" : "与 {user} 分享",
     "Removed share for {user}" : "移除给 {user} 的共享",
-    "Shared by %1$s" : "由 %1$s 共享",
     "Shared by {actor}" : "由 {actor} 共享",
-    "%1$s removed share" : "%1$s 移除共享",
-    "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
     "{actor} removed {user} from {file}" : "{actor} 移除 {user} 从 {file}",
-    "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>其它服务器</strong> 中一个文件或者文件夹被共享 ",
     "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。",
     "Wrong share ID, share doesn't exist" : "错误的共享 ID，共享不存在",
@@ -106,9 +90,11 @@
     "%1$s unshared %2$s from you" : "%1$s 未共享你的 %2$s ",
     "Public shared folder %1$s was downloaded" : "公共共享文件夹 %1$s 已被下载",
     "Public shared file %1$s was downloaded" : "公共共享文件 %1$s 已被下载",
+    "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s 共享 %1$s 给 %3$s",
     "You removed the share of %2$s for %1$s" : "你移除了 %2$s 的共享 %1$s",
     "%2$s removed the share of %3$s for %1$s" : "%2$s 移除了 %3$s 的共享 %1$s",
+    "You shared %1$s with group %2$s" : "您把 %1$s 分享给了 %2$s 组",
     "%2$s shared %1$s with group %3$s" : "%2$s 共享 %1$s 给群组 %3$s",
     "You removed the share of group %2$s for %1$s" : "你移除了组 %2$s 的共享 %1$s",
     "%2$s removed the share of group %3$s for %1$s" : "%2$s 移除了组 %3$s 的共享 %1$s",
@@ -118,6 +104,7 @@
     "%2$s removed the public link for %1$s" : "%2$s 移除了公共链接 %1$s",
     "Your public link for %1$s expired" : "你的公开链接 %1$s 已过期",
     "The public link of %2$s for %1$s expired" : "%2$s 的公开链接 %1$s 已过期",
+    "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
     "%2$s removed the share for %1$s" : "%2$s 移除了共享 %1$s",
     "Shared with %2$s" : "共享给 %2$s",
     "Shared with %3$s by %2$s" : "由 %2$s 共享给 %3$s",
@@ -130,9 +117,22 @@
     "Shared via link by %2$s" : "%2$s 以链接方式共享",
     "Shared via public link" : "通过公开链接共享",
     "%2$s removed public link" : "%2$s 移除了公共链接",
-    "Public link expired" : "公开链接已过期",
     "Public link of %2$s expired" : "%2$s 的公开链接已过期",
     "Shared by %2$s" : "由 %2$s 共享",
-    "Shares" : "共享"
+    "Shares" : "共享",
+    "Downloaded by %1$s" : "已被 %1$s 下载",
+    "%1$s downloaded via public link" : "已被 %1$s 通过公开链接下载",
+    "%1$s downloaded %2$s" : "%1$s 已下载 %2$s",
+    "Shared with group %1$s" : "分享到群组 %1$s",
+    "Removed share for group %1$s" : "到群组 %1$s 的分享已被移除",
+    "%2$s shared with group %1$s" : "%2$s 被分享到群组 %1$s",
+    "You removed group %2$s from %1$s" : "你移除了群组 %2$s 在 %1$s",
+    "%1$s shared as public link" : "%1$s 公共链接分享",
+    "%1$s removed public link" : "%1$s 删除公共链接",
+    "You shared %1$s as public link" : "你共享了 %1$s 为公开链接",
+    "You removed public link for %1$s" : "你移除了 %1$s 的公开链接",
+    "Shared with %1$s" : "与 %1$s 分享",
+    "Shared by %1$s" : "由 %1$s 共享",
+    "%1$s removed share" : "%1$s 移除共享"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/pl.js b/apps/workflowengine/l10n/pl.js
index 84e63e0189082530a5c63e4ec5c8eb8314df258e..9b1d324469c520600898a03f59b80963102ace43 100644
--- a/apps/workflowengine/l10n/pl.js
+++ b/apps/workflowengine/l10n/pl.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "workflowengine",
     {
-    "Successfully saved" : "Zapisywanie powiodło się",
-    "Saving failed:" : "Zapisywanie nie powiodło się:",
+    "Successfully saved" : "Zapis się powiódł",
+    "Saving failed:" : "Zapis się nie udał:",
     "File mime type" : "Typ MIME pliku",
     "is" : "jest",
     "is not" : "nie jest",
@@ -17,13 +17,13 @@ OC.L10N.register(
     "File system tag" : "Etykieta systemu plików",
     "is tagged with" : "jest oznaczony",
     "is not tagged with" : "Nie jest oznaczony",
-    "Select tag…" : "Wybierz etykietę ...",
+    "Select tag…" : "Wybierz etykietę...",
     "Request remote address" : "Uzyskaj zdalny adres",
     "matches IPv4" : "pasuje IPv4",
     "does not match IPv4" : "nie pasuje IPv4",
     "matches IPv6" : "pasuje IPv6",
     "does not match IPv6" : "nie pasuje IPv6",
-    "Request time" : "Przekroczono czas odpowiedzi",
+    "Request time" : "Czas odpowiedzi",
     "between" : "pomiędzy",
     "not between" : "nie pomiędzy",
     "Start" : "Start",
@@ -38,8 +38,8 @@ OC.L10N.register(
     "iOS client" : "Klient iOS",
     "Desktop client" : "Klient na komputer",
     "User group membership" : "Członkostwo grupy użytkownika",
-    "is member of" : "Jest członkiem z",
-    "is not member of" : "Nie jest członkiem z",
+    "is member of" : "jest członkiem w",
+    "is not member of" : "nie jest członkiem w",
     "The given operator is invalid" : "Dana operacja jest nieprawidłowa",
     "The given regular expression is invalid" : "Podane wyrażenie regularne jest błędne",
     "The given file size is invalid" : "Podany rozmiar pliku jest nieprawidłowy",
@@ -63,7 +63,7 @@ OC.L10N.register(
     "Add rule group" : "Dodaj regułę grupy",
     "Short rule description" : "Krótki opis reguły",
     "Add rule" : "Dodaj regułę",
-    "Reset" : "Reset",
+    "Reset" : "Zresetuj",
     "Save" : "Zapisz",
     "Saving…" : "Zapisywanie...",
     "Loading…" : "Wczytywanie..."
diff --git a/apps/workflowengine/l10n/pl.json b/apps/workflowengine/l10n/pl.json
index 31bcd2aca3e6200b69708f357337fe41f0ea8fa9..f60c8750f26b2e342dc379fe6e1c05b0453d84de 100644
--- a/apps/workflowengine/l10n/pl.json
+++ b/apps/workflowengine/l10n/pl.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Successfully saved" : "Zapisywanie powiodło się",
-    "Saving failed:" : "Zapisywanie nie powiodło się:",
+    "Successfully saved" : "Zapis się powiódł",
+    "Saving failed:" : "Zapis się nie udał:",
     "File mime type" : "Typ MIME pliku",
     "is" : "jest",
     "is not" : "nie jest",
@@ -15,13 +15,13 @@
     "File system tag" : "Etykieta systemu plików",
     "is tagged with" : "jest oznaczony",
     "is not tagged with" : "Nie jest oznaczony",
-    "Select tag…" : "Wybierz etykietę ...",
+    "Select tag…" : "Wybierz etykietę...",
     "Request remote address" : "Uzyskaj zdalny adres",
     "matches IPv4" : "pasuje IPv4",
     "does not match IPv4" : "nie pasuje IPv4",
     "matches IPv6" : "pasuje IPv6",
     "does not match IPv6" : "nie pasuje IPv6",
-    "Request time" : "Przekroczono czas odpowiedzi",
+    "Request time" : "Czas odpowiedzi",
     "between" : "pomiędzy",
     "not between" : "nie pomiędzy",
     "Start" : "Start",
@@ -36,8 +36,8 @@
     "iOS client" : "Klient iOS",
     "Desktop client" : "Klient na komputer",
     "User group membership" : "Członkostwo grupy użytkownika",
-    "is member of" : "Jest członkiem z",
-    "is not member of" : "Nie jest członkiem z",
+    "is member of" : "jest członkiem w",
+    "is not member of" : "nie jest członkiem w",
     "The given operator is invalid" : "Dana operacja jest nieprawidłowa",
     "The given regular expression is invalid" : "Podane wyrażenie regularne jest błędne",
     "The given file size is invalid" : "Podany rozmiar pliku jest nieprawidłowy",
@@ -61,7 +61,7 @@
     "Add rule group" : "Dodaj regułę grupy",
     "Short rule description" : "Krótki opis reguły",
     "Add rule" : "Dodaj regułę",
-    "Reset" : "Reset",
+    "Reset" : "Zresetuj",
     "Save" : "Zapisz",
     "Saving…" : "Zapisywanie...",
     "Loading…" : "Wczytywanie..."
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index 4f8b57c08b3f48b18d26947fb6ef8a310ddb2fac..a821b44018183f9d6c47a6c12c998961360604f4 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -160,6 +160,7 @@ OC.L10N.register(
     "The specified document has not been found on the server." : "Norādītais dokuments nav atrasts serverī.",
     "You can click here to return to %s." : "Jūs varat noklikšķināt šeit, lai atgrieztos uz %s.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Sveiki,\n\ninformējam, ka %s koplietoja ar jums %s.\nApskati to: %s\n",
+    "The share will expire on %s." : "Koplietošana beigsies %s.",
     "Cheers!" : "Priekā!",
     "Internal Server Error" : "Iekšēja servera kļūda",
     "The server encountered an internal error and was unable to complete your request." : "Serverī radās iekšēja kļūda, un tas nevarēja pabeigt jūsu pieprasījumu.",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index 2e1cd5877cf265b06669e43b10fc5c7f16d792c4..e5e0d59b293f6b1b3d9d7e0e881dae9a3cfba9a9 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -158,6 +158,7 @@
     "The specified document has not been found on the server." : "Norādītais dokuments nav atrasts serverī.",
     "You can click here to return to %s." : "Jūs varat noklikšķināt šeit, lai atgrieztos uz %s.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Sveiki,\n\ninformējam, ka %s koplietoja ar jums %s.\nApskati to: %s\n",
+    "The share will expire on %s." : "Koplietošana beigsies %s.",
     "Cheers!" : "Priekā!",
     "Internal Server Error" : "Iekšēja servera kļūda",
     "The server encountered an internal error and was unable to complete your request." : "Serverī radās iekšēja kļūda, un tas nevarēja pabeigt jūsu pieprasījumu.",
diff --git a/settings/l10n/ia.js b/settings/l10n/ia.js
index a1c218838156d3707bd9340459387786bd71de6f..e6aa618838ff98a1fdb5f5ac774fedbd576b726b 100644
--- a/settings/l10n/ia.js
+++ b/settings/l10n/ia.js
@@ -26,6 +26,108 @@ OC.L10N.register(
     "Settings saved" : "Configurationes salveguardate",
     "Unable to change full name" : "Impossibile cambiar nomine complete",
     "Unable to change email address" : "Impossibile cambiar adresse de e-posta",
-    "Forbidden" : "Prohibite"
+    "Your full name has been changed." : "Tu nomine complete esseva cambiate.",
+    "Forbidden" : "Prohibite",
+    "Invalid user" : "Usator invalide",
+    "Unable to change mail address" : "Impossibile cambiar adresse de e-posta",
+    "Password confirmation is required" : "Un confirmation del contrasigno es necessari",
+    "Couldn't remove app." : "Impossibile remover application.",
+    "Couldn't update app." : "Impossibile actualisar application.",
+    "Official" : "Official",
+    "All" : "Tote",
+    "Update to %s" : "Actualisar a %s",
+    "Disable" : "Disactivar",
+    "Enable" : "Activar",
+    "Updating...." : "Actualisante...",
+    "Uninstall" : "De-installar",
+    "Experimental" : "Experimental",
+    "Disconnect" : "Disconnecter",
+    "Internet Explorer" : "Internet Explorer",
+    "Edge" : "Edge",
+    "Firefox" : "Firefox",
+    "Google Chrome" : "Google Chrome",
+    "Safari" : "Safari",
+    "Google Chrome for Android" : "Google Chrome pro Android",
+    "iPhone iOS" : "iPhone iOS",
+    "iPad iOS" : "iPad iOS",
+    "This session" : "Iste session",
+    "Copy" : "Copiar",
+    "Copied!" : "Copiate!",
+    "Press ⌘-C to copy." : "Pulsa ⌘-C pro copiar.",
+    "Press Ctrl-C to copy." : "Pulsa Ctrl-C pro copiar.",
+    "Delete" : "Deler",
+    "Local" : "Local",
+    "Only visible to local users" : "Solmente visibile a usatores local",
+    "Only visible to you" : "Solmente visibile a tu",
+    "Contacts" : "Contactos",
+    "Groups" : "Gruppos",
+    "undo" : "disfacer",
+    "never" : "nunquam",
+    "Personal info" : "Information personal",
+    "Sessions" : "Sessiones",
+    "App passwords" : "Contrasignos de applicationes",
+    "Email server" : "Servitor de e-posta",
+    "Encryption" : "Cryptographia",
+    "Version" : "Version",
+    "days" : "dies",
+    "Tips & tricks" : "Consilios e maneos",
+    "Theming" : "Themas",
+    "Documentation:" : "Documentation:",
+    "User documentation" : "Documentation de usator",
+    "Admin documentation" : "Documentation de administrator",
+    "Visit website" : "Visitar sito web",
+    "Report a bug" : "Reportar un defecto",
+    "Show description …" : "Monstrar description...",
+    "Hide description …" : "Celar description...",
+    "Common Name" : "Nomine Commun",
+    "Valid until" : "Valide usque",
+    "Valid until %s" : "Valide usque %s",
+    "Import root certificate" : "Importar certificato root",
+    "Administrator documentation" : "Documentation de administrator",
+    "Online documentation" : "Documentation in linea",
+    "Forum" : "Foro",
+    "Commercial support" : "Supporto commercial",
+    "Upload new" : "Incargar nove",
+    "Remove image" : "Remover imagine",
+    "Cancel" : "Cancellar",
+    "Address" : "Adresse",
+    "Your postal address" : "Tu adresse postal",
+    "Website" : "Sito web",
+    "Your website" : "Tu sito web",
+    "Twitter" : "Twitter",
+    "You are member of the following groups:" : "Tu es membro del sequente gruppos:",
+    "Password" : "Contrasigno",
+    "Current password" : "Contrasigno actual",
+    "New password" : "Nove contrasigno",
+    "Change password" : "Cambiar contrasigno",
+    "Language" : "Lingua",
+    "Help translate" : "Adjuta a traducer",
+    "Device" : "Dispositivo",
+    "Passcodes that give an app or device permissions to access your account." : "Contrasignos que dona a tu application o dispositivo le permissiones pro acceder a tu conto.",
+    "Name" : "Nomine",
+    "App name" : "Nomine del application",
+    "Create new app password" : "Crear un nove contrasigno pro application",
+    "Use the credentials below to configure your app or device." : "Usa le datos de authentication infra pro configurar tu application o dispositivo.",
+    "Username" : "Nomine de usator",
+    "Done" : "Preste",
+    "Follow us on Google Plus!" : "Seque nos in Google Plus!",
+    "E-Mail" : "E-posta",
+    "Create" : "Crear",
+    "Group name" : "Nomine del gruppo",
+    "Everyone" : "Totos",
+    "Admins" : "Administratores",
+    "Default quota" : "Quota predefinite",
+    "Other" : "Altere",
+    "Quota" : "Quota",
+    "Please wait...." : "Per favor attende...",
+    "iPhone" : "iPhone",
+    "add group" : "adder gruppo",
+    "Log" : "Registro",
+    "What to log" : "Que registrar?",
+    "Download logfile" : "Discargar file de registro",
+    "More" : "Plus",
+    "Less" : "Minus",
+    "Add Group" : "Adder Gruppo",
+    "Group" : "Gruppo"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ia.json b/settings/l10n/ia.json
index b0e661c1ef6b9159d209c6da042d4a6bad46e914..7643ea248228ab86fba66f8b67169ca830ed60a1 100644
--- a/settings/l10n/ia.json
+++ b/settings/l10n/ia.json
@@ -24,6 +24,108 @@
     "Settings saved" : "Configurationes salveguardate",
     "Unable to change full name" : "Impossibile cambiar nomine complete",
     "Unable to change email address" : "Impossibile cambiar adresse de e-posta",
-    "Forbidden" : "Prohibite"
+    "Your full name has been changed." : "Tu nomine complete esseva cambiate.",
+    "Forbidden" : "Prohibite",
+    "Invalid user" : "Usator invalide",
+    "Unable to change mail address" : "Impossibile cambiar adresse de e-posta",
+    "Password confirmation is required" : "Un confirmation del contrasigno es necessari",
+    "Couldn't remove app." : "Impossibile remover application.",
+    "Couldn't update app." : "Impossibile actualisar application.",
+    "Official" : "Official",
+    "All" : "Tote",
+    "Update to %s" : "Actualisar a %s",
+    "Disable" : "Disactivar",
+    "Enable" : "Activar",
+    "Updating...." : "Actualisante...",
+    "Uninstall" : "De-installar",
+    "Experimental" : "Experimental",
+    "Disconnect" : "Disconnecter",
+    "Internet Explorer" : "Internet Explorer",
+    "Edge" : "Edge",
+    "Firefox" : "Firefox",
+    "Google Chrome" : "Google Chrome",
+    "Safari" : "Safari",
+    "Google Chrome for Android" : "Google Chrome pro Android",
+    "iPhone iOS" : "iPhone iOS",
+    "iPad iOS" : "iPad iOS",
+    "This session" : "Iste session",
+    "Copy" : "Copiar",
+    "Copied!" : "Copiate!",
+    "Press ⌘-C to copy." : "Pulsa ⌘-C pro copiar.",
+    "Press Ctrl-C to copy." : "Pulsa Ctrl-C pro copiar.",
+    "Delete" : "Deler",
+    "Local" : "Local",
+    "Only visible to local users" : "Solmente visibile a usatores local",
+    "Only visible to you" : "Solmente visibile a tu",
+    "Contacts" : "Contactos",
+    "Groups" : "Gruppos",
+    "undo" : "disfacer",
+    "never" : "nunquam",
+    "Personal info" : "Information personal",
+    "Sessions" : "Sessiones",
+    "App passwords" : "Contrasignos de applicationes",
+    "Email server" : "Servitor de e-posta",
+    "Encryption" : "Cryptographia",
+    "Version" : "Version",
+    "days" : "dies",
+    "Tips & tricks" : "Consilios e maneos",
+    "Theming" : "Themas",
+    "Documentation:" : "Documentation:",
+    "User documentation" : "Documentation de usator",
+    "Admin documentation" : "Documentation de administrator",
+    "Visit website" : "Visitar sito web",
+    "Report a bug" : "Reportar un defecto",
+    "Show description …" : "Monstrar description...",
+    "Hide description …" : "Celar description...",
+    "Common Name" : "Nomine Commun",
+    "Valid until" : "Valide usque",
+    "Valid until %s" : "Valide usque %s",
+    "Import root certificate" : "Importar certificato root",
+    "Administrator documentation" : "Documentation de administrator",
+    "Online documentation" : "Documentation in linea",
+    "Forum" : "Foro",
+    "Commercial support" : "Supporto commercial",
+    "Upload new" : "Incargar nove",
+    "Remove image" : "Remover imagine",
+    "Cancel" : "Cancellar",
+    "Address" : "Adresse",
+    "Your postal address" : "Tu adresse postal",
+    "Website" : "Sito web",
+    "Your website" : "Tu sito web",
+    "Twitter" : "Twitter",
+    "You are member of the following groups:" : "Tu es membro del sequente gruppos:",
+    "Password" : "Contrasigno",
+    "Current password" : "Contrasigno actual",
+    "New password" : "Nove contrasigno",
+    "Change password" : "Cambiar contrasigno",
+    "Language" : "Lingua",
+    "Help translate" : "Adjuta a traducer",
+    "Device" : "Dispositivo",
+    "Passcodes that give an app or device permissions to access your account." : "Contrasignos que dona a tu application o dispositivo le permissiones pro acceder a tu conto.",
+    "Name" : "Nomine",
+    "App name" : "Nomine del application",
+    "Create new app password" : "Crear un nove contrasigno pro application",
+    "Use the credentials below to configure your app or device." : "Usa le datos de authentication infra pro configurar tu application o dispositivo.",
+    "Username" : "Nomine de usator",
+    "Done" : "Preste",
+    "Follow us on Google Plus!" : "Seque nos in Google Plus!",
+    "E-Mail" : "E-posta",
+    "Create" : "Crear",
+    "Group name" : "Nomine del gruppo",
+    "Everyone" : "Totos",
+    "Admins" : "Administratores",
+    "Default quota" : "Quota predefinite",
+    "Other" : "Altere",
+    "Quota" : "Quota",
+    "Please wait...." : "Per favor attende...",
+    "iPhone" : "iPhone",
+    "add group" : "adder gruppo",
+    "Log" : "Registro",
+    "What to log" : "Que registrar?",
+    "Download logfile" : "Discargar file de registro",
+    "More" : "Plus",
+    "Less" : "Minus",
+    "Add Group" : "Adder Gruppo",
+    "Group" : "Gruppo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file