diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-06-10 15:54:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-10 15:54:14 +0200 |
commit | 148498bba574587d66bc18c0f1685ec5e332f3ba (patch) | |
tree | a31fc8e5425a8ba29d462ab6a7d021e19f7575f5 /apps | |
parent | 6ee4e0b94c15a784e8a22ee790664f0d21caa02b (diff) | |
parent | 50c697dbd4a8f8ab2f372944c0a55ad89f201f40 (diff) | |
download | nextcloud-server-148498bba574587d66bc18c0f1685ec5e332f3ba.tar.gz nextcloud-server-148498bba574587d66bc18c0f1685ec5e332f3ba.zip |
Merge pull request #32741 from nextcloud/Valdnet-patch-2
l10n: Delete apostrophe
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
-rw-r--r-- | apps/files/src/components/TransferOwnershipDialogue.vue | 2 | ||||
-rw-r--r-- | apps/files/templates/list.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/lib/Controller/RemoteController.php | 4 | ||||
-rw-r--r-- | apps/files_sharing/lib/Controller/ShareAPIController.php | 16 | ||||
-rw-r--r-- | apps/files_sharing/templates/part.404.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/tests/ApiTest.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/tests/Controller/ShareAPIControllerTest.php | 10 | ||||
-rw-r--r-- | apps/files_versions/appinfo/info.xml | 4 | ||||
-rw-r--r-- | apps/settings/lib/Controller/AppSettingsController.php | 4 | ||||
-rw-r--r-- | apps/settings/lib/Controller/ChangePasswordController.php | 2 | ||||
-rw-r--r-- | apps/settings/src/components/BasicSettings/BackgroundJob.vue | 8 | ||||
-rw-r--r-- | apps/theming/src/UserThemes.vue | 2 |
13 files changed, 30 insertions, 30 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 701b635fac3..510582ae998 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -3579,7 +3579,7 @@ * Shows a "permission denied" notification */ _showPermissionDeniedNotification: function() { - var message = t('files', 'You don’t have permission to upload or create files here'); + var message = t('files', 'You do not have permission to upload or create files here'); OC.Notification.show(message, {type: 'error'}); }, diff --git a/apps/files/src/components/TransferOwnershipDialogue.vue b/apps/files/src/components/TransferOwnershipDialogue.vue index 22e2a22b009..8e96cdebf54 100644 --- a/apps/files/src/components/TransferOwnershipDialogue.vue +++ b/apps/files/src/components/TransferOwnershipDialogue.vue @@ -213,7 +213,7 @@ export default { logger.error('Could not send ownership transfer request', { error }) if (error?.response?.status === 403) { - this.submitError = t('files', 'Cannot transfer ownership of a file or folder you don\'t own') + this.submitError = t('files', 'Cannot transfer ownership of a file or folder you do not own') } else { this.submitError = error.message || t('files', 'Unknown error') } diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 25558bf16f7..9087c86a4a2 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -6,7 +6,7 @@ <div id="file_action_panel"></div> <div class="notCreatable notPublic hidden"> <div class="icon-alert-outline"></div> - <?php p($l->t('You don’t have permission to upload or create files here'))?> + <?php p($l->t('You do not have permission to upload or create files here'))?> </div> <?php /* Note: the template attributes are here only for the public page. These are normally loaded through ajax instead (updateStorageStatistics). diff --git a/apps/files_sharing/lib/Controller/RemoteController.php b/apps/files_sharing/lib/Controller/RemoteController.php index 75684220c52..47523e08639 100644 --- a/apps/files_sharing/lib/Controller/RemoteController.php +++ b/apps/files_sharing/lib/Controller/RemoteController.php @@ -86,7 +86,7 @@ class RemoteController extends OCSController { $this->logger->error('Could not accept federated share with id: ' . $id, ['app' => 'files_sharing']); - throw new OCSNotFoundException('wrong share ID, share doesn\'t exist.'); + throw new OCSNotFoundException('wrong share ID, share does not exist.'); } /** @@ -106,7 +106,7 @@ class RemoteController extends OCSController { // Make sure the user has no notification for something that does not exist anymore. $this->externalManager->processNotification($id); - throw new OCSNotFoundException('wrong share ID, share doesn\'t exist.'); + throw new OCSNotFoundException('wrong share ID, share does not exist.'); } /** diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index f531954d5da..fafdb1a64cd 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -366,7 +366,7 @@ class ShareAPIController extends OCSController { try { $share = $this->getShareById($id); } catch (ShareNotFound $e) { - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } try { @@ -378,7 +378,7 @@ class ShareAPIController extends OCSController { // Fall trough } - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } /** @@ -394,7 +394,7 @@ class ShareAPIController extends OCSController { try { $share = $this->getShareById($id); } catch (ShareNotFound $e) { - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } try { @@ -404,7 +404,7 @@ class ShareAPIController extends OCSController { } if (!$this->canAccessShare($share)) { - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } // if it's a group share or a room share @@ -1056,13 +1056,13 @@ class ShareAPIController extends OCSController { try { $share = $this->getShareById($id); } catch (ShareNotFound $e) { - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } $this->lock($share->getNode()); if (!$this->canAccessShare($share, false)) { - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } if (!$this->canEditShare($share)) { @@ -1291,11 +1291,11 @@ class ShareAPIController extends OCSController { try { $share = $this->getShareById($id); } catch (ShareNotFound $e) { - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } if (!$this->canAccessShare($share)) { - throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist')); + throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); } try { diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php index 3ef117d7524..2aa55383847 100644 --- a/apps/files_sharing/templates/part.404.php +++ b/apps/files_sharing/templates/part.404.php @@ -1,6 +1,6 @@ <ul> <li class="error error-broken-link"> - <p><?php p($l->t('Sorry, this link doesn’t seem to work anymore.')) ?></p> + <p><?php p($l->t('Sorry, this link does not seem to work anymore.')) ?></p> <p><?php p($l->t('Reasons might be:')); ?></p> <ul> <li><?php p($l->t('the item was removed')); ?></li> diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index c7159e82163..a16a1aaf383 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -929,7 +929,7 @@ class ApiTest extends TestCase { $ocs->getShare(0); $this->fail(); } catch (OCSNotFoundException $e) { - $this->assertEquals('Wrong share ID, share doesn\'t exist', $e->getMessage()); + $this->assertEquals('Wrong share ID, share does not exist', $e->getMessage()); } $ocs->cleanup(); } diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 5555aef1425..fd5580f19a7 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -196,7 +196,7 @@ class ShareAPIControllerTest extends TestCase { public function testDeleteShareShareNotFound() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist'); + $this->expectExceptionMessage('Wrong share ID, share does not exist'); $this->shareManager ->expects($this->exactly(6)) @@ -433,7 +433,7 @@ class ShareAPIControllerTest extends TestCase { */ public function testDeleteSharedWithGroupIDontBelongTo() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist'); + $this->expectExceptionMessage('Wrong share ID, share does not exist'); $node = $this->getMockBuilder(File::class)->getMock(); @@ -498,7 +498,7 @@ class ShareAPIControllerTest extends TestCase { ->with('ocinternal:42', 'currentUser') ->will($this->throwException(new \OC\Share20\Exception\ShareNotFound())); - $expected = new \OC\OCS\Result(null, 404, 'wrong share ID, share doesn\'t exist.'); + $expected = new \OC\OCS\Result(null, 404, 'wrong share ID, share does not exist.'); $this->assertEquals($expected, $this->ocs->getShare(42)); } */ @@ -808,7 +808,7 @@ class ShareAPIControllerTest extends TestCase { public function testGetShareInvalidNode() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist'); + $this->expectExceptionMessage('Wrong share ID, share does not exist'); $share = \OC::$server->getShareManager()->newShare(); $share->setSharedBy('initiator') @@ -2602,7 +2602,7 @@ class ShareAPIControllerTest extends TestCase { public function testUpdateShareCantAccess() { $this->expectException(\OCP\AppFramework\OCS\OCSNotFoundException::class); - $this->expectExceptionMessage('Wrong share ID, share doesn\'t exist'); + $this->expectExceptionMessage('Wrong share ID, share does not exist'); $node = $this->getMockBuilder(Folder::class)->getMock(); $share = $this->newShare(); diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml index 3032d8cc934..49e48e6e436 100644 --- a/apps/files_versions/appinfo/info.xml +++ b/apps/files_versions/appinfo/info.xml @@ -5,8 +5,8 @@ <name>Versions</name> <summary>This application automatically maintains older versions of files that are changed.</summary> <description> - This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions. - In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation. + This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user does not run out of Quota because of versions. + In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation. </description> <version>1.18.0</version> <licence>agpl</licence> diff --git a/apps/settings/lib/Controller/AppSettingsController.php b/apps/settings/lib/Controller/AppSettingsController.php index 77f807943cd..618d99b3d73 100644 --- a/apps/settings/lib/Controller/AppSettingsController.php +++ b/apps/settings/lib/Controller/AppSettingsController.php @@ -520,7 +520,7 @@ class AppSettingsController extends Controller { $this->appManager->clearAppsCache(); return new JSONResponse(['data' => ['appid' => $appId]]); } - return new JSONResponse(['data' => ['message' => $this->l10n->t('Couldn\'t remove app.')]], Http::STATUS_INTERNAL_SERVER_ERROR); + return new JSONResponse(['data' => ['message' => $this->l10n->t('Could not remove app.')]], Http::STATUS_INTERNAL_SERVER_ERROR); } /** @@ -542,7 +542,7 @@ class AppSettingsController extends Controller { if ($result !== false) { return new JSONResponse(['data' => ['appid' => $appId]]); } - return new JSONResponse(['data' => ['message' => $this->l10n->t('Couldn\'t update app.')]], Http::STATUS_INTERNAL_SERVER_ERROR); + return new JSONResponse(['data' => ['message' => $this->l10n->t('Could not update app.')]], Http::STATUS_INTERNAL_SERVER_ERROR); } private function sortApps($a, $b) { diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php index 85e4218ebb5..7c3ab9546bc 100644 --- a/apps/settings/lib/Controller/ChangePasswordController.php +++ b/apps/settings/lib/Controller/ChangePasswordController.php @@ -243,7 +243,7 @@ class ChangePasswordController extends Controller { return new JSONResponse([ 'status' => 'error', 'data' => [ - 'message' => $this->l->t('Backend doesn\'t support password change, but the user\'s encryption key was updated.'), + 'message' => $this->l->t('Backend does not support password change, but the user\'s encryption key was updated.'), ] ]); } elseif (!$result && !$recoveryEnabledForUser) { diff --git a/apps/settings/src/components/BasicSettings/BackgroundJob.vue b/apps/settings/src/components/BasicSettings/BackgroundJob.vue index 525e82b42b8..07f5c5cab4c 100644 --- a/apps/settings/src/components/BasicSettings/BackgroundJob.vue +++ b/apps/settings/src/components/BasicSettings/BackgroundJob.vue @@ -22,7 +22,7 @@ <template> <SettingsSection :title="t('settings', 'Background jobs')" - :description="t('settings', 'For the server to work properly, it’s important to configure background jobs correctly. Cron is the recommended setting. Please see the documentation for more information.')" + :description="t('settings', 'For the server to work properly, it\'s important to configure background jobs correctly. Cron is the recommended setting. Please see the documentation for more information.')" :doc-url="backgroundJobsDocUrl"> <template v-if="lastCron !== 0"> <span v-if="oldExecution" class="error"> @@ -30,11 +30,11 @@ </span> <span v-else-if="longExecutionNotCron" class="warning"> - {{ t('settings', "Some jobs haven’t been executed since {maxAgeRelativeTime}. Please consider increasing the execution frequency.", {maxAgeRelativeTime}) }} + {{ t('settings', "Some jobs have not been executed since {maxAgeRelativeTime}. Please consider increasing the execution frequency.", {maxAgeRelativeTime}) }} </span> <span v-else-if="longExecutionCron" class="warning"> - {{ t('settings', "Some jobs haven’t been executed since {maxAgeRelativeTime}. Please consider switching to system cron.", {maxAgeRelativeTime}) }} + {{ t('settings', "Some jobs have not been executed since {maxAgeRelativeTime}. Please consider switching to system cron.", {maxAgeRelativeTime}) }} </span> <span v-else> @@ -43,7 +43,7 @@ </template> <span v-else class="error"> - {{ t('settings', 'Background job didn’t run yet!') }} + {{ t('settings', 'Background job did not run yet!') }} </span> <CheckboxRadioSwitch type="radio" diff --git a/apps/theming/src/UserThemes.vue b/apps/theming/src/UserThemes.vue index ee514f049a5..f3e51f0a375 100644 --- a/apps/theming/src/UserThemes.vue +++ b/apps/theming/src/UserThemes.vue @@ -81,7 +81,7 @@ export default { descriptionDetail() { return t( 'theming', - 'If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!' + 'If you find any issues, do not hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!' ) .replace('{issuetracker}', this.issuetrackerLink) .replace('{designteam}', this.designteamLink) |