Merge branch 'master' into implement_712

6 files changed, 18 insertions, 2 deletions

diff --git a/apps/federatedfilesharing/l10n/cs_CZ.js b/apps/federatedfilesharing/l10n/cs_CZ.js
index 0a6ba02eeac..c51add4747e 100644
--- a/apps/federatedfilesharing/l10n/cs_CZ.js
+++ b/apps/federatedfilesharing/l10n/cs_CZ.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Heslo vzdáleného sdílení",
     "Cancel" : "Zrušit",
     "Add remote share" : "Přidat propojené sdílení",
+    "Copied!" : "Zkopírováno!",
+    "Not supported!" : "Nepodporováno!",
+    "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.",
+    "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.",
     "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID",
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
     "Couldn't establish a federated share." : "Nepodařilo se ustavit spojené sdílení.",
diff --git a/apps/federatedfilesharing/l10n/cs_CZ.json b/apps/federatedfilesharing/l10n/cs_CZ.json
index 26c8dd38be7..1c079650d46 100644
--- a/apps/federatedfilesharing/l10n/cs_CZ.json
+++ b/apps/federatedfilesharing/l10n/cs_CZ.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Heslo vzdáleného sdílení",
     "Cancel" : "Zrušit",
     "Add remote share" : "Přidat propojené sdílení",
+    "Copied!" : "Zkopírováno!",
+    "Not supported!" : "Nepodporováno!",
+    "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.",
+    "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.",
     "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID",
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
     "Couldn't establish a federated share." : "Nepodařilo se ustavit spojené sdílení.",
diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js
index 019f23253e6..24244aa931e 100644
--- a/apps/federatedfilesharing/l10n/de_DE.js
+++ b/apps/federatedfilesharing/l10n/de_DE.js
@@ -15,7 +15,7 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sier erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json
index 263bc6865e3..66cb25b49fe 100644
--- a/apps/federatedfilesharing/l10n/de_DE.json
+++ b/apps/federatedfilesharing/l10n/de_DE.json
@@ -13,7 +13,7 @@
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sier erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
diff --git a/apps/federatedfilesharing/l10n/is.js b/apps/federatedfilesharing/l10n/is.js
index c2140787537..7015934fd1c 100644
--- a/apps/federatedfilesharing/l10n/is.js
+++ b/apps/federatedfilesharing/l10n/is.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Lykilorð fjartengdrar sameignar",
     "Cancel" : "Hætta við",
     "Add remote share" : "Bæta við fjartengdri sameign",
+    "Copied!" : "Afritað!",
+    "Not supported!" : "Ekki stutt!",
+    "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.",
+    "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.",
     "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)",
     "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
     "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.",
diff --git a/apps/federatedfilesharing/l10n/is.json b/apps/federatedfilesharing/l10n/is.json
index bd5af8d4622..1d62a8fd345 100644
--- a/apps/federatedfilesharing/l10n/is.json
+++ b/apps/federatedfilesharing/l10n/is.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Lykilorð fjartengdrar sameignar",
     "Cancel" : "Hætta við",
     "Add remote share" : "Bæta við fjartengdri sameign",
+    "Copied!" : "Afritað!",
+    "Not supported!" : "Ekki stutt!",
+    "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.",
+    "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.",
     "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)",
     "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
     "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.",