diff --git a/apps/federation/l10n/de.js b/apps/federation/l10n/de.js
index 2b476b94c9..1a2511578e 100644
--- a/apps/federation/l10n/de.js
+++ b/apps/federation/l10n/de.js
@@ -8,7 +8,7 @@ OC.L10N.register(
     "Federation" : "Federation",
     "Trusted servers" : "Vertrauenswürdige Server",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Dir, Dich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.",
-    "Add server automatically once a federated share was created successfully" : "Einen mit ownCloud Federation verbundenen Server automatisch hinzufügen, sobald die Verbindung einmal erfolgreich erstellt wurde",
+    "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde",
     "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen",
     "Trusted server" : "Vertrauenswürdiger Server",
     "Add" : "Hinzufügen"
diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json
index 2c37fc10fa..fe99a8dfec 100644
--- a/apps/federation/l10n/de.json
+++ b/apps/federation/l10n/de.json
@@ -6,7 +6,7 @@
     "Federation" : "Federation",
     "Trusted servers" : "Vertrauenswürdige Server",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Dir, Dich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.",
-    "Add server automatically once a federated share was created successfully" : "Einen mit ownCloud Federation verbundenen Server automatisch hinzufügen, sobald die Verbindung einmal erfolgreich erstellt wurde",
+    "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde",
     "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen",
     "Trusted server" : "Vertrauenswürdiger Server",
     "Add" : "Hinzufügen"
diff --git a/apps/federation/l10n/de_DE.js b/apps/federation/l10n/de_DE.js
index 1a8bef05ae..c55829d1e6 100644
--- a/apps/federation/l10n/de_DE.js
+++ b/apps/federation/l10n/de_DE.js
@@ -8,7 +8,7 @@ OC.L10N.register(
     "Federation" : "Federation",
     "Trusted servers" : "Vertrauenswürdige Server",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Ihnen, sich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.",
-    "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobald eine federated Freigabe erstellt wurde",
+    "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde",
     "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen",
     "Trusted server" : "Vertrauenswürdiger Server",
     "Add" : "Hinzufügen"
diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json
index c9b54c5f89..2e82f93b65 100644
--- a/apps/federation/l10n/de_DE.json
+++ b/apps/federation/l10n/de_DE.json
@@ -6,7 +6,7 @@
     "Federation" : "Federation",
     "Trusted servers" : "Vertrauenswürdige Server",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Ihnen, sich mit anderen vertrauenswürdigen Servern zu verbinden, um das Benutzerverzeichnis auszutauschen. Dies wird zum Beispiel für die automatische Vervollständigung externer Benutzernamen beim Federated-Sharing verwendet.",
-    "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobald eine federated Freigabe erstellt wurde",
+    "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen, sobald eine Federation-Freigabe erfolgreich erstellt wurde",
     "+ Add trusted server" : "+ Vertrauenswürdigen Server hinzufügen",
     "Trusted server" : "Vertrauenswürdiger Server",
     "Add" : "Hinzufügen"
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index e9dcfe2907..3ee5022819 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -102,6 +102,7 @@ OC.L10N.register(
     "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>",
     "A new file or folder has been <strong>created</strong>" : "Fitxategi edo karpeta berri bat <strong>sortu da</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>",
+    "Unlimited" : "Mugarik gabe",
     "Upload (max. %s)" : "Igo (max. %s)",
     "File handling" : "Fitxategien kudeaketa",
     "Maximum upload size" : "Igo daitekeen gehienezko tamaina",
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index f95d391dad..9bc05236e1 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -100,6 +100,7 @@
     "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>",
     "A new file or folder has been <strong>created</strong>" : "Fitxategi edo karpeta berri bat <strong>sortu da</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>",
+    "Unlimited" : "Mugarik gabe",
     "Upload (max. %s)" : "Igo (max. %s)",
     "File handling" : "Fitxategien kudeaketa",
     "Maximum upload size" : "Igo daitekeen gehienezko tamaina",
diff --git a/apps/updatenotification/l10n/ja.js b/apps/updatenotification/l10n/ja.js
index 289eebe861..90ee9342fa 100644
--- a/apps/updatenotification/l10n/ja.js
+++ b/apps/updatenotification/l10n/ja.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Update to %1$s is available." : "%1$s への更新が利用可能です。",
     "Update for %1$s to version %2$s is available." : "%1$s に対するバージョン %2$s へアップデートが利用可能です。",
     "Update for {app} to version %s is available." : " {app} に対するバージョン %s へアップデートが利用可能です。",
+    "Update notification" : "通知を更新",
     "A new version is available: %s" : "新しいバージョンが利用可能: %s",
     "Open updater" : "アップデーターを開く",
     "Download now" : "今すぐダウンロード",
@@ -17,6 +18,7 @@ OC.L10N.register(
     "Checked on %s" : "%s に確認",
     "Update channel:" : "アップデートチャンネル:",
     "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "開発版の新しいバージョンにアップデートできます。ただし、アップデート後は安定版にダウングレードできません。",
+    "Note that after a new release it can take some time before it shows up here. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found." : "新しいリリースの後、公開されるまでには時間がかかります。\n新しいバージョンを公開して配布しますが、問題が発見されたときにバージョンをスキップすることがあります。",
     "Notify members of the following groups about available updates:" : "次のグループのメンバーに対してアップデートのメッセージが表示されます:",
     "Only notification for app updates are available." : "アプリ更新情報があるときのみ通知する。",
     "The selected update channel makes dedicated notifications for the server obsolete." : "選択した更新チャネルでは、廃止サーバーについて専用の通知を行います。",
diff --git a/apps/updatenotification/l10n/ja.json b/apps/updatenotification/l10n/ja.json
index fcead04da5..c7e5c1bb44 100644
--- a/apps/updatenotification/l10n/ja.json
+++ b/apps/updatenotification/l10n/ja.json
@@ -8,6 +8,7 @@
     "Update to %1$s is available." : "%1$s への更新が利用可能です。",
     "Update for %1$s to version %2$s is available." : "%1$s に対するバージョン %2$s へアップデートが利用可能です。",
     "Update for {app} to version %s is available." : " {app} に対するバージョン %s へアップデートが利用可能です。",
+    "Update notification" : "通知を更新",
     "A new version is available: %s" : "新しいバージョンが利用可能: %s",
     "Open updater" : "アップデーターを開く",
     "Download now" : "今すぐダウンロード",
@@ -15,6 +16,7 @@
     "Checked on %s" : "%s に確認",
     "Update channel:" : "アップデートチャンネル:",
     "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "開発版の新しいバージョンにアップデートできます。ただし、アップデート後は安定版にダウングレードできません。",
+    "Note that after a new release it can take some time before it shows up here. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found." : "新しいリリースの後、公開されるまでには時間がかかります。\n新しいバージョンを公開して配布しますが、問題が発見されたときにバージョンをスキップすることがあります。",
     "Notify members of the following groups about available updates:" : "次のグループのメンバーに対してアップデートのメッセージが表示されます:",
     "Only notification for app updates are available." : "アプリ更新情報があるときのみ通知する。",
     "The selected update channel makes dedicated notifications for the server obsolete." : "選択した更新チャネルでは、廃止サーバーについて専用の通知を行います。",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 008e22b54b..5cb71095a5 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s",
+    "Education Edition" : "Bildungsausgabe",
     "Enterprise bundle" : "Firmen-Paket",
     "Groupware bundle" : "Groupware-Paket",
     "Social sharing bundle" : "Paket für das Teilen in sozialen Medien",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index e40233aa06..cbe4d07ae1 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -10,6 +10,7 @@
     "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s",
+    "Education Edition" : "Bildungsausgabe",
     "Enterprise bundle" : "Firmen-Paket",
     "Groupware bundle" : "Groupware-Paket",
     "Social sharing bundle" : "Paket für das Teilen in sozialen Medien",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 4af618c62b..2e5708c797 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s",
+    "Education Edition" : "Bildungsausgabe",
     "Enterprise bundle" : "Firmen-Paket",
     "Groupware bundle" : "Groupware-Paket",
     "Social sharing bundle" : "Paket für das Teilen in sozialen Medien",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 6e65ac418f..ff3cd62c04 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -10,6 +10,7 @@
     "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s",
+    "Education Edition" : "Bildungsausgabe",
     "Enterprise bundle" : "Firmen-Paket",
     "Groupware bundle" : "Groupware-Paket",
     "Social sharing bundle" : "Paket für das Teilen in sozialen Medien",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 47f7df1155..1f1e14fc86 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "%1$s, %2$s and %3$s" : "%1$s, %2$s et %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s et %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s et %5$s",
+    "Education Edition" : "Édition pour l'éducation ",
     "Enterprise bundle" : "Pack pour entreprise",
     "Groupware bundle" : "Pack pour travail collaboratif",
     "Social sharing bundle" : "Pack pour partage social",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 502ed939f7..9ce75adbe6 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -10,6 +10,7 @@
     "%1$s, %2$s and %3$s" : "%1$s, %2$s et %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s et %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s et %5$s",
+    "Education Edition" : "Édition pour l'éducation ",
     "Enterprise bundle" : "Pack pour entreprise",
     "Groupware bundle" : "Pack pour travail collaboratif",
     "Social sharing bundle" : "Pack pour partage social",
diff --git a/lib/l10n/nb.js b/lib/l10n/nb.js
index ec86a04be4..47a1daa646 100644
--- a/lib/l10n/nb.js
+++ b/lib/l10n/nb.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "%1$s, %2$s and %3$s" : "%1$s, %2$s og %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s og %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s og %5$s",
+    "Education Edition" : "Utdanningsversjon",
     "Enterprise bundle" : "Bedrifts-pakke",
     "Groupware bundle" : "Gruppevare-pakke",
     "Social sharing bundle" : "Sosialdelings-pakke",
diff --git a/lib/l10n/nb.json b/lib/l10n/nb.json
index 06f17fbd8f..3f6be7ddfa 100644
--- a/lib/l10n/nb.json
+++ b/lib/l10n/nb.json
@@ -10,6 +10,7 @@
     "%1$s, %2$s and %3$s" : "%1$s, %2$s og %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s og %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s og %5$s",
+    "Education Edition" : "Utdanningsversjon",
     "Enterprise bundle" : "Bedrifts-pakke",
     "Groupware bundle" : "Gruppevare-pakke",
     "Social sharing bundle" : "Sosialdelings-pakke",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index e98cc71c4f..cbcad02629 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s",
+    "Education Edition" : "Edição Educativa",
     "Enterprise bundle" : "Pacote Enterprise",
     "Groupware bundle" : "Pacote Groupware",
     "Social sharing bundle" : "Pacote de compartilhamento social",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index a7fb31d8f9..d9c52a6f04 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -10,6 +10,7 @@
     "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s",
+    "Education Edition" : "Edição Educativa",
     "Enterprise bundle" : "Pacote Enterprise",
     "Groupware bundle" : "Pacote Groupware",
     "Social sharing bundle" : "Pacote de compartilhamento social",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index 0b1b5a8bff..d4477b8002 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "%1$s, %2$s and %3$s" : "%1$s, %2$s ve %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s ve %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s ve %5$s",
+    "Education Edition" : "Eğitim Sürümü",
     "Enterprise bundle" : "Kurumsal paket",
     "Groupware bundle" : "Grup paketi",
     "Social sharing bundle" : "Sosyal ağ paketi",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 498e75ffb0..cdd37b07a3 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -10,6 +10,7 @@
     "%1$s, %2$s and %3$s" : "%1$s, %2$s ve %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s ve %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s ve %5$s",
+    "Education Edition" : "Eğitim Sürümü",
     "Enterprise bundle" : "Kurumsal paket",
     "Groupware bundle" : "Grup paketi",
     "Social sharing bundle" : "Sosyal ağ paketi",