avoid usage of brand name 'ownCloud'

diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index 810a9fdd8d18b01fb0ac3c4b5b4c4d3586806cfe..f5ac11b2168f3f32f4fd11d71671e297d810594b 100644 (file)
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -57,7 +57,7 @@ class App {
                // rename to "/Shared" is denied
                if( $dir === '/' and $newname === 'Shared' ) {
                        $result['data'] = array(
-                               'message'       => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+                               'message'       => $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved.")
                        );
                // rename to existing file is denied
                } else if ($this->view->file_exists($dir . '/' . $newname)) {

diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 8eff978cde095970f24eb93f8253b2ce397b8223..e654255c40771c10575421279496b6ae0882c220 100644 (file)
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -88,7 +88,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
                $result = $this->files->rename($dir, $oldname, $newname);
                $expected = array(
                        'success'       => false,
-                       'data'          => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+                       'data'          => array('message' => "Invalid folder name. Usage of 'Shared' is reserved.")
                );
 
                $this->assertEquals($expected, $result);