rename 'server-to-server sharing' to 'federated cloud'

diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index 7dce0df7d83cd0143fc5c0cc514e308ee85d8b81..f2f7561598fd380d1c76cd36d3a6ad6fc074cb9e 100644 (file)
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -34,7 +34,7 @@ class Server2Server {
        public function createShare($params) {
 
                if (!$this->isS2SEnabled(true)) {
-                       return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+                       return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
                }
 
                $remote = isset($_POST['remote']) ? $_POST['remote'] : null;
@@ -94,7 +94,7 @@ class Server2Server {
        public function acceptShare($params) {
 
                if (!$this->isS2SEnabled()) {
-                       return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+                       return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
                }
 
                $id = $params['id'];
@@ -121,7 +121,7 @@ class Server2Server {
        public function declineShare($params) {
 
                if (!$this->isS2SEnabled()) {
-                       return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+                       return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
                }
 
                $id = $params['id'];
@@ -152,7 +152,7 @@ class Server2Server {
        public function unshare($params) {
 
                if (!$this->isS2SEnabled()) {
-                       return new \OC_OCS_Result(null, 503, 'Server does not support server-to-server sharing');
+                       return new \OC_OCS_Result(null, 503, 'Server does not support federated cloud sharing');
                }
 
                $id = $params['id'];

diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php
index c71ef31b21c3ad132eaafaf470a4232678eec91f..9fac97faf55dbfe4913f83c6652caa59c9e7a752 100644 (file)
--- a/apps/files_sharing/templates/settings-admin.php
+++ b/apps/files_sharing/templates/settings-admin.php
@@ -4,7 +4,7 @@
 ?>
 <div class="section" id="fileSharingSettings" >
 
-       <h2><?php p($l->t('Server-to-Server Sharing'));?></h2>
+       <h2><?php p($l->t('Federated Cloud Sharing'));?></h2>
 
        <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled"
                   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />