Merge branch 'master' into implement_712

12 files changed, 66 insertions, 22 deletions

diff --git a/apps/federation/l10n/de.js b/apps/federation/l10n/de.js
index c24fe42d6a4..13496d63987 100644
--- a/apps/federation/l10n/de.js
+++ b/apps/federation/l10n/de.js
@@ -10,6 +10,10 @@ OC.L10N.register(
     "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",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json
index 837e69628f3..db2f303de01 100644
--- a/apps/federation/l10n/de.json
+++ b/apps/federation/l10n/de.json
@@ -8,6 +8,10 @@
     "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",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/de_DE.js b/apps/federation/l10n/de_DE.js
index 42abfa0f1a6..c83bdad5868 100644
--- a/apps/federation/l10n/de_DE.js
+++ b/apps/federation/l10n/de_DE.js
@@ -10,6 +10,10 @@ OC.L10N.register(
     "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json
index 816c75b491d..6ca52a00452 100644
--- a/apps/federation/l10n/de_DE.json
+++ b/apps/federation/l10n/de_DE.json
@@ -8,6 +8,10 @@
     "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/fi_FI.js b/apps/federation/l10n/fi_FI.js
index 3a2d85a51b6..53052a96406 100644
--- a/apps/federation/l10n/fi_FI.js
+++ b/apps/federation/l10n/fi_FI.js
@@ -1,15 +1,17 @@
 OC.L10N.register(
     "federation",
     {
-    "Server added to the list of trusted ownClouds" : "Palvelin lisätty luotettujen ownCloudien luetteloon",
+    "Added to the list of trusted servers" : "Lisätty luotettujen palvelimien luetteloon",
     "Server is already in the list of trusted servers." : "Palvelin on jo luotettujen palvelimien luettelossa.",
-    "No ownCloud server found" : "ownCloud-palvelinta ei löydy",
+    "No server to federate with found" : "Palvelinta johon liittyä ei löytynyt",
     "Could not add server" : "Palvelimen lisääminen ei onnistunut",
     "Federation" : "Federaatio",
-    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.",
+    "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." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjäluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
     "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti",
-    "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet",
-    "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin",
-    "ownCloud Server" : "ownCloud-palvelin"
+    "Trusted Servers" : "Luotetut palvelimet",
+    "+ Add Nextcloud server" : "+ Lisää Nextcloud-palvelin",
+    "Nextcloud Server" : "Nextcloud-palvelin",
+    "Server added to the list of trusted Nextclouds" : "Palvelin lisätty luotettujen palvelimien luetteloon",
+    "No Nextcloud server found" : "Nextcloud-palvelinta ei löytynyt"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/fi_FI.json b/apps/federation/l10n/fi_FI.json
index 8060a437617..4cc9068a74e 100644
--- a/apps/federation/l10n/fi_FI.json
+++ b/apps/federation/l10n/fi_FI.json
@@ -1,13 +1,15 @@
 { "translations": {
-    "Server added to the list of trusted ownClouds" : "Palvelin lisätty luotettujen ownCloudien luetteloon",
+    "Added to the list of trusted servers" : "Lisätty luotettujen palvelimien luetteloon",
     "Server is already in the list of trusted servers." : "Palvelin on jo luotettujen palvelimien luettelossa.",
-    "No ownCloud server found" : "ownCloud-palvelinta ei löydy",
+    "No server to federate with found" : "Palvelinta johon liittyä ei löytynyt",
     "Could not add server" : "Palvelimen lisääminen ei onnistunut",
     "Federation" : "Federaatio",
-    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.",
+    "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." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjäluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
     "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti",
-    "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet",
-    "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin",
-    "ownCloud Server" : "ownCloud-palvelin"
+    "Trusted Servers" : "Luotetut palvelimet",
+    "+ Add Nextcloud server" : "+ Lisää Nextcloud-palvelin",
+    "Nextcloud Server" : "Nextcloud-palvelin",
+    "Server added to the list of trusted Nextclouds" : "Palvelin lisätty luotettujen palvelimien luetteloon",
+    "No Nextcloud server found" : "Nextcloud-palvelinta ei löytynyt"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/id.js b/apps/federation/l10n/id.js
index c4725768abe..801cd52ae12 100644
--- a/apps/federation/l10n/id.js
+++ b/apps/federation/l10n/id.js
@@ -3,12 +3,17 @@ OC.L10N.register(
     {
     "Added to the list of trusted servers" : "Server telah ditambahkan pada daftar server terpercaya",
     "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya",
+    "No server to federate with found" : "Tidak ada server yang bisa difederasikan",
     "Could not add server" : "Tidak dapat menambahkan server",
     "Federation" : "Federasi",
     "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." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
     "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat",
     "Trusted Servers" : "Server Terpercaya",
     "+ Add Nextcloud server" : "+ Tambahkan server Nextcloud",
-    "Nextcloud Server" : "Server Nextcloud"
+    "Nextcloud Server" : "Server Nextcloud",
+    "Server added to the list of trusted Nextclouds" : "Server telah ditambahkan pada daftar server Nextcloud terpercaya",
+    "No Nextcloud server found" : "Tidak ada server Nextcloud ditemukan",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi Nextcloud memungkinkan Anda untuk terhubung dengan server Nextcloud lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
+    "Trusted Nextcloud Servers" : "Server Nextcloud Terpercaya"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/federation/l10n/id.json b/apps/federation/l10n/id.json
index 7d8a0c37a95..2ca5efeaf2a 100644
--- a/apps/federation/l10n/id.json
+++ b/apps/federation/l10n/id.json
@@ -1,12 +1,17 @@
 { "translations": {
     "Added to the list of trusted servers" : "Server telah ditambahkan pada daftar server terpercaya",
     "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya",
+    "No server to federate with found" : "Tidak ada server yang bisa difederasikan",
     "Could not add server" : "Tidak dapat menambahkan server",
     "Federation" : "Federasi",
     "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." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
     "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat",
     "Trusted Servers" : "Server Terpercaya",
     "+ Add Nextcloud server" : "+ Tambahkan server Nextcloud",
-    "Nextcloud Server" : "Server Nextcloud"
+    "Nextcloud Server" : "Server Nextcloud",
+    "Server added to the list of trusted Nextclouds" : "Server telah ditambahkan pada daftar server Nextcloud terpercaya",
+    "No Nextcloud server found" : "Tidak ada server Nextcloud ditemukan",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi Nextcloud memungkinkan Anda untuk terhubung dengan server Nextcloud lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
+    "Trusted Nextcloud Servers" : "Server Nextcloud Terpercaya"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/is.js b/apps/federation/l10n/is.js
index 88c83aad4a0..77695a4a42d 100644
--- a/apps/federation/l10n/is.js
+++ b/apps/federation/l10n/is.js
@@ -3,12 +3,17 @@ OC.L10N.register(
     {
     "Added to the list of trusted servers" : "Bætt á lista yfir treysta þjóna",
     "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.",
+    "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst",
     "Could not add server" : "Gat ekki bætt við þjóni",
     "Federation" : "Samband",
     "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." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
     "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign",
     "Trusted Servers" : "Treystir þjónar",
     "+ Add Nextcloud server" : "+ Bæta við Nextcloud þjóni",
-    "Nextcloud Server" : "Nextcloud þjónn"
+    "Nextcloud Server" : "Nextcloud þjónn",
+    "Server added to the list of trusted Nextclouds" : "Þjóninum bætt við listann yfir treyst Nextcloud-ský",
+    "No Nextcloud server found" : "Enginn Nextcloud-þjónn fannst",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
+    "Trusted Nextcloud Servers" : "Treystir Nextcloud-þjónar"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/federation/l10n/is.json b/apps/federation/l10n/is.json
index 5277841fe04..49980207ce3 100644
--- a/apps/federation/l10n/is.json
+++ b/apps/federation/l10n/is.json
@@ -1,12 +1,17 @@
 { "translations": {
     "Added to the list of trusted servers" : "Bætt á lista yfir treysta þjóna",
     "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.",
+    "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst",
     "Could not add server" : "Gat ekki bætt við þjóni",
     "Federation" : "Samband",
     "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." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
     "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign",
     "Trusted Servers" : "Treystir þjónar",
     "+ Add Nextcloud server" : "+ Bæta við Nextcloud þjóni",
-    "Nextcloud Server" : "Nextcloud þjónn"
+    "Nextcloud Server" : "Nextcloud þjónn",
+    "Server added to the list of trusted Nextclouds" : "Þjóninum bætt við listann yfir treyst Nextcloud-ský",
+    "No Nextcloud server found" : "Enginn Nextcloud-þjónn fannst",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
+    "Trusted Nextcloud Servers" : "Treystir Nextcloud-þjónar"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/pt_BR.js b/apps/federation/l10n/pt_BR.js
index 210cf76baeb..c13e2b79d5a 100644
--- a/apps/federation/l10n/pt_BR.js
+++ b/apps/federation/l10n/pt_BR.js
@@ -10,6 +10,8 @@ OC.L10N.register(
     "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito",
     "Trusted Servers" : "Servidores confiáveis",
     "+ Add Nextcloud server" : "+ Adicionar servidor Nextcloud",
-    "Nextcloud Server" : "Servidor Nextcloud"
+    "Nextcloud Server" : "Servidor Nextcloud",
+    "No Nextcloud server found" : "Servidor Nextcloud não encontrado",
+    "Trusted Nextcloud Servers" : "Servidores Nextcloud confiáveis"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json
index d0defc984f4..17369337cc7 100644
--- a/apps/federation/l10n/pt_BR.json
+++ b/apps/federation/l10n/pt_BR.json
@@ -8,6 +8,8 @@
     "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito",
     "Trusted Servers" : "Servidores confiáveis",
     "+ Add Nextcloud server" : "+ Adicionar servidor Nextcloud",
-    "Nextcloud Server" : "Servidor Nextcloud"
+    "Nextcloud Server" : "Servidor Nextcloud",
+    "No Nextcloud server found" : "Servidor Nextcloud não encontrado",
+    "Trusted Nextcloud Servers" : "Servidores Nextcloud confiáveis"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file