Merge branch 'master' into implement_712

14 files changed, 90 insertions, 8 deletions

diff --git a/apps/federatedfilesharing/l10n/de.js b/apps/federatedfilesharing/l10n/de.js
index 67870087289..9c6b86d8b02 100644
--- a/apps/federatedfilesharing/l10n/de.js
+++ b/apps/federatedfilesharing/l10n/de.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Passwort für die entfernte Freigabe",
     "Cancel" : "Abbrechen",
     "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Copied!" : "Kopiert!",
+    "Not supported!" : "Nicht unterstützt!",
+    "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.",
+    "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.",
     "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID",
     "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",
@@ -18,10 +22,10 @@ OC.L10N.register(
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
-    "Couldn't add remote share" : "Remotefreigabe kann nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",
-    "File is already shared with %s" : "Datei wird bereits geteilt mit %s",
+    "File is already shared with %s" : "Datei wird bereits mit %s geteilt",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
     "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"/%3$s\" als Remotefreigabe von %1$s (als Teil von %2$s) erhalten",
diff --git a/apps/federatedfilesharing/l10n/de.json b/apps/federatedfilesharing/l10n/de.json
index e1ec0c70c2b..b3cd09aeb4d 100644
--- a/apps/federatedfilesharing/l10n/de.json
+++ b/apps/federatedfilesharing/l10n/de.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Passwort für die entfernte Freigabe",
     "Cancel" : "Abbrechen",
     "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Copied!" : "Kopiert!",
+    "Not supported!" : "Nicht unterstützt!",
+    "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.",
+    "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.",
     "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID",
     "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",
@@ -16,10 +20,10 @@
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
-    "Couldn't add remote share" : "Remotefreigabe kann nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",
-    "File is already shared with %s" : "Datei wird bereits geteilt mit %s",
+    "File is already shared with %s" : "Datei wird bereits mit %s geteilt",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.",
     "Could not find share" : "Freigabe konnte nicht gefunden werden",
     "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"/%3$s\" als Remotefreigabe von %1$s (als Teil von %2$s) erhalten",
diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js
index 4d26d7215ba..019f23253e6 100644
--- a/apps/federatedfilesharing/l10n/de_DE.js
+++ b/apps/federatedfilesharing/l10n/de_DE.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Passwort für die entfernte Freigabe",
     "Cancel" : "Abbrechen",
     "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Copied!" : "Kopiert!",
+    "Not supported!" : "Nicht unterstützt!",
+    "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.",
+    "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.",
     "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID",
     "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",
@@ -18,7 +22,7 @@ OC.L10N.register(
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
-    "Couldn't add remote share" : "Remotefreigabe kann nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",
     "File is already shared with %s" : "Datei wird bereits geteilt mit %s",
diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json
index 7b8fd1fcd28..263bc6865e3 100644
--- a/apps/federatedfilesharing/l10n/de_DE.json
+++ b/apps/federatedfilesharing/l10n/de_DE.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Passwort für die entfernte Freigabe",
     "Cancel" : "Abbrechen",
     "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "Copied!" : "Kopiert!",
+    "Not supported!" : "Nicht unterstützt!",
+    "Press ⌘-C to copy." : "⌘-C zum Kopieren drücken.",
+    "Press Ctrl-C to copy." : "Ctrl-C zum Kopieren drücken.",
     "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID",
     "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",
@@ -16,7 +20,7 @@
     "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
     "Storage not valid" : "Speicher ungültig",
     "Federated Share successfully added" : "Federated-Share erfolgreich hinzugefügt",
-    "Couldn't add remote share" : "Remotefreigabe kann nicht hinzu gefügt werden",
+    "Couldn't add remote share" : "Remotefreigabe konnte nicht hinzu gefügt werden",
     "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
     "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt",
     "File is already shared with %s" : "Datei wird bereits geteilt mit %s",
diff --git a/apps/federatedfilesharing/l10n/is.js b/apps/federatedfilesharing/l10n/is.js
index 58bfa4e8f41..c2140787537 100644
--- a/apps/federatedfilesharing/l10n/is.js
+++ b/apps/federatedfilesharing/l10n/is.js
@@ -1,12 +1,29 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Federated sharing" : "Deiling milli þjóna",
+    "Federated sharing" : "Deiling milli þjóna (skýjasambandssameign)",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?",
+    "Remote share" : "Fjartengd sameign",
+    "Remote share password" : "Lykilorð fjartengdrar sameignar",
+    "Cancel" : "Hætta við",
+    "Add remote share" : "Bæta við fjartengdri sameign",
     "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.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Gat ekki bætt við skýjasambandssameign, hugsanlega var lykilorðið ekki rétt.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Beiðni um skýjasambandssameign tókst, þú munt fá boðskort. Athugaður skilaboð til þín.",
+    "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.",
+    "Not allowed to create a federated share with the owner." : "Ekki er heimilt að búa til skýjasambandssameign með eigandanum.",
+    "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki",
+    "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt",
+    "Storage not valid" : "Geymslan er ekki gild",
+    "Federated Share successfully added" : "Tókst að bæta við skýjasambandssameign",
+    "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign",
     "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s",
     "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda",
     "File is already shared with %s" : "Skránni er þegar deilt með %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deiling %s mistókst, gat ekki fundið %s, hugsanlega er þjónninn ekki tiltækur í augnablikinu.",
+    "Could not find share" : "Gat ekki fundið sameign",
     "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s (fyrir hönd %2$s)",
     "You received \"/%3$s\" as a remote share from %1$s" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s",
     "Accept" : "Samþykkja",
diff --git a/apps/federatedfilesharing/l10n/is.json b/apps/federatedfilesharing/l10n/is.json
index dabc08d6005..bd5af8d4622 100644
--- a/apps/federatedfilesharing/l10n/is.json
+++ b/apps/federatedfilesharing/l10n/is.json
@@ -1,10 +1,27 @@
 { "translations": {
-    "Federated sharing" : "Deiling milli þjóna",
+    "Federated sharing" : "Deiling milli þjóna (skýjasambandssameign)",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?",
+    "Remote share" : "Fjartengd sameign",
+    "Remote share password" : "Lykilorð fjartengdrar sameignar",
+    "Cancel" : "Hætta við",
+    "Add remote share" : "Bæta við fjartengdri sameign",
     "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.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Gat ekki bætt við skýjasambandssameign, hugsanlega var lykilorðið ekki rétt.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Beiðni um skýjasambandssameign tókst, þú munt fá boðskort. Athugaður skilaboð til þín.",
+    "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.",
+    "Not allowed to create a federated share with the owner." : "Ekki er heimilt að búa til skýjasambandssameign með eigandanum.",
+    "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki",
+    "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt",
+    "Storage not valid" : "Geymslan er ekki gild",
+    "Federated Share successfully added" : "Tókst að bæta við skýjasambandssameign",
+    "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign",
     "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s",
     "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda",
     "File is already shared with %s" : "Skránni er þegar deilt með %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deiling %s mistókst, gat ekki fundið %s, hugsanlega er þjónninn ekki tiltækur í augnablikinu.",
+    "Could not find share" : "Gat ekki fundið sameign",
     "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s (fyrir hönd %2$s)",
     "You received \"/%3$s\" as a remote share from %1$s" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s",
     "Accept" : "Samþykkja",
diff --git a/apps/federatedfilesharing/l10n/it.js b/apps/federatedfilesharing/l10n/it.js
index fa6c9b9ee4c..9873a708c05 100644
--- a/apps/federatedfilesharing/l10n/it.js
+++ b/apps/federatedfilesharing/l10n/it.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Password della condivisione remota",
     "Cancel" : "Annulla",
     "Add remote share" : "Aggiungi condivisione remota",
+    "Copied!" : "Copiato!",
+    "Not supported!" : "Non supportato!",
+    "Press ⌘-C to copy." : "Premi ⌘-C per copiare.",
+    "Press Ctrl-C to copy." : "Premi Ctrl-C per copiare.",
     "Invalid Federated Cloud ID" : "ID di cloud federata non valido",
     "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
     "Couldn't establish a federated share." : "Impossibile stabilire una condivisione federata",
diff --git a/apps/federatedfilesharing/l10n/it.json b/apps/federatedfilesharing/l10n/it.json
index 4a0348cc474..dcc83a1fc19 100644
--- a/apps/federatedfilesharing/l10n/it.json
+++ b/apps/federatedfilesharing/l10n/it.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Password della condivisione remota",
     "Cancel" : "Annulla",
     "Add remote share" : "Aggiungi condivisione remota",
+    "Copied!" : "Copiato!",
+    "Not supported!" : "Non supportato!",
+    "Press ⌘-C to copy." : "Premi ⌘-C per copiare.",
+    "Press Ctrl-C to copy." : "Premi Ctrl-C per copiare.",
     "Invalid Federated Cloud ID" : "ID di cloud federata non valido",
     "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
     "Couldn't establish a federated share." : "Impossibile stabilire una condivisione federata",
diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js
index 9c32f1a4d32..09093f2c5a2 100644
--- a/apps/federatedfilesharing/l10n/nl.js
+++ b/apps/federatedfilesharing/l10n/nl.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Wachtwoord externe share",
     "Cancel" : "Annuleren",
     "Add remote share" : "Toevoegen externe share",
+    "Copied!" : "Gekopieerd!",
+    "Not supported!" : "Niet ondersteund!",
+    "Press ⌘-C to copy." : "Druk op ⌘-C om te kopiëren.",
+    "Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.",
     "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID",
     "Server to server sharing is not enabled on this server" : "Server met server delen is op deze server niet geactiveerd",
     "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen",
diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json
index 9b18287db44..99005581fcd 100644
--- a/apps/federatedfilesharing/l10n/nl.json
+++ b/apps/federatedfilesharing/l10n/nl.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Wachtwoord externe share",
     "Cancel" : "Annuleren",
     "Add remote share" : "Toevoegen externe share",
+    "Copied!" : "Gekopieerd!",
+    "Not supported!" : "Niet ondersteund!",
+    "Press ⌘-C to copy." : "Druk op ⌘-C om te kopiëren.",
+    "Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.",
     "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID",
     "Server to server sharing is not enabled on this server" : "Server met server delen is op deze server niet geactiveerd",
     "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen",
diff --git a/apps/federatedfilesharing/l10n/pt_BR.js b/apps/federatedfilesharing/l10n/pt_BR.js
index ee19fa11d13..dc3b5cb464b 100644
--- a/apps/federatedfilesharing/l10n/pt_BR.js
+++ b/apps/federatedfilesharing/l10n/pt_BR.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Senha do compartilhamento remoto",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar compartilhamento remoto",
+    "Copied!" : "Copiado!",
+    "Not supported!" : "Não suportado!",
+    "Press ⌘-C to copy." : "Pressione ⌘-C para copiar.",
+    "Press Ctrl-C to copy." : "Pressione Ctrl-C para copiar.",
     "Invalid Federated Cloud ID" : "Inválida Associação de Nuvem ID",
     "Server to server sharing is not enabled on this server" : "Servidor para compartilhamento de servidor não está ativo neste servidor",
     "Couldn't establish a federated share." : "Não foi possível estabelecer um compartilhamento federado.",
diff --git a/apps/federatedfilesharing/l10n/pt_BR.json b/apps/federatedfilesharing/l10n/pt_BR.json
index 1fffd8a11f2..d727e7c3424 100644
--- a/apps/federatedfilesharing/l10n/pt_BR.json
+++ b/apps/federatedfilesharing/l10n/pt_BR.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Senha do compartilhamento remoto",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar compartilhamento remoto",
+    "Copied!" : "Copiado!",
+    "Not supported!" : "Não suportado!",
+    "Press ⌘-C to copy." : "Pressione ⌘-C para copiar.",
+    "Press Ctrl-C to copy." : "Pressione Ctrl-C para copiar.",
     "Invalid Federated Cloud ID" : "Inválida Associação de Nuvem ID",
     "Server to server sharing is not enabled on this server" : "Servidor para compartilhamento de servidor não está ativo neste servidor",
     "Couldn't establish a federated share." : "Não foi possível estabelecer um compartilhamento federado.",
diff --git a/apps/federatedfilesharing/l10n/ru.js b/apps/federatedfilesharing/l10n/ru.js
index a0ab14e1e71..6f7ddb0a4ed 100644
--- a/apps/federatedfilesharing/l10n/ru.js
+++ b/apps/federatedfilesharing/l10n/ru.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Пароль для удаленного общего ресурса",
     "Cancel" : "Отмена",
     "Add remote share" : "Добавить удалённый общий ресурс",
+    "Copied!" : "Скопировано!",
+    "Not supported!" : "Не поддерживается!",
+    "Press ⌘-C to copy." : "Нажмите ⌘-C для копирования.",
+    "Press Ctrl-C to copy." : "Нажмите Ctrl-C для копирования.",
     "Invalid Federated Cloud ID" : "Неверный ID в объединении облачных хранилищ.",
     "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
     "Couldn't establish a federated share." : "Не удаётся установить распределённый общий ресурс.",
diff --git a/apps/federatedfilesharing/l10n/ru.json b/apps/federatedfilesharing/l10n/ru.json
index a7ba23145bb..905598932c6 100644
--- a/apps/federatedfilesharing/l10n/ru.json
+++ b/apps/federatedfilesharing/l10n/ru.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Пароль для удаленного общего ресурса",
     "Cancel" : "Отмена",
     "Add remote share" : "Добавить удалённый общий ресурс",
+    "Copied!" : "Скопировано!",
+    "Not supported!" : "Не поддерживается!",
+    "Press ⌘-C to copy." : "Нажмите ⌘-C для копирования.",
+    "Press Ctrl-C to copy." : "Нажмите Ctrl-C для копирования.",
     "Invalid Federated Cloud ID" : "Неверный ID в объединении облачных хранилищ.",
     "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общего доступа",
     "Couldn't establish a federated share." : "Не удаётся установить распределённый общий ресурс.",