From 2d00320a4b7e89a13488613527497c7168863abd Mon Sep 17 00:00:00 2001
From: sunflowerskater <sunflowerskater@tutanota.com>
Date: Fri, 16 Dec 2022 18:33:10 -0300
Subject: [PATCH] general: Rename "application" to "app"

Several places in Shell use the word "application". However,"app"
is a more common term nowadays, so update strings accordingly.

https://gitlab.gnome.org/Teams/Design/initiatives/-/issues/123
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6202

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2614>
---
 data/50-gnome-shell-launchers.xml    | 18 +++++++++---------
 data/50-gnome-shell-system.xml       |  4 ++--
 js/ui/appDisplay.js                  |  2 +-
 js/ui/closeDialog.js                 |  2 +-
 js/ui/components/autorunManager.js   |  2 +-
 js/ui/dash.js                        |  4 ++--
 js/ui/inhibitShortcutsDialog.js      |  4 ++--
 js/ui/main.js                        |  2 +-
 js/ui/notificationDaemon.js          |  4 ++--
 js/ui/overviewControls.js            |  2 +-
 js/ui/padOsd.js                      |  8 ++++----
 js/ui/screenShield.js                | 10 ++++++----
 js/ui/shellDBus.js                   |  2 +-
 subprojects/extensions-app/README.md |  2 +-
 14 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/data/50-gnome-shell-launchers.xml b/data/50-gnome-shell-launchers.xml
index ca57ee68c..f3a606f80 100644
--- a/data/50-gnome-shell-launchers.xml
+++ b/data/50-gnome-shell-launchers.xml
@@ -6,39 +6,39 @@
                 package="gnome-shell">
 
 	<KeyListEntry name="switch-to-application-1"
-                      description="Activate favorite application 1"
+                      description="Activate favorite app 1"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-2"
-                      description="Activate favorite application 2"
+                      description="Activate favorite app 2"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-3"
-                      description="Activate favorite application 3"
+                      description="Activate favorite app 3"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-4"
-                      description="Activate favorite application 4"
+                      description="Activate favorite app 4"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-5"
-                      description="Activate favorite application 5"
+                      description="Activate favorite app 5"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-6"
-                      description="Activate favorite application 6"
+                      description="Activate favorite app 6"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-7"
-                      description="Activate favorite application 7"
+                      description="Activate favorite app 7"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-8"
-                      description="Activate favorite application 8"
+                      description="Activate favorite app 8"
                       hidden="true"/>
 
 	<KeyListEntry name="switch-to-application-9"
-                      description="Activate favorite application 9"
+                      description="Activate favorite app 9"
                       hidden="true"/>
 
 </KeyListEntries>
diff --git a/data/50-gnome-shell-system.xml b/data/50-gnome-shell-system.xml
index 33e5ba532..37fd0cd86 100644
--- a/data/50-gnome-shell-system.xml
+++ b/data/50-gnome-shell-system.xml
@@ -15,10 +15,10 @@
                       description="Show the overview"/>
 
 	<KeyListEntry name="toggle-application-view"
-                      description="Show all applications"/>
+                      description="Show all apps"/>
 
 	<KeyListEntry name="open-application-menu"
-                      description="Open the application menu"/>
+                      description="Open the app menu"/>
 
 </KeyListEntries>
 
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index a9b876e31..2535f2ee8 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1149,7 +1149,7 @@ var BaseAppView = GObject.registerClass({
         if (this._items.has(id))
             this._items.get(id).navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
         else
-            log(`No such application ${id}`);
+            log(`No such app ${id}`);
     }
 
     selectApp(id) {
diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index f5ddecd2b..ace93b8f0 100644
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -39,7 +39,7 @@ var CloseDialog = GObject.registerClass({
         /* Translators: %s is an application name */
         let title = _("“%s” is not responding.").format(windowApp.get_name());
         let description = _('You may choose to wait a short while for it to ' +
-                            'continue or force the application to quit entirely.');
+                            'continue or force the app to quit entirely.');
         return new Dialog.MessageDialogContent({ title, description });
     }
 
diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index 0e3fa9385..4a55a3a2a 100644
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -68,7 +68,7 @@ function startAppForMount(app, mount) {
         retval = app.launch(files,
                             global.create_app_launch_context(0, -1));
     } catch (e) {
-        log(`Unable to launch the application ${app.get_name()}: ${e}`);
+        log(`Unable to launch the app ${app.get_name()}: ${e}`);
     }
 
     return retval;
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 1514d2999..212592bdf 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -202,7 +202,7 @@ class ShowAppsIcon extends DashItemContainer {
             toggle_mode: true,
         });
         this._iconActor = null;
-        this.icon = new IconGrid.BaseIcon(_('Show Applications'), {
+        this.icon = new IconGrid.BaseIcon(_('Show Apps'), {
             setSizeManually: true,
             showLabel: false,
             createIcon: this._createIcon.bind(this),
@@ -248,7 +248,7 @@ class ShowAppsIcon extends DashItemContainer {
         if (canRemove)
             this.setLabelText(_('Unpin'));
         else
-            this.setLabelText(_("Show Applications"));
+            this.setLabelText(_('Show Apps'));
     }
 
     handleDragOver(source, _actor, _x, _y, _time) {
diff --git a/js/ui/inhibitShortcutsDialog.js b/js/ui/inhibitShortcutsDialog.js
index 7c3d15996..d38aae6a7 100644
--- a/js/ui/inhibitShortcutsDialog.js
+++ b/js/ui/inhibitShortcutsDialog.js
@@ -75,8 +75,8 @@ var InhibitShortcutsDialog = GObject.registerClass({
             title: _('Allow inhibiting shortcuts'),
             description: name
                 /* Translators: %s is an application name like "Settings" */
-                ? _('The application %s wants to inhibit shortcuts').format(name)
-                : _('An application wants to inhibit shortcuts'),
+                ? _('The app %s wants to inhibit shortcuts').format(name)
+                : _('An app wants to inhibit shortcuts'),
         });
 
         let restoreAccel = this._getRestoreAccel();
diff --git a/js/ui/main.js b/js/ui/main.js
index 3c7ed9647..16c1eef9f 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -284,7 +284,7 @@ function _initializeUI() {
         messageTray.add(source);
         const notification = new MessageTray.Notification(source,
             _('System was put in unsafe mode'),
-            _('Applications now have unrestricted access'));
+            _('Apps now have unrestricted access'));
         notification.addAction(_('Undo'),
             () => (global.context.unsafe_mode = false));
         notification.setTransient(true);
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index b27158e4f..22e716220 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -597,7 +597,7 @@ class GtkNotificationDaemonAppSource extends MessageTray.Source {
             const params = target ? [target] : [];
             app.ActivateActionAsync(actionId, params, getPlatformData());
         } catch (error) {
-            logError(error, 'Failed to activate application proxy');
+            logError(error, 'Failed to activate app proxy');
         }
         Main.overview.hide();
         Main.panel.closeCalendar();
@@ -608,7 +608,7 @@ class GtkNotificationDaemonAppSource extends MessageTray.Source {
             const app = await this._createApp();
             app.ActivateAsync(getPlatformData());
         } catch (error) {
-            logError(error, 'Failed to open application proxy');
+            logError(error, 'Failed to open app proxy');
         }
         Main.overview.hide();
         Main.panel.closeCalendar();
diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 3528a73b1..18df17278 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -405,7 +405,7 @@ class ControlsManager extends St.Widget {
 
         Main.ctrlAltTabManager.addGroup(
             this.appDisplay,
-            _('Applications'),
+            _('Apps'),
             'view-app-grid-symbolic', {
                 proxy: this,
                 focusCallback: () => {
diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index 2442e98fc..33d5a87f1 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -150,10 +150,10 @@ var ActionComboBox = GObject.registerClass({
         this._editMenuManager.addMenu(this._editMenu);
 
         this._actionLabels = new Map();
-        this._actionLabels.set(GDesktopEnums.PadButtonAction.NONE, _("Application defined"));
-        this._actionLabels.set(GDesktopEnums.PadButtonAction.HELP, _("Show on-screen help"));
-        this._actionLabels.set(GDesktopEnums.PadButtonAction.SWITCH_MONITOR, _("Switch monitor"));
-        this._actionLabels.set(GDesktopEnums.PadButtonAction.KEYBINDING, _("Assign keystroke"));
+        this._actionLabels.set(GDesktopEnums.PadButtonAction.NONE, _('App defined'));
+        this._actionLabels.set(GDesktopEnums.PadButtonAction.HELP, _('Show on-screen help'));
+        this._actionLabels.set(GDesktopEnums.PadButtonAction.SWITCH_MONITOR, _('Switch monitor'));
+        this._actionLabels.set(GDesktopEnums.PadButtonAction.KEYBINDING, _('Assign keystroke'));
 
         this._buttonItems = [];
 
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 6c2fe25c2..b6c3c5547 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -268,8 +268,9 @@ var ScreenShield = class extends Signals.EventEmitter {
             //
             // XXX: another option is to kick the user into the gdm login
             // screen, where we're not affected by grabs
-            Main.notifyError(_("Unable to lock"),
-                             _("Lock was blocked by an application"));
+            Main.notifyError(
+                _('Unable to lock'),
+                _('Lock was blocked by an app'));
             return;
         }
 
@@ -665,8 +666,9 @@ var ScreenShield = class extends Signals.EventEmitter {
 
         // Warn the user if we can't become modal
         if (!this._becomeModal()) {
-            Main.notifyError(_("Unable to lock"),
-                             _("Lock was blocked by an application"));
+            Main.notifyError(
+                _('Unable to lock'),
+                _('Lock was blocked by an app'));
             return;
         }
 
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 0b458316a..244214e8c 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -160,7 +160,7 @@ var GnomeShell = class {
             invocation.return_error_literal(
                 Gio.DBusError,
                 Gio.DBusError.FILE_NOT_FOUND,
-                `No application with ID ${id}`);
+                `No app with ID ${id}`);
             return;
         }
 
diff --git a/subprojects/extensions-app/README.md b/subprojects/extensions-app/README.md
index 6c0feb648..d621ed1ab 100644
--- a/subprojects/extensions-app/README.md
+++ b/subprojects/extensions-app/README.md
@@ -1,5 +1,5 @@
 # ![logo] GNOME Extensions
-GNOME Extensions is a small application for managing GNOME Shell
+GNOME Extensions is a small app for managing GNOME Shell
 extensions. It is usually built as part of gnome-shell, but can be
 used as a stand-alone project as well.