Merge pull request #5467 from nextcloud/Valdnet-patch-1

l10n: Unify spelling

lib/Chat/Changelog/Manager.php

@@ -91,7 +91,7 @@ class Manager {
 			),
 			$this->l->t('New in Talk %s', ['6']),
 			$this->l->t('- Microsoft Edge and Safari can now be used to participate in audio and video calls'),
-			$this->l->t('- One-to-one conversations are now persistent and can not be turned into group conversations by accident anymore. Also when one of the participants leaves the conversation, the conversation is not automatically deleted anymore. Only if both participants leave, the conversation is deleted from the server'),
+			$this->l->t('- One-to-one conversations are now persistent and cannot be turned into group conversations by accident anymore. Also when one of the participants leaves the conversation, the conversation is not automatically deleted anymore. Only if both participants leave, the conversation is deleted from the server'),
 			$this->l->t('- You can now notify all participants by posting "@all" into the chat'),
 			$this->l->t('- With the "arrow-up" key you can repost your last message'),
 			$this->l->t('- Talk can now have commands, send "/help" as a chat message to see if your administrator configured some'),

src/components/AdminSettings/TurnServers.vue

@@ -84,7 +84,7 @@ export default {
 
 	computed: {
 		documentationHint() {
-			return t('spreed', 'A TURN server is used to proxy the traffic from participants behind a firewall. If individual participants can not connect to others a TURN server is most likely required. See {linkstart}this documentation{linkend} for setup instructions.')
+			return t('spreed', 'A TURN server is used to proxy the traffic from participants behind a firewall. If individual participants cannot connect to others a TURN server is most likely required. See {linkstart}this documentation{linkend} for setup instructions.')
 				.replace('{linkstart}', '<a  target="_blank" rel="noreferrer nofollow" class="external" href="https://nextcloud-talk.readthedocs.io/en/latest/TURN/">')
 				.replace('{linkend}', ' ↗</a>')
 		},

src/components/MessagesList/MessagesGroup/Message/Message.vue

@@ -544,7 +544,7 @@ export default {
 			if (this.sendingFailure === 'quota') {
 				return t('spreed', 'Not enough free space to upload file')
 			}
-			return t('spreed', 'You can not send messages to this conversation at the moment')
+			return t('spreed', 'You cannot send messages to this conversation at the moment')
 		},
 
 		isMyMsg() {

templates/settings/admin-settings.php

@@ -14,7 +14,7 @@ style('spreed', ['settings-admin']);
 		<h2><?php p($l->t('Limit to groups')) ?></h2>
 		<p class="settings-hint"><?php p($l->t('When at least one group is selected, only people of the listed groups can be part of conversations.')); ?></p>
 		<p class="settings-hint"><?php p($l->t('Guests can still join public conversations.')); ?></p>
-		<p class="settings-hint"><?php p($l->t('Users that can not use Talk anymore will still be listed as participants in their previous conversations and also their chat messages will be kept.')); ?></p>
+		<p class="settings-hint"><?php p($l->t('Users that cannot use Talk anymore will still be listed as participants in their previous conversations and also their chat messages will be kept.')); ?></p>
 	</div>
 
 	<div class="videocalls section" id="chat_commands">