Merge pull request #27063 from nextcloud/Valdnet-patch-4

apps/dashboard/src/App.vue

@@ -65,7 +65,7 @@
 					</li>
 				</Draggable>
 
-				<a v-if="isAdmin" :href="appStoreUrl" class="button">{{ t('dashboard', 'Get more widgets from the app store') }}</a>
+				<a v-if="isAdmin" :href="appStoreUrl" class="button">{{ t('dashboard', 'Get more widgets from the App Store') }}</a>
 
 				<h3>{{ t('dashboard', 'Change background image') }}</h3>
 				<BackgroundSettings :background="background"

apps/settings/lib/Controller/CheckSetupController.php

@@ -247,7 +247,7 @@ class CheckSetupController extends Controller {
 			return '';
 		}
 
-		$features = $this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
+		$features = $this->l10n->t('installing and updating apps via the App Store or Federated Cloud Sharing');
 		if (!$this->config->getSystemValue('appstoreenabled', true)) {
 			$features = $this->l10n->t('Federated Cloud Sharing');
 		}

apps/settings/src/mixins/AppManagement.js

@@ -45,14 +45,14 @@ export default {
 		},
 		enableButtonTooltip() {
 			if (this.app.needsDownload) {
-				return t('settings', 'The app will be downloaded from the app store')
+				return t('settings', 'The app will be downloaded from the App Store')
 			}
 			return false
 		},
 		forceEnableButtonTooltip() {
 			const base = t('settings', 'This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected.')
 			if (this.app.needsDownload) {
-				return base + ' ' + t('settings', 'The app will be downloaded from the app store')
+				return base + ' ' + t('settings', 'The app will be downloaded from the App Store')
 			}
 			return base
 		},

apps/updatenotification/src/components/UpdateNotification.vue

@@ -194,7 +194,7 @@ export default {
 			}
 
 			if (this.appStoreFailed) {
-				return t('updatenotification', 'Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore.')
+				return t('updatenotification', 'Could not connect to the App Store or no updates have been returned at all. Search manually for updates or make sure your server has access to the internet and can connect to the App Store.')
 			}
 
 			return this.missingAppUpdates.length === 0

apps/workflowengine/src/components/Workflow.vue

@@ -20,7 +20,7 @@
 					<div class="icon icon-add" />
 					<div class="actions__item__description">
 						<h3>{{ t('workflowengine', 'More flows') }}</h3>
-						<small>{{ t('workflowengine', 'Browse the app store') }}</small>
+						<small>{{ t('workflowengine', 'Browse the App Store') }}</small>
 					</div>
 				</a>
 			</transition-group>

core/Command/Upgrade.php

@@ -208,10 +208,10 @@ class Upgrade extends Command {
 				$output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
 			});
 			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($output) {
-				$output->writeln('<info>Update app ' . $app . ' from appstore</info>');
+				$output->writeln('<info>Update app ' . $app . ' from App Store</info>');
 			});
 			$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($output) {
-				$output->writeln('<info>Checked for update of app "' . $app . '" in appstore </info>');
+				$output->writeln('<info>Checked for update of app "' . $app . '" in App Store </info>');
 			});
 			$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($output) {
 				$output->writeln("<info>Checking whether the database schema for <$app> can be updated (this can take a long time depending on the database size)</info>");

core/ajax/update.php

@@ -163,13 +163,13 @@ if (\OCP\Util::needUpgrade()) {
 		$eventSource->send('success', $l->t('Updated database'));
 	});
 	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checking for update of app "%s" in appstore', [$app]));
+		$eventSource->send('success', $l->t('Checking for update of app "%s" in App Store', [$app]));
 	});
 	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Update app "%s" from appstore', [$app]));
+		$eventSource->send('success', $l->t('Update app "%s" from App Store', [$app]));
 	});
 	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checked for update of app "%s" in appstore', [$app]));
+		$eventSource->send('success', $l->t('Checked for update of app "%s" in App Store', [$app]));
 	});
 	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));

core/src/components/setup/RecommendedApps.vue

@@ -26,7 +26,7 @@
 			{{ t('core', 'Loading apps …') }}
 		</p>
 		<p v-else-if="loadingAppsError" class="loading-error text-center">
-			{{ t('core', 'Could not fetch list of apps from the app store.') }}
+			{{ t('core', 'Could not fetch list of apps from the App Store.') }}
 		</p>
 		<p v-else class="text-center">
 			{{ t('core', 'Installing apps …') }}

lib/private/legacy/OC_Util.php

@@ -768,7 +768,7 @@ class OC_Util {
 				$errors[] = [
 					'error' => $l->t('Cannot write into "apps" directory'),
 					'hint' => $l->t('This can usually be fixed by giving the webserver write access to the apps directory'
-						. ' or disabling the appstore in the config file.')
+						. ' or disabling the App Store in the config file.')
 				];
 			}
 		}