fix more strings

5 files changed, 11 insertions, 11 deletions

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 56c9022aa72..525a34d9067 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -121,7 +121,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 				$('.enable.needs-download').tipsy({fallback: t('settings', 'The app will be downloaded from the app store')});
 
-				$('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use.')});
+				$('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the community. They offer central functionality and are ready for production use.')});
 				$('.app-level .approved').tipsy({fallback: t('settings', 'Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.')});
 				$('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')});
 			},
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index b5c5b2510b6..c0a7424cf67 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -362,7 +362,7 @@ if ($_['cronErrors']) {
 		<p><?php p($l->t('Please read carefully before activating server-side encryption: ')); ?></p>
 		<ul>
 			<li><?php p($l->t('Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.')); ?></li>
-			<li><?php p($l->t('Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases.')); ?></li>
+			<li><?php p($l->t('Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases.')); ?></li>
 			<li><?php p($l->t('Be aware that encryption always increases the file size.')); ?></li>
 			<li><?php p($l->t('It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.')); ?></li>
 		</ul>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index d3c14332693..2edbf1530eb 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -117,12 +117,12 @@ script(
 
 	{{#if missingMinOwnCloudVersion}}
 		<div class="app-dependencies">
-			<p><?php p($l->t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p>
+			<p><?php p($l->t('This app has no minimum Nextcloud version assigned. This will be an error in the future.')); ?></p>
 		</div>
 	{{else}}
 		{{#if missingMaxOwnCloudVersion}}
 			<div class="app-dependencies">
-				<p><?php p($l->t('This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p>
+				<p><?php p($l->t('This app has no maximum Nextcloud version assigned. This will be an error in the future.')); ?></p>
 			</div>
 		{{/if}}
 	{{/if}}
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b4ff5db5c7c..45f61310b30 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -138,7 +138,7 @@ if($_['passwordChangeSupported']) {
 
 <div id="sessions" class="section">
 	<h2><?php p($l->t('Sessions'));?></h2>
-	<span class="hidden-when-empty"><?php p($l->t('These are the web, desktop and mobile clients currently logged in to your ownCloud.'));?></span>
+	<span class="hidden-when-empty"><?php p($l->t('These are the web, desktop and mobile clients currently logged in to your account.'));?></span>
 	<table>
 		<thead class="token-list-header">
 			<tr>
@@ -166,7 +166,7 @@ if($_['passwordChangeSupported']) {
 		<tbody class="token-list icon-loading">
 		</tbody>
 	</table>
-	<p><?php p($l->t('A device password is a passcode that gives an app or device permissions to access your ownCloud account.'));?></p>
+	<p><?php p($l->t('A device password is a passcode that gives an app or device permissions to access your account.'));?></p>
 	<div id="device-token-form">
 		<input id="device-token-name" type="text" placeholder="Device name">
 		<button id="device-add-token" class="button">Create new device password</button>
@@ -197,7 +197,7 @@ if($_['passwordChangeSupported']) {
 			</option>
 		<?php endforeach;?>
 	</select>
-	<?php if (OC_Util::getEditionString() === ''): ?>
+	<?php if (false && OC_Util::getEditionString() === ''): ?>
 	<a href="https://www.transifex.com/projects/p/owncloud/"
 		target="_blank" rel="noreferrer">
 		<em><?php p($l->t('Help translate'));?></em>
@@ -223,10 +223,10 @@ if($_['passwordChangeSupported']) {
 	<?php if (OC_Util::getEditionString() === ''): ?>
 	<p>
 		<?php print_unescaped($l->t('If you want to support the project
-		<a href="https://owncloud.org/contribute"
+		<a href="https://nextcloud.com/contribute"
 			target="_blank" rel="noreferrer">join development</a>
 		or
-		<a href="https://owncloud.org/promote"
+		<a href="https://nextcloud.com/contribute"
 			target="_blank" rel="noreferrer">spread the word</a>!'));?>
 	</p>
 	<?php endif; ?>
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php
index c88c90f6b6b..2834277cfd6 100644
--- a/settings/templates/settings.development.notice.php
+++ b/settings/templates/settings.development.notice.php
@@ -8,12 +8,12 @@
 				'{linkclose}',
 			],
 			[
-				'<a href="https://owncloud.org/contact" target="_blank" rel="noreferrer">',
+				'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
 				'<a href="https://github.com/owncloud" target="_blank" rel="noreferrer">',
 				'<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer">',
 				'</a>',
 			],
-			$l->t('Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
+			$l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.')
 		)); ?>
 	</p>
 <?php endif; ?>