[stable31] fix(l10n): Improve english source strings

apps/files/src/components/DragAndDropNotice.vue

@@ -85,7 +85,7 @@ export default defineComponent({
 			if (this.isQuotaExceeded) {
 				return this.t('files', 'Your have used your space quota and cannot upload files anymore')
 			} else if (!this.canUpload) {
-				return this.t('files', 'You don’t have permission to upload or create files here')
+				return this.t('files', 'You don\'t have permission to upload or create files here.')
 			}
 			return null
 		},

apps/files/src/components/FilesListTableHeaderActions.vue

@@ -300,7 +300,7 @@ export default defineComponent({
 						return
 					}
 
-					showError(this.t('files', '"{displayName}" failed on some elements ', { displayName }))
+					showError(this.t('files', '"{displayName}" failed on some elements', { displayName }))
 					return
 				}
 

apps/files/src/components/FilesListVirtual.vue

@@ -189,7 +189,7 @@ export default defineComponent({
 		caption() {
 			const defaultCaption = t('files', 'List of files and folders.')
 			const viewCaption = this.currentView.caption || defaultCaption
-			const cantUploadCaption = this.cantUpload ? t('files', 'You don’t have permission to upload or create files here.') : null
+			const cantUploadCaption = this.cantUpload ? t('files', 'You don\'t have permission to upload or create files here.') : null
 			const quotaExceededCaption = this.isQuotaExceeded ? t('files', 'You have used your space quota and cannot upload files anymore.') : null
 			const sortableCaption = t('files', 'Column headers with buttons are sortable.')
 			const virtualListNote = t('files', 'This list is not fully rendered for performance reasons. The files will be rendered as you navigate through the list.')

apps/files/templates/list.php

@@ -13,7 +13,7 @@
 		</div>
 		<div class="notCreatable notPublic hidden">
 			<div class="icon-alert-outline"></div>
-			<?php p($l->t('You do not have permission to upload or create files here'))?>
+			<?php p($l->t('You don\'t 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).

apps/settings/lib/SetupChecks/AllowedAdminRanges.php

@@ -36,7 +36,7 @@ public function run(): SetupResult {
 			$allowedAdminRanges === false
 			|| (is_array($allowedAdminRanges) && empty($allowedAdminRanges))
 		) {
-			return SetupResult::success($this->l10n->t('Admin IP filtering isn’t applied.'));
+			return SetupResult::success($this->l10n->t('Admin IP filtering isn\'t applied.'));
 		}
 
 		if (!is_array($allowedAdminRanges)) {

apps/settings/lib/SetupChecks/DatabaseHasMissingIndices.php

@@ -85,7 +85,7 @@ public function run(): SetupResult {
 				}
 			}
 			return SetupResult::warning(
-				$this->l10n->t('Detected some missing optional indices. Occasionally new indices are added (by Nextcloud or installed applications) to improve database performance. Adding indices can sometimes take awhile and temporarily hurt performance so this is not done automatically during upgrades. Once the indices are added, queries to those tables should be faster. Use the command `occ db:add-missing-indices` to add them. ') . $list . '.',
+				$this->l10n->t('Detected some missing optional indices. Occasionally new indices are added (by Nextcloud or installed applications) to improve database performance. Adding indices can sometimes take awhile and temporarily hurt performance so this is not done automatically during upgrades. Once the indices are added, queries to those tables should be faster. Use the command `occ db:add-missing-indices` to add them.') . "\n" . $list,
 				$this->urlGenerator->linkToDocs('admin-long-running-migration-steps')
 			);
 		}

apps/sharebymail/lib/ShareByMailProvider.php

@@ -426,7 +426,7 @@ protected function sendPassword(IShare $share, string $password, array $emails):
 		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
 		$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
 
-		$plainBodyPart = $this->l->t("%1\$s shared %2\$s with you.\nYou should have already received a separate mail with a link to access it.\n", [$initiatorDisplayName, $filename]);
+		$plainBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
 		$htmlBodyPart = $this->l->t('%1$s shared %2$s with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
 
 		$message = $this->mailer->createMessage();

apps/user_ldap/lib/Access.php

@@ -342,7 +342,7 @@ public function setPassword($userDN, $password) {
 			return @$this->invokeLDAPMethod('exopPasswd', $userDN, '', $password) ||
 				@$this->invokeLDAPMethod('modReplace', $userDN, $password);
 		} catch (ConstraintViolationException $e) {
-			throw new HintException('Password change rejected.', Util::getL10N('user_ldap')->t('Password change rejected. Hint: ') . $e->getMessage(), (int)$e->getCode());
+			throw new HintException('Password change rejected.', Util::getL10N('user_ldap')->t('Password change rejected. Hint: %s', $e->getMessage()), (int)$e->getCode());
 		}
 	}
 

core/Command/Maintenance/Install.php

@@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 			// ignore the OS X setup warning
 			if (count($errors) !== 1 ||
-				(string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
+				(string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk!') {
 				return 1;
 			}
 		}

lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php

@@ -156,7 +156,7 @@ public function beforeController($controller, $methodName) {
 					throw new NotAdminException($this->l10n->t('Logged in account must be an admin, a sub admin or gotten special right to access this setting'));
 				}
 				if (!$this->remoteAddress->allowsAdminActions()) {
-					throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn’t allow you to perform admin actions'));
+					throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn\'t allow you to perform admin actions'));
 				}
 			}
 			if ($this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class)
@@ -173,12 +173,12 @@ public function beforeController($controller, $methodName) {
 			}
 			if ($this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class)
 				&& !$this->remoteAddress->allowsAdminActions()) {
-				throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn’t allow you to perform admin actions'));
+				throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn\'t allow you to perform admin actions'));
 			}
 			if (!$this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class)
 				&& !$this->hasAnnotationOrAttribute($reflectionMethod, 'NoAdminRequired', NoAdminRequired::class)
 				&& !$this->remoteAddress->allowsAdminActions()) {
-				throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn’t allow you to perform admin actions'));
+				throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn\'t allow you to perform admin actions'));
 			}
 
 		}

lib/private/Setup.php

@@ -186,7 +186,7 @@ public function getSystemInfo(bool $allowAllDatabases = false): array {
 			$errors[] = [
 				'error' => $this->l10n->t(
 					'Mac OS X is not supported and %s will not work properly on this platform. ' .
-					'Use it at your own risk! ',
+					'Use it at your own risk!',
 					[$this->defaults->getProductName()]
 				),
 				'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),