Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2022-09-02 18:01:52 +0300
committerGitHub <noreply@github.com>2022-09-02 18:01:52 +0300
commit6132b6a4aec0cad2a92478ea913d6b8c6ce43835 (patch)
tree0546c3808cd4bf3a287108ce3df0c6bc801c9226
parent579497e9995b4da34402c3c155cb16560b67f0f0 (diff)
parentb31c92e6f513009aacbb465d71ec8fac1478738f (diff)
Merge pull request #33790 from nextcloud/Valdnet-patch-2
l10n: Spelling unification
-rw-r--r--apps/settings/lib/Sections/Admin/Delegation.php2
-rw-r--r--lib/private/NavigationManager.php2
-rw-r--r--tests/acceptance/features/bootstrap/SettingsMenuContext.php2
-rw-r--r--tests/acceptance/features/header.feature2
-rw-r--r--tests/lib/NavigationManagerTest.php2
5 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings/lib/Sections/Admin/Delegation.php b/apps/settings/lib/Sections/Admin/Delegation.php
index e1fc6ddf52c..b88a359c8e8 100644
--- a/apps/settings/lib/Sections/Admin/Delegation.php
+++ b/apps/settings/lib/Sections/Admin/Delegation.php
@@ -55,7 +55,7 @@ class Delegation implements IIconSection {
* @return string
*/
public function getName() {
- return $this->l->t('Admin privileges');
+ return $this->l->t('Administration privileges');
}
/**
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index bbf28d2c142..7fd76850816 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -228,7 +228,7 @@ class NavigationManager implements INavigationManager {
'id' => 'admin_settings',
'order' => 3,
'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
- 'name' => $l->t('Admin settings'),
+ 'name' => $l->t('Administration settings'),
'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
]);
} else {
diff --git a/tests/acceptance/features/bootstrap/SettingsMenuContext.php b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
index 0effe906240..f89d8782198 100644
--- a/tests/acceptance/features/bootstrap/SettingsMenuContext.php
+++ b/tests/acceptance/features/bootstrap/SettingsMenuContext.php
@@ -148,7 +148,7 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
*/
public function iVisitTheAdminSettingsPage() {
$this->iOpenTheSettingsMenu();
- $this->actor->find(self::menuItemFor('Admin settings'), 2)->click();
+ $this->actor->find(self::menuItemFor('Administration settings'), 2)->click();
}
/**
diff --git a/tests/acceptance/features/header.feature b/tests/acceptance/features/header.feature
index 2debb78638c..21f9147c9ac 100644
--- a/tests/acceptance/features/header.feature
+++ b/tests/acceptance/features/header.feature
@@ -8,7 +8,7 @@ Feature: header
And I see that the Settings menu has only 8 items
And I see that the "Set status" item in the Settings menu is shown
And I see that the "Personal settings" item in the Settings menu is shown
- And I see that the "Admin settings" item in the Settings menu is shown
+ And I see that the "Administration settings" item in the Settings menu is shown
And I see that the "Apps" item in the Settings menu is shown
And I see that the "Users" item in the Settings menu is shown
And I see that the "Help" item in the Settings menu is shown
diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php
index d29b6888c2c..8d70b1b25ae 100644
--- a/tests/lib/NavigationManagerTest.php
+++ b/tests/lib/NavigationManagerTest.php
@@ -299,7 +299,7 @@ class NavigationManagerTest extends TestCase {
'order' => 3,
'href' => '/apps/test/',
'icon' => '/apps/settings/img/admin.svg',
- 'name' => 'Admin settings',
+ 'name' => 'Administration settings',
'active' => false,
'type' => 'settings',
'classes' => '',