WIP - Remove ShellJS gir

You can define a new importer object by importing a subdirectory in GJS. This is undocumented, but it is likely to at least hold until the whole thing moves to ES6 modules.
2016-10-04 22:27:18 -07:00
26 changed files with 1330 additions and 3443 deletions
--- a/29
+++ b/29
@ -1,32 +1,3 @@
-3.22.2
-======
-* Fix OSD popup glitches [Cosimo; #772723, #772287]
-* Request periodic scans while WiFi list is open [Dan; #767918]
-* Always show primary network icon when connected [Florian; #773890]
-* Misc. bug fixes [Carlos, Florian, Ray; #773875, #740043, #773893]
-
-Contributors:
-  Cosimo Cecchi, Carlos Garcia Campos, Florian Müllner, Ray Strode, Dan Williams
-
-Translations:
-  Kjartan Maraas [nb], Fabio Tomat [fur], Philip Chimento [zh_CN],
-  YunQiang Su [zh_CN], Piotr Drąg [pl], Stas Solovey [ru]
-
-3.22.1
-======
-* Fix hidden network indicator on startup [Florian; #772249]
-* Fix order of windows with modal dialogs in window switcher [Florian; #747153]
-* Fix feedback loop between StClipboard and X11 bridge [Carlos; #760745]
-* Reliably match windows from Flatpak apps [Florian; #772615]
-* Misc. bug fixes [Philip; #742249]
-
-Contributors:
-  Philip Chimento, Carlos Garnacho, Florian Müllner
-
-Translations:
-  Inaki Larranaga Murgoitio [eu], Khaled Hosny [ar], BM [uz@cyrillic],
-  Milo Casagrande [it], Cheng-Chia Tseng [zh_TW], gogo [hr]
-
 3.22.0
 ======
 * Misc. bug fixes [Florian, Rui; #771391, #771536] #771656]
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@ -1029,7 +1029,6 @@ NPP_GetValue(NPP          instance,
    if (!instance->pdata)
      return NPERR_INVALID_INSTANCE_ERROR;

-    funcs.retainobject (instance->pdata);
    *(NPObject**)value = instance->pdata;
    break;

--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.22.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.22.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 AX_IS_RELEASE([git-directory])

 AC_CONFIG_HEADERS([config.h])
@ -78,7 +78,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.21.5
 GOBJECT_INTROSPECTION_MIN_VERSION=1.49.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.22.1
+MUTTER_MIN_VERSION=3.22.0
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@ -6,9 +6,7 @@
 const Lang = imports.lang;
 const Signals = imports.signals;

-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
-const ShellJS = imports.gi.ShellJS;

 const Config = imports.misc.config;
 const FileUtils = imports.misc.fileUtils;
@ -140,12 +138,11 @@ function createExtensionObject(uuid, dir, type) {
    return extension;
 }

-var _extension = null;
-
 function installImporter(extension) {
-    _extension = extension;
-    ShellJS.add_extension_importer('imports.misc.extensionUtils._extension', 'imports', extension.path);
-    _extension = null;
+    let oldSearchPath = imports.searchPath.slice();  // make a copy
+    imports.searchPath = [extension.path];
+    extension.imports = imports['.'];  // "subdir" creates a new importer object
+    imports.searchPath = oldSearchPath;
 }

 const ExtensionFinder = new Lang.Class({
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -46,19 +46,6 @@ function _createWindowClone(window, size) {
                               y_expand: true });
 };

-function getWindows(workspace) {
-    // We ignore skip-taskbar windows in switchers, but if they are attached
-    // to their parent, their position in the MRU list may be more appropriate
-    // than the parent; so start with the complete list ...
-    let windows = global.display.get_tab_list(Meta.TabList.NORMAL_ALL,
-                                              workspace);
-    // ... map windows to their parent where appropriate ...
-    return windows.map(w => {
-        return w.is_attached_dialog() ? w.get_transient_for() : w;
-    // ... and filter out skip-taskbar windows and duplicates
-    }).filter((w, i, a) => !w.skip_taskbar && a.indexOf(w) == i);
-}
-
 const AppSwitcherPopup = new Lang.Class({
    Name: 'AppSwitcherPopup',
    Extends: SwitcherPopup.SwitcherPopup,
@ -530,7 +517,7 @@ const WindowSwitcherPopup = new Lang.Class({

    _getWindowList: function() {
        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
-        return getWindows(workspace);
+        return global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
    },

    _keyPressHandler: function(keysym, action) {
@ -568,7 +555,7 @@ const WindowCyclerPopup = new Lang.Class({

    _getWindows: function() {
        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
-        return getWindows(workspace);
+        return global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
    },

    _keyPressHandler: function(keysym, action) {
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@ -615,14 +615,6 @@ const NetworkAgent = new Lang.Class({
        this._vpnRequests = { };
        this._notifications = { };

-        this._pluginDir = Gio.file_new_for_path(GLib.build_filenamev([Config.SYSCONFDIR, 'NetworkManager/VPN']));
-        try {
-            let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
-            monitor.connect('changed', () => { this._vpnCacheBuilt = false; });
-        } catch(e) {
-            log('Failed to create monitor for VPN plugin dir: ' + e.message);
-        }
-
        this._native.connect('new-request', Lang.bind(this, this._newRequest));
        this._native.connect('cancel-request', Lang.bind(this, this._cancelRequest));

@ -773,8 +765,9 @@ const NetworkAgent = new Lang.Class({
        this._vpnCacheBuilt = true;
        this._vpnBinaries = { };

+        let dir = Gio.file_new_for_path(GLib.build_filenamev([Config.SYSCONFDIR, 'NetworkManager/VPN']));
        try {
-            let fileEnum = this._pluginDir.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
+            let fileEnum = dir.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
            let info;

            while ((info = fileEnum.next_file(null))) {
@ -784,7 +777,7 @@ const NetworkAgent = new Lang.Class({

                try {
                    let keyfile = new GLib.KeyFile();
-                    keyfile.load_from_file(this._pluginDir.get_child(name).get_path(), GLib.KeyFileFlags.NONE);
+                    keyfile.load_from_file(dir.get_child(name).get_path(), GLib.KeyFileFlags.NONE);
                    let service = keyfile.get_string('VPN Connection', 'service');
                    let binary = keyfile.get_string('GNOME', 'auth-dialog');
                    let externalUIMode = false;
@ -817,7 +810,7 @@ const NetworkAgent = new Lang.Class({
                    }
                } catch(e) {
                    log('Error \'%s\' while processing VPN keyfile \'%s\''.
-                        format(e.message, this._pluginDir.get_child(name).get_path()));
+                        format(e.message, dir.get_child(name).get_path()));
                    continue;
                }
            }
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -72,8 +72,8 @@ const OsdWindowConstraint = new Lang.Class({

        // Recenter
        let [x, y] = actorBox.get_origin();
-        actorBox.set_origin(Math.ceil(x + width / 2 - size / 2),
-                            Math.ceil(y + height / 2 - size / 2));
+        actorBox.set_origin(Math.floor(x + width / 2 - size / 2),
+                            Math.floor(y + height / 2 - size / 2));
    }
 });

@ -109,11 +109,8 @@ const OsdWindow = new Lang.Class({
        this._reset();

        Main.layoutManager.connect('monitors-changed',
-                                   Lang.bind(this, this._relayout));
-        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        themeContext.connect('notify::scale-factor',
-                             Lang.bind(this, this._relayout));
-        this._relayout();
+                                   Lang.bind(this, this._monitorsChanged));
+        this._monitorsChanged();
        Main.uiGroup.add_child(this.actor);
    },

@ -191,7 +188,7 @@ const OsdWindow = new Lang.Class({
        this.setLevel(null);
    },

-    _relayout: function() {
+    _monitorsChanged: function() {
        /* assume 110x110 on a 640x480 display and scale from there */
        let monitor = Main.layoutManager.monitors[this._monitorIndex];
        if (!monitor)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@ -783,16 +783,6 @@ const PopupMenu = new Lang.Class({
                break;
        }

-        let state = event.get_state();
-
-        // if user has a modifier down (except capslock)
-        // then don't handle the key press here
-        state &= ~Clutter.ModifierType.LOCK_MASK;
-        state &= Clutter.ModifierType.MODIFIER_MASK;
-
-        if (state)
-            return Clutter.EVENT_PROPAGATE;
-
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
            this.toggle();
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -847,7 +847,6 @@ const ScreenShield = new Lang.Class({
    },

    _activateFade: function(lightbox, time) {
-        Main.uiGroup.set_child_above_sibling(lightbox.actor, null);
        lightbox.show(time);

        if (this._becameActiveId == 0)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -5,7 +5,6 @@ const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const NetworkManager = imports.gi.NetworkManager;
 const NMClient = imports.gi.NMClient;
 const NMGtk = imports.gi.NMGtk;
@ -753,9 +752,10 @@ const NMWirelessDialog = new Lang.Class({
        this._updateSensitivity();
        this._syncView();

-        this._scanTimeoutId = Mainloop.timeout_add_seconds(15, Lang.bind(this, this._onScanTimeout));
-        GLib.Source.set_name_by_id(this._scanTimeoutId, '[gnome-shell] this._onScanTimeout');
-        this._onScanTimeout();
+        if (accessPoints.length == 0) {
+            /* If there are no visible access points, request a scan */
+            this._device.request_scan_simple(null);
+        }
    },

    destroy: function() {
@ -780,19 +780,9 @@ const NMWirelessDialog = new Lang.Class({
            this._airplaneModeChangedId = 0;
        }

-        if (this._scanTimeoutId) {
-            Mainloop.source_remove(this._scanTimeoutId);
-            this._scanTimeoutId = 0;
-        }
-
        this.parent();
    },

-    _onScanTimeout: function() {
-        this._device.request_scan_simple(null);
-        return GLib.SOURCE_CONTINUE;
-    },
-
    _activeApChanged: function() {
        if (this._activeNetwork)
            this._activeNetwork.item.setActive(false);
@ -2020,24 +2010,13 @@ const NMApplet = new Lang.Class({
    },

    _updateIcon: function() {
-        if (!this._client.networking_enabled) {
+        if (!this._client.networking_enabled || !this._mainConnection) {
            this._primaryIndicator.visible = false;
        } else {
-            let dev = null;
-            if (this._mainConnection)
-                dev = this._mainConnection._primaryDevice;
-
-            let state = this._client.get_state();
-            let connected = state == NetworkManager.State.CONNECTED_GLOBAL;
-            this._primaryIndicator.visible = (dev != null) || connected;
-            if (dev) {
+            let dev = this._mainConnection._primaryDevice;
+            this._primaryIndicator.visible = (dev != null);
+            if (dev)
                this._primaryIndicator.icon_name = dev.getIndicatorIcon();
-            } else if (connected) {
-                if (this._client.connectivity == NetworkManager.ConnectivityState.FULL)
-                    this._primaryIndicator.icon_name = 'network-wired-symbolic';
-                else
-                    this._primaryIndicator.icon_name = 'network-wired-no-route-symbolic';
-            }
        }

        this._vpnIndicator.icon_name = this._vpnSection.getIndicatorIcon();
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -29,7 +29,6 @@ gl
 gu
 he
 hi
-hr
 hu
 ia
 id
--- a/po/fur.po
+++ b/po/fur.po
@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: video-subtitles master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-11 08:09+0000\n"
-"PO-Revision-Date: 2016-10-17 12:19+0200\n"
+"POT-Creation-Date: 2016-08-20 08:27+0000\n"
+"PO-Revision-Date: 2016-08-22 22:52+0200\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
@ -19,30 +19,6 @@ msgstr ""
 "X-Generator: Poedit 1.8.8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: data/50-gnome-shell-system.xml:6
-msgid "System"
-msgstr "Sisteme"
-
-#: data/50-gnome-shell-system.xml:9
-msgid "Show the notification list"
-msgstr "Mostre la liste des notifichis"
-
-#: data/50-gnome-shell-system.xml:12
-msgid "Focus the active notification"
-msgstr "Met il focus ae notifiche ative"
-
-#: data/50-gnome-shell-system.xml:15
-msgid "Show the overview"
-msgstr "Mostre la panoramiche"
-
-#: data/50-gnome-shell-system.xml:18
-msgid "Show all applications"
-msgstr "Mostre dutis lis aplicazions"
-
-#: data/50-gnome-shell-system.xml:21
-msgid "Open the application menu"
-msgstr "Vierç il menù aplicazions"
-
 #: data/gnome-shell-extension-prefs.desktop.in.in:4
 msgid "GNOME Shell Extension Preferences"
 msgstr "Preferencis Estensions di GNOME Shell"
@ -158,9 +134,9 @@ msgid ""
 "state of the checkbox."
 msgstr ""
 "La shell e domandarà une password cuant che un dispositîf cifrât o un "
-"filesystem rimot al ven montât. Se le password e pues jessi salvade par un "
-"ûs futûr, une casele di selezion 'Visasi Password' e sarà presinte. Cheste "
-"clâf e impueste il valôr predefinît di cheste casele di selezion."
+"filesystem rimot al ven montât. Se le password e pues sedi salvade par un ûs "
+"futûr, une casele di selezion 'Visasi Password' e sarà presinte. Cheste clâf "
+"e impueste il valôr predefinît di cheste casele di selezion."

 #: data/org.gnome.shell.gschema.xml.in:77
 msgid ""
@ -363,7 +339,7 @@ msgstr "No in liste?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: js/gdm/loginDialog.js:859
+#: js/gdm/loginDialog.js:854
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(p.e., utent o %s)"
@ -371,12 +347,12 @@ msgstr "(p.e., utent o %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: js/gdm/loginDialog.js:864 js/ui/components/networkAgent.js:271
+#: js/gdm/loginDialog.js:859 js/ui/components/networkAgent.js:271
 #: js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Non utent:"

-#: js/gdm/loginDialog.js:1201
+#: js/gdm/loginDialog.js:1196
 msgid "Login Window"
 msgstr "Barcon di acès"

@ -765,7 +741,7 @@ msgstr "Passowrd rêt mobil a bande largje"
 msgid "A password is required to connect to “%s”."
 msgstr "A covente une password par tacâsi a '%s'."

-#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1660
+#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Ministradôr di rêt"

@ -791,7 +767,7 @@ msgstr "Mi displâs, no je lade drete. Prove di gnûf"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: js/ui/components/telepathyClient.js:765
+#: js/ui/components/telepathyClient.js:760
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "L'utent %s al è cognossût cumò come %s"
@ -1324,7 +1300,7 @@ msgstr "Permeti a %s di cognossi la tô posizion?"
 #: js/ui/status/location.js:437
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr ""
-"L'acès ae posizion al pues jessi cambiât cuant che tu vuelis su impostazions "
+"L'acès ae posizion al pues sedi cambiât cuant che tu vuelis su impostazions "
 "privacy."

 #: js/ui/status/network.js:101
@ -1503,11 +1479,11 @@ msgstr "VPN"
 msgid "VPN Off"
 msgstr "VPN distudât"

-#: js/ui/status/network.js:1699
+#: js/ui/status/network.js:1697
 msgid "Connection failed"
 msgstr "Conession falide"

-#: js/ui/status/network.js:1700
+#: js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Ativazion de conession di rêt falide"

@ -1535,7 +1511,7 @@ msgstr "A restin %d∶%02d (%d%%)"
 #: js/ui/status/power.js:103
 #, javascript-format
 msgid "%d∶%02d Until Full (%d %%)"
-msgstr "%d∶%02d par jessi plene (%d%%)"
+msgstr "%d∶%02d par sedi plene (%d%%)"

 #: js/ui/status/power.js:131 js/ui/status/power.js:133
 #, javascript-format
@ -1760,12 +1736,30 @@ msgstr "Lis password no corispuindin."

 #: src/shell-keyring-prompt.c:738
 msgid "Password cannot be blank"
-msgstr "La password no pues jessi vueide"
+msgstr "La password no pues sedi vueide"

 #: src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Dialic di autenticazion anulât dal utent"

+#~ msgid "System"
+#~ msgstr "Sisteme"
+
+#~ msgid "Show the notification list"
+#~ msgstr "Mostre la liste des notifichis"
+
+#~ msgid "Focus the active notification"
+#~ msgstr "Met il focus ae notifiche ative"
+
+#~ msgid "Show the overview"
+#~ msgstr "Mostre la panoramiche"
+
+#~ msgid "Show all applications"
+#~ msgstr "Mostre dutis lis aplicazions"
+
+#~ msgid "Open the application menu"
+#~ msgstr "Vierç il menù aplicazions"
+
 #~ msgid "Show the week date in the calendar"
 #~ msgstr "Mostre il dì de setemane tal calendari"

--- a/po/hr.po
+++ b/po/hr.po
--- a/po/it.po
+++ b/po/it.po
@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-03 09:39+0000\n"
-"PO-Revision-Date: 2016-10-06 13:48+0200\n"
+"POT-Creation-Date: 2016-09-07 09:41+0000\n"
+"PO-Revision-Date: 2016-10-03 11:38+0200\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italiano <tp@lists.linux.it>\n"
 "Language: it\n"
@ -374,7 +374,7 @@ msgstr "Non elencato?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: js/gdm/loginDialog.js:859
+#: js/gdm/loginDialog.js:854
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(p.e. utente o %s)"
@ -382,12 +382,12 @@ msgstr "(p.e. utente o %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: js/gdm/loginDialog.js:864 js/ui/components/networkAgent.js:271
+#: js/gdm/loginDialog.js:859 js/ui/components/networkAgent.js:271
 #: js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nome utente: "

-#: js/gdm/loginDialog.js:1201
+#: js/gdm/loginDialog.js:1196
 msgid "Login Window"
 msgstr "Finestra di accesso"

@ -778,7 +778,7 @@ msgstr "Password rete mobile"
 msgid "A password is required to connect to “%s”."
 msgstr "È richiesta una password per connettersi a «%s»."

-#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1660
+#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Gestore reti"

@ -804,7 +804,7 @@ msgstr "Errore nell'autenticazione. Provare di nuovo."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: js/ui/components/telepathyClient.js:765
+#: js/ui/components/telepathyClient.js:760
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s ha cambiato nome in %s"
@ -1085,10 +1085,9 @@ msgstr "Artista sconosciuto"
 msgid "Unknown title"
 msgstr "Titolo sconosciuto"

-# (ndt) non molto chiaro il suo utilizzo, arriva dal un file che implementa la specifica MPRIS.
 #: js/ui/mpris.js:217
 msgid "Media"
-msgstr "Controlli"
+msgstr "Supporto"

 #: js/ui/overview.js:84
 msgid "Undo"
@ -1525,11 +1524,11 @@ msgstr "VPN"
 msgid "VPN Off"
 msgstr "VPN spento"

-#: js/ui/status/network.js:1699
+#: js/ui/status/network.js:1697
 msgid "Connection failed"
 msgstr "Connessione non riuscita"

-#: js/ui/status/network.js:1700
+#: js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Attivazione della connessione di rete non riuscita"

@ -1787,3 +1786,12 @@ msgstr "La password non può essere vuota"
 #: src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Il dialogo di autenticazione è stato annullato dall'utente"
+
+#~ msgid "Show the week date in the calendar"
+#~ msgstr "Mostra il numero della settimana nel calendario"
+
+#~ msgid "If true, display the ISO week date in the calendar."
+#~ msgstr "Se VERO, visualizza il giorno della settimana ISO nel calendario."
+
+#~ msgid "Use as Internet connection"
+#~ msgstr "Usa come connessione a Internet"
--- a/po/nb.po
+++ b/po/nb.po
@ -3,14 +3,14 @@
 # This file is distributed under the same license as the gnome-shell package.
 #
 # Åka Sikrom <a4@hush.com>, 2014-2015.
-# Kjartan Maraas <kmaraas@gnome.org>, 2009-2016.
+# Kjartan Maraas <kmaraas@gnome.org>, 2009-2015.
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 3.22.x\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-16 19:40+0200\n"
-"PO-Revision-Date: 2016-10-16 19:41+0200\n"
+"Project-Id-Version: gnome-shell 3.19.x\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-01 14:12+0200\n"
+"PO-Revision-Date: 2016-05-01 14:21+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
@ -20,6 +20,291 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"

+#: ../data/50-gnome-shell-system.xml.in.h:1
+msgid "System"
+msgstr "System"
+
+#: ../data/50-gnome-shell-system.xml.in.h:2
+msgid "Show the notification list"
+msgstr "Vis varslingsliste"
+
+#: ../data/50-gnome-shell-system.xml.in.h:3
+msgid "Focus the active notification"
+msgstr "Fokuser på aktiv varsling"
+
+#: ../data/50-gnome-shell-system.xml.in.h:4
+msgid "Show the overview"
+msgstr "Vis oversikt"
+
+#: ../data/50-gnome-shell-system.xml.in.h:5
+msgid "Show all applications"
+msgstr "Vis alle programmer"
+
+#: ../data/50-gnome-shell-system.xml.in.h:6
+msgid "Open the application menu"
+msgstr "Åpne programmenyen"
+
+#: ../data/gnome-shell-extension-prefs.desktop.in.in.h:1
+msgid "GNOME Shell Extension Preferences"
+msgstr "Brukervalg for GNOME Shell-utvidelser"
+
+#: ../data/gnome-shell-extension-prefs.desktop.in.in.h:2
+msgid "Configure GNOME Shell Extensions"
+msgstr "Sett opp utvidelser for GNOME Shell"
+
+#: ../data/org.gnome.Shell.desktop.in.in.h:1
+msgid "GNOME Shell"
+msgstr "GNOME Shell"
+
+#: ../data/org.gnome.Shell.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "Vindushåndtering og oppstart av programmer"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:1
+msgid "Enable internal tools useful for developers and testers from Alt-F2"
+msgstr "Slå på interne verktøy for utviklere og testere fra Alt-F2"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:2
+msgid ""
+"Allows access to internal debugging and monitoring tools using the Alt-F2 "
+"dialog."
+msgstr ""
+"Tillat tilgang til interne feilsøkings- og overvåkingsverktøy ved å bruke "
+"Alt-F2-dialogen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:3
+msgid "UUIDs of extensions to enable"
+msgstr "UUID-er for utvidelser som skal slås på"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:4
+msgid ""
+"GNOME Shell extensions have a UUID property; this key lists extensions which "
+"should be loaded. Any extension that wants to be loaded needs to be in this "
+"list. You can also manipulate this list with the EnableExtension and "
+"DisableExtension D-Bus methods on org.gnome.Shell."
+msgstr ""
+"GNOME Shell-utvidelser har en UUID-egenskap. Denne nøkkelen viser utvidelser "
+"som skal lastes inn. Alle utvidelser som ønsker å bli lastet inn må være med "
+"på denne lista. Du kan også manipulere lista med DBus-metodene "
+"EnablExtension og DisableExtension på org.gnome.Shell."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:5
+msgid "Disables the validation of extension version compatibility"
+msgstr ""
+"Slår av gyldighetssjekk av hvorvidt programversjoner passer med utvidelser"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:6
+msgid ""
+"GNOME Shell will only load extensions that claim to support the current "
+"running version. Enabling this option will disable this check and try to "
+"load all extensions regardless of the versions they claim to support."
+msgstr ""
+"GNOME Shell laster bare inn utvidelser som hevder å støtte kjørende versjon. "
+"Hvis du slår på dette valget, slår du av denne sjekken, og alle utvidelser "
+"lastes inn uavhengig av hvilke versjoner de hevder å støtte."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
+msgid "List of desktop file IDs for favorite applications"
+msgstr "Liste av skrivebordsfil-id-er for favorittprogrammer"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:8
+msgid ""
+"The applications corresponding to these identifiers will be displayed in the "
+"favorites area."
+msgstr ""
+"Programmene som passer til disse identifikatorene vises i favorittområdet."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
+msgid "App Picker View"
+msgstr "Visning av programvelger"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
+msgid "Index of the currently selected view in the application picker."
+msgstr "Indeks for valgt visning i programvelgeren."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
+msgid "History for command (Alt-F2) dialog"
+msgstr "Historikk for kommandodialog (Alt-F2)"
+
+#. Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+msgid "History for the looking glass dialog"
+msgstr "Historikk for forstørrelsesglass-dialogen"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+msgid "Always show the 'Log out' menu item in the user menu."
+msgstr "Alltid vis menyoppføringen «Logg ut» i brukermenyen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menu item in single-"
+"user, single-session situations."
+msgstr ""
+"Denne nøkkelen overstyrer skjuling av menyoppføringen «Logg ut» i "
+"situasjonen én bruker, én sesjon."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+msgid ""
+"Whether to remember password for mounting encrypted or remote filesystems"
+msgstr "Om passord til eksterne eller krypterte filsystemer skal huskes."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+msgid ""
+"The shell will request a password when an encrypted device or a remote "
+"filesystem is mounted. If the password can be saved for future use a "
+"'Remember Password' checkbox will be present. This key sets the default "
+"state of the checkbox."
+msgstr ""
+"Skallet spør etter passord når du monterer en kryptert enhet eller et "
+"eksternt filsystem. Hvis passordet kan lagres for fremtidig bruk, vises en "
+"avkryssingsboks med teksten «Husk passord». Denne nøkkelen bestemmer "
+"standardverdien for avkryssingsboksen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+msgid ""
+"Whether the default Bluetooth adapter had set up devices associated to it"
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+msgid ""
+"The shell will only show a Bluetooth menu item if a Bluetooth adapter is "
+"powered, or if there were devices set up associated with the default "
+"adapter. This will be reset if the default adapter is ever seen not to have "
+"devices associated to it."
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+msgid "Show the week date in the calendar"
+msgstr "Vis ukedato/ukenummer i kalender"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+msgid "If true, display the ISO week date in the calendar."
+msgstr "Viser ISO-ukedato i kalenderen hvis «true»."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+msgid "Keybinding to open the application menu"
+msgstr "Tastaturbinding som åpner programmenyen"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+msgid "Keybinding to open the application menu."
+msgstr "Tastaturbinding som åpner programmenyen."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+msgid "Keybinding to open the \"Show Applications\" view"
+msgstr "Tastaturbinding som åpner visningen «Vis programmer»"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+msgid ""
+"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgstr ""
+"Tastaturbinding som åpner visningen «Vis programmer» i aktivitetsoversikten."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+msgid "Keybinding to open the overview"
+msgstr "Tastaturbinding som åpner oversikten"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+msgid "Keybinding to open the Activities Overview."
+msgstr "Tastaturbinding som åpner aktivitetsoversikten."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+msgid "Keybinding to toggle the visibility of the notification list"
+msgstr "Tastaturbinding som slår av/på visning av varslingsliste"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+msgid "Keybinding to toggle the visibility of the notification list."
+msgstr "Tastaturbinding som slår av/på visning av varslingsliste."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+msgid "Keybinding to focus the active notification"
+msgstr "Tastaturbinding som fokuserer aktiv varsling"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+msgid "Keybinding to focus the active notification."
+msgstr "Tastaturbinding som fokuserer aktiv varsling."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+msgid ""
+"Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr ""
+"Hurtigtast som stanser og fortsetter pågående bevegelser til "
+"feilsøkingsformål"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+msgid "Which keyboard to use"
+msgstr "Tastatur som skal brukes"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+msgid "The type of keyboard to use."
+msgstr "Type tastatur som skal brukes."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+msgid "Limit switcher to current workspace."
+msgstr "Begrens programveksling til gjeldende arbeidsområde."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+msgid ""
+"If true, only applications that have windows on the current workspace are "
+"shown in the switcher. Otherwise, all applications are included."
+msgstr ""
+"Hvis verdien er sann («true»), er det bare programmer med vinduer på "
+"gjeldende arbeidsområder som vises i programveksleren. I motsatt fall kan du "
+"veksle mellom programmer på tvers av arbeidsområder."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+msgid "The application icon mode."
+msgstr "Ikonmodus for programmet."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+msgid ""
+"Configures how the windows are shown in the switcher. Valid possibilities "
+"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+"only' (shows only the application icon) or 'both'."
+msgstr ""
+"Bestemmer hvordan vinduene vises i programveksleren. Gyldige "
+"valgalternativer er «thumbnail-only» (viser miniatyrbilde av vinduet), «app-"
+"icon-only» (viser bare programikonet) og «both» (viser begge forannevnte)."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+msgid ""
+"If true, only windows from the current workspace are shown in the switcher. "
+"Otherwise, all windows are included."
+msgstr ""
+"Hvis verdien er sann («true»), er det bare vinduer på gjeldende "
+"arbeidsområder som vises i programveksleren. I motsatt fall vises vinduer "
+"fra alle arbeidsområder."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+msgid "Attach modal dialog to the parent window"
+msgstr "Fest modal dialog til opphavsvinduet"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+msgid ""
+"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr ""
+"Denne nøkkelen overstyrer nøkkelen i org.gnome.mutter når GNOME Shell kjøres."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Del opp skjermkantene i fliser når brukeren drar og slipper vinduer på dem"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
+msgid "Workspaces are managed dynamically"
+msgstr "Arbeidsområder håndteres dynamisk"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
+msgid "Workspaces only on primary monitor"
+msgstr "Arbeidsområder vises kun på hovedskjerm"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
+msgid "Delay focus changes in mouse mode until the pointer stops moving"
+msgstr "Utsett fokusendringer i musmodus til peker slutter å bevege seg"
+
+#: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
+msgid "Network Login"
+msgstr "Nettverkspålogging"
+
 #: ../js/extensionPrefs/main.js:117
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
@ -31,7 +316,7 @@ msgstr "Utvidelser for GNOME Shell"

 #: ../js/gdm/authPrompt.js:147 ../js/ui/audioDeviceSelection.js:71
 #: ../js/ui/components/networkAgent.js:145
-#: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:483
+#: ../js/ui/components/polkitAgent.js:179 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
@ -65,7 +350,7 @@ msgstr "Ikke listet?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: ../js/gdm/loginDialog.js:859
+#: ../js/gdm/loginDialog.js:854
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
@ -73,12 +358,12 @@ msgstr "(f.eks. bruker eller %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:864 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:859 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Brukernavn: "

-#: ../js/gdm/loginDialog.js:1201
+#: ../js/gdm/loginDialog.js:1196
 msgid "Login Window"
 msgstr "Innloggingsvindu"

@ -186,16 +471,6 @@ msgstr "%d %B %Y, %H.%M"
 msgid "Web Authentication Redirect"
 msgstr "Omdirigering av autentisering på nett"

-#. No support for non-modal system dialogs, so ignore the option
-#. let modal = options['modal'] || true;
-#: ../js/ui/accessDialog.js:62 ../js/ui/status/location.js:426
-msgid "Deny Access"
-msgstr "Nekt tilgang"
-
-#: ../js/ui/accessDialog.js:63 ../js/ui/status/location.js:429
-msgid "Grant Access"
-msgstr "Gi tilgang"
-
 #: ../js/ui/appDisplay.js:794
 msgid "Frequently used applications will appear here"
 msgstr "Ofte brukte programmer vises her"
@ -262,7 +537,7 @@ msgstr "Bytt bakgrunn …"
 msgid "Display Settings"
 msgstr "Innstillinger for skjerm"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:374
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
 msgid "Settings"
 msgstr "Innstillinger"

@ -318,55 +593,55 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "L"

-#: ../js/ui/calendar.js:442
+#: ../js/ui/calendar.js:416
 msgid "Previous month"
 msgstr "Forrige måned"

-#: ../js/ui/calendar.js:452
+#: ../js/ui/calendar.js:426
 msgid "Next month"
 msgstr "Neste måned"

-#: ../js/ui/calendar.js:605
+#: ../js/ui/calendar.js:579
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"

-#: ../js/ui/calendar.js:660
+#: ../js/ui/calendar.js:634
 msgid "Week %V"
 msgstr "Uke %V"

 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #.
-#: ../js/ui/calendar.js:721
+#: ../js/ui/calendar.js:695
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Hele dagen"

-#: ../js/ui/calendar.js:836
+#: ../js/ui/calendar.js:821
 msgid "Events"
 msgstr "Hendelser"

-#: ../js/ui/calendar.js:845
+#: ../js/ui/calendar.js:830
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %B %d"

-#: ../js/ui/calendar.js:849
+#: ../js/ui/calendar.js:834
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"

-#: ../js/ui/calendar.js:931
+#: ../js/ui/calendar.js:919
 msgid "Notifications"
 msgstr "Varslinger"

-#: ../js/ui/calendar.js:1082
+#: ../js/ui/calendar.js:1070
 msgid "No Notifications"
 msgstr "Ingen varslinger"

-#: ../js/ui/calendar.js:1085
+#: ../js/ui/calendar.js:1073
 msgid "No Events"
 msgstr "Ingen hendelser"

@ -478,7 +753,7 @@ msgstr "Nettverkspassord for mobilt bredbånd"
 msgid "A password is required to connect to “%s”."
 msgstr "Du må oppgi et passord for å koble til «%s»."

-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1660
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Nettverkshåndtering"

@ -504,7 +779,7 @@ msgstr "Beklager, det virket ikke. Prøv igjen."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:765
+#: ../js/ui/components/telepathyClient.js:760
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@ -636,7 +911,7 @@ msgstr[1] ""
 "Systemet starter på nytt og installere oppdateringer automatisk om %d "
 "sekunder."

-#: ../js/ui/endSessionDialog.js:127 ../js/ui/endSessionDialog.js:147
+#: ../js/ui/endSessionDialog.js:127
 msgctxt "button"
 msgid "Restart &amp; Install"
 msgstr "Start på nytt og installer"
@ -651,43 +926,28 @@ msgctxt "checkbox"
 msgid "Power off after updates are installed"
 msgstr "Slå av etter at oppdateringer er installert"

-#: ../js/ui/endSessionDialog.js:137
-msgctxt "title"
-msgid "Restart & Install Upgrade"
-msgstr "Start på nytt og installer oppgradering"
-
-#. Translators: This is the text displayed for system upgrades in the
-#. shut down dialog. First %s gets replaced with the distro name and
-#. second %s with the distro version to upgrade to
-#: ../js/ui/endSessionDialog.js:142
-#, javascript-format
-msgid ""
-"%s %s will be installed after restart. Upgrade installation can take a long "
-"time: ensure that you have backed up and that the computer is plugged in."
-msgstr "%s %s vil bli installert etter omstart. Installering av en oppgradering kan ta lang tid: forsikre deg om at du har en sikkerhetskopi og at datamaskinen er koblet til strøm."
-
-#: ../js/ui/endSessionDialog.js:361
+#: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
 msgstr ""
 "Kjører på batteristrøm: vennligst koble til strøm før oppdateringer blir "
 "installert."

-#: ../js/ui/endSessionDialog.js:378
+#: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
 msgstr "Noen programmer er opptatt eller har arbeid som ikke er lagret."

-#: ../js/ui/endSessionDialog.js:385
+#: ../js/ui/endSessionDialog.js:362
 msgid "Other users are logged in."
 msgstr "Andre brukere er logget inn."

 #. Translators: Remote here refers to a remote session, like a ssh login
-#: ../js/ui/endSessionDialog.js:671
+#: ../js/ui/endSessionDialog.js:640
 #, javascript-format
 msgid "%s (remote)"
 msgstr "%s (ekstern)"

 #. Translators: Console here refers to a tty like a VT console
-#: ../js/ui/endSessionDialog.js:674
+#: ../js/ui/endSessionDialog.js:643
 #, javascript-format
 msgid "%s (console)"
 msgstr "%s (konsoll)"
@ -701,7 +961,7 @@ msgstr "Installer"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Vil du laste ned og installere «%s» fra extensions.gnome.org?"

-#: ../js/ui/keyboard.js:742 ../js/ui/status/keyboard.js:782
+#: ../js/ui/keyboard.js:741 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Tastatur"

@ -738,7 +998,7 @@ msgstr "Slått på"

 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1866
+#: ../js/ui/lookingGlass.js:719 ../src/gvc/gvc-mixer-control.c:1828
 msgid "Disabled"
 msgstr "Slått av"

@ -786,7 +1046,7 @@ msgstr "Media"
 msgid "Undo"
 msgstr "Angre"

-#: ../js/ui/overview.js:113
+#: ../js/ui/overview.js:117
 msgid "Overview"
 msgstr "Oversikt"

@ -794,7 +1054,7 @@ msgstr "Oversikt"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:240
+#: ../js/ui/overview.js:244
 msgid "Type to search…"
 msgstr "Skriv for å søke …"

@ -858,11 +1118,11 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d ny varsling"
 msgstr[1] "%d nye varslinger"

-#: ../js/ui/screenShield.js:449 ../js/ui/status/system.js:382
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
 msgid "Lock"
 msgstr "Lås"

-#: ../js/ui/screenShield.js:704
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME må låse skjermen"

@ -873,11 +1133,11 @@ msgstr "GNOME må låse skjermen"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: ../js/ui/screenShield.js:825 ../js/ui/screenShield.js:1291
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Klarte ikke å låse"

-#: ../js/ui/screenShield.js:826 ../js/ui/screenShield.js:1292
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Låsing ble stoppet av et program"

@ -961,7 +1221,7 @@ msgstr "Stor tekst"
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: ../js/ui/status/bluetooth.js:56 ../js/ui/status/network.js:624
+#: ../js/ui/status/bluetooth.js:56
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-innstillinger"

@ -996,7 +1256,7 @@ msgstr "Slå av"
 msgid "Brightness"
 msgstr "Lysstyrke"

-#: ../js/ui/status/keyboard.js:805
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"

@ -1024,6 +1284,14 @@ msgstr "Plassering slått av"
 msgid "Enable"
 msgstr "Slå på"

+#: ../js/ui/status/location.js:426
+msgid "Deny Access"
+msgstr "Nekt tilgang"
+
+#: ../js/ui/status/location.js:429
+msgid "Grant Access"
+msgstr "Gi tilgang"
+
 #. Translators: %s is an application name
 #: ../js/ui/status/location.js:435
 #, javascript-format
@ -1032,9 +1300,7 @@ msgstr "Gi %s tilgang til din plassering?"

 #: ../js/ui/status/location.js:437
 msgid "Location access can be changed at any time from the privacy settings."
-msgstr ""
-"Tilgang til plassering kan endres når som helst fra innstillinger for "
-"personvern."
+msgstr "Tilgang til plassering kan endres når som helst fra innstillinger for personvern."

 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
@ -1102,7 +1368,7 @@ msgstr "%s tilkobling mislyktes"
 msgid "Wired Settings"
 msgstr "Innstillinger for trådbundet nettverk"

-#: ../js/ui/status/network.js:545
+#: ../js/ui/status/network.js:545 ../js/ui/status/network.js:624
 msgid "Mobile Broadband Settings"
 msgstr "Innstillinger for mobilt bredbånd"

@ -1120,8 +1386,8 @@ msgid "%s Disabled"
 msgstr "%s slått av"

 #: ../js/ui/status/network.js:632
-msgid "Connect to Internet"
-msgstr "Koble til internett"
+msgid "Use as Internet connection"
+msgstr "Bruk som internettforbindelse"

 #: ../js/ui/status/network.js:813
 msgid "Airplane Mode is On"
@ -1212,11 +1478,11 @@ msgstr "VPN"
 msgid "VPN Off"
 msgstr "VPN av"

-#: ../js/ui/status/network.js:1699
+#: ../js/ui/status/network.js:1697
 msgid "Connection failed"
 msgstr "Tilkobling mislyktes"

-#: ../js/ui/status/network.js:1700
+#: ../js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling mislyktes"

@ -1258,27 +1524,27 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "Flymodus er slått på"

-#: ../js/ui/status/system.js:351
+#: ../js/ui/status/system.js:348
 msgid "Switch User"
 msgstr "Bytt bruker"

-#: ../js/ui/status/system.js:356
+#: ../js/ui/status/system.js:353
 msgid "Log Out"
 msgstr "Logg ut"

-#: ../js/ui/status/system.js:361
+#: ../js/ui/status/system.js:358
 msgid "Account Settings"
 msgstr "Innstillinger for konto"

-#: ../js/ui/status/system.js:378
+#: ../js/ui/status/system.js:375
 msgid "Orientation Lock"
 msgstr "Lås for orientering"

-#: ../js/ui/status/system.js:386
+#: ../js/ui/status/system.js:383
 msgid "Suspend"
 msgstr "Hvilemodus"

-#: ../js/ui/status/system.js:389
+#: ../js/ui/status/system.js:386
 msgid "Power Off"
 msgstr "Slå av"

@ -1404,9 +1670,13 @@ msgstr "Flytt til skjermen til venstre"
 msgid "Move to Monitor Right"
 msgstr "Flytt til skjermen til høyre"

+#: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
+msgid "Evolution Calendar"
+msgstr "Evolution kalender"
+
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1873
+#: ../src/gvc/gvc-mixer-control.c:1835
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@ -1415,14 +1685,14 @@ msgstr[1] "%u utganger"

 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1883
+#: ../src/gvc/gvc-mixer-control.c:1845
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u inngang"
 msgstr[1] "%u innganger"

-#: ../src/gvc/gvc-mixer-control.c:2738
+#: ../src/gvc/gvc-mixer-control.c:2371
 msgid "System Sounds"
 msgstr "Systemlyder"

@ -1442,12 +1712,12 @@ msgstr "Bruk spesifikt modus, f.eks «gdm» for innloggingsskjerm"
 msgid "List possible modes"
 msgstr "Vis mulige modi"

-#: ../src/shell-app.c:270
+#: ../src/shell-app.c:246
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ukjent"

-#: ../src/shell-app.c:511
+#: ../src/shell-app.c:487
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Klarte ikke å starte «%s»"
@ -1463,232 +1733,3 @@ msgstr "Passordet kan ikke være tomt"
 #: ../src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Autentiseringsdialogen ble lukket av brukeren"
-
-#~ msgid "System"
-#~ msgstr "System"
-
-#~ msgid "Show the notification list"
-#~ msgstr "Vis varslingsliste"
-
-#~ msgid "Focus the active notification"
-#~ msgstr "Fokuser på aktiv varsling"
-
-#~ msgid "Show the overview"
-#~ msgstr "Vis oversikt"
-
-#~ msgid "Show all applications"
-#~ msgstr "Vis alle programmer"
-
-#~ msgid "Open the application menu"
-#~ msgstr "Åpne programmenyen"
-
-#~ msgid "GNOME Shell Extension Preferences"
-#~ msgstr "Brukervalg for GNOME Shell-utvidelser"
-
-#~ msgid "Configure GNOME Shell Extensions"
-#~ msgstr "Sett opp utvidelser for GNOME Shell"
-
-#~ msgid "GNOME Shell"
-#~ msgstr "GNOME Shell"
-
-#~ msgid "Window management and application launching"
-#~ msgstr "Vindushåndtering og oppstart av programmer"
-
-#~ msgid "Enable internal tools useful for developers and testers from Alt-F2"
-#~ msgstr "Slå på interne verktøy for utviklere og testere fra Alt-F2"
-
-#~ msgid ""
-#~ "Allows access to internal debugging and monitoring tools using the Alt-F2 "
-#~ "dialog."
-#~ msgstr ""
-#~ "Tillat tilgang til interne feilsøkings- og overvåkingsverktøy ved å bruke "
-#~ "Alt-F2-dialogen."
-
-#~ msgid "UUIDs of extensions to enable"
-#~ msgstr "UUID-er for utvidelser som skal slås på"
-
-#~ msgid ""
-#~ "GNOME Shell extensions have a UUID property; this key lists extensions "
-#~ "which should be loaded. Any extension that wants to be loaded needs to be "
-#~ "in this list. You can also manipulate this list with the EnableExtension "
-#~ "and DisableExtension D-Bus methods on org.gnome.Shell."
-#~ msgstr ""
-#~ "GNOME Shell-utvidelser har en UUID-egenskap. Denne nøkkelen viser "
-#~ "utvidelser som skal lastes inn. Alle utvidelser som ønsker å bli lastet "
-#~ "inn må være med på denne lista. Du kan også manipulere lista med DBus-"
-#~ "metodene EnablExtension og DisableExtension på org.gnome.Shell."
-
-#~ msgid "Disables the validation of extension version compatibility"
-#~ msgstr ""
-#~ "Slår av gyldighetssjekk av hvorvidt programversjoner passer med utvidelser"
-
-#~ msgid ""
-#~ "GNOME Shell will only load extensions that claim to support the current "
-#~ "running version. Enabling this option will disable this check and try to "
-#~ "load all extensions regardless of the versions they claim to support."
-#~ msgstr ""
-#~ "GNOME Shell laster bare inn utvidelser som hevder å støtte kjørende "
-#~ "versjon. Hvis du slår på dette valget, slår du av denne sjekken, og alle "
-#~ "utvidelser lastes inn uavhengig av hvilke versjoner de hevder å støtte."
-
-#~ msgid "List of desktop file IDs for favorite applications"
-#~ msgstr "Liste av skrivebordsfil-id-er for favorittprogrammer"
-
-#~ msgid ""
-#~ "The applications corresponding to these identifiers will be displayed in "
-#~ "the favorites area."
-#~ msgstr ""
-#~ "Programmene som passer til disse identifikatorene vises i favorittområdet."
-
-#~ msgid "App Picker View"
-#~ msgstr "Visning av programvelger"
-
-#~ msgid "Index of the currently selected view in the application picker."
-#~ msgstr "Indeks for valgt visning i programvelgeren."
-
-#~ msgid "History for command (Alt-F2) dialog"
-#~ msgstr "Historikk for kommandodialog (Alt-F2)"
-
-#~ msgid "History for the looking glass dialog"
-#~ msgstr "Historikk for forstørrelsesglass-dialogen"
-
-#~ msgid "Always show the 'Log out' menu item in the user menu."
-#~ msgstr "Alltid vis menyoppføringen «Logg ut» i brukermenyen."
-
-#~ msgid ""
-#~ "This key overrides the automatic hiding of the 'Log out' menu item in "
-#~ "single-user, single-session situations."
-#~ msgstr ""
-#~ "Denne nøkkelen overstyrer skjuling av menyoppføringen «Logg ut» i "
-#~ "situasjonen én bruker, én sesjon."
-
-#~ msgid ""
-#~ "Whether to remember password for mounting encrypted or remote filesystems"
-#~ msgstr "Om passord til eksterne eller krypterte filsystemer skal huskes."
-
-#~ msgid ""
-#~ "The shell will request a password when an encrypted device or a remote "
-#~ "filesystem is mounted. If the password can be saved for future use a "
-#~ "'Remember Password' checkbox will be present. This key sets the default "
-#~ "state of the checkbox."
-#~ msgstr ""
-#~ "Skallet spør etter passord når du monterer en kryptert enhet eller et "
-#~ "eksternt filsystem. Hvis passordet kan lagres for fremtidig bruk, vises "
-#~ "en avkryssingsboks med teksten «Husk passord». Denne nøkkelen bestemmer "
-#~ "standardverdien for avkryssingsboksen."
-
-#~ msgid "Show the week date in the calendar"
-#~ msgstr "Vis ukedato/ukenummer i kalender"
-
-#~ msgid "If true, display the ISO week date in the calendar."
-#~ msgstr "Viser ISO-ukedato i kalenderen hvis «true»."
-
-#~ msgid "Keybinding to open the application menu"
-#~ msgstr "Tastaturbinding som åpner programmenyen"
-
-#~ msgid "Keybinding to open the application menu."
-#~ msgstr "Tastaturbinding som åpner programmenyen."
-
-#~ msgid "Keybinding to open the \"Show Applications\" view"
-#~ msgstr "Tastaturbinding som åpner visningen «Vis programmer»"
-
-#~ msgid ""
-#~ "Keybinding to open the \"Show Applications\" view of the Activities "
-#~ "Overview."
-#~ msgstr ""
-#~ "Tastaturbinding som åpner visningen «Vis programmer» i "
-#~ "aktivitetsoversikten."
-
-#~ msgid "Keybinding to open the overview"
-#~ msgstr "Tastaturbinding som åpner oversikten"
-
-#~ msgid "Keybinding to open the Activities Overview."
-#~ msgstr "Tastaturbinding som åpner aktivitetsoversikten."
-
-#~ msgid "Keybinding to toggle the visibility of the notification list"
-#~ msgstr "Tastaturbinding som slår av/på visning av varslingsliste"
-
-#~ msgid "Keybinding to toggle the visibility of the notification list."
-#~ msgstr "Tastaturbinding som slår av/på visning av varslingsliste."
-
-#~ msgid "Keybinding to focus the active notification"
-#~ msgstr "Tastaturbinding som fokuserer aktiv varsling"
-
-#~ msgid "Keybinding to focus the active notification."
-#~ msgstr "Tastaturbinding som fokuserer aktiv varsling."
-
-#~ msgid ""
-#~ "Keybinding that pauses and resumes all running tweens, for debugging "
-#~ "purposes"
-#~ msgstr ""
-#~ "Hurtigtast som stanser og fortsetter pågående bevegelser til "
-#~ "feilsøkingsformål"
-
-#~ msgid "Which keyboard to use"
-#~ msgstr "Tastatur som skal brukes"
-
-#~ msgid "The type of keyboard to use."
-#~ msgstr "Type tastatur som skal brukes."
-
-#~ msgid "Limit switcher to current workspace."
-#~ msgstr "Begrens programveksling til gjeldende arbeidsområde."
-
-#~ msgid ""
-#~ "If true, only applications that have windows on the current workspace are "
-#~ "shown in the switcher. Otherwise, all applications are included."
-#~ msgstr ""
-#~ "Hvis verdien er sann («true»), er det bare programmer med vinduer på "
-#~ "gjeldende arbeidsområder som vises i programveksleren. I motsatt fall kan "
-#~ "du veksle mellom programmer på tvers av arbeidsområder."
-
-#~ msgid "The application icon mode."
-#~ msgstr "Ikonmodus for programmet."
-
-#~ msgid ""
-#~ "Configures how the windows are shown in the switcher. Valid possibilities "
-#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-#~ "only' (shows only the application icon) or 'both'."
-#~ msgstr ""
-#~ "Bestemmer hvordan vinduene vises i programveksleren. Gyldige "
-#~ "valgalternativer er «thumbnail-only» (viser miniatyrbilde av vinduet), "
-#~ "«app-icon-only» (viser bare programikonet) og «both» (viser begge "
-#~ "forannevnte)."
-
-#~ msgid ""
-#~ "If true, only windows from the current workspace are shown in the "
-#~ "switcher. Otherwise, all windows are included."
-#~ msgstr ""
-#~ "Hvis verdien er sann («true»), er det bare vinduer på gjeldende "
-#~ "arbeidsområder som vises i programveksleren. I motsatt fall vises vinduer "
-#~ "fra alle arbeidsområder."
-
-#~ msgid "Attach modal dialog to the parent window"
-#~ msgstr "Fest modal dialog til opphavsvinduet"
-
-#~ msgid ""
-#~ "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-#~ msgstr ""
-#~ "Denne nøkkelen overstyrer nøkkelen i org.gnome.mutter når GNOME Shell "
-#~ "kjøres."
-
-#~ msgid "Enable edge tiling when dropping windows on screen edges"
-#~ msgstr ""
-#~ "Del opp skjermkantene i fliser når brukeren drar og slipper vinduer på dem"
-
-#~ msgid "Workspaces are managed dynamically"
-#~ msgstr "Arbeidsområder håndteres dynamisk"
-
-#~ msgid "Workspaces only on primary monitor"
-#~ msgstr "Arbeidsområder vises kun på hovedskjerm"
-
-#~ msgid "Delay focus changes in mouse mode until the pointer stops moving"
-#~ msgstr "Utsett fokusendringer i musmodus til peker slutter å bevege seg"
-
-#~ msgid "Network Login"
-#~ msgstr "Nettverkspålogging"
-
-#~ msgid "Use as Internet connection"
-#~ msgstr "Bruk som internettforbindelse"
-
-#~ msgid "Evolution Calendar"
-#~ msgstr "Evolution kalender"
--- a/po/pl.po
+++ b/po/pl.po
@ -9,10 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-11 08:09+0000\n"
-"PO-Revision-Date: 2016-10-22 16:08+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-20 10:20+0200\n"
+"PO-Revision-Date: 2016-08-20 10:22+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@ -366,7 +365,7 @@ msgstr "Inny użytkownik?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: js/gdm/loginDialog.js:859
+#: js/gdm/loginDialog.js:854
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(np. użytkownik lub %s)"
@ -374,12 +373,12 @@ msgstr "(np. użytkownik lub %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: js/gdm/loginDialog.js:864 js/ui/components/networkAgent.js:271
+#: js/gdm/loginDialog.js:859 js/ui/components/networkAgent.js:271
 #: js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nazwa użytkownika: "

-#: js/gdm/loginDialog.js:1201
+#: js/gdm/loginDialog.js:1196
 msgid "Login Window"
 msgstr "Okno logowania"

@ -768,7 +767,7 @@ msgstr "Hasło sieci komórkowej"
 msgid "A password is required to connect to “%s”."
 msgstr "Do połączenia z siecią „%s” wymagane jest hasło."

-#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1660
+#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Menedżer sieci"

@ -794,7 +793,7 @@ msgstr "To nie zadziałało. Proszę spróbować ponownie."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: js/ui/components/telepathyClient.js:765
+#: js/ui/components/telepathyClient.js:760
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Użytkownik %s jest teraz znany jako %s"
@ -1513,11 +1512,11 @@ msgstr "VPN"
 msgid "VPN Off"
 msgstr "Wyłączono sieć VPN"

-#: js/ui/status/network.js:1699
+#: js/ui/status/network.js:1697
 msgid "Connection failed"
 msgstr "Połączenie się nie powiodło"

-#: js/ui/status/network.js:1700
+#: js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Aktywacja połączenia sieciowego się nie powiodła"

@ -1776,6 +1775,3 @@ msgstr "Hasło nie może być puste"
 #: src/shell-polkit-authentication-agent.c:353
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Okno dialogowe uwierzytelnienia zostało odrzucone przez użytkownika"
-
-msgid "Launch using Dedicated Graphics Card"
-msgstr "Uruchom za pomocą dedykowanej karty graficznej"
--- a/po/ru.po
+++ b/po/ru.po
@ -19,16 +19,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-11-04 15:16+0000\n"
-"PO-Revision-Date: 2016-11-08 21:21+0300\n"
+"POT-Creation-Date: 2016-09-07 09:41+0000\n"
+"PO-Revision-Date: 2016-09-11 20:49+0300\n"
 "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
-"Language-Team: Русский <gnome-cyr@gnome.org>\n"
+"Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 2.91.7\n"

 #: data/50-gnome-shell-system.xml:6
@ -333,23 +333,23 @@ msgstr "Возникла ошибка загрузки диалогового о
 msgid "GNOME Shell Extensions"
 msgstr "Расширения GNOME Shell"

-#: js/gdm/authPrompt.js:149 js/ui/audioDeviceSelection.js:71
+#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
 #: js/ui/components/networkAgent.js:145 js/ui/components/polkitAgent.js:179
 #: js/ui/endSessionDialog.js:483 js/ui/extensionDownloader.js:195
-#: js/ui/shellMountOperation.js:399 js/ui/status/network.js:926
+#: js/ui/shellMountOperation.js:399 js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Отмена"

-#: js/gdm/authPrompt.js:171 js/gdm/authPrompt.js:218 js/gdm/authPrompt.js:450
+#: js/gdm/authPrompt.js:169 js/gdm/authPrompt.js:216 js/gdm/authPrompt.js:448
 msgid "Next"
 msgstr "Далее"

-#: js/gdm/authPrompt.js:214 js/ui/shellMountOperation.js:403
+#: js/gdm/authPrompt.js:212 js/ui/shellMountOperation.js:403
 #: js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Разблокировать"

-#: js/gdm/authPrompt.js:216
+#: js/gdm/authPrompt.js:214
 msgctxt "button"
 msgid "Sign In"
 msgstr "Войти"
@ -367,7 +367,7 @@ msgstr "Нет в списке?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: js/gdm/loginDialog.js:859
+#: js/gdm/loginDialog.js:854
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(например, пользователь или %s)"
@ -375,12 +375,12 @@ msgstr "(например, пользователь или %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: js/gdm/loginDialog.js:864 js/ui/components/networkAgent.js:271
+#: js/gdm/loginDialog.js:859 js/ui/components/networkAgent.js:271
 #: js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Имя пользователя: "

-#: js/gdm/loginDialog.js:1201
+#: js/gdm/loginDialog.js:1196
 msgid "Login Window"
 msgstr "Окно входа в систему"

@ -438,7 +438,7 @@ msgstr "%A, %H∶%M"
 #: js/misc/util.js:209
 #, no-c-format
 msgid "%B %d, %H∶%M"
-msgstr "%e %b., %H∶%M"
+msgstr "%d %b., %H∶%M"

 # fix даты
 #. Translators: this is the month name, day number, year
@ -447,7 +447,7 @@ msgstr "%e %b., %H∶%M"
 #: js/misc/util.js:215
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
-msgstr "%e %b. %Y, %H∶%M"
+msgstr "%d %b. %Y, %H∶%M"

 # по всей видимости разрабы коммент перепутали c "Translators: Time in 12h format"
 #. Translators: Time in 12h format
@ -476,7 +476,7 @@ msgstr "%A, %l∶%M %p"
 #: js/misc/util.js:238
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
-msgstr "%e %b., %l∶%M %p"
+msgstr "%d %b., %l∶%M %p"

 # fix даты
 #. Translators: this is the month name, day number, year
@ -485,7 +485,7 @@ msgstr "%e %b., %l∶%M %p"
 #: js/misc/util.js:244
 #, no-c-format
 msgid "%B %d %Y, %l∶%M %p"
-msgstr "%e %b. %Y, %l∶%M %p"
+msgstr "%d %b. %Y, %l∶%M %p"

 #. TRANSLATORS: this is the title of the wifi captive portal login
 #. * window, until we know the title of the actual login page
@ -503,35 +503,31 @@ msgstr "Запретить доступ"
 msgid "Grant Access"
 msgstr "Предоставить доступ"

-#: js/ui/appDisplay.js:806
+#: js/ui/appDisplay.js:794
 msgid "Frequently used applications will appear here"
 msgstr "Здесь появляются часто используемые приложения"

-#: js/ui/appDisplay.js:926
+#: js/ui/appDisplay.js:914
 msgid "Frequent"
 msgstr "Популярные"

-#: js/ui/appDisplay.js:933
+#: js/ui/appDisplay.js:921
 msgid "All"
 msgstr "Все"

-#: js/ui/appDisplay.js:1891
+#: js/ui/appDisplay.js:1853
 msgid "New Window"
 msgstr "Новое окно"

-#: js/ui/appDisplay.js:1905
-msgid "Launch using Dedicated Graphics Card"
-msgstr ""
-
-#: js/ui/appDisplay.js:1932 js/ui/dash.js:289
+#: js/ui/appDisplay.js:1881 js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Удалить из избранного"

-#: js/ui/appDisplay.js:1938
+#: js/ui/appDisplay.js:1887
 msgid "Add to Favorites"
 msgstr "Добавить в избранное"

-#: js/ui/appDisplay.js:1948
+#: js/ui/appDisplay.js:1897
 msgid "Show Details"
 msgstr "Показать подробности"

@ -659,16 +655,17 @@ msgstr "Весь день"
 msgid "Events"
 msgstr "События"

+# fix для даты в календаре и на экране блокировки, за разъяснением обращаться к Stas Solovey <whats_up@tut.by>
 #: js/ui/calendar.js:845
 msgctxt "calendar heading"
 msgid "%A, %B %d"
-msgstr "%A, %e %b."
+msgstr "%A, %d %b."

 # fix для даты в календаре и на экране блокировки
 #: js/ui/calendar.js:849
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
-msgstr "%A, %e %b. %Y"
+msgstr "%A, %d %b. %Y"

 #: js/ui/calendar.js:931
 msgid "Notifications"
@ -690,7 +687,7 @@ msgstr "Внешний диск подключён"
 msgid "External drive disconnected"
 msgstr "Внешний диск отключён"

-#: js/ui/components/autorunManager.js:356
+#: js/ui/components/autorunManager.js:355
 #, javascript-format
 msgid "Open with %s"
 msgstr "Открыть с помощью %s"
@ -703,8 +700,8 @@ msgstr "Пароль:"
 msgid "Type again:"
 msgstr "Введите ещё раз:"

-#: js/ui/components/networkAgent.js:140 js/ui/status/network.js:270
-#: js/ui/status/network.js:353 js/ui/status/network.js:929
+#: js/ui/components/networkAgent.js:140 js/ui/status/network.js:269
+#: js/ui/status/network.js:352 js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Соединиться"

@ -778,7 +775,7 @@ msgstr "Пароль для мобильной широкополосной се
 msgid "A password is required to connect to “%s”."
 msgstr "Для подключения к «%s» требуется пароль."

-#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1670
+#: js/ui/components/networkAgent.js:647 js/ui/status/network.js:1658
 msgid "Network Manager"
 msgstr "Диспетчер сети"

@ -804,7 +801,7 @@ msgstr "Не удалось подтвердить подлинность. По

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: js/ui/components/telepathyClient.js:765
+#: js/ui/components/telepathyClient.js:760
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Контакт %s теперь известен как %s"
@ -961,6 +958,8 @@ msgid "Power off after updates are installed"
 msgstr "Выключить после установки обновлений"

 #: js/ui/endSessionDialog.js:137
+#| msgctxt "title"
+#| msgid "Restart & Install Updates"
 msgctxt "title"
 msgid "Restart & Install Upgrade"
 msgstr "Перезапуск и установка обновлений"
@ -1110,54 +1109,6 @@ msgstr "Обзор"
 msgid "Type to search…"
 msgstr "Найти…"

-#: js/ui/padOsd.js:37
-msgid "New shortcut…"
-msgstr ""
-
-#: js/ui/padOsd.js:86
-#, fuzzy
-#| msgid "Applications"
-msgid "Application defined"
-msgstr "Приложения"
-
-#: js/ui/padOsd.js:87
-msgid "Show on-screen help"
-msgstr ""
-
-#: js/ui/padOsd.js:88
-#, fuzzy
-#| msgid "Switch User"
-msgid "Switch monitor"
-msgstr "Сменить пользователя"
-
-#: js/ui/padOsd.js:89
-msgid "Assign keystroke"
-msgstr ""
-
-#: js/ui/padOsd.js:143
-msgid "Done"
-msgstr ""
-
-#: js/ui/padOsd.js:597
-msgid "Edit…"
-msgstr ""
-
-#: js/ui/padOsd.js:610 js/ui/padOsd.js:665
-msgid "None"
-msgstr ""
-
-#: js/ui/padOsd.js:648
-msgid "Press a button to configure"
-msgstr ""
-
-#: js/ui/padOsd.js:649
-msgid "Press Esc to exit"
-msgstr ""
-
-#: js/ui/padOsd.js:652
-msgid "Press any key to exit"
-msgstr ""
-
 #: js/ui/panel.js:358
 msgid "Quit"
 msgstr "Завершить"
@ -1225,7 +1176,7 @@ msgstr[2] "%d новых уведомлений"
 msgid "Lock"
 msgstr "Заблокировать"

-#: js/ui/screenShield.js:707
+#: js/ui/screenShield.js:704
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME необходимо заблокировать экран"

@ -1236,11 +1187,11 @@ msgstr "GNOME необходимо заблокировать экран"
 #.
 #. XXX: another option is to kick the user into the gdm login
 #. screen, where we're not affected by grabs
-#: js/ui/screenShield.js:828 js/ui/screenShield.js:1295
+#: js/ui/screenShield.js:825 js/ui/screenShield.js:1291
 msgid "Unable to lock"
 msgstr "Не удалось заблокировать"

-#: js/ui/screenShield.js:829 js/ui/screenShield.js:1296
+#: js/ui/screenShield.js:826 js/ui/screenShield.js:1292
 msgid "Lock was blocked by an application"
 msgstr "Блокировке помешало приложение"

@ -1324,7 +1275,7 @@ msgstr "Крупный текст"
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:625
+#: js/ui/status/bluetooth.js:56 js/ui/status/network.js:624
 msgid "Bluetooth Settings"
 msgstr "Настроить Bluetooth"

@ -1342,16 +1293,16 @@ msgid "Off"
 msgstr "Выключено"

 #: js/ui/status/bluetooth.js:140
-msgid "On"
-msgstr "Включено"
+msgid "Not In Use"
+msgstr "Не используется"

-#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1289
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:1279
 msgid "Turn On"
 msgstr "Включить"

-#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:179
-#: js/ui/status/network.js:354 js/ui/status/network.js:1289
-#: js/ui/status/network.js:1404 js/ui/status/rfkill.js:90
+#: js/ui/status/bluetooth.js:142 js/ui/status/network.js:178
+#: js/ui/status/network.js:353 js/ui/status/network.js:1279
+#: js/ui/status/network.js:1394 js/ui/status/rfkill.js:90
 #: js/ui/status/rfkill.js:117
 msgid "Turn Off"
 msgstr "Выключить"
@ -1400,18 +1351,18 @@ msgstr ""
 "Параметры доступа к данным местоположения можно изменить в любое время в "
 "настройках конфиденциальности."

-#: js/ui/status/network.js:102
+#: js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<неизвестно>"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:452 js/ui/status/network.js:1318
+#: js/ui/status/network.js:451 js/ui/status/network.js:1308
 #, javascript-format
 msgid "%s Off"
 msgstr "Выключено %s"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:455
+#: js/ui/status/network.js:454
 #, javascript-format
 msgid "%s Connected"
 msgstr "Подключено %s"
@ -1419,168 +1370,168 @@ msgstr "Подключено %s"
 #. Translators: this is for network devices that are physically present but are not
 #. under NetworkManager's control (and thus cannot be used in the menu);
 #. %s is a network identifier
-#: js/ui/status/network.js:460
+#: js/ui/status/network.js:459
 #, javascript-format
 msgid "%s Unmanaged"
 msgstr "Не управляется %s"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:463
+#: js/ui/status/network.js:462
 #, javascript-format
 msgid "%s Disconnecting"
 msgstr "Отключение %s"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:470 js/ui/status/network.js:1310
+#: js/ui/status/network.js:469 js/ui/status/network.js:1300
 #, javascript-format
 msgid "%s Connecting"
 msgstr "Подключение %s"

 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
-#: js/ui/status/network.js:473
+#: js/ui/status/network.js:472
 #, javascript-format
 msgid "%s Requires Authentication"
 msgstr "Требуется аутентификация для %s"

 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing; %s is a network identifier
-#: js/ui/status/network.js:481
+#: js/ui/status/network.js:480
 #, javascript-format
 msgid "Firmware Missing For %s"
 msgstr "Отсутствует прошивка для %s"

 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage; %s is a network identifier
-#: js/ui/status/network.js:485
+#: js/ui/status/network.js:484
 #, javascript-format
 msgid "%s Unavailable"
 msgstr "Недоступно %s"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:488
+#: js/ui/status/network.js:487
 #, javascript-format
 msgid "%s Connection Failed"
 msgstr "Сбой подключения %s"

-#: js/ui/status/network.js:504
+#: js/ui/status/network.js:503
 msgid "Wired Settings"
 msgstr "Параметры проводных соединений"

-#: js/ui/status/network.js:546
+#: js/ui/status/network.js:545
 msgid "Mobile Broadband Settings"
 msgstr "Параметры широкополосной мобильной связи"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:589 js/ui/status/network.js:1315
+#: js/ui/status/network.js:588 js/ui/status/network.js:1305
 #, javascript-format
 msgid "%s Hardware Disabled"
 msgstr "Оборудование выключено %s"

 #. Translators: this is for a network device that cannot be activated
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
-#: js/ui/status/network.js:593
+#: js/ui/status/network.js:592
 #, javascript-format
 msgid "%s Disabled"
 msgstr "Выключено %s"

-#: js/ui/status/network.js:633
+#: js/ui/status/network.js:632
 msgid "Connect to Internet"
 msgstr "Подключиться к Интернету"

-#: js/ui/status/network.js:823
+#: js/ui/status/network.js:813
 msgid "Airplane Mode is On"
 msgstr "Включён режим авиаперелёта"

-#: js/ui/status/network.js:824
+#: js/ui/status/network.js:814
 msgid "Wi-Fi is disabled when airplane mode is on."
 msgstr "Когда включён режим авиаперелёта, адаптер Wi-Fi выключен."

-#: js/ui/status/network.js:825
+#: js/ui/status/network.js:815
 msgid "Turn Off Airplane Mode"
 msgstr "Выключить режим авиаперелёта"

-#: js/ui/status/network.js:834
+#: js/ui/status/network.js:824
 msgid "Wi-Fi is Off"
 msgstr "Wi-Fi выключен"

-#: js/ui/status/network.js:835
+#: js/ui/status/network.js:825
 msgid "Wi-Fi needs to be turned on in order to connect to a network."
 msgstr "Для подключения к сети, адаптер Wi-Fi должен быть включён."

-#: js/ui/status/network.js:836
+#: js/ui/status/network.js:826
 msgid "Turn On Wi-Fi"
 msgstr "Включить Wi-Fi"

-#: js/ui/status/network.js:861
+#: js/ui/status/network.js:851
 msgid "Wi-Fi Networks"
 msgstr "Сети Wi-Fi"

-#: js/ui/status/network.js:863
+#: js/ui/status/network.js:853
 msgid "Select a network"
 msgstr "Выберите сеть"

-#: js/ui/status/network.js:893
+#: js/ui/status/network.js:883
 msgid "No Networks"
 msgstr "Сети отсутствуют"

-#: js/ui/status/network.js:914 js/ui/status/rfkill.js:115
+#: js/ui/status/network.js:904 js/ui/status/rfkill.js:115
 msgid "Use hardware switch to turn off"
 msgstr "Используйте механический переключатель, чтобы выключить"

-#: js/ui/status/network.js:1181
+#: js/ui/status/network.js:1171
 msgid "Select Network"
 msgstr "Выбрать сеть"

-#: js/ui/status/network.js:1187
+#: js/ui/status/network.js:1177
 msgid "Wi-Fi Settings"
 msgstr "Параметры Wi-Fi"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1306
+#: js/ui/status/network.js:1296
 #, javascript-format
 msgid "%s Hotspot Active"
 msgstr "Точка доступа %s включена"

 #. Translators: %s is a network identifier
-#: js/ui/status/network.js:1321
+#: js/ui/status/network.js:1311
 #, javascript-format
 msgid "%s Not Connected"
 msgstr "Не подключено %s"

-#: js/ui/status/network.js:1421
+#: js/ui/status/network.js:1411
 msgid "connecting..."
 msgstr "подключение…"

 #. Translators: this is for network connections that require some kind of key or password
-#: js/ui/status/network.js:1424
+#: js/ui/status/network.js:1414
 msgid "authentication required"
 msgstr "требуется подтверждение подлинности"

-#: js/ui/status/network.js:1426
+#: js/ui/status/network.js:1416
 msgid "connection failed"
 msgstr "сбой подключения"

-#: js/ui/status/network.js:1492 js/ui/status/rfkill.js:93
+#: js/ui/status/network.js:1482 js/ui/status/rfkill.js:93
 msgid "Network Settings"
 msgstr "Настроить сеть"

-#: js/ui/status/network.js:1494
+#: js/ui/status/network.js:1484
 msgid "VPN Settings"
 msgstr "Параметры VPN"

-#: js/ui/status/network.js:1513
+#: js/ui/status/network.js:1503
 msgid "VPN"
 msgstr "VPN"

-#: js/ui/status/network.js:1523
+#: js/ui/status/network.js:1513
 msgid "VPN Off"
 msgstr "Соединение VPN выключено"

-#: js/ui/status/network.js:1709
+#: js/ui/status/network.js:1697
 msgid "Connection failed"
 msgstr "Сбой подключения"

-#: js/ui/status/network.js:1710
+#: js/ui/status/network.js:1698
 msgid "Activation of network connection failed"
 msgstr "Не удалось активировать сетевое подключение"

@ -1682,22 +1633,22 @@ msgstr "Поиск"
 msgid "“%s” is ready"
 msgstr "Окно «%s» ожидает"

-#: js/ui/windowManager.js:64
+#: js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "Сохранить эти параметры дисплея?"

 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #.
-#: js/ui/windowManager.js:83
+#: js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "Вернуть параметры"

-#: js/ui/windowManager.js:86
+#: js/ui/windowManager.js:85
 msgid "Keep Changes"
 msgstr "Сохранить изменения"

-#: js/ui/windowManager.js:104
+#: js/ui/windowManager.js:103
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@ -1707,7 +1658,7 @@ msgstr[2] "Изменения параметров будут отменены

 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height.
-#: js/ui/windowManager.js:659
+#: js/ui/windowManager.js:658
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@ -1809,20 +1760,20 @@ msgstr[2] "%u входов"
 msgid "System Sounds"
 msgstr "Системные звуки"

-#: src/main.c:380
+#: src/main.c:381
 msgid "Print version"
 msgstr "Показать номер версии"

-#: src/main.c:386
+#: src/main.c:387
 msgid "Mode used by GDM for login screen"
 msgstr "Режим, используемый GDM для окна входа в систему"

-#: src/main.c:392
+#: src/main.c:393
 msgid "Use a specific mode, e.g. \"gdm\" for login screen"
 msgstr ""
 "Использовать для экрана входа в систему определённый режим, например «gdm»"

-#: src/main.c:398
+#: src/main.c:399
 msgid "List possible modes"
 msgstr "Список возможных режимов"

@ -1848,9 +1799,6 @@ msgstr "Пароль не может быть пустым"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Аутентификация отклонена пользователем"

-#~ msgid "Not In Use"
-#~ msgstr "Не используется"
-
 #~ msgid "Show the week date in the calendar"
 #~ msgstr "Показывать в календаре нумерацию недель"

@ -1885,3 +1833,6 @@ msgstr "Аутентификация отклонена пользователе

 #~ msgid "Airplane Mode"
 #~ msgstr "Режим авиаперелёта"
+
+#~ msgid "On"
+#~ msgstr "Включено"
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -78,7 +78,7 @@ gnome_shell_cflags =				\
 	-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\"

 privlibdir = $(pkglibdir)
-privlib_LTLIBRARIES = libgnome-shell-js.la libgnome-shell-menu.la libgnome-shell.la
+privlib_LTLIBRARIES = libgnome-shell-menu.la libgnome-shell.la
 noinst_LTLIBRARIES += libgnome-shell-base.la

 shell_built_sources = \
@ -200,7 +200,7 @@ gnome_shell_CPPFLAGS = \

 # Here, and after, we repeat mutter and bluetooth libraries just for the rpath
 # The dependency is already pulled in by libtool
-gnome_shell_LDADD = libgnome-shell.la libgnome-shell-js.la $(GNOME_SHELL_LIBS) $(MUTTER_LIBS)
+gnome_shell_LDADD = libgnome-shell.la $(GNOME_SHELL_LIBS) $(MUTTER_LIBS)
 gnome_shell_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)
 gnome_shell_DEPENDENCIES = libgnome-shell.la

@ -212,7 +212,7 @@ nodist_gnome_shell_extension_prefs_SOURCES = \
 	$(top_builddir)/js/js-resources.h		\
 	$(NULL)
 gnome_shell_extension_prefs_CPPFLAGS = $(gnome_shell_cflags)
-gnome_shell_extension_prefs_LDADD = libgnome-shell-js.la $(GNOME_SHELL_LIBS)
+gnome_shell_extension_prefs_LDADD = $(GNOME_SHELL_LIBS)
 gnome_shell_extension_prefs_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)

 if HAVE_NETWORKMANAGER
@ -226,30 +226,13 @@ nodist_gnome_shell_portal_helper_SOURCES = \
 	$(top_builddir)/js/js-resources.h		\
 	$(NULL)
 gnome_shell_portal_helper_CPPFLAGS = $(gnome_shell_cflags)
-gnome_shell_portal_helper_LDADD = libgnome-shell-js.la $(GNOME_SHELL_LIBS)
+gnome_shell_portal_helper_LDADD = $(GNOME_SHELL_LIBS)
 gnome_shell_portal_helper_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)

 endif

 ########################################

-libgnome_shell_js_la_SOURCES =		\
-	shell-js.h			\
-	shell-js.cpp			\
-	$(NULL)
-
-libgnome_shell_js_la_LIBADD =		\
-	$(GNOME_SHELL_JS_LIBS)		\
-	$(NULL)
-
-libgnome_shell_js_la_LDFLAGS =		\
-	-avoid-version
-
-libgnome_shell_js_la_CPPFLAGS =		\
-	$(GNOME_SHELL_JS_CFLAGS)
-
-########################################
-
 shell_recorder_sources =        \
 	shell-recorder.c	\
 	shell-recorder.h
@ -366,13 +349,6 @@ Shell_0_1_gir_SCANNERFLAGS =	\
 INTROSPECTION_GIRS += Shell-0.1.gir
 CLEANFILES += Shell-0.1.gir

-ShellJS-0.1.gir: libgnome-shell-js.la
-ShellJS_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
-ShellJS_0_1_gir_LIBS = libgnome-shell-js.la
-ShellJS_0_1_gir_FILES = $(libgnome_shell_js_la_SOURCES)
-INTROSPECTION_GIRS += ShellJS-0.1.gir
-CLEANFILES += ShellJS-0.1.gir
-
 St-1.0.gir: libst-1.0.la
 St_1_0_gir_INCLUDES = Clutter-1.0 Gtk-3.0
 St_1_0_gir_CFLAGS = $(st_cflags) -DST_COMPILATION
--- a/src/gnome-shell-extension-prefs.c
+++ b/src/gnome-shell-extension-prefs.c
@ -6,8 +6,6 @@
 #include <gjs/gjs.h>
 #include <glib/gi18n.h>

-#include "shell-js.h"
-
 int
 main (int argc, char *argv[])
 {
@ -51,18 +49,3 @@ main (int argc, char *argv[])

  return 0;
 }
-
-
-/* HACK:
-   Add a dummy function that calls into libgnome-shell-js.so to ensure it's
-   linked to /usr/bin/gnome-shell-extension-prefs even when linking with
-   --as-needed. This function is never actually called.
-   https://bugzilla.gnome.org/show_bug.cgi?id=670477
-*/
-void _shell_link_to_shell_js (void);
-
-void
-_shell_link_to_shell_js (void)
-{
-  shell_js_add_extension_importer (NULL, NULL, NULL, NULL);
-}
--- a/src/main.c
+++ b/src/main.c
@ -25,7 +25,6 @@

 #include "shell-global.h"
 #include "shell-global-private.h"
-#include "shell-js.h"
 #include "shell-perf-log.h"
 #include "st.h"

@ -480,17 +479,3 @@ main (int argc, char **argv)

  return ecode;
 }
-
-/* HACK:
-   Add a dummy function that calls into libgnome-shell-js.so to ensure it's
-   linked to /usr/bin/gnome-shell even when linking with --as-needed.
-   This function is never actually called.
-   https://bugzilla.gnome.org/show_bug.cgi?id=670477
-*/
-void _shell_link_to_shell_js (void);
-
-void
-_shell_link_to_shell_js (void)
-{
-  shell_js_add_extension_importer (NULL, NULL, NULL, NULL);
-}
--- a/src/shell-js.cpp
+++ b/src/shell-js.cpp
@ -1,78 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#include "config.h"
-
-#include "shell-js.h"
-
-#include <gio/gio.h>
-#include <gjs/gjs.h>
-#include <gjs/gjs-module.h>
-
-/**
- * shell_js_add_extension_importer:
- * @target_object_script: JavaScript code evaluating to a target object
- * @target_property: Name of property to use for importer
- * @directory: Source directory:
- * @error: A #GError
- *
- * This function sets a property named @target_property on the object
- * resulting from the evaluation of @target_object_script code, which
- * acts as a GJS importer for directory @directory.
- *
- * Returns: %TRUE on success
- */
-gboolean
-shell_js_add_extension_importer (const char  *target_object_script,
-                                 const char  *target_property,
-                                 const char  *directory,
-                                 GError     **error)
-{
-  JS::Value target_object;
-  GList *contexts;
-  JSContext *context;
-  char *search_path[2] = { 0, 0 };
-  gboolean ret = FALSE;
-
-  /* Take the first GjsContext from all of them --
-   * we should only ever have one context, so this
-   * should be alright. */
-  contexts = gjs_context_get_all ();
-  context = (JSContext*) gjs_context_get_native_context ((GjsContext*)contexts->data);
-  g_list_free_full (contexts, g_object_unref);
-
-  JS_BeginRequest (context);
-
-  /* This is a bit of a hack; ideally we'd be able to pass our target
-   * object directly into this function, but introspection doesn't
-   * support that at the moment.  Instead evaluate a string to get it. */
-  if (!JS_EvaluateScript(context,
-                         gjs_get_global_object (context),
-                         target_object_script,
-                         strlen (target_object_script),
-                         "<target_object_script>",
-                         0,
-                         &target_object))
-    {
-      gjs_log_exception(context);
-      g_set_error(error,
-                  G_IO_ERROR,
-                  G_IO_ERROR_FAILED,
-                  "Unable to import %s", target_object_script);
-      goto out;
-    }
-
-  if (!target_object.isObject ())
-    {
-      g_error ("shell_js_add_extension_importer: invalid target object");
-      goto out;
-    }
-
-  search_path[0] = (char*)directory;
-  gjs_define_importer (context, &target_object.toObject (), target_property,
-                       (const char **)search_path, FALSE);
-  ret = TRUE;
-
- out:
-  JS_EndRequest (context);
-  return ret;
-}
--- a/src/shell-js.h
+++ b/src/shell-js.h
@ -1,16 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_JS_H__
-#define __SHELL_JS_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-gboolean shell_js_add_extension_importer (const char   *target_object_script,
-                                          const char   *target_property,
-                                          const char   *directory,
-                                          GError      **error);
-
-G_END_DECLS
-
-#endif /* __SHELL_JS_H__ */
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@ -202,39 +202,9 @@ get_app_from_window_wmclass (MetaWindow  *window)
  return NULL;
 }

-/*
- * get_app_from_id:
- * @window: a #MetaWindow
- *
- * Looks only at the given window, and attempts to determine
- * an application based on %id.  If one can't be determined,
- * return %NULL.
- *
- * Return value: (transfer full): A newly-referenced #ShellApp, or %NULL
- */
-static ShellApp *
-get_app_from_id (MetaWindow  *window,
-                 const char  *id)
-{
-  ShellApp *app;
-  ShellAppSystem *appsys;
-  char *desktop_file;
-
-  g_return_val_if_fail (id != NULL, NULL);
-
-  appsys = shell_app_system_get_default ();
-
-  desktop_file = g_strconcat (id, ".desktop", NULL);
-  app = shell_app_system_lookup_app (appsys, desktop_file);
-  if (app)
-    g_object_ref (app);
-
-  g_free (desktop_file);
-  return app;
-}
-
 /*
 * get_app_from_gapplication_id:
+ * @monitor: a #ShellWindowTracker
 * @window: a #MetaWindow
 *
 * Looks only at the given window, and attempts to determine
@ -246,35 +216,24 @@ get_app_from_id (MetaWindow  *window,
 static ShellApp *
 get_app_from_gapplication_id (MetaWindow  *window)
 {
+  ShellApp *app;
+  ShellAppSystem *appsys;
  const char *id;
+  char *desktop_file;
+
+  appsys = shell_app_system_get_default ();

  id = meta_window_get_gtk_application_id (window);
  if (!id)
    return NULL;

-  return get_app_from_id (window, id);
-}
+  desktop_file = g_strconcat (id, ".desktop", NULL);
+  app = shell_app_system_lookup_app (appsys, desktop_file);
+  if (app)
+    g_object_ref (app);

-/*
- * get_app_from_flatpak_id:
- * @window: a #MetaWindow
- *
- * Looks only at the given window, and attempts to determine
- * an application based on its Flatpak ID.  If one can't be determined,
- * return %NULL.
- *
- * Return value: (transfer full): A newly-referenced #ShellApp, or %NULL
- */
-static ShellApp *
-get_app_from_flatpak_id (MetaWindow  *window)
-{
-  const char *id;
-
-  id = meta_window_get_flatpak_id (window);
-  if (!id)
-    return NULL;
-
-  return get_app_from_id (window, id);
+  g_free (desktop_file);
+  return app;
 }

 /*
@ -395,13 +354,6 @@ get_app_for_window (ShellWindowTracker    *tracker,
  if (meta_window_is_remote (window))
    return _shell_app_new_for_window (window);

-  /* Check if the window was opened from within a Flatpak sandbox; if this
-   * is the case, a corresponding .desktop file is guaranteed to match;
-   */
-  result = get_app_from_flatpak_id (window);
-  if (result != NULL)
-    return result;
-
  /* Check if the window has a GApplication ID attached; this is
   * canonical if it does
   */
--- a/src/st/st-clipboard.c
+++ b/src/st/st-clipboard.c
@ -117,7 +117,6 @@ st_clipboard_provider (GdkXEvent *xevent_p,
  GdkDisplay *display = gdk_display_get_default ();

  if (xev->type != SelectionRequest ||
-      xev->xany.window != clipboard->priv->clipboard_window ||
      !clipboard->priv->clipboard_text)
    return GDK_FILTER_CONTINUE;

@ -234,15 +233,13 @@ st_clipboard_x11_event_filter (GdkXEvent *xevent_p,
 {
  XEvent *xev = (XEvent *) xevent_p;
  EventFilterData *filter_data = user_data;
-  StClipboardPrivate *priv = filter_data->clipboard->priv;
  Atom actual_type;
  int actual_format, result;
  unsigned long nitems, bytes_after;
  unsigned char *data = NULL;
  GdkDisplay *display = gdk_display_get_default ();

-  if(xev->type != SelectionNotify ||
-     xev->xany.window != priv->clipboard_window)
+  if(xev->type != SelectionNotify)
    return GDK_FILTER_CONTINUE;

  if (xev->xselection.property == None)