Merge branch 'master' of https://github.com/owncloud/core into downstream-160614

4 files changed, 10 insertions, 4 deletions

diff --git a/apps/federatedfilesharing/l10n/ar.js b/apps/federatedfilesharing/l10n/ar.js
index 451663a7b6b..799c279a416 100644
--- a/apps/federatedfilesharing/l10n/ar.js
+++ b/apps/federatedfilesharing/l10n/ar.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
+    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح",
+    "Accept" : "قبول"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/federatedfilesharing/l10n/ar.json b/apps/federatedfilesharing/l10n/ar.json
index 630ab95f64b..2b2cb7401b1 100644
--- a/apps/federatedfilesharing/l10n/ar.json
+++ b/apps/federatedfilesharing/l10n/ar.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
+    "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح",
+    "Accept" : "قبول"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/apps/federatedfilesharing/l10n/oc.js b/apps/federatedfilesharing/l10n/oc.js
index d491a9eb1b7..fa9cb75d400 100644
--- a/apps/federatedfilesharing/l10n/oc.js
+++ b/apps/federatedfilesharing/l10n/oc.js
@@ -1,8 +1,10 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
+    "Federated sharing" : "Federated sharing",
     "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
     "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "File is already shared with %s" : "Lo fichièr es ja partejat amb %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
     "Accept" : "Acceptar",
     "Decline" : "Refusar",
@@ -17,6 +19,6 @@ OC.L10N.register(
     "Share it:" : "Partejar :",
     "Add to your website" : "Apondre a vòstre site web",
     "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
-    "HTML Code:" : "Còde HTML :"
+    "HTML Code:" : "Còdi HTML :"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/federatedfilesharing/l10n/oc.json b/apps/federatedfilesharing/l10n/oc.json
index 8047f9fc5bc..452df9dfbc5 100644
--- a/apps/federatedfilesharing/l10n/oc.json
+++ b/apps/federatedfilesharing/l10n/oc.json
@@ -1,6 +1,8 @@
 { "translations": {
+    "Federated sharing" : "Federated sharing",
     "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
     "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "File is already shared with %s" : "Lo fichièr es ja partejat amb %s",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
     "Accept" : "Acceptar",
     "Decline" : "Refusar",
@@ -15,6 +17,6 @@
     "Share it:" : "Partejar :",
     "Add to your website" : "Apondre a vòstre site web",
     "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
-    "HTML Code:" : "Còde HTML :"
+    "HTML Code:" : "Còdi HTML :"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file