mutter/clutter/cogl merge build fixes

2016-04-11 23:12:23 +02:00
38 changed files with 1243 additions and 2198 deletions
--- a/44
+++ b/44
@ -1,47 +1,3 @@
-3.21.2
-======
-* Fix sorting of hidden apps in app switcher [Florian; #766238]
-* Set logind's LockedHint property when locked [Victor; #764773]
-* Allocate framebuffers early to fix a crash on NVIDIA [Martin; #764898]
-* Fix cycle-windows/cycle-group keybindings [Florian; #730739]
-* Switch to shared desktop schema for calendar settings [Iain; #766318]
-* Misc. bug fixes [Florian, Cosimo, Michele; #766325, #758471, #757556,
-  #757019, #766598]
-
-Contributors:
-  Cosimo Cecchi, Michele Gaio, Iain Lane, Florian Müllner, Martin Szulecki,
-  Victor Toso
-
-Translations:
-  Tiago Santos [pt], Kjartan Maraas [nb], Jiro Matsuzawa [ja],
-  Cédric Valmary [oc], Sveinn í Felli [is]
-
-3.21.1
-======
-* Save screencasts in HOME if XDG_VIDEO_DIR doesn't exist [Florian; #765015]
-* Don't show orientation lock when g-s-d won't rotate [Florian; #765267]
-* Misc. bug fixes [Heiher, Florian, Marek, Rui; #722752, #765061, #763068,
-  #765607, #757676, #760439]
-
-Contributors:
-  Heiher, Marek Chalupa, Rui Matos, Florian Müllner
-
-Translations:
-  Arash Mousavi [fa], Kristjan SCHMIDT [eo], GNOME Translation Robot [gd]
-
-3.20.1
-======
-* Plug a memory leak [Aaron; #735705]
-
-Contributors:
-  Aaron Plattner
-
-Translations:
-  Daniel Korostil [uk], Matej Urbančič [sl], Inaki Larranaga Murgoitio [eu],
-  Cheng-Chia Tseng [zh_TW], Fabio Tomat [fur], Trần Ngọc Quân [vi],
-  YunQiang Su [zh_CN], Marek Černocký [cs], Arash Mousavi [fa],
-  Alexander Shopov [bg], Khaled Hosny [ar]
-
 3.20.0
 ======

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

 AC_CONFIG_HEADERS([config.h])
@ -77,7 +77,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.21.5
 GOBJECT_INTROSPECTION_MIN_VERSION=1.45.4
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.21.2
+MUTTER_MIN_VERSION=3.20.0
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
@ -99,7 +99,6 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            $recorder_modules
            gdk-x11-3.0 libsoup-2.4
            mutter-clutter-1.0 >= $CLUTTER_MIN_VERSION
-            mutter-cogl-pango-1.0
            libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
            gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
            libcanberra libcanberra-gtk3
@ -119,7 +118,7 @@ PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
 PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 PKG_CHECK_MODULES(TRAY, mutter-clutter-1.0 gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.21.2)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.19.2)

 AC_ARG_ENABLE(browser-plugin,
              [AS_HELP_STRING([--enable-browser-plugin],
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@ -82,10 +82,22 @@
        adapter is ever seen not to have devices associated to it.
      </_description>
    </key>
+    <child name="calendar" schema="org.gnome.shell.calendar"/>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
  </schema>

+  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-weekdate" type="b">
+      <default>false</default>
+      <_summary>Show the week date in the calendar</_summary>
+      <_description>
+        If true, display the ISO week date in the calendar.
+      </_description>
+      </key>
+  </schema>
+
  <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="open-application-menu" type="as">
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@ -535,9 +535,6 @@ StScrollBar {
    border-radius: 0.3em;
    background-color: rgba(11, 12, 13, 0.5);
    color: #eeeeec; }
-  .osd-window .level-bar {
-    background-color: #eeeeec;
-    border-radius: 0.3em; }

 /* App Switcher */
 .switcher-popup {
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -535,9 +535,6 @@ StScrollBar {
    border-radius: 0.3em;
    background-color: rgba(11, 12, 13, 0.5);
    color: #eeeeec; }
-  .osd-window .level-bar {
-    background-color: #eeeeec;
-    border-radius: 0.3em; }

 /* App Switcher */
 .switcher-popup {
--- a/docs/reference/shell/Makefile.am
+++ b/docs/reference/shell/Makefile.am
@ -113,7 +113,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS)
-GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la -rpath $(MUTTER_TYPELIB_DIR)
+GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la

 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
--- a/docs/reference/st/Makefile.am
+++ b/docs/reference/st/Makefile.am
@ -78,7 +78,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=
-GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la -rpath $(MUTTER_TYPELIB_DIR)
+GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la

 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -40,9 +40,6 @@ const SystemdLoginSessionIface = '<node> \
 <signal name="Lock" /> \
 <signal name="Unlock" /> \
 <property name="Active" type="b" access="read" /> \
-<method name="SetLockedHint"> \
-    <arg type="b" direction="in"/> \
-</method> \
 </interface> \
 </node>';

--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -354,59 +354,6 @@ const AppSwitcherPopup = new Lang.Class({
    }
 });

-const CyclerPopup = new Lang.Class({
-    Name: 'CyclerPopup',
-    Extends: SwitcherPopup.SwitcherPopup,
-    Abstract: true,
-
-    _init : function() {
-        this.parent();
-
-        this._items = this._getWindows();
-
-        if (this._items.length == 0)
-            return;
-
-        // We don't show an actual popup, so just provide what SwitcherPopup
-        // expects instead of inheriting from SwitcherList
-        this._switcherList = { actor: new St.Widget(),
-                               highlight: Lang.bind(this, this._highlightItem),
-                               connect: function() {} };
-    },
-
-    _highlightItem: function(index, justOutline) {
-        Main.activateWindow(this._items[index]);
-    },
-
-    _finish: function() {
-        this._highlightItem(this._selectedIndex);
-
-        this.parent();
-    }
-});
-
-
-const GroupCyclerPopup = new Lang.Class({
-    Name: 'GroupCyclerPopup',
-    Extends: CyclerPopup,
-
-    _getWindows: function() {
-        let app = Shell.WindowTracker.get_default().focus_app;
-        return app ? app.get_windows() : [];
-    },
-
-    _keyPressHandler: function(keysym, action) {
-        if (action == Meta.KeyBindingAction.CYCLE_GROUP)
-            this._select(this._next());
-        else if (action == Meta.KeyBindingAction.CYCLE_GROUP_BACKWARD)
-            this._select(this._previous());
-        else
-            return Clutter.EVENT_PROPAGATE;
-
-        return Clutter.EVENT_STOP;
-    }
-});
-
 const WindowSwitcherPopup = new Lang.Class({
    Name: 'WindowSwitcherPopup',
    Extends: SwitcherPopup.SwitcherPopup,
@ -454,32 +401,6 @@ const WindowSwitcherPopup = new Lang.Class({
    }
 });

-const WindowCyclerPopup = new Lang.Class({
-    Name: 'WindowCyclerPopup',
-    Extends: CyclerPopup,
-
-    _init: function() {
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
-        this.parent();
-    },
-
-    _getWindows: function() {
-        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
-        return global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
-    },
-
-    _keyPressHandler: function(keysym, action) {
-        if (action == Meta.KeyBindingAction.CYCLE_WINDOWS)
-            this._select(this._next());
-        else if (action == Meta.KeyBindingAction.CYCLE_WINDOWS_BACKWARD)
-            this._select(this._previous());
-        else
-            return Clutter.EVENT_PROPAGATE;
-
-        return Clutter.EVENT_STOP;
-    }
-});
-
 const AppIcon = new Lang.Class({
    Name: 'AppIcon',

--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -1814,7 +1814,7 @@ const AppIconMenu = new Lang.Class({
            if (!source.actor.mapped)
                this.close();
        }));
-        source.actor.connect('destroy', Lang.bind(this, this.destroy));
+        source.actor.connect('destroy', Lang.bind(this, function () { this.actor.destroy(); }));

        Main.uiGroup.add_actor(this.actor);
    },
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -345,7 +345,7 @@ const Calendar = new Lang.Class({

    _init: function() {
        this._weekStart = Shell.util_get_week_start();
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });
+        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.calendar' });

        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -571,13 +571,20 @@ const _Draggable = new Lang.Class({
            return;
        }

-        this._animateDragEnd(eventTime,
-                             { x: snapBackX,
-                               y: snapBackY,
-                               scale_x: snapBackScale,
-                               scale_y: snapBackScale,
-                               time: SNAP_BACK_ANIMATION_TIME,
-                             });
+        this._animationInProgress = true;
+        // No target, so snap back
+        Tweener.addTween(this._dragActor,
+                         { x: snapBackX,
+                           y: snapBackY,
+                           scale_x: snapBackScale,
+                           scale_y: snapBackScale,
+                           opacity: this._dragOrigOpacity,
+                           time: SNAP_BACK_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: this._onAnimationComplete,
+                           onCompleteScope: this,
+                           onCompleteParams: [this._dragActor, eventTime]
+                         });
    },

    _restoreDragActor: function(eventTime) {
@ -589,44 +596,18 @@ const _Draggable = new Lang.Class({
        this._dragActor.set_scale(restoreScale, restoreScale);
        this._dragActor.opacity = 0;

-        this._animateDragEnd(eventTime,
-                             { time: REVERT_ANIMATION_TIME });
-    },
-
-    _animateDragEnd: function (eventTime, params) {
        this._animationInProgress = true;
-
-        // finish animation if the actor gets destroyed
-        // during it
-        this._dragActorDestroyId =
-            this._dragActor.connect('destroy',
-                                    Lang.bind(this, this._finishAnimation));
-
-        params['opacity']          = this._dragOrigOpacity;
-        params['transition']       = 'easeOutQuad';
-        params['onComplete']       = this._onAnimationComplete;
-        params['onCompleteScope']  = this;
-        params['onCompleteParams'] = [this._dragActor, eventTime];
-
-        // start the animation
-        Tweener.addTween(this._dragActor, params)
-    },
-
-    _finishAnimation : function () {
-        if (!this._animationInProgress)
-            return
-
-        this._animationInProgress = false;
-        if (!this._buttonDown)
-            this._dragComplete();
-
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
+        Tweener.addTween(this._dragActor,
+                         { opacity: this._dragOrigOpacity,
+                           time: REVERT_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: this._onAnimationComplete,
+                           onCompleteScope: this,
+                           onCompleteParams: [this._dragActor, eventTime]
+                         });
    },

    _onAnimationComplete : function (dragActor, eventTime) {
-        dragActor.disconnect(this._dragActorDestroyId);
-        this._dragActorDestroyId = 0;
-
        if (this._dragOrigParent) {
            Main.uiGroup.remove_child(this._dragActor);
            this._dragOrigParent.add_actor(this._dragActor);
@ -635,9 +616,12 @@ const _Draggable = new Lang.Class({
        } else {
            dragActor.destroy();
        }
-
+        global.screen.set_cursor(Meta.Cursor.DEFAULT);
        this.emit('drag-end', eventTime, false);
-        this._finishAnimation();
+
+        this._animationInProgress = false;
+        if (!this._buttonDown)
+            this._dragComplete();
    },

    _dragComplete: function() {
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -259,7 +259,7 @@ const ModalDialog = new Lang.Class({
        if (this.state == State.OPENED || this.state == State.OPENING)
            return true;

-        if (!this.pushModal(timestamp))
+        if (!this.pushModal({ timestamp: timestamp }))
            return false;

        this._fadeOpen(onPrimary);
@ -318,11 +318,8 @@ const ModalDialog = new Lang.Class({
    pushModal: function (timestamp) {
        if (this._hasModal)
            return true;
-
-        let params = { actionMode: this._actionMode };
-        if (timestamp)
-            params['timestamp'] = timestamp;
-        if (!Main.pushModal(this._group, params))
+        if (!Main.pushModal(this._group, { timestamp: timestamp,
+                                           actionMode: this._actionMode }))
            return false;

        this._hasModal = true;
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -22,9 +22,9 @@ const LevelBar = new Lang.Class({
        this._level = 0;

        this.actor = new St.Bin({ style_class: 'level',
-                                  x_align: St.Align.START,
-                                  y_fill: true });
-        this._bar = new St.Widget({ style_class: 'level-bar' });
+                                  x_fill: true, y_fill: true });
+        this._bar = new St.DrawingArea();
+        this._bar.connect('repaint', Lang.bind(this, this._repaint));

        this.actor.set_child(this._bar);
    },
@ -38,10 +38,35 @@ const LevelBar = new Lang.Class({
        if (newValue == this._level)
            return;
        this._level = newValue;
+        this._bar.queue_repaint();
+    },

-        let width = this.actor.width;
-        width *= (this._level / 100.);
-        this._bar.width = width;
+    _repaint: function() {
+        let cr = this._bar.get_context();
+
+        let node = this.actor.get_theme_node();
+        let radius = node.get_border_radius(0); // assume same radius for all corners
+        Clutter.cairo_set_source_color(cr, node.get_foreground_color());
+
+        let [w, h] = this._bar.get_surface_size();
+        w *= (this._level / 100.);
+
+        if (w == 0)
+            return;
+
+        cr.moveTo(radius, 0);
+        if (w >= radius)
+            cr.arc(w - radius, radius, radius, 1.5 * Math.PI, 2. * Math.PI);
+        else
+            cr.lineTo(w, 0);
+        if (w >= radius)
+            cr.arc(w - radius, h - radius, radius, 0, 0.5 * Math.PI);
+        else
+            cr.lineTo(w, h);
+        cr.arc(radius, h - radius, radius, 0.5 * Math.PI, Math.PI);
+        cr.arc(radius, radius, radius, Math.PI, 1.5 * Math.PI);
+        cr.fill();
+        cr.$dispose();
    }
 });

--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -559,9 +559,6 @@ const ScreenShield = new Lang.Class({
        if (prevIsActive != this._isActive)
            this.emit('active-changed');

-        if (this._loginSession)
-            this._loginSession.SetLockedHintRemote(active);
-
        this._syncInhibitor();
    },

--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@ -62,8 +62,8 @@ var AgentIface = '<node> \
  </interface> \
 </node>';

-var PermissionStoreIface = '<node> \
-  <interface name="org.freedesktop.impl.portal.PermissionStore"> \
+var XdgAppIface = '<node> \
+  <interface name="org.freedesktop.XdgApp.PermissionStore"> \
    <method name="Lookup"> \
      <arg name="table" type="s" direction="in"/> \
      <arg name="id" type="s" direction="in"/> \
@ -80,7 +80,7 @@ var PermissionStoreIface = '<node> \
  </interface> \
 </node>';

-const PermissionStore = Gio.DBusProxy.makeProxyWrapper(PermissionStoreIface);
+const PermissionStore = Gio.DBusProxy.makeProxyWrapper(XdgAppIface);

 const Indicator = new Lang.Class({
    Name: 'LocationIndicator',
@ -254,8 +254,8 @@ const Indicator = new Lang.Class({
    _connectToPermissionStore: function() {
        this._permStoreProxy = null;
        new PermissionStore(Gio.DBus.session,
-                           'org.freedesktop.impl.portal.PermissionStore',
-                           '/org/freedesktop/impl/portal/PermissionStore',
+                           'org.freedesktop.XdgApp',
+                           '/org/freedesktop/XdgApp/PermissionStore',
                           Lang.bind(this, this._onPermStoreProxyReady));
    },

--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -621,7 +621,7 @@ const NMDeviceBluetooth = new Lang.Class({
    _init: function(client, device, settings) {
        this.parent(client, device, settings);

-        this.item.menu.addMenuItem(createSettingsAction(_("Bluetooth Settings"), device));
+        this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
    },

    _getDescription: function() {
@ -629,7 +629,7 @@ const NMDeviceBluetooth = new Lang.Class({
    },

    getConnectLabel: function() {
-        return _("Connect to Internet");
+        return _("Use as Internet connection");
    },

    getIndicatorIcon: function() {
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@ -6,7 +6,6 @@ const Gdm = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;

@ -111,7 +110,6 @@ const Indicator = new Lang.Class({

        this._session = new GnomeSession.SessionManager();
        this._loginManager = LoginManager.getLoginManager();
-        this._monitorManager = Meta.MonitorManager.get();
        this._haveShutdown = true;
        this._haveSuspend = true;

@ -157,8 +155,6 @@ const Indicator = new Lang.Class({

        this._orientationSettings.connect('changed::orientation-lock',
                                          Lang.bind(this, this._updateOrientationLock));
-        Main.layoutManager.connect('monitors-changed',
-                                   Lang.bind(this, this._updateOrientationLock));
        Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
                                   Gio.BusNameWatcherFlags.NONE,
                                   Lang.bind(this, this._sensorProxyAppeared),
@ -268,8 +264,7 @@ const Indicator = new Lang.Class({

    _updateOrientationLock: function() {
        if (this._sensorProxy)
-            this._orientationLockAction.visible = this._sensorProxy.HasAccelerometer &&
-                                                  this._monitorManager.get_is_builtin_display_on();
+            this._orientationLockAction.visible = this._sensorProxy.HasAccelerometer;
        else
            this._orientationLockAction.visible = false;

--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -850,34 +850,22 @@ const WindowManager = new Lang.Class({
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-applications',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-group',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-applications-backward',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-group-backward',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-windows',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startWindowSwitcher));
        this.setCustomKeybindingHandler('switch-windows-backward',
                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
-        this.setCustomKeybindingHandler('cycle-windows',
-                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
-        this.setCustomKeybindingHandler('cycle-windows-backward',
-                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
-        this.setCustomKeybindingHandler('cycle-group',
-                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
-        this.setCustomKeybindingHandler('cycle-group-backward',
-                                        Shell.ActionMode.NORMAL,
-                                        Lang.bind(this, this._startSwitcher));
+                                        Lang.bind(this, this._startWindowSwitcher));
        this.setCustomKeybindingHandler('switch-panels',
                                        Shell.ActionMode.NORMAL |
                                        Shell.ActionMode.OVERVIEW |
@ -1756,37 +1744,23 @@ const WindowManager = new Lang.Class({
        this._windowMenuManager.showWindowMenuForWindow(window, menu, rect);
    },

-    _startSwitcher: function(display, screen, window, binding) {
-        let constructor = null;
-        switch (binding.get_name()) {
-            case 'switch-applications':
-            case 'switch-applications-backward':
-            case 'switch-group':
-            case 'switch-group-backward':
-                constructor = AltTab.AppSwitcherPopup;
-                break;
-            case 'switch-windows':
-            case 'switch-windows-backward':
-                constructor = AltTab.WindowSwitcherPopup;
-                break;
-            case 'cycle-windows':
-            case 'cycle-windows-backward':
-                constructor = AltTab.WindowCyclerPopup;
-                break;
-            case 'cycle-group':
-            case 'cycle-group-backward':
-                constructor = AltTab.GroupCyclerPopup;
-                break;
-        }
-
-        if (!constructor)
-            return;
-
+    _startAppSwitcher : function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
            this._workspaceSwitcherPopup.destroy();

-        let tabPopup = new constructor();
+        let tabPopup = new AltTab.AppSwitcherPopup();
+
+        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
+            tabPopup.destroy();
+    },
+
+    _startWindowSwitcher : function(display, screen, window, binding) {
+        /* prevent a corner case where both popups show up at once */
+        if (this._workspaceSwitcherPopup != null)
+            this._workspaceSwitcherPopup.destroy();
+
+        let tabPopup = new AltTab.WindowSwitcherPopup();

        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
            tabPopup.destroy();
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -45,11 +45,11 @@ const PrimaryActorLayout = new Lang.Class({
        this.primaryActor = primaryActor;
    },

-    vfunc_get_preferred_width: function(container, forHeight) {
+    vfunc_get_preferred_width: function(forHeight) {
        return this.primaryActor.get_preferred_width(forHeight);
    },

-    vfunc_get_preferred_height: function(container, forWidth) {
+    vfunc_get_preferred_height: function(forWidth) {
        return this.primaryActor.get_preferred_height(forWidth);
    },
 });
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/fa.po
+++ b/po/fa.po
@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2016-04-08 09:40+0000\n"
-"PO-Revision-Date: 2016-04-14 22:53+0430\n"
+"PO-Revision-Date: 2016-04-08 20:41+0430\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@ -69,7 +69,8 @@ msgstr ""
 #: ../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 "اجازه دسترسی به ابزارهای اشکال‌زدا و پایشگر داخلی با استفاده از محاوره‌ی Alt-F2."
+msgstr ""
+"اجازه دسترسی به ابزارهای اشکال‌زدا و پایشگر داخلی با استفاده از محاوره‌ی Alt-F2."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
@ -77,15 +78,15 @@ msgstr "شناسه‌های UUID افزونه‌ها جهت فعال‌سازی"

 #: ../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."
+"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 ""
-"افزونه‌های گنوم‌شل مشخصه‌ی UUID دارند؛ این کلید، افزونه‌هایی که باید بار شوند را فهرست "
-"می‌کند. هر افزونه‌ای که می‌خواهد بار شود، باید در این فهرست باشد. شما همچنین می‌توانید "
-"این فهرست را از طریق EnableExtension و DisableExtension (روش‌های D-Bus) در org.gnome."
-"Shell نیز بسازید."
+"افزونه‌های گنوم‌شل مشخصه‌ی UUID دارند؛ این کلید، افزونه‌هایی که باید بار شوند را "
+"فهرست می‌کند. هر افزونه‌ای که می‌خواهد بار شود، باید در این فهرست باشد. شما همچنین "
+"می‌توانید این فهرست را از طریق EnableExtension و DisableExtension (روش‌های D-Bus) "
+"در org.gnome.Shell نیز بسازید."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
@ -94,12 +95,12 @@ msgstr "غیرفعال‌سازی بررسی سازگاری نسخه‌ی افز
 #: ../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."
+"version. Enabling this option will disable this check and try to load all "
+"extensions regardless of the versions they claim to support."
 msgstr ""
 "گنوم‌شل تنها نسخه‌هایی از افزونه‌ها رو بارگیری می‌کند که ادعا می‌کنند از نسخه فعلی "
-"پشتیبانی می‌کند. فعال‌سازی این گزینه، بررسی این مورد را غیرفعال می‌کند و سعی خواهد شد که "
-"تمام افزنه‌ها، بدون درنظر گرفتن سازگاری آنها بارگیری شوند."
+"پشتیبانی می‌کند. فعال‌سازی این گزینه، بررسی این مورد را غیرفعال می‌کند و سعی خواهد "
+"شد که تمام افزنه‌ها، بدون درنظر گرفتن سازگاری آنها بارگیری شوند."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
@ -134,8 +135,8 @@ msgstr "همیشه «خروج از سیستم» را در منو کاربر نم

 #: ../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."
+"This key overrides the automatic hiding of the 'Log out' menu item in single-"
+"user, single-session situations."
 msgstr ""
 "این کلید مخفی‌سازی خودکار «خروج از سیستم» در منو را در حالت‌های یک-کاربر، یک-نشست "
 "بازنویسی می‌کند."
@ -148,13 +149,15 @@ msgstr ""

 #: ../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."
+"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 ""
-"پوسته هنگامی که یک دستگاه رمزنگاری شده و یا سیستم‌پرونده دوردست سوار می‌شود، درخواست "
-"گذرواژه می‌کند. اگر گذرواژه را بتوان برای استفاده آینده ذخیره کرد، گزینه «به‌خاطر سپردن "
-"گذرواژه» موجود خواهد بود. این کلید حالت پیش‌فرض این گزینه را تنظیم می‌کند."
+"پوسته هنگامی که یک دستگاه رمزنگاری شده و یا سیستم‌پرونده دوردست سوار می‌شود، "
+"درخواست گذرواژه می‌کند. اگر گذرواژه را بتوان برای استفاده آینده ذخیره کرد، گزینه "
+"«به‌خاطر سپردن گذرواژه» موجود خواهد بود. این کلید حالت پیش‌فرض این گزینه را تنظیم "
+"می‌کند."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Whether the default Bluetooth adapter had set up devices associated to it"
@ -162,12 +165,13 @@ 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."
+"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"
@ -190,7 +194,8 @@ msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "کلید مقید برای باز کردن نمای «نمایش برنامه‌ها»"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid "Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgid ""
+"Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr "کلید مقید برای باز کردن نمای «نمایش برنامه‌ها» در نمای‌کلی فعالیت‌ها."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
@ -218,9 +223,11 @@ msgid "Keybinding to focus the active notification."
 msgstr "کلید مقید برای متمرکز کردن اعلان فعال."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:32
-msgid "Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgid ""
+"Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
-"کلیدهای مقید برای مکث کردن و اجرا کردن تمام دوغلوهای در حال اجرا، برای مصارف رفع اشکال"
+"کلیدهای مقید برای مکث کردن و اجرا کردن تمام دوغلوهای در حال اجرا، برای مصارف رفع "
+"اشکال"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Which keyboard to use"
@ -236,11 +243,11 @@ msgstr "محدود کردن تعویض‌گر به فضای‌کاری فعلی.

 #: ../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."
+"If true, only applications that have windows on the current workspace are shown "
+"in the switcher. Otherwise, all applications are included."
 msgstr ""
-"اگر درست باشد، تنها برنامه‌هایی که در فضای‌کاری فعلی پنجره دارند در تعویض‌گر نشان داده "
-"می‌شوند. در غیر این صورت، تمام برنامه‌ها نشان داده می‌شوند."
+"اگر درست باشد، تنها برنامه‌هایی که در فضای‌کاری فعلی پنجره دارند در تعویض‌گر نشان "
+"داده می‌شوند. در غیر این صورت، تمام برنامه‌ها نشان داده می‌شوند."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "The application icon mode."
@ -249,20 +256,20 @@ msgstr "حالت شمایلی برنامه."
 #: ../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'."
+"'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' (shows only "
+"the application icon) or 'both'."
 msgstr ""
-"نحوه نمایش پنجره‌ها را در تعویض‌کننده پیکربندی می‌کند. مقدار ممکن عبارتند از «thumbnail-"
-"only» (نمایش تصویر بندانگشتی از پنجره)، «app-icon-only» (نمایش تنها شمایل برنامه) یا "
-"«both»."
+"نحوه نمایش پنجره‌ها را در تعویض‌کننده پیکربندی می‌کند. مقدار ممکن عبارتند از "
+"«thumbnail-only» (نمایش تصویر بندانگشتی از پنجره)، «app-icon-only» (نمایش تنها "
+"شمایل برنامه) یا «both»."

 #: ../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 ""
-"اگر درست باشد، تنها پنجره‌های فضای‌کاری فعلی در تعویض‌گر نمایش داده می‌شود. در غیر این "
-"صورت، تمام پنجره‌ها اضافه می‌شوند."
+"اگر درست باشد، تنها پنجره‌های فضای‌کاری فعلی در تعویض‌گر نمایش داده می‌شود. در غیر "
+"این صورت، تمام پنجره‌ها اضافه می‌شوند."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Attach modal dialog to the parent window"
@ -286,7 +293,8 @@ msgstr "فضاهای کاری تنها در صفحه‌نمایش اصلی"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:45
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "به تاخیر انداختن تغییر تمرکز در حالت موشی تا زمانی که نشانگر از حرکت باز ایستد"
+msgstr ""
+"به تاخیر انداختن تغییر تمرکز در حالت موشی تا زمانی که نشانگر از حرکت باز ایستد"

 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
 msgid "Network Login"
@ -308,7 +316,8 @@ msgstr "افزونه‌های گنوم‌شل"
 msgid "Cancel"
 msgstr "لغو"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216 ../js/gdm/authPrompt.js:448
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216
+#: ../js/gdm/authPrompt.js:448
 msgid "Next"
 msgstr "بعدی"

@ -590,7 +599,7 @@ msgstr "ماه بعد"
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
-msgstr "%Od"
+msgstr "%Id"

 #: ../js/ui/calendar.js:634
 msgid "Week %V"
@ -686,7 +695,8 @@ msgstr "تایید هویت برای شبکه بی‌سیم لازم است"

 #: ../js/ui/components/networkAgent.js:321 ../js/ui/components/networkAgent.js:659
 #, javascript-format
-msgid "Passwords or encryption keys are required to access the wireless network “%s”."
+msgid ""
+"Passwords or encryption keys are required to access the wireless network “%s”."
 msgstr "گذرواژه یا کلیدهای رمزنگاری برای دسترسی به شبکه «%s» لازم است."

 #: ../js/ui/components/networkAgent.js:325 ../js/ui/components/networkAgent.js:662
@ -873,11 +883,14 @@ msgstr "راه‌اندازی مجدد و نصب بروزرسانی‌ها"
 #: ../js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
-msgid_plural "The system will automatically restart and install updates in %d seconds."
+msgid_plural ""
+"The system will automatically restart and install updates in %d seconds."
 msgstr[0] ""
-"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب می‌کند."
+"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب "
+"می‌کند."
 msgstr[1] ""
-"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب می‌کند."
+"سیستم پس از %Id ثانیه به طور خودکار مجددا راه‌اندازی می‌شود و بروزرسانی‌های را نصب "
+"می‌کند."

 #: ../js/ui/endSessionDialog.js:127
 msgctxt "button"
@ -896,7 +909,8 @@ msgstr "خاموش کردن بعد از نصب بروزرسانی‌ها"

 #: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
-msgstr "درحال اجرا بر روی انرژی باتری: لطفا قبل از نصب بروزرسانی‌ها، به برق وصل کنید."
+msgstr ""
+"درحال اجرا بر روی انرژی باتری: لطفا قبل از نصب بروزرسانی‌ها، به برق وصل کنید."

 #: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
@ -1860,7 +1874,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "این حساب قبلا به کارگزار متصل شده است"

 #~ msgid "Connection has been replaced by a new connection using the same resource"
-#~ msgstr "اتصال توسط یک اتصال جدید که از منبع مشابه استفاده می‌کند، جایگزین شده است"
+#~ msgstr ""
+#~ "اتصال توسط یک اتصال جدید که از منبع مشابه استفاده می‌کند، جایگزین شده است"

 #~ msgid "The account already exists on the server"
 #~ msgstr "حساب از قبل بر روی کارگزار وجود دارد"
@ -1871,16 +1886,18 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgid "Certificate has been revoked"
 #~ msgstr "گواهینامه لغو شده است"

-#~ msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#~ msgid ""
+#~ "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 #~ msgstr ""
-#~ "گواهینامه از الگوریتم رمزی نامطمئنی استفاده می‌کند یا از نظر cryptography ضعیف است"
+#~ "گواهینامه از الگوریتم رمزی نامطمئنی استفاده می‌کند یا از نظر cryptography ضعیف "
+#~ "است"

 #~ msgid ""
 #~ "The length of the server certificate, or the depth of the server certificate "
 #~ "chain, exceed the limits imposed by the cryptography library"
 #~ msgstr ""
-#~ "اندازه گواهینامه کارگزار، یا عمق حلقه‌ی گواهینامه کارگزار، از محدودیت اعمال شده "
-#~ "توسط کتابخانه cryptography تجاوز کرد"
+#~ "اندازه گواهینامه کارگزار، یا عمق حلقه‌ی گواهینامه کارگزار، از محدودیت اعمال "
+#~ "شده توسط کتابخانه cryptography تجاوز کرد"

 #~ msgid "Internal error"
 #~ msgstr "خطای داخلی"
@ -1942,8 +1959,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "فهرست دسته‌هایی که باید به شکل پوشه نمایش داده شوند"

 #~ msgid ""
-#~ "Each category name in this list will be represented as folder in the application "
-#~ "view, rather than being displayed inline in the main view."
+#~ "Each category name in this list will be represented as folder in the "
+#~ "application view, rather than being displayed inline in the main view."
 #~ msgstr ""
 #~ "هر نام دسته در این فهرست، بجای اینکه پشت سر هم در نمای اصلی نمایش داده شود، "
 #~ "به‌عنوان پوشه در نمای برنامه‌ها نشان داده می‌شود."
@ -1952,11 +1969,11 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "چیدمان دکمه‌ها در نوار عنوان"

 #~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME "
-#~ "Shell."
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running "
+#~ "GNOME Shell."
 #~ msgstr ""
-#~ "این کلید، کلید org.gnome.desktop.wm.preferences را در زمان اجرای گنوم‌شل بازنویسی "
-#~ "می‌کند."
+#~ "این کلید، کلید org.gnome.desktop.wm.preferences را در زمان اجرای گنوم‌شل "
+#~ "بازنویسی می‌کند."

 #~ msgid "Select an extension to configure using the combobox above."
 #~ msgstr "با استفاده از جعبه‌ی بالا یک افزونه برای پیکربندی انتخاب کنید."
@ -1999,8 +2016,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"

 #~ msgid "Please confirm whether the Passkey '%06d' matches the one on the device."
 #~ msgstr ""
-#~ "لطفا تایید کنید که آیا کلید عبور مربوط به «%I06d» با همتای آن در دستگاه مطابقت "
-#~ "دارد یا خیر."
+#~ "لطفا تایید کنید که آیا کلید عبور مربوط به «%I06d» با همتای آن در دستگاه "
+#~ "مطابقت دارد یا خیر."

 #~ msgid "Matches"
 #~ msgstr "منطبق شد"
@ -2037,32 +2054,34 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "ضبط یک تصویربرداری از صفحه‌نمایش"

 #~ msgid "Whether to collect stats about applications usage"
-#~ msgstr "اینکه اطلاعات برنامه‌ها درباره‌ی میزان استفاده از منابع جمع‌آوری شود یا خیر"
+#~ msgstr ""
+#~ "اینکه اطلاعات برنامه‌ها درباره‌ی میزان استفاده از منابع جمع‌آوری شود یا خیر"

 #~ msgid ""
-#~ "The shell normally monitors active applications in order to present the most used "
-#~ "ones (e.g. in launchers). While this data will be kept private, you may want to "
-#~ "disable this for privacy reasons. Please note that doing so won't remove already "
-#~ "saved data."
+#~ "The shell normally monitors active applications in order to present the most "
+#~ "used ones (e.g. in launchers). While this data will be kept private, you may "
+#~ "want to disable this for privacy reasons. Please note that doing so won't "
+#~ "remove already saved data."
 #~ msgstr ""
-#~ "پوسته گنوم در حالت عادی برنامه‌های فعال را جهت ارائه برنامه‌های بیشتر استفاده شده "
-#~ "پایش می کند. (برای مثال در اجرا کننده‌ها). با اینکه که این اطلاعات به صورت خصوصی "
-#~ "نگاه‌داری می‌شود، ممکن است شما بخواهید این امکان را به دلایل امنیتی غیرفعال کنید. "
-#~ "لطفا توجه کنید این کار باعث پاک شدن اطلاعاتی که تاکنون ذخیره شده‌اند نمی‌شود."
+#~ "پوسته گنوم در حالت عادی برنامه‌های فعال را جهت ارائه برنامه‌های بیشتر استفاده "
+#~ "شده پایش می کند. (برای مثال در اجرا کننده‌ها). با اینکه که این اطلاعات به صورت "
+#~ "خصوصی نگاه‌داری می‌شود، ممکن است شما بخواهید این امکان را به دلایل امنیتی "
+#~ "غیرفعال کنید. لطفا توجه کنید این کار باعث پاک شدن اطلاعاتی که تاکنون ذخیره "
+#~ "شده‌اند نمی‌شود."

 #~ msgid ""
 #~ "Internally used to store the last IM presence explicitly set by the user. The "
 #~ "value here is from the TpConnectionPresenceType enumeration."
 #~ msgstr ""
-#~ "به‌طور داخلی جهت ذخیره‌ی آخرین وضعیتِ حاضرِ ثبت شده‌ی توسط کاربر استفاده می‌شود. مقدار "
-#~ "اینجا از محل محاسبه‌ی TpConnectionPresenceType است."
+#~ "به‌طور داخلی جهت ذخیره‌ی آخرین وضعیتِ حاضرِ ثبت شده‌ی توسط کاربر استفاده می‌شود. "
+#~ "مقدار اینجا از محل محاسبه‌ی TpConnectionPresenceType است."

 #~ msgid ""
-#~ "Internally used to store the last session presence status for the user. The value "
-#~ "here is from the GsmPresenceStatus enumeration."
+#~ "Internally used to store the last session presence status for the user. The "
+#~ "value here is from the GsmPresenceStatus enumeration."
 #~ msgstr ""
-#~ "به‌طور داخلی برای ذخیره آخرین نشستی که کاربر در آن وضعیت حاضر داشته است استفاده "
-#~ "می‌شود. مقدار اینجا از محاسبه GsmPresenceStatus است."
+#~ "به‌طور داخلی برای ذخیره آخرین نشستی که کاربر در آن وضعیت حاضر داشته است "
+#~ "استفاده می‌شود. مقدار اینجا از محاسبه GsmPresenceStatus است."

 #~ msgid "Keybinding to toggle the screen recorder"
 #~ msgstr "کلید مقید برای تغییر وضعیت ضبط کننده‌ی صفحه"
@ -2074,49 +2093,49 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "سرعت فریم استفاده شده در تصویربرداری از صفحه‌نمایش."

 #~ msgid ""
-#~ "The framerate of the resulting screencast recordered by GNOME Shell's screencast "
-#~ "recorder in frames-per-second."
+#~ "The framerate of the resulting screencast recordered by GNOME Shell's "
+#~ "screencast recorder in frames-per-second."
 #~ msgstr ""
-#~ "سرعت فریم حاصل از تصویربرداری از صفحه نمایش با استفاده از ضبط کننده نمایشگر پوسته‌ی "
-#~ "گنوم بر اساس فریم بر ثانیه"
+#~ "سرعت فریم حاصل از تصویربرداری از صفحه نمایش با استفاده از ضبط کننده نمایشگر "
+#~ "پوسته‌ی گنوم بر اساس فریم بر ثانیه"

 #~ msgid "The gstreamer pipeline used to encode the screencast"
 #~ msgstr "مجرای ارتباطی gstreamer برای کدگذاری تصویربرداری از صفحه نمایش"

 #~ msgid ""
-#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax used "
-#~ "for gst-launch. The pipeline should have an unconnected sink pad where the "
-#~ "recorded video is recorded. It will normally have a unconnected source pad; output "
-#~ "from that pad will be written into the output file. However the pipeline can also "
-#~ "take care of its own output - this might be used to send the output to an icecast "
-#~ "server via shout2send or similar. When unset or set to an empty value, the default "
-#~ "pipeline will be used. This is currently 'vp8enc min_quantizer=13 max_quantizer=13 "
-#~ "cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux' and records to WEBM "
-#~ "using the VP8 codec. %T is used as a placeholder for a guess at the optimal thread "
-#~ "count on the system."
+#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
+#~ "used for gst-launch. The pipeline should have an unconnected sink pad where "
+#~ "the recorded video is recorded. It will normally have a unconnected source "
+#~ "pad; output from that pad will be written into the output file. However the "
+#~ "pipeline can also take care of its own output - this might be used to send "
+#~ "the output to an icecast server via shout2send or similar. When unset or set "
+#~ "to an empty value, the default pipeline will be used. This is currently "
+#~ "'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads="
+#~ "%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T is used as "
+#~ "a placeholder for a guess at the optimal thread count on the system."
 #~ msgstr ""
-#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax used "
-#~ "for gst-launch. The pipeline should have an unconnected sink pad where the "
-#~ "recorded video is recorded. It will normally have a unconnected source pad; output "
-#~ "from that pad will be written into the output file. However the pipeline can also "
-#~ "take care of its own output - this might be used to send the output to an icecast "
-#~ "server via shout2send or similar. When unset or set to an empty value, the default "
-#~ "pipeline will be used. This is currently 'vp8enc min_quantizer=13 max_quantizer=13 "
-#~ "cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux' and records to WEBM "
-#~ "using the VP8 codec. %T is used as a placeholder for a guess at the optimal thread "
-#~ "count on the system."
+#~ "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
+#~ "used for gst-launch. The pipeline should have an unconnected sink pad where "
+#~ "the recorded video is recorded. It will normally have a unconnected source "
+#~ "pad; output from that pad will be written into the output file. However the "
+#~ "pipeline can also take care of its own output - this might be used to send "
+#~ "the output to an icecast server via shout2send or similar. When unset or set "
+#~ "to an empty value, the default pipeline will be used. This is currently "
+#~ "'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads="
+#~ "%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T is used as "
+#~ "a placeholder for a guess at the optimal thread count on the system."

 #~ msgid "File extension used for storing the screencast"
 #~ msgstr "پسوند پرونده‌ی قابل استفاده برای ذخیره تصویربرداری از صفحه‌نمایش"

 #~ msgid ""
 #~ "The filename for recorded screencasts will be a unique filename based on the "
-#~ "current date, and use this extension. It should be changed when recording to a "
-#~ "different container format."
+#~ "current date, and use this extension. It should be changed when recording to "
+#~ "a different container format."
 #~ msgstr ""
-#~ "نام پرونده‌ی ضبط شده برای تصویربرداری از صفحه‌نمایش یکتا و براساس تاریخ جاری خواهد "
-#~ "بود و از این افزونه استفاده خواهد کرد. اگر در زمان ضبط از قالب دیگری استفاده کنید "
-#~ "باید تغییر کند."
+#~ "نام پرونده‌ی ضبط شده برای تصویربرداری از صفحه‌نمایش یکتا و براساس تاریخ جاری "
+#~ "خواهد بود و از این افزونه استفاده خواهد کرد. اگر در زمان ضبط از قالب دیگری "
+#~ "استفاده کنید باید تغییر کند."

 #~ msgid "Extension"
 #~ msgstr "افزونه"
@ -2143,7 +2162,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "ویدئو صفحه‌نمایش %Id %t"

 #~ msgid "Click Log Out to quit these applications and log out of the system."
-#~ msgstr "بر روی خروج از سیستم کلیک کنید تا از این برنامه‌ها خارج و از سیستم خارج شوید."
+#~ msgstr ""
+#~ "بر روی خروج از سیستم کلیک کنید تا از این برنامه‌ها خارج و از سیستم خارج شوید."

 #~ msgid "Logging out of the system."
 #~ msgstr "درحال خروج از سیستم."
@ -2156,8 +2176,8 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"

 #~ msgid "Click Restart to quit these applications and restart the system."
 #~ msgstr ""
-#~ "بر روی راه‌اندازی مجدد کلیک کنید تا از این برنامه‌ها خارج و سیستم مجددا راه‌اندازی "
-#~ "گردد."
+#~ "بر روی راه‌اندازی مجدد کلیک کنید تا از این برنامه‌ها خارج و سیستم مجددا "
+#~ "راه‌اندازی گردد."

 #~ msgid "Restarting the system."
 #~ msgstr "درحال راه‌اندازی مجدد سیستم."
@ -2302,11 +2322,11 @@ msgstr "محاوره تایید هویت از طرف کاربر رد شد"
 #~ msgstr "وضعیت گپ شما «مشغول» تنظیم می‌شود"

 #~ msgid ""
-#~ "Notifications are now disabled, including chat messages. Your online status has "
-#~ "been adjusted to let others know that you might not see their messages."
+#~ "Notifications are now disabled, including chat messages. Your online status "
+#~ "has been adjusted to let others know that you might not see their messages."
 #~ msgstr ""
-#~ "هم‌اکنون اعلان‌ها، از جمله پیام‌های گپ، غیرفعال هستند. وضعیتِ برخطِ شما به گونه‌ای تنظیم "
-#~ "شده است که به دیگران نشان دهد ممکن است شما پیام‌هایشان را نبینید."
+#~ "هم‌اکنون اعلان‌ها، از جمله پیام‌های گپ، غیرفعال هستند. وضعیتِ برخطِ شما به گونه‌ای "
+#~ "تنظیم شده است که به دیگران نشان دهد ممکن است شما پیام‌هایشان را نبینید."

 #~ msgid "Shutting down might cause them to lose unsaved work."
 #~ msgstr "خاموش‌کردن ممکن است باعث شود که کارهای ذخیره نشده خود را از دست بدهند."
--- a/po/gd.po
+++ b/po/gd.po
@ -1,14 +1,14 @@
 # Scottish Gaelic translation for gnome-shell.
 # Copyright (C) 2015 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
-# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016.
+# GunChleoc <fios@foramnagaidhlig.net>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 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-04-28 21:52+0000\n"
-"PO-Revision-Date: 2016-04-29 10:56+0100\n"
+"POT-Creation-Date: 2015-11-17 16:10+0000\n"
+"PO-Revision-Date: 2015-11-17 17:10+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@ -61,329 +61,85 @@ msgstr "Slige GNOME"
 msgid "Window management and application launching"
 msgstr "Stiùireadh uinneagan is tòiseachadh aplacaidean"

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:1
-msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
-"Cuir an comas innealan airson luchd-leasachaidh 's luchd-deuchainn o 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 ""
-"Ceadaich inntrigeadh dha na h-innealan a chum dì-bhugachaidh 's sgrùdaidh le "
-"còmhradh Alt-F2."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
+#| msgid "No extensions installed"
 msgid "UUIDs of extensions to enable"
 msgstr "UUIDs nan leudachan ri an cur an comas"

-#: ../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 ""
-"Tha buadh UUID aig leudachain na Slige GNOME; seallaidh an iuchair sin na "
-"leudachain a bu chòir luchdadh. Feumaidh gach leudachan a tha ag iarraidh "
-"luchdadh a bhith air an liosta seo. 'S urrainn dhut an liosta seo "
-"atharrachadh cuideachd leis na modhan D-Bus EnableExtension agus "
-"DisableExtension air org.gnome.Shell."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:5
-msgid "Disables the validation of extension version compatibility"
-msgstr ""
-"Cuiridh seo à comas dearbhadh na co-chòrdalachd airson tionndadh nan "
-"leudachan"
-
-#: ../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 ""
-"Cha luchdaich an t-Slige GNOME ach leudachain a dh'innseas gu bheil iar co-"
-"chòrdail leis an tionndadh a tha 'ga ruith. Ma chuireas tu an roghainn seo "
-"an comas, thèid an dearbhadh a chur à comas agus feuchaidh sinn ris a h-uile "
-"leudachan a luchdadh ge b' e dè na tionndaidhean ris an cuir iad taic dhan "
-"rèir-san."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:7
-msgid "List of desktop file IDs for favorite applications"
-msgstr ""
-"Liosta dhe IDan nam faidhlichean desktop airson nan aplacaidean as annsa "
-"leat"
-
-#: ../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 ""
-"Thèid na h-aplacaidean a fhreagras ris na h-aithnichearan seo a shealltainn "
-"air raon nan annsachdan."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:9
-msgid "App Picker View"
-msgstr "Sealladh roghnaichear nan aplacaid"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:10
-msgid "Index of the currently selected view in the application picker."
-msgstr "Inneacs an t-seallaidh làithrich ann an roghnaichear nan aplacaid."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:11
-msgid "History for command (Alt-F2) dialog"
-msgstr "Eachdraidh a' chòmhraidh-àithne (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 "Eachdraidh a' chomhraidh aig looking glass"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
-msgid "Always show the 'Log out' menu item in the user menu."
-msgstr ""
-"Seall nì \"Clàraich a-mach\" air clàr-taice a' chleachdaiche an-còmhnaidh."
-
-#: ../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 ""
-"Tar-àithnidh an iuchair seo am falach fèin-obrachail aig \"Clàraich a-mach\" "
-"air a' chlar-taice ann an suidheachaidhean le aon chleachdaiche 's aon "
-"seisean a-mhàin."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
-msgid ""
-"Whether to remember password for mounting encrypted or remote filesystems"
-msgstr ""
-"Co-dhiù an dèid am facal-faire a chuimhneachadh airson munntachadh "
-"shiostaman-fhaidhlichean crioptaichte no cèine"
-
-#: ../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 ""
-"Iarraidh an t-slige facal-fàire ort nuair a thèid siostam-fhaidhlichean "
-"crioptaichte no cèin a mhunntachadh. Ma ghabhas am facal-faire sàbhaladh "
-"airson na h-ama ri teachd, bidh bogsa-còmhraige \"Cuimhnich am facal-fàire\" "
-"ann. Suidhichidh an iuchair seo staid tùsail na bogsa-còmhraige ud."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid ""
-"Whether the default Bluetooth adapter had set up devices associated to it"
-msgstr ""
-"Co-dhiù an robh uidheaman co-cheangailte ris an adaptar Bluetooth gus nach "
-"robh"
-
-#: ../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 ""
-"Cha seall an t-slige nì clàir-taice \"Bluetooth\" ach ma tha cumhachd aig "
-"adaptar Bluetooth na ma chaidh uidheaman co-cheangailte ris an adaptar "
-"tùsail roimhe. Thèid seo ath-shuidheachadh ma chithear an t-adaptar tùsail "
-"gun uidheam co-cheangailte ris."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
-msgid "Show the week date in the calendar"
-msgstr "Seall latha na seachdaine air a' mhìosachan"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
-msgid "If true, display the ISO week date in the calendar."
-msgstr "Mas e true a th' ann, seall latha na seachdaine ISO air a' mhìosachan."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#| msgid "Open the application menu"
 msgid "Keybinding to open the application menu"
 msgstr "Nasgadh iuchrach gus clàr-taice na h-aplacaid fhosgladh"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#| msgid "Open the application menu"
 msgid "Keybinding to open the application menu."
 msgstr "Nasgadh iuchrach gus clàr-taice na h-aplacaid fhosgladh."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to open the \"Show Applications\" view"
-msgstr "Nasgadh iuchrach gus an sealladh \"Seall aplacaidean\" fhosgladh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-#| msgid "Keybinding to open the application menu."
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr ""
-"Nasgadh iuchrach gus an sealladh \"Seall aplacaidean\" aig foir-shealladh na "
-"gnìomhachd fhosgladh."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-#| msgid "Keybinding to open the application menu"
-msgid "Keybinding to open the overview"
-msgstr "Nasgadh iuchrach gus am foir-shealladh fhosgladh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
-#| msgid "Keybinding to open the application menu."
-msgid "Keybinding to open the Activities Overview."
-msgstr "Nasgadh iuchrach gus foir-shealladh na gnìomhachd fhosgladh."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
-#| msgid "Keybinding to focus the active notification"
-msgid "Keybinding to toggle the visibility of the notification list"
-msgstr ""
-"Nasgadh iuchrach gus an fhaicsinneachd air liosta nam brathan a thoglachadh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
-#| msgid "Keybinding to focus the active notification."
-msgid "Keybinding to toggle the visibility of the notification list."
-msgstr ""
-"Nasgadh iuchrach gus an fhaicsinneachd air liosta nam brathan a thoglachadh."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#| msgid "Focus the active notification"
 msgid "Keybinding to focus the active notification"
 msgstr "Nasgadh iuchrach gus am fòcas a chur air a' bhrath ghnìomhach"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#| msgid "Focus the active notification"
 msgid "Keybinding to focus the active notification."
 msgstr "Nasgadh iuchrach gus am fòcas a chur air a' bhrath ghnìomhach."

-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
-msgid ""
-"Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr ""
-"Nasgadh iuchrach a chuir gach tween a tha 'ga ruith 'na stad 's a "
-"thòisicheas orra a-rithist a chum dì-bhugachaidh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
-msgid "Which keyboard to use"
-msgstr "Am meur-chlàr ri chleachdadh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
-msgid "The type of keyboard to use."
-msgstr "An seòrsa de mheur-chlàr a thèid a chleachdadh."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid "Limit switcher to current workspace."
-msgstr "Cuingich an t-suidsear air an rum-obrach làithreach."
-
-#: ../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 ""
-"Mas e true a th' ann, cha dèid a shealltainn san t-suidsear ach na "
-"h-aplacaidean aig a bheil uinneag san rum-obrach làithreach. Mur e, thèid a "
-"h-uile aplacaid a ghabhail a-steach."
-
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#| msgid "Open the application menu"
 msgid "The application icon mode."
 msgstr "Modh ìomhaigheag na h-aplacaid."

-#: ../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 ""
-"Rèitichidh seo an dòigh sa thèid na h-uinneagan a shealltainn san "
-"t-suidsear. 'S e \"thumbnail-only\" (seallaidh seo dealbhag na h-uinneige), "
-"\"app-icon-only\" (seallaidh seo ìomhaigheag na h-aplacaid) no \"both\" "
-"(seallaidh seo an dà chuid dhiubh) a tha sna luachan dligheach."
-
-#: ../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 ""
-"Mas e true a th' ann, cha dèid a shealltainn san t-suidsear ach na "
-"h-uinneagan a tha san rum-obrach làithreach. Mur e, thèid a h-uile uinneag a "
-"ghabhail a-steach."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
-msgid "Attach modal dialog to the parent window"
-msgstr "Ceangail còmhradh mòdach ris an uinneag-pàraint"
-
-#: ../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 ""
-"Tar-àithnidh an iuchair seo an iuchair ann an org.gnome.mutter nuair a thèid "
-"Slige GNOME a ruith."
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Cuir leacadh nan oirean an comas nuair a thèid uinneagan a leigeil às aig "
-"oir na sgrìn"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
-msgid "Workspaces are managed dynamically"
-msgstr "Thèid na rumannan-obrach a stiùireadh a làimh"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:44
-msgid "Workspaces only on primary monitor"
-msgstr "Rumannan-obrach air a' phrìomh-sgrìn a-mhàin"
-
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:45
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Cuir dàil air atharraichean an fòcais ann am modh luchaige gus an sguir an "
-"tomhaire air gluasad"
-
 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
 msgid "Network Login"
 msgstr "Clàradh a-steach lìonraidh"

-#: ../js/extensionPrefs/main.js:117
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Thachair mearachd le luchdadh còmhradh nan roghainnean airson %s:"

-#: ../js/extensionPrefs/main.js:149
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Leudachain na Slige GNOME"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/audioDeviceSelection.js:71
-#: ../js/ui/components/networkAgent.js:145
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
 #: ../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"
 msgstr "Sguir dheth"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216
-#: ../js/gdm/authPrompt.js:448
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:447
 msgid "Next"
 msgstr "Air adhart"

-#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Neo-ghlais"

-#: ../js/gdm/authPrompt.js:214
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Clàraich a-steach"

-#: ../js/gdm/loginDialog.js:285
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Tagh seisean"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:435
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Nach eil e air an liosta?"

 #. 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:854
+#: ../js/gdm/loginDialog.js:850
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(m.e., cleachdaiche no %s)"
@ -391,12 +147,12 @@ msgstr "(m.e., cleachdaiche no %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:859 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Ainm-cleachdaiche:"

-#: ../js/gdm/loginDialog.js:1196
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Uinneag a' chlàraidh a-steach"

@ -532,37 +288,16 @@ msgstr "Cuir ris na h-annsachdan"
 msgid "Show Details"
 msgstr "Seall am mion-fhiosrachadh"

-#: ../js/ui/appFavorites.js:134
+#: ../js/ui/appFavorites.js:133
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Chaidh %s a chur ris na h-annsachdan agad."

-#: ../js/ui/appFavorites.js:168
+#: ../js/ui/appFavorites.js:167
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Chaidh %s a toirt air falbh o na h-annsachdan agad."

-#: ../js/ui/audioDeviceSelection.js:59
-msgid "Select Audio Device"
-msgstr "Tagh uidheam fuaime"
-
-#: ../js/ui/audioDeviceSelection.js:69
-#| msgid "Account Settings"
-msgid "Sound Settings"
-msgstr "Roghainnean fuaime"
-
-#: ../js/ui/audioDeviceSelection.js:78
-msgid "Headphones"
-msgstr "Headphones"
-
-#: ../js/ui/audioDeviceSelection.js:80
-msgid "Headset"
-msgstr "Headset"
-
-#: ../js/ui/audioDeviceSelection.js:82 ../js/ui/status/volume.js:213
-msgid "Microphone"
-msgstr "Micreofon"
-
 #: ../js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "Atharraich an cùlaibh…"
@ -571,12 +306,12 @@ msgstr "Atharraich an cùlaibh…"
 msgid "Display Settings"
 msgstr "Roghainnean an t-seallaidh"

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

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:47
+#: ../js/ui/calendar.js:55
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@ -586,96 +321,100 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:76
+#: ../js/ui/calendar.js:84
 msgctxt "grid sunday"
 msgid "S"
 msgstr "Dò"

 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:78
+#: ../js/ui/calendar.js:86
 msgctxt "grid monday"
 msgid "M"
 msgstr "Lu"

 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:80
+#: ../js/ui/calendar.js:88
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "Mà"

 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:90
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "Ci"

 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:92
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Da"

 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:94
 msgctxt "grid friday"
 msgid "F"
 msgstr "hA"

 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:96
 msgctxt "grid saturday"
 msgid "S"
 msgstr "Sa"

-#: ../js/ui/calendar.js:416
+#: ../js/ui/calendar.js:566
 msgid "Previous month"
 msgstr "Am mìos roimhe"

-#: ../js/ui/calendar.js:426
+#: ../js/ui/calendar.js:576
 msgid "Next month"
 msgstr "An ath mhìos"

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

-#: ../js/ui/calendar.js:634
+#: ../js/ui/calendar.js:783
 msgid "Week %V"
 msgstr "Seachdain %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:695
+#: ../js/ui/calendar.js:1188
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Fad an latha"

-#: ../js/ui/calendar.js:821
+#: ../js/ui/calendar.js:1295
+msgid "Clear section"
+msgstr "Falamhaich an earrann"
+
+#: ../js/ui/calendar.js:1522
 msgid "Events"
 msgstr "Tachartasan"

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

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

-#: ../js/ui/calendar.js:919
+#: ../js/ui/calendar.js:1620
 msgid "Notifications"
 msgstr "Brathan"

-#: ../js/ui/calendar.js:1070
+#: ../js/ui/calendar.js:1771
 msgid "No Notifications"
 msgstr "Chan eil brath ann"

-#: ../js/ui/calendar.js:1073
+#: ../js/ui/calendar.js:1774
 msgid "No Events"
 msgstr "Chan eil tachartas ann"

@ -814,7 +553,7 @@ msgstr ""

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:760
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "thug %s %s air"
@ -1023,11 +762,11 @@ msgid "Keyboard"
 msgstr "Am meur-chlàr"

 #. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:65
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Falaich an treidhe"

-#: ../js/ui/legacyTray.js:106
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Ìomhaigheagan staide"

@ -1055,7 +794,7 @@ msgstr "An comas"

 #. 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 "À comas"

@ -1079,30 +818,10 @@ msgstr "Seall am bun-tùs"
 msgid "Web Page"
 msgstr "Duilleag-lìn"

-#: ../js/ui/messageList.js:543
-msgid "Clear section"
-msgstr "Falamhaich an earrann"
-
 #: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Fiosrachadh an t-siostaim"

-#: ../js/ui/mpris.js:194
-#| msgctxt "program"
-#| msgid "Unknown"
-msgid "Unknown artist"
-msgstr "Neach-ciùil nach aithne dhuinn"
-
-#: ../js/ui/mpris.js:195
-#| msgctxt "program"
-#| msgid "Unknown"
-msgid "Unknown title"
-msgstr "Tiotal nach aithne dhuinn"
-
-#: ../js/ui/mpris.js:217
-msgid "Media"
-msgstr "Meadhanan"
-
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Neo-dhèan"
@ -1183,7 +902,7 @@ msgstr[1] "%d bhrath ùr"
 msgstr[2] "%d brathan ùra"
 msgstr[3] "%d brath ùr"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "Glais"

@ -1327,50 +1046,30 @@ msgstr "Soilleireachd"
 msgid "Show Keyboard Layout"
 msgstr "Seall co-dhealbhachd a' mheur-chlàir"

-#: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
+#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
 msgid "Location Enabled"
 msgstr "Tha an t-ionad an comas"

-#: ../js/ui/status/location.js:108 ../js/ui/status/location.js:216
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
 msgid "Disable"
 msgstr "Cuir à comas"

-#: ../js/ui/status/location.js:109
+#: ../js/ui/status/location.js:73
 msgid "Privacy Settings"
 msgstr "Roghainnean na prìobhaideachd"

-#: ../js/ui/status/location.js:214
+#: ../js/ui/status/location.js:176
 msgid "Location In Use"
 msgstr "Tha an t-ionad 'ga chleachdadh"

-#: ../js/ui/status/location.js:218
+#: ../js/ui/status/location.js:180
 msgid "Location Disabled"
 msgstr "Tha an t-ionad à comas"

-#: ../js/ui/status/location.js:219
+#: ../js/ui/status/location.js:181
 msgid "Enable"
 msgstr "Cuir an comas"

-#: ../js/ui/status/location.js:426
-msgid "Deny Access"
-msgstr "Diùlt an t-inntrigeadh"
-
-#: ../js/ui/status/location.js:429
-msgid "Grant Access"
-msgstr "Ceadaich an t-inntrigeadh"
-
-#. Translators: %s is an application name
-#: ../js/ui/status/location.js:435
-#, javascript-format
-msgid "Give %s access to your location?"
-msgstr "A bheil thu airson inntrigeadh dhan ionad agad a thoirt dha %s?"
-
-#: ../js/ui/status/location.js:437
-msgid "Location access can be changed at any time from the privacy settings."
-msgstr ""
-"'S urrainn dhut inntrigeadh an ionaid atharrachadh uair sam bith ann an "
-"roghainnean na prìobhaideachd."
-
 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<neo-aithnichte>"
@ -1555,37 +1254,34 @@ msgstr "Dh'fhàillig leis a' cheangal"
 msgid "Activation of network connection failed"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail ris an lìonra"

-#: ../js/ui/status/power.js:61
+#: ../js/ui/status/power.js:49
 msgid "Power Settings"
 msgstr "Roghainnean na cumhachd"

-#: ../js/ui/status/power.js:77
+#: ../js/ui/status/power.js:65
 msgid "Fully Charged"
 msgstr "Air a làn-teairrdseadh"

 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:84 ../js/ui/status/power.js:90
+#: ../js/ui/status/power.js:72 ../js/ui/status/power.js:78
 msgid "Estimating…"
 msgstr "'Ga thuairmeas…"

 #. Translators: this is <hours>:<minutes> Remaining (<percentage>)
-#: ../js/ui/status/power.js:98
+#: ../js/ui/status/power.js:86
 #, javascript-format
+#| msgid "%d∶%02d Remaining (%d%%)"
 msgid "%d∶%02d Remaining (%d %%)"
 msgstr "%d∶%02d air fhàgail (%d %%)"

 #. Translators: this is <hours>:<minutes> Until Full (<percentage>)
-#: ../js/ui/status/power.js:103
+#: ../js/ui/status/power.js:91
 #, javascript-format
+#| msgid "%d∶%02d Until Full (%d%%)"
 msgid "%d∶%02d Until Full (%d %%)"
 msgstr "%d∶%02d gus am bi e làn (%d %%)"

-#: ../js/ui/status/power.js:131 ../js/ui/status/power.js:133
-#, javascript-format
-msgid "%d %%"
-msgstr "%d %%"
-
 #. The menu only appears when airplane mode is on, so just
 #. statically build it as if it was on, rather than dynamically
 #. changing the menu contents.
@ -1593,27 +1289,27 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "Modh itealain air"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "Leum gu cleachdaiche eile"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "Clàraich a-mach"

-#: ../js/ui/status/system.js:358
+#: ../js/ui/status/system.js:353
 msgid "Account Settings"
 msgstr "Roghainnean a' chunntais"

-#: ../js/ui/status/system.js:375
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "Glais na comhair"

-#: ../js/ui/status/system.js:383
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "Cuir 'na dhàil"

-#: ../js/ui/status/system.js:386
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "Cuir a' chumhachd dheth"

@ -1625,6 +1321,10 @@ msgstr "Dh'atharraich àirde na fuaime"
 msgid "Volume"
 msgstr "Àirde na fuaime"

+#: ../js/ui/status/volume.js:213
+msgid "Microphone"
+msgstr "Micreofon"
+
 #: ../js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "Clàraich an-steach mar chleachdaiche eile"
@ -1751,7 +1451,7 @@ msgstr "Mìosachan Evolution"

 #. 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"
@ -1762,7 +1462,7 @@ msgstr[3] "%u às-chur"

 #. 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"
@ -1771,7 +1471,7 @@ msgstr[1] "%u ion-chur"
 msgstr[2] "%u ion-chuir"
 msgstr[3] "%u ion-chur"

-#: ../src/gvc/gvc-mixer-control.c:2738
+#: ../src/gvc/gvc-mixer-control.c:2371
 msgid "System Sounds"
 msgstr "Fuaimean an t-siostaim"

--- a/po/is.po
+++ b/po/is.po
--- a/po/ja.po
+++ b/po/ja.po
@ -14,10 +14,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 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-05-02 22:01+0000\n"
-"PO-Revision-Date: 2016-05-08 15:12+0900\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-03-11 22:17+0000\n"
+"PO-Revision-Date: 2016-03-12 14:12+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa@gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
@ -71,51 +70,31 @@ msgid "Enable internal tools useful for developers and testers from Alt-F2"
 msgstr "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 ""
-"Alt-F2 ダイアログを利用した内部のデバッグツールとモニターツールへのアクセスを"
-"許可します。"
+msgid "Allows access to internal debugging and monitoring tools using the Alt-F2 dialog."
+msgstr "Alt-F2 ダイアログを利用した内部のデバッグツールとモニターツールへのアクセスを許可します。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
 msgstr "有効にする拡張機能の UUID"

 #: ../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 の拡張機能には UUID プロパティがあり、このキーは、ロードしたい拡"
-"張機能の UUID のリストです。ロードしたい拡張機能はこのリストに含めなければな"
-"りません。このリストは org.gnome.Shell の EnableExtensions や "
-"DisableExtensions といった DBus メソッドでも操作できます。"
+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 の拡張機能には UUID プロパティがあり、このキーは、ロードしたい拡張機能の UUID のリストです。ロードしたい拡張機能はこのリストに含めなければなりません。このリストは org.gnome.Shell の EnableExtensions や DisableExtensions といった DBus メソッドでも操作できます。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
 msgstr "拡張機能のバージョン互換の検証を無効にする"

 #: ../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 のバージョンをサポートする拡張機能だけが"
-"ロードされます。この設定を true にした場合、バージョンチェック機能が無効にな"
-"り、拡張機能のサポートバージョンに関係なくすべての拡張機能をロードします。"
+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 のバージョンをサポートする拡張機能だけがロードされます。この設定を true にした場合、バージョンチェック機能が無効になり、拡張機能のサポートバージョンに関係なくすべての拡張機能をロードします。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
 msgstr "お気に入りのアプリケーションの .desktop ファイル ID の一覧"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:8
-msgid ""
-"The applications corresponding to these identifiers will be displayed in the "
-"favorites area."
+msgid "The applications corresponding to these identifiers will be displayed in the favorites area."
 msgstr "これらの ID で示されるアプリケーションは「お気に入り」に表示されます。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
@ -140,49 +119,24 @@ msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "ユーザーメニューに「ログアウト」を常に表示する"

 #: ../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 ""
-"このキーは、単一ユーザー、単一セッション状況で「ログアウト」メニューアイテム"
-"を自動的に非表示にする機能よりも優先します。"
+msgid "This key overrides the automatic hiding of the 'Log out' menu item in single-user, single-session situations."
+msgstr "このキーは、単一ユーザー、単一セッション状況で「ログアウト」メニューアイテムを自動的に非表示にする機能よりも優先します。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
-msgid ""
-"Whether to remember password for mounting encrypted or remote filesystems"
-msgstr ""
-"マウント対象の暗号化されたファイルシステムやリモートファイルシステムのパス"
-"ワードを記憶する"
+msgid "Whether to remember password for mounting encrypted or remote filesystems"
+msgstr "マウント対象の暗号化されたファイルシステムやリモートファイルシステムのパスワードを記憶する"

 #: ../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 ""
-"GNOME Shell は、暗号化されたデバイスやリモートファイルシステムのマウント時に"
-"パスワードを要求します。パスワードを保存できる場合は、「パスワードを保存」"
-"チェックボックスが表示されます。このキーは、チェックボックスのデフォルト値と"
-"なります。"
+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 "GNOME Shell は、暗号化されたデバイスやリモートファイルシステムのマウント時にパスワードを要求します。パスワードを保存できる場合は、「パスワードを保存」チェックボックスが表示されます。このキーは、チェックボックスのデフォルト値となります。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
-msgid ""
-"Whether the default Bluetooth adapter had set up devices associated to it"
-msgstr ""
-"デフォルトの Bluetooth アダプターにデバイスが関連付けられているかどうか"
+msgid "Whether the default Bluetooth adapter had set up devices associated to it"
+msgstr "デフォルトの Bluetooth アダプターにデバイスが関連付けられているかどうか"

 #: ../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 ""
-"Bluetooth アダプターの電源がオンになっているか、あるいはデフォルトのアダプ"
-"ターに関連付けられたデバイスがある場合にのみ、GNOME Shell は Bluetooth メ"
-"ニューを表示します。デフォルトのアダプターに関連付けられたデバイスがなくなっ"
-"た場合に、この値はリセットされます。"
+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 "Bluetooth アダプターの電源がオンになっているか、あるいはデフォルトのアダプターに関連付けられたデバイスがある場合にのみ、GNOME Shell は Bluetooth メニューを表示します。デフォルトのアダプターに関連付けられたデバイスがなくなった場合に、この値はリセットされます。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Show the week date in the calendar"
@ -205,8 +159,7 @@ msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "アプリケーション一覧を開くキーバインド"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgid "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr "アプリケーション一覧を開くキーバインドです。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
@ -234,10 +187,8 @@ msgid "Keybinding to focus the active notification."
 msgstr "アクティブな通知にフォーカスを当てるキーバインドです。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:32
-msgid ""
-"Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr ""
-"Tween の一時停止および再開を行うキーバインドです。デバッグ用途で使用します。"
+msgid "Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr "Tween の一時停止および再開を行うキーバインドです。デバッグ用途で使用します。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Which keyboard to use"
@ -252,46 +203,28 @@ msgid "Limit switcher to current workspace."
 msgstr "スイッチャーを現在のワークスペース内に制限する"

 #: ../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 ""
-"true に設定した場合、現在のワークスペースにウィンドウのあるアプリケーションだ"
-"けをスイッチャーに表示します。false に設定した場合はすべてのアプリケーション"
-"を表示します。"
+msgid "If true, only applications that have windows on the current workspace are shown in the switcher. Otherwise, all applications are included."
+msgstr "true に設定した場合、現在のワークスペースにウィンドウのあるアプリケーションだけをスイッチャーに表示します。false に設定した場合はすべてのアプリケーションを表示します。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "The application icon mode."
 msgstr "アプリケーションアイコンモード"

 #: ../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 ""
-"ウィンドウスイッチャーでのウィンドウの表示方法を設定します。指定可能な値"
-"は、'thumbnail-only' (ウィンドウのサムネイルを表示します)、'app-icon-"
-"only' (アプリケーションアイコンを表示します)、あるいは 'both' です。"
+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 "ウィンドウスイッチャーでのウィンドウの表示方法を設定します。指定可能な値は、'thumbnail-only' (ウィンドウのサムネイルを表示します)、'app-icon-only' (アプリケーションアイコンを表示します)、あるいは 'both' です。"

 #: ../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 ""
-"true に設定した場合、現在のワークスペースのウィンドウだけをスイッチャーに表示"
-"します。false に設定した場合はすべてのアプリケーションを表示します。"
+msgid "If true, only windows from the current workspace are shown in the switcher. Otherwise, all windows are included."
+msgstr "true に設定した場合、現在のワークスペースのウィンドウだけをスイッチャーに表示します。false に設定した場合はすべてのアプリケーションを表示します。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Attach modal dialog to the parent window"
 msgstr "モーダルダイアログを親ウィンドウに結び付ける"

 #: ../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 ""
-"GNOME Shell 使用時は、 このキーが、org.gnome.mutter の同じキーよりも優先しま"
-"す。"
+msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr "GNOME Shell 使用時は、 このキーが、org.gnome.mutter の同じキーよりも優先します。"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Enable edge tiling when dropping windows on screen edges"
@ -545,7 +478,7 @@ msgstr "背景の変更…"
 msgid "Display Settings"
 msgstr "ディスプレイ設定"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
 msgid "Settings"
 msgstr "設定"

@ -713,12 +646,8 @@ msgstr "無線ネットワークでは認証が要求されます"
 #: ../js/ui/components/networkAgent.js:321
 #: ../js/ui/components/networkAgent.js:659
 #, javascript-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"“%s”."
-msgstr ""
-"無線ネットワーク ”%s” にアクセスするにはパスワードか、または暗号化キーが必要"
-"です。"
+msgid "Passwords or encryption keys are required to access the wireless network “%s”."
+msgstr "無線ネットワーク ”%s” にアクセスするにはパスワードか、または暗号化キーが必要です。"

 #: ../js/ui/components/networkAgent.js:325
 #: ../js/ui/components/networkAgent.js:662
@ -787,7 +716,7 @@ msgstr "申し訳ありません、認証できませんでした。再試行し

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:760
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s は %s になりました"
@ -907,8 +836,7 @@ msgstr "再起動して更新をインストールする"
 #: ../js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
-msgid_plural ""
-"The system will automatically restart and install updates in %d seconds."
+msgid_plural "The system will automatically restart and install updates in %d seconds."
 msgstr[0] "%d 秒後にシステムを再起動して更新をインストールします。"

 #: ../js/ui/endSessionDialog.js:127
@ -928,8 +856,7 @@ msgstr "更新をインストール後電源をオフにする"

 #: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
-msgstr ""
-"バッテリーで動作中です: 更新をインストールする前に電源に接続してください。"
+msgstr "バッテリーで動作中です: 更新をインストールする前に電源に接続してください。"

 #: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
@ -997,7 +924,7 @@ msgstr "有効"

 #. 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 "無効"

@ -1115,7 +1042,7 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d 件の新しい通知"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "ロック"

@ -1296,8 +1223,7 @@ msgstr "%s が現在の位置情報を取得することを許可しますか?"

 #: ../js/ui/status/location.js:437
 msgid "Location access can be changed at any time from the privacy settings."
-msgstr ""
-"位置情報のアクセス許可設定は、プライバシー設定からいつでも変更できます。"
+msgstr "位置情報のアクセス許可設定は、プライバシー設定からいつでも変更できます。"

 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
@ -1521,27 +1447,27 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "機内モードオン"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "ユーザーの切り替え"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "ログアウト"

-#: ../js/ui/status/system.js:358
+#: ../js/ui/status/system.js:353
 msgid "Account Settings"
 msgstr "アカウント設定"

-#: ../js/ui/status/system.js:375
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "画面方向ロック"

-#: ../js/ui/status/system.js:383
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "サスペンド"

-#: ../js/ui/status/system.js:386
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "電源オフ"

@ -1628,11 +1554,11 @@ msgstr "画面上でタイトルバーを移動する"

 #: ../js/ui/windowMenu.js:70
 msgid "Always on Top"
-msgstr "最前面に維持する"
+msgstr "最前面に配置する"

 #: ../js/ui/windowMenu.js:89
 msgid "Always on Visible Workspace"
-msgstr "すべてのワークスペースに表示する"
+msgstr "すべてのワークスペースに配置する"

 #: ../js/ui/windowMenu.js:105
 msgid "Move to Workspace Left"
@ -1672,7 +1598,7 @@ msgstr "Evolution カレンダー"

 #. 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"
@ -1680,13 +1606,13 @@ msgstr[0] "出力数: %u"

 #. 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"

-#: ../src/gvc/gvc-mixer-control.c:2738
+#: ../src/gvc/gvc-mixer-control.c:2371
 msgid "System Sounds"
 msgstr "システムのサウンド"

--- a/po/nb.po
+++ b/po/nb.po
@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "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"
+"POT-Creation-Date: 2016-01-07 22:59+0100\n"
+"PO-Revision-Date: 2016-01-07 22:59+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: Norwegian bokmål\n"
@ -305,34 +305,33 @@ msgstr "Utsett fokusendringer i musmodus til peker slutter å bevege seg"
 msgid "Network Login"
 msgstr "Nettverkspålogging"

-#: ../js/extensionPrefs/main.js:117
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Det oppsto en feil ved lasting av brukervalgdialog for %s:"

-#: ../js/extensionPrefs/main.js:149
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Utvidelser for GNOME Shell"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/audioDeviceSelection.js:71
-#: ../js/ui/components/networkAgent.js:145
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
 #: ../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"
 msgstr "Avbryt"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216
-#: ../js/gdm/authPrompt.js:448
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:447
 msgid "Next"
 msgstr "Neste"

-#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Lås opp"

-#: ../js/gdm/authPrompt.js:214
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Logg inn"
@ -499,36 +498,16 @@ msgstr "Legg til i favoritter"
 msgid "Show Details"
 msgstr "Vis detaljer"

-#: ../js/ui/appFavorites.js:134
+#: ../js/ui/appFavorites.js:133
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s ble lagt til i favoritter."

-#: ../js/ui/appFavorites.js:168
+#: ../js/ui/appFavorites.js:167
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra favoritter."

-#: ../js/ui/audioDeviceSelection.js:59
-msgid "Select Audio Device"
-msgstr "Velg lydenhet"
-
-#: ../js/ui/audioDeviceSelection.js:69
-msgid "Sound Settings"
-msgstr "Innstillinger for lyd"
-
-#: ../js/ui/audioDeviceSelection.js:78
-msgid "Headphones"
-msgstr "Hodetelefoner"
-
-#: ../js/ui/audioDeviceSelection.js:80
-msgid "Headset"
-msgstr "Headset"
-
-#: ../js/ui/audioDeviceSelection.js:82 ../js/ui/status/volume.js:213
-msgid "Microphone"
-msgstr "Mikrofon"
-
 #: ../js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "Bytt bakgrunn …"
@ -537,12 +516,12 @@ msgstr "Bytt bakgrunn …"
 msgid "Display Settings"
 msgstr "Innstillinger for skjerm"

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

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:47
+#: ../js/ui/calendar.js:55
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@ -552,96 +531,100 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:76
+#: ../js/ui/calendar.js:84
 msgctxt "grid sunday"
 msgid "S"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:78
+#: ../js/ui/calendar.js:86
 msgctxt "grid monday"
 msgid "M"
 msgstr "M"

 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:80
+#: ../js/ui/calendar.js:88
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "T"

 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:90
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "O"

 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:92
 msgctxt "grid thursday"
 msgid "T"
 msgstr "T"

 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:94
 msgctxt "grid friday"
 msgid "F"
 msgstr "F"

 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:96
 msgctxt "grid saturday"
 msgid "S"
 msgstr "L"

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

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

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

-#: ../js/ui/calendar.js:634
+#: ../js/ui/calendar.js:784
 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:695
+#: ../js/ui/calendar.js:1189
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Hele dagen"

-#: ../js/ui/calendar.js:821
+#: ../js/ui/calendar.js:1296
+msgid "Clear section"
+msgstr "Tøm seksjon"
+
+#: ../js/ui/calendar.js:1523
 msgid "Events"
 msgstr "Hendelser"

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

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

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

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

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

@ -779,7 +762,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:760
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@ -966,11 +949,11 @@ msgid "Keyboard"
 msgstr "Tastatur"

 #. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:65
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Skjul statusområde"

-#: ../js/ui/legacyTray.js:106
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Statusikoner"

@ -1022,26 +1005,10 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"

-#: ../js/ui/messageList.js:543
-msgid "Clear section"
-msgstr "Tøm seksjon"
-
 #: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Systeminformasjon"

-#: ../js/ui/mpris.js:194
-msgid "Unknown artist"
-msgstr "Ukjent artist"
-
-#: ../js/ui/mpris.js:195
-msgid "Unknown title"
-msgstr "Ukjent tittel"
-
-#: ../js/ui/mpris.js:217
-msgid "Media"
-msgstr "Media"
-
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Angre"
@ -1118,7 +1085,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d ny varsling"
 msgstr[1] "%d nye varslinger"

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

@ -1260,48 +1227,30 @@ msgstr "Lysstyrke"
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"

-#: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
+#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
 msgid "Location Enabled"
 msgstr "Plassering slått på"

-#: ../js/ui/status/location.js:108 ../js/ui/status/location.js:216
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
 msgid "Disable"
 msgstr "Slå av"

-#: ../js/ui/status/location.js:109
+#: ../js/ui/status/location.js:73
 msgid "Privacy Settings"
 msgstr "Innstillinger for personvern"

-#: ../js/ui/status/location.js:214
+#: ../js/ui/status/location.js:176
 msgid "Location In Use"
 msgstr "Plassering i bruk"

-#: ../js/ui/status/location.js:218
+#: ../js/ui/status/location.js:180
 msgid "Location Disabled"
 msgstr "Plassering slått av"

-#: ../js/ui/status/location.js:219
+#: ../js/ui/status/location.js:181
 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
-msgid "Give %s access to your location?"
-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."
-
 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<ukjent>"
@ -1524,27 +1473,27 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "Flymodus er slått på"

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

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

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

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

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

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

@ -1556,6 +1505,10 @@ msgstr "Volum endret"
 msgid "Volume"
 msgstr "Volum"

+#: ../js/ui/status/volume.js:213
+msgid "Microphone"
+msgstr "Mikrofon"
+
 #: ../js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "Logg inn som en annen bruker"
--- a/po/oc.po
+++ b/po/oc.po
@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: gnome-shell master fr\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-04-29 09:47+0000\n"
+"POT-Creation-Date: 2016-02-18 15:11+0000\n"
 "PO-Revision-Date: 2016-02-27 19:47+0200\n"
 "Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
 "Language-Team: Tot En Òc\n"
@ -88,8 +88,8 @@ msgstr ""
 "Las extensions GNOME Shell an una proprietat UUID. Aquesta clau enumèra las "
 "extensions que devon èsser cargadas. Tota extension que voldriá èsser "
 "cargada deu èsser aponduda dins aquesta lista. Podètz tanben manipular "
-"aquesta lista amb los metòdes DBus EnableExtension e DisableExtension de org."
-"gnome.Shell."
+"aquesta lista amb los metòdes DBus EnableExtension e DisableExtension de "
+"org.gnome.Shell."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
@ -220,13 +220,13 @@ msgstr "Combinason de tòcas per dobrir la vista d'ensemble de las aplicacions."
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr ""
-"Combinason de tòcas per inversar la visibilitat de la lista de las "
+"Combinaison de tòcas per inversar la visibilitat de la lista de las "
 "notificacions"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr ""
-"Combinason de tòcas per inversar la visibilitat de la lista de las "
+"Combinaison de tòcas per inversar la visibilitat de la lista de las "
 "notificacions"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
@ -241,7 +241,7 @@ msgstr "Combinason de tòcas per donar lo focus a la notificacion activa."
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
-"Combinason de tòcas per arrestar e tampar totas las transicions amb una "
+"Combinaison de tòcas per arrestar e tampar totas las transicions amb una "
 "tòca de desbugatge"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
@ -254,7 +254,7 @@ msgstr "Lo tipe de clavièr utilizat."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "Limit switcher to current workspace."
-msgstr "Limite lo selector de fenèstras a l'espaci de trabalh actual."
+msgstr "Limite lo selector de fenèstras à l'espaci de trabalh actual."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid ""
@ -321,14 +321,14 @@ msgstr ""
 msgid "Network Login"
 msgstr "Identificacion ret"

-#: ../js/extensionPrefs/main.js:117
+#: ../js/extensionPrefs/main.js:121
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
-"Una error s'es produita al moment del cargament de la bóstia de dialòg de "
+"Una error s'es producha al moment del cargament de la bóstia de dialòg de "
 "las preferéncias de %s :"

-#: ../js/extensionPrefs/main.js:149
+#: ../js/extensionPrefs/main.js:153
 msgid "GNOME Shell Extensions"
 msgstr "Extensions GNOME Shell"

@ -415,6 +415,8 @@ msgstr "Execucion de « %s » impossibla :"

 #. Translators: Time in 24h format
 #: ../js/misc/util.js:191
+#| msgctxt "event list time"
+#| msgid "%H∶%M"
 msgid "%H∶%M"
 msgstr "%H:%M"

@ -528,6 +530,7 @@ msgid "%s has been removed from your favorites."
 msgstr "%s es estat suprimit de vòstres favorits."

 #: ../js/ui/audioDeviceSelection.js:59
+#| msgid "Send Files to Device…"
 msgid "Select Audio Device"
 msgstr "Seleccionar lo perfieric àudio"

@ -552,10 +555,11 @@ msgid "Change Background…"
 msgstr "Modificar lo rèireplan…"

 #: ../js/ui/backgroundMenu.js:21
+#| msgid "Privacy Settings"
 msgid "Display Settings"
 msgstr "Afichar los paramètres"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
 msgid "Settings"
 msgstr "Paramètres"

@ -621,6 +625,8 @@ msgstr "Mes seguent"

 #: ../js/ui/calendar.js:579
 #, no-javascript-format
+#| msgctxt "percent of battery remaining"
+#| msgid "%d%%"
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
@ -639,8 +645,8 @@ msgstr "Setmana %V"
 #
 #  All Day
 #
-#  lo calendrier (mal) francisé :
-#  http://blog.arkezis.com/wp-content/uploads/2011/04/Captura.png
+#  le calendrier (mal) francisé :
+#  http://blog.arkezis.com/wp-content/uploads/2011/04/Capture.png
 #
 #  See also https://bugzilla.gnome.org/show_bug.cgi?id=658679
 #
@ -742,7 +748,7 @@ msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
 msgstr ""
-"Cal un senhal o una clau de chiframent per accedir a la ret sens fial « %s »"
+"Cal un senhal o una clau de chiframent per accedir au ret sans fil « %s »"

 #: ../js/ui/components/networkAgent.js:325
 #: ../js/ui/components/networkAgent.js:662
@ -761,12 +767,12 @@ msgstr "Autentificacion DSL"
 #: ../js/ui/components/networkAgent.js:339
 #: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
-msgstr "Còdi PIN requesit"
+msgstr "Còde PIN requesit"

 #: ../js/ui/components/networkAgent.js:340
 #: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
-msgstr "Un còdi PIN es necessari pels telefòns mobils de benda larga"
+msgstr "Un còde PIN es necessari pels telefòns mobils de benda larga"

 #: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
@ -783,7 +789,7 @@ msgstr "Senhal del telefòn mobil de benda larga"
 #: ../js/ui/components/networkAgent.js:680
 #, javascript-format
 msgid "A password is required to connect to “%s”."
-msgstr "Un senhal es requis per se connectar a « %s »."
+msgstr "Un senhal es requis per se connecter à « %s »."

 #: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1658
 msgid "Network Manager"
@ -811,7 +817,7 @@ msgstr "Fracàs de l'autentificacion. Ensajatz tornarmai."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:760
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s es ara conegut jol nom de %s"
@ -999,18 +1005,18 @@ msgstr "Installar"
 #: ../js/ui/extensionDownloader.js:204
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
-msgstr "Telecargar e installar « %s » a partir de extensions.gnome.org ?"
+msgstr "Telecargar e installar « %s » à partir de extensions.gnome.org ?"

 #: ../js/ui/keyboard.js:741 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Clavièr"

 #. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:65
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Amagar lo tirador"

-#: ../js/ui/legacyTray.js:106
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Icònas d'estat"

@ -1038,7 +1044,7 @@ msgstr "Activat"

 #. 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 "Desactivat"

@ -1062,7 +1068,7 @@ msgstr "Afichar la font"
 msgid "Web Page"
 msgstr "Pagina Web"

-#: ../js/ui/messageList.js:543
+#: ../js/ui/messageList.js:542
 msgid "Clear section"
 msgstr "Escafar la seccion"

@ -1071,10 +1077,13 @@ msgid "System Information"
 msgstr "Informacions del sistèma"

 #: ../js/ui/mpris.js:194
+#| msgid "Unknown reason"
 msgid "Unknown artist"
 msgstr "Artista desconegut"

 #: ../js/ui/mpris.js:195
+#| msgctxt "program"
+#| msgid "Unknown"
 msgid "Unknown title"
 msgstr "Títol desconegut"

@ -1109,6 +1118,7 @@ msgid "Activities"
 msgstr "Activitats"

 #: ../js/ui/panel.js:695
+#| msgid "System"
 msgctxt "System menu in the top bar"
 msgid "System"
 msgstr "Sistèma"
@ -1158,7 +1168,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d notificacion novèla"
 msgstr[1] "%d notificacions novèlas"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "Verrolhar"

@ -1268,6 +1278,7 @@ msgstr "Paramètres Bluetooth"
 #. Translators: this is the number of connected bluetooth devices
 #: ../js/ui/status/bluetooth.js:136
 #, javascript-format
+#| msgid "Connected"
 msgid "%d Connected"
 msgid_plural "%d Connected"
 msgstr[0] "%d connectat"
@ -1278,6 +1289,7 @@ msgid "Off"
 msgstr "Desactivat"

 #: ../js/ui/status/bluetooth.js:140
+#| msgid "In Use"
 msgid "Not In Use"
 msgstr "Pas en cors d'utilizacion"

@ -1301,6 +1313,7 @@ msgid "Show Keyboard Layout"
 msgstr "Afichar la disposicion del clavièr"

 #: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
+#| msgid "Location"
 msgid "Location Enabled"
 msgstr "Localizacion activada"

@ -1313,10 +1326,12 @@ msgid "Privacy Settings"
 msgstr "Paramètres de confidencialitat"

 #: ../js/ui/status/location.js:214
+#| msgid "Location"
 msgid "Location In Use"
 msgstr "Localizacion activada"

 #: ../js/ui/status/location.js:218
+#| msgid "connection failed"
 msgid "Location Disabled"
 msgstr "Localizacion desactivada"

@ -1324,22 +1339,23 @@ msgstr "Localizacion desactivada"
 msgid "Enable"
 msgstr "Activar"

-#: ../js/ui/status/location.js:426
+#: ../js/ui/status/location.js:434
 msgid "Deny Access"
 msgstr "Refusar l'accès"

-#: ../js/ui/status/location.js:429
+#: ../js/ui/status/location.js:437
+#| msgid "Always grant access"
 msgid "Grant Access"
 msgstr "Acordar l'accès"

-#. Translators: %s is an application name
-#: ../js/ui/status/location.js:435
+#: ../js/ui/status/location.js:442
 #, javascript-format
 msgid "Give %s access to your location?"
 msgstr ""

-#: ../js/ui/status/location.js:437
-msgid "Location access can be changed at any time from the privacy settings."
+#: ../js/ui/status/location.js:443
+#, javascript-format
+msgid "%s is requesting access to your location."
 msgstr ""

 #: ../js/ui/status/network.js:101
@ -1355,6 +1371,7 @@ msgstr "%s atudat"
 #. Translators: %s is a network identifier
 #: ../js/ui/status/network.js:454
 #, javascript-format
+#| msgid "Connected"
 msgid "%s Connected"
 msgstr "%s connectat"

@ -1363,24 +1380,28 @@ msgstr "%s connectat"
 #. %s is a network identifier
 #: ../js/ui/status/network.js:459
 #, javascript-format
+#| msgid "Unmanaged"
 msgid "%s Unmanaged"
 msgstr "%s pas gerit"

 #. Translators: %s is a network identifier
 #: ../js/ui/status/network.js:462
 #, javascript-format
+#| msgid "Disconnecting"
 msgid "%s Disconnecting"
 msgstr "Desconnexion de %s en cors"

 #. Translators: %s is a network identifier
 #: ../js/ui/status/network.js:469 ../js/ui/status/network.js:1300
 #, javascript-format
+#| msgid "Connecting"
 msgid "%s Connecting"
 msgstr "Connexion de %s en cors"

 #. Translators: this is for network connections that require some kind of key or password; %s is a network identifier
 #: ../js/ui/status/network.js:472
 #, javascript-format
+#| msgid "Wired 802.1X authentication"
 msgid "%s Requires Authentication"
 msgstr ""

@ -1388,6 +1409,7 @@ msgstr ""
 #. module, which is missing; %s is a network identifier
 #: ../js/ui/status/network.js:480
 #, javascript-format
+#| msgid "Firmware missing"
 msgid "Firmware Missing For %s"
 msgstr ""

@ -1395,12 +1417,14 @@ msgstr ""
 #. is disabled by rfkill, or it has no coverage; %s is a network identifier
 #: ../js/ui/status/network.js:484
 #, javascript-format
+#| msgid "Unavailable"
 msgid "%s Unavailable"
 msgstr "%s pas disponible"

 #. Translators: %s is a network identifier
 #: ../js/ui/status/network.js:487
 #, javascript-format
+#| msgid "Connection failed"
 msgid "%s Connection Failed"
 msgstr "Fracàs de connexion a %s"

@ -1415,6 +1439,7 @@ msgstr "Paramètres del telefòn mobil de benda larga"
 #. Translators: %s is a network identifier
 #: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
 #, javascript-format
+#| msgid "Hardware Disabled"
 msgid "%s Hardware Disabled"
 msgstr "Equipament %s desactivat"

@ -1422,6 +1447,7 @@ msgstr "Equipament %s desactivat"
 #. because it's disabled by rfkill (airplane mode); %s is a network identifier
 #: ../js/ui/status/network.js:592
 #, javascript-format
+#| msgid "Disabled"
 msgid "%s Disabled"
 msgstr "%s desactivat"

@ -1480,12 +1506,14 @@ msgstr "Paramètres del Wifi"
 #. Translators: %s is a network identifier
 #: ../js/ui/status/network.js:1296
 #, javascript-format
+#| msgid "Hotspot Active"
 msgid "%s Hotspot Active"
 msgstr "Hotspot %s activat"

 #. Translators: %s is a network identifier
 #: ../js/ui/status/network.js:1311
 #, javascript-format
+#| msgid "Not Connected"
 msgid "%s Not Connected"
 msgstr "%s desconnectat"

@ -1515,6 +1543,7 @@ msgid "VPN"
 msgstr "VPN"

 #: ../js/ui/status/network.js:1513
+#| msgid "Power Off"
 msgid "VPN Off"
 msgstr "VPN atudat"

@ -1543,12 +1572,14 @@ msgstr "Estimacion en cors…"
 #. Translators: this is <hours>:<minutes> Remaining (<percentage>)
 #: ../js/ui/status/power.js:98
 #, javascript-format
+#| msgid "%d∶%02d Remaining (%d%%)"
 msgid "%d∶%02d Remaining (%d %%)"
 msgstr "%d∶%02d restant (%d %%)"

 #. Translators: this is <hours>:<minutes> Until Full (<percentage>)
 #: ../js/ui/status/power.js:103
 #, javascript-format
+#| msgid "%d∶%02d Until Full (%d%%)"
 msgid "%d∶%02d Until Full (%d %%)"
 msgstr "%d∶%02d abans cargament complet (%d %%)"

@ -1561,30 +1592,32 @@ msgstr "%d %%"
 #. statically build it as if it was on, rather than dynamically
 #. changing the menu contents.
 #: ../js/ui/status/rfkill.js:88
+#| msgid "Airplane Mode is On"
 msgid "Airplane Mode On"
 msgstr "Lo mòde avion es activat"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "Cambiar d'utilizaire"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "Tampar la session"

-#: ../js/ui/status/system.js:358
+#: ../js/ui/status/system.js:353
+#| msgid "Sound Settings"
 msgid "Account Settings"
 msgstr "Paramètres del compte"

-#: ../js/ui/status/system.js:375
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "Verrolhatge de l'orientacion"

-#: ../js/ui/status/system.js:383
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "Metre en velha"

-#: ../js/ui/status/system.js:386
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "Atudar"

@ -1612,7 +1645,7 @@ msgstr "Aplicacions"
 msgid "Search"
 msgstr "Recèrca"

-#: ../js/ui/windowAtencionHandler.js:20
+#: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "« %s » es prêt"
@ -1679,12 +1712,14 @@ msgid "Always on Visible Workspace"
 msgstr "Totjorn sus l'espaci de trabalh visible"

 #: ../js/ui/windowMenu.js:105
+#| msgid "Move to Workspace Up"
 msgid "Move to Workspace Left"
 msgstr "Desplaçar cap a l'espaci de trabalh d'esquèrra"

 #: ../js/ui/windowMenu.js:110
+#| msgid "Move to Workspace Up"
 msgid "Move to Workspace Right"
-msgstr "Desplaçar cap a l'espaci de trabalh a dreita"
+msgstr "Desplaçar cap a l'espaci de trabalh a drecha"

 #: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
@ -1695,20 +1730,24 @@ msgid "Move to Workspace Down"
 msgstr "Desplaçar cap a l'espaci de trabalh inferior"

 #: ../js/ui/windowMenu.js:136
+#| msgid "Move to Workspace Up"
 msgid "Move to Monitor Up"
 msgstr "Desplaçar cap a l'ecran superior"

 #: ../js/ui/windowMenu.js:142
+#| msgid "Move to Workspace Down"
 msgid "Move to Monitor Down"
 msgstr "Desplaçar cap a l'ecran inferior"

 #: ../js/ui/windowMenu.js:148
+#| msgid "Move to Workspace Up"
 msgid "Move to Monitor Left"
 msgstr "Desplaçar cap a l'ecran d'esquèrra"

 #: ../js/ui/windowMenu.js:154
+#| msgid "Move to Workspace Up"
 msgid "Move to Monitor Right"
-msgstr "Desplaçar cap a l'ecran de dreita"
+msgstr "Desplaçar cap a l'ecran de drecha"

 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
@ -1716,7 +1755,7 @@ msgstr "Agenda d'Evolution"

 #. 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"
@ -1725,14 +1764,14 @@ msgstr[1] "%u sortidas"

 #. 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 entrada"
 msgstr[1] "%u entradas"

-#: ../src/gvc/gvc-mixer-control.c:2738
+#: ../src/gvc/gvc-mixer-control.c:2371
 msgid "System Sounds"
 msgstr "Sons sistèma"

@ -1836,7 +1875,7 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ "running GNOME Shell."
 #~ msgstr ""
 #~ "Aquesta clau pren lo pas sus la clau dins org.gnome.desktop.wm."
-#~ "preferences quand GNOME Shell es aviat."
+#~ "preferences lorsque GNOME Shell es aviat."

 #~ msgid "Select an extension to configure using the combobox above."
 #~ msgstr ""
@ -2000,7 +2039,7 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ msgstr "Lo nom de l'òste del certificat correspond pas"

 #~ msgid "Certificate fingerprint mismatch"
-#~ msgstr "L'emprenta del certificat correspond pas"
+#~ msgstr "L'emprencha del certificat correspond pas"

 #~ msgid "Certificate self-signed"
 #~ msgstr "Certificat autosignat"
@ -2155,7 +2194,7 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"

 #~ msgid "Please enter the PIN mentioned on the device."
 #~ msgstr ""
-#~ "Picatz lo numèro d'identificacion personala (PIN) mencionat sul periferic."
+#~ "Picatz lo numèro d'identificacion personal (PIN) mencionat sul periferic."

 #~ msgid "OK"
 #~ msgstr "Validar"
@ -2209,16 +2248,16 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ msgstr "%l\\u2236%M\\u2009%p"

 #~ msgid "Settings Menu"
-#~ msgstr "Menú dels paramètres"
+#~ msgstr "Menu des paramètres"

 #~ msgid "Screenshots"
-#~ msgstr "Capturas d'ecran"
+#~ msgstr "Captures d'écran"

 #~ msgid "Record a screencast"
-#~ msgstr "Enregistrar una vidèo d'ecran"
+#~ msgstr "Enregistrer una vidéo d'écran"

 #~ msgid "Whether to collect stats about applications usage"
-#~ msgstr "Collecter des statistiques sus l'utilizacion des applications"
+#~ msgstr "Collecter des statistiques sur l'utilisation des applications"

 #~ msgid ""
 #~ "The shell normally monitors active applications in order to present the "
@ -2226,49 +2265,49 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ "you may want to disable this for privacy reasons. Please note that doing "
 #~ "so won't remove already saved data."
 #~ msgstr ""
-#~ "Normalament GNOME Shell survelha las aplicacions activas per fin de "
-#~ "determinar las mai utilizadas (per ex. pels aviadors). Quitament se aquestas "
-#~ "donadas son gardadas secretas, de motius de confidencialitat vos pòdon "
-#~ "butar a desactivar aquesta foncionalitat. Remarcatz qu'aquesta "
-#~ "desactivacion suprimís pas d'eventualas donadas ja enregistradas."
+#~ "Normalement GNOME Shell surveille les applications actives afin de "
+#~ "déterminer les plus utilisées (par ex. pour les lanceurs). Bien que ces "
+#~ "données soient gardées secrètes, des motifs de confidentialité peuvent "
+#~ "vous pousser à désactiver cette fonctionnalité. Remarquez que cette "
+#~ "désactivation ne supprime pas d'éventuelles données déjà enregistrées."

 #~ msgid ""
 #~ "Internally used to store the last IM presence explicitly set by the user. "
 #~ "The value here is from the TpConnectionPresenceType enumeration."
 #~ msgstr ""
-#~ "Utilizat en intèrne per enregistrar la darrièra preséncia de messatjariá "
-#~ "instantanèa IM explicitament definida per l'utilizaire. Aicí la valor es "
-#~ "tirada de l'enumeracion TpConnectionPresenceType."
+#~ "Utilisé en interne pour enregistrer la dernière présence de messagerie "
+#~ "instantanée IM explicitement définie par l'utilisateur. Ici la valeur est "
+#~ "tirée de l'énumération TpConnectionPresenceType."

 #~ msgid ""
 #~ "Internally used to store the last session presence status for the user. "
 #~ "The value here is from the GsmPresenceStatus enumeration."
 #~ msgstr ""
-#~ "Utilizat en interne per enregistrar lo darrièr estatut de preséncia de la "
-#~ "session per l'utilizaire. Aici la valor es tirada de l'enumeracion "
+#~ "Utilisé en interne pour enregistrer le dernier statut de présence de la "
+#~ "session pour l'utilisateur. Ici la valeur est tirée de l'énumération "
 #~ "GsmPresenceStatus."

 #~ msgid "Keybinding to toggle the screen recorder"
-#~ msgstr "Combinason de tòcas per bascular l'enregistrador d'ecran"
+#~ msgstr "Combinaison de touches pour basculer l'enregistreur d'écran"

 #~ msgid "Keybinding to start/stop the builtin screen recorder."
 #~ msgstr ""
-#~ "Combinason de tòcas per aviar/arrestar l'enregistrador d'ecran "
-#~ "integrat."
+#~ "Combinaison de touches pour démarrer/arrêter l'enregistreur d'écran "
+#~ "intégré."

 #~ msgid "Framerate used for recording screencasts."
 #~ msgstr ""
-#~ "Nombre d'imatges per segonda per l'enregistrament de las animacions d'ecran."
+#~ "Nombre d'images par seconde pour l'enregistrement des animations d'écran."

 #~ msgid ""
 #~ "The framerate of the resulting screencast recordered by GNOME Shell's "
 #~ "screencast recorder in frames-per-second."
 #~ msgstr ""
-#~ "Lo nombre d'imatges per segonda de las animacions d'ecran enregistradas per "
-#~ "l'aisina idònia de GNOME Shell."
+#~ "Le nombre d'images par seconde des animations d'écran enregistrées par "
+#~ "l'outil idoine de GNOME Shell."

 #~ msgid "The gstreamer pipeline used to encode the screencast"
-#~ msgstr "Lo pipeline GStreamer utilizat per encodar l'animacion d'ecran"
+#~ msgstr "Le pipeline GStreamer utilisé pour coder l'animation d'écran"

 #~ msgid ""
 #~ "Sets the GStreamer pipeline used to encode recordings. It follows the "
@ -2283,101 +2322,101 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ "WEBM using the VP8 codec. %T is used as a placeholder for a guess at the "
 #~ "optimal thread count on the system."
 #~ msgstr ""
-#~ "Definicion del pipeline GStreamer utilizat per encodar los enregistraments "
-#~ "vidèo. La sintaxi es identica a la de gst-launch. Lo connectador "
-#~ "d'entrada (sink pad) del pipeline deuriá èsser non connectat là où la vidèo "
-#~ "es enregistrada. Lo connectador font deuriá normalement èsser non "
-#~ "connectat ; la sortida de ce connectador es escrita dins lo fichièr de "
-#~ "sortida. Pasmens, lo pipeline pòt tanben se cargar de sa pròpria sortida, "
-#~ "per exemple per diriger la sortida cap a un servidor icecast via "
-#~ "shout2send o autre. Se aquesta clau es pas definida o se es voida, "
-#~ "es lo pipeline per defaut qu'es utilizat. Aqueste es actualament « "
-#~ "vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 "
-#~ "threads=%T ! queue ! webmmux' » e l'enregistrament utiliza lo format WEBM "
-#~ "e lo codec VP8. %T es utilizat coma paramètre per una suposicion quant "
-#~ "al nombre optimal de threads d'utilizar sul sistèma."
+#~ "Définition del pipeline GStreamer utilisé pour coder les enregistrements "
+#~ "vidéo. La syntaxe est identique à celle de gst-launch. Le connecteur "
+#~ "d'entrée (sink pad) del pipeline devrait être non connecté là où la vidéo "
+#~ "est enregistrée. Le connecteur source devrait normalement être non "
+#~ "connecté ; la sortie de ce connecteur est écrite dans le fichièr de "
+#~ "sortie. Cependant, le pipeline peut aussi se charger de sa propre sortie, "
+#~ "par exemple pour diriger la sortie vers un servidor icecast via shout2send "
+#~ "ou autre. Si cette clé es pas définie o si elle est vide, c'est le "
+#~ "pipeline par défaut qui est utilisé. Celui-ci est actuellement « vp8enc "
+#~ "min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads="
+#~ "%T ! queue ! webmmux' » e l'enregistrement utilise le format WEBM e le "
+#~ "codec VP8. %T est utilisé comme paramètre pour una supposition quant au "
+#~ "nombre optimal de threads à utiliser sur le système."

 #~ msgid "File extension used for storing the screencast"
 #~ msgstr ""
-#~ "Extension de fichièr d'utilizar per enregistrar l'animacion d'ecran"
+#~ "Extension de fichièr à utiliser pour enregistrer l'animation d'écran"

 #~ msgid ""
 #~ "The filename for recorded screencasts will be a unique filename based on "
 #~ "the current date, and use this extension. It should be changed when "
 #~ "recording to a different container format."
 #~ msgstr ""
-#~ "Lo nom de fichièr de las animacions d'ecran es unic, se basa sus la data, "
-#~ "e utiliza aquesta extension. Deuriá èsser modificada se lo format del "
-#~ "contenidor utilizat per l'enregistrament es diferent."
+#~ "Le nom de fichièr des animations d'écran est unique, se base sur la date, "
+#~ "et utilise cette extension. Elle devrait être modifiée si le format del "
+#~ "conteneur utilisé pour l'enregistrement est différent."

 #~ msgid "Session…"
 #~ msgstr "Session…"

 #~ msgid "Power"
-#~ msgstr "Energia"
+#~ msgstr "Énergie"

 #~ msgid "Restart"
 #~ msgstr "Reaviar"

 #~ msgid "Screencast from %d %t"
-#~ msgstr "Vidèo d'ecran %d %t"
+#~ msgstr "Vidéo d'écran %d %t"

 #~ msgid "Click Log Out to quit these applications and log out of the system."
 #~ msgstr ""
-#~ "Clicatz sus « Tampar la session » per quitar aquestas aplicacions e fermer "
+#~ "Cliquez sur « Tampar la session » pour quitter ces applications e fermer "
 #~ "la session."

 #~ msgid "Logging out of the system."
-#~ msgstr "Desconnexion del sistèma."
+#~ msgstr "Déconnexion del système."

 #~ msgid "Click Power Off to quit these applications and power off the system."
 #~ msgstr ""
-#~ "Clicatz sus « Atudar » per quitar aquestas aplicacions e atudar "
-#~ "l'ordenador."
+#~ "Cliquez sur « Éteindre » pour quitter ces applications e éteindre "
+#~ "l'ordinateur."

 #~ msgid "Powering off the system."
-#~ msgstr "Extinction del sistèma."
+#~ msgstr "Extinction del système."

 #~ msgid "Click Restart to quit these applications and restart the system."
 #~ msgstr ""
-#~ "Clicatz sus « Reaviar » per quitar aquestas aplicacions e reaviar "
-#~ "l'ordenador."
+#~ "Cliquez sur « Reaviar » pour quitter ces applications e redémarrer "
+#~ "l'ordinateur."

 #~ msgid "Restarting the system."
-#~ msgstr "Reaviada del sistèma."
+#~ msgstr "Redémarrage del système."

 #~ msgid "Universal Access Settings"
 #~ msgstr "Paramètres de l'accès universel"

 #~ msgid "Visibility"
-#~ msgstr "Visibilitat"
+#~ msgstr "Visibilité"

 #~ msgid "Set Up a New Device…"
-#~ msgstr "Configurar un novèl periferic…"
+#~ msgstr "Configurer un nouveau périphérique…"

 #~ msgid "Connection"
 #~ msgstr "Connexion"

 #~ msgid "Send Files…"
-#~ msgstr "Mandar de fichièrs…"
+#~ msgstr "Envoyer des fichièrs…"

 #~ msgid "Keyboard Settings"
-#~ msgstr "Paramètres del clavièr"
+#~ msgstr "Paramètres del clavier"

 #~ msgid "Mouse Settings"
-#~ msgstr "Paramètres de la mirga"
+#~ msgstr "Paramètres de la souris"

 #~ msgid "Region & Language Settings"
-#~ msgstr "Paramètres de region e de lenga"
+#~ msgstr "Paramètres de région e de langue"

 #~ msgid "Volume, network, battery"
-#~ msgstr "Volum, ret, batariá"
+#~ msgstr "Volume, réseau, batterie"

 #~ msgid "disabled"
-#~ msgstr "desactivat"
+#~ msgstr "désactivé"

 #~ msgid "cable unplugged"
-#~ msgstr "cable desbrancat"
+#~ msgstr "câble débranché"

 #~ msgid "More…"
 #~ msgstr "Mai…"
@ -2389,10 +2428,10 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ msgstr "Ethernet automatic"

 #~ msgid "Auto broadband"
-#~ msgstr "Connexion benda larga automatica"
+#~ msgstr "Connexion large bande automatique"

 #~ msgid "Auto dial-up"
-#~ msgstr "Connexion per telefòn automatica"
+#~ msgstr "Connexion par téléphone automatique"

 #~ msgid "Auto %s"
 #~ msgstr "Auto %s"
@ -2411,11 +2450,11 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"

 #~ msgid "%d hour remaining"
 #~ msgid_plural "%d hours remaining"
-#~ msgstr[0] "%d ora restanta"
-#~ msgstr[1] "%d oras restantas"
+#~ msgstr[0] "%d ora restante"
+#~ msgstr[1] "%d oras restantes"

 #~ msgid "%d %s %d %s remaining"
-#~ msgstr "%d %s %d %s restantas"
+#~ msgstr "%d %s %d %s restantes"

 #~ msgid "hour"
 #~ msgid_plural "hours"
@ -2424,19 +2463,19 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"

 #~ msgid "minute"
 #~ msgid_plural "minutes"
-#~ msgstr[0] "minuta"
-#~ msgstr[1] "minutas"
+#~ msgstr[0] "minute"
+#~ msgstr[1] "minutes"

 #~ msgid "%d minute remaining"
 #~ msgid_plural "%d minutes remaining"
-#~ msgstr[0] "%d minuta restanta"
-#~ msgstr[1] "%d minutas restantas"
+#~ msgstr[0] "%d minute restante"
+#~ msgstr[1] "%d minutes restantes"

 #~ msgid "AC Adapter"
-#~ msgstr "Adaptador secteur"
+#~ msgstr "Adaptateur secteur"

 #~ msgid "Laptop Battery"
-#~ msgstr "Batariá de l'ordenador"
+#~ msgstr "Batterie de l'ordinateur"

 #~ msgid "UPS"
 #~ msgstr "UPS"
@ -2445,32 +2484,32 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ msgstr "Ecran"

 #~ msgid "Mouse"
-#~ msgstr "Mirga"
+#~ msgstr "Souris"

 #~ msgid "PDA"
-#~ msgstr "Assistent personal"
+#~ msgstr "Assistant personnel"

 #~ msgid "Cell Phone"
-#~ msgstr "Telefòn portable"
+#~ msgstr "Téléphone portable"

 #~ msgid "Media Player"
-#~ msgstr "Lector multimèdia"
+#~ msgstr "Lecteur multimédia"

 #~ msgid "Tablet"
-#~ msgstr "Tauleta"
+#~ msgstr "Tablette"

 #~ msgid "Computer"
-#~ msgstr "Ordenador"
+#~ msgstr "Ordinateur"

 #~ msgctxt "device"
 #~ msgid "Unknown"
-#~ msgstr "Desconegut"
+#~ msgstr "Inconnu"

 #~ msgid "Available"
 #~ msgstr "Disponible"

 #~ msgid "Busy"
-#~ msgstr "Ocupat"
+#~ msgstr "Occupé"

 #~ msgid "Invisible"
 #~ msgstr "Invisible"
@ -2479,30 +2518,30 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ msgstr "Absent"

 #~ msgid "Idle"
-#~ msgstr "Inactiu"
+#~ msgstr "Inactif"

 #~ msgid "Your chat status will be set to busy"
-#~ msgstr "Vòstre estatut per las discussions serà definit a ocupat"
+#~ msgstr "Votre statut pour les discussions sera défini à occupé"

 #~ msgid ""
 #~ "Notifications are now disabled, including chat messages. Your online "
 #~ "status has been adjusted to let others know that you might not see their "
 #~ "messages."
 #~ msgstr ""
-#~ "Les notifications son maintenant desactivadas, y compris les messages de "
-#~ "discussion. Votre statut en linha a été modificat per fin que les autres "
-#~ "sachent qu'il se pòt que vous ne voyez pas leurs messages."
+#~ "Les notifications son maintenant désactivées, y compris les messages de "
+#~ "discussion. Votre statut en ligne a été modifié afin que les autres "
+#~ "sachent qu'il se peut que vous ne voyez pas leurs messages."

 #~ msgid "Shutting down might cause them to lose unsaved work."
 #~ msgstr ""
-#~ "L'extinction pourrait lor far pèrdre lor travaux non enregistrats."
+#~ "L'extinction pourrait leur faire perdre leur travaux non enregistrés."

 #~ msgctxt "title"
 #~ msgid "Sign In"
 #~ msgstr "Connexion"

 #~ msgid "APPLICATIONS"
-#~ msgstr "APLICACIONS"
+#~ msgstr "APPLICATIONS"

 #~ msgid "SETTINGS"
 #~ msgstr "PARAMÈTRES"
@ -2518,70 +2557,70 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ msgstr "%l:%M %p"

 #~ msgid "Subscription request"
-#~ msgstr "Demanda d'abonnement"
+#~ msgstr "Demande d'abonnement"

 #~ msgid "Connection error"
-#~ msgstr "Error de connexion"
+#~ msgstr "Erreur de connexion"

 #
-# luc: TODO: double check with source code. %A is weekday « Mandat lundi a 8:23»
+# luc: TODO: double check with source code. %A is weekday « Envoyé lundi à 8:23»
 #~ msgid "Sent at <b>%X</b> on <b>%A</b>"
-#~ msgstr "Mandat <b>%A</b> a <b>%X</b>"
+#~ msgstr "Envoyé <b>%A</b> à <b>%X</b>"

 #~ msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
-#~ msgstr "Mandat lo <b>%A %-d %B %Y</b>"
+#~ msgstr "Envoyé le <b>%A %-d %B %Y</b>"

 #~ msgid "Connection to %s failed"
-#~ msgstr "La connexion a %s a fracassat"
+#~ msgstr "La connexion à %s a échoué"

 #~ msgid "Reconnect"
-#~ msgstr "Se reconnectar"
+#~ msgstr "Se reconnecter"

 #~ msgid "tray"
-#~ msgstr "tirador de messatjariá"
+#~ msgstr "tiroir de messagerie"

 #~ msgid "Browse Files..."
-#~ msgstr "Percórrer los fichièrs..."
+#~ msgstr "Parcourir les fichièrs..."

 #~ msgid "Error browsing device"
-#~ msgstr "Error en percorrent lo periferic"
+#~ msgstr "Erreur en parcourant le périphérique"

 #~ msgid "The requested device cannot be browsed, error is '%s'"
 #~ msgstr ""
-#~ "Lo periferic demandat pòt pas èsser percorrut, l'error es « %s »"
+#~ "Le périphérique demandé ne peut pas être parcouru, l'erreur est « %s »"

 #~ msgid "More..."
-#~ msgstr "Mai..."
+#~ msgstr "Plus..."

 #~ msgid "Wireless"
-#~ msgstr "Sens fial"
+#~ msgstr "Sans fil"

 #~ msgid "VPN Connections"
-#~ msgstr "Connexions per VPN"
+#~ msgstr "Connexions par VPN"

 #~ msgid "System Settings"
-#~ msgstr "Paramètres sistèma"
+#~ msgstr "Paramètres système"

 #~ msgid "Your favorite Easter Egg"
-#~ msgstr "Vòstre uòu de Pascas favorit"
+#~ msgstr "Votre œuf de Pâques favori"

 #~ msgid "United Kingdom"
-#~ msgstr "Reialme Unit"
+#~ msgstr "Royaume-Uni"

 #~ msgid "Default"
-#~ msgstr "Defaut"
+#~ msgstr "Défaut"

 #~ msgid "Authentication required"
-#~ msgstr "Autentificacion necessària"
+#~ msgstr "Authentification nécessaire"

 #~ msgid "Show the message list"
-#~ msgstr "Afichar la lista de messatges"
+#~ msgstr "Afficher la liste de messages"

 #~ msgid "Captive Portal"
-#~ msgstr "Portal captiu"
+#~ msgstr "Portail captif"

 #~ msgid "The maximum accuracy level of location."
-#~ msgstr "Lo nivèl de precision de localizacion maximal"
+#~ msgstr "Le niveau de précision de localisation maximal"

 #~ msgid ""
 #~ "Configures the maximum level of location accuracy applications are "
@ -2592,13 +2631,13 @@ msgstr "La fenèstra d'autentificacion es estada escartada per l'utilizaire"
 #~ "on their own using network resources (albeit with street-level accuracy "
 #~ "at best)."
 #~ msgstr ""
-#~ "Configure lo nivèl maximal de precision de localizacion que las "
-#~ "aplicacions son autorizadas a veire. Las opcions validas son « off "
-#~ "» (desactivar lo seguiment de l'emplaçament), « country » (país), « city "
-#~ "» (vila), « neighborhood » (quartièr), « street » (carrièra) e « exact "
-#~ "» (emplaçament exacte, necessita generalament un receptor GPS). "
-#~ "Gardatz en cap qu'aqueste paramètre contraròtla unicament çò que GeoClue "
-#~ "autorizarà las aplicacions a veire mas que demòran pr'aquò "
-#~ "capablas de determinar l'emplaçament de l'utilizaire d'ela-meteissa en "
-#~ "utilizant las ressorsas ret (amb al pus melhor un nivèl de precision "
-#~ "limitat a la carrièra)."
+#~ "Configure le niveau maximal de précision de localisation que les "
+#~ "applications son autorisées à voir. Les options valides son « off "
+#~ "» (désactiver le suivi de l'emplacement), « country » (pays), « city "
+#~ "» (ville), « neighborhood » (quartier), « rue » (rue) e « exact "
+#~ "» (emplacement exact, nécessite généralement un récepteur GPS).  Veuillez "
+#~ "garder en tête que ce paramètre contrôle uniquement ce que GeoClue "
+#~ "autorisera les applications à voir mas qu'elles restent néanmoins "
+#~ "capables de déterminer l'emplacement de l'utilisateur d'elle-même en "
+#~ "utilisant les ressources réseau (avec au mieux un niveau de précision "
+#~ "limité à la rue)."
--- a/po/pt.po
+++ b/po/pt.po
@ -4,26 +4,24 @@
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2010, 2011, 2012, 2013, 2014.
 # Rui Gouveia <rui.gouveia@gmail.com>, 2011.
 # António Lima <amrlima@gmail.com>, 2013.
-# Tiago Santos <tiagofsantos81@sapo.pt>, 2014, 2016.
+# Tiago S. <almosthumane@portugalmail.pt>, 2014.
 # Bruno Ramalhete <bram.512@gmail.com>, 2015.
 # Pedro Albuquerque <palbuquerque73@gmail.com>, 2014, 2015.
-# Sérgio Cardeira <cardeira dot sergio at gmail dot com>, 2016.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.14\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-04-26 13:48+0000\n"
-"PO-Revision-Date: 2016-04-30 16:45+0100\n"
-"Last-Translator: Tiago Santos <tiagofsantos81@sapo.pt>\n"
-"Language-Team: Português <>\n"
+"POT-Creation-Date: 2015-11-20 22:14+0000\n"
+"PO-Revision-Date: 2015-11-21 09:02+0100\n"
+"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
+"Language-Team: Pedro Albuquerque\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 "X-Language: pt_PT\n"
 "X-Source-Language: C\n"
@ -325,52 +323,51 @@ msgstr ""
 msgid "Network Login"
 msgstr "Sessão na rede"

-#: ../js/extensionPrefs/main.js:117
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Ocorreu um erro ao ler o diálogo de preferências de %s:"

-#: ../js/extensionPrefs/main.js:149
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Extensões da interface do GNOME"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/audioDeviceSelection.js:71
-#: ../js/ui/components/networkAgent.js:145
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
 #: ../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"
 msgstr "Cancelar"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:216
-#: ../js/gdm/authPrompt.js:448
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:447
 msgid "Next"
 msgstr "Seguinte"

-#: ../js/gdm/authPrompt.js:212 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Desbloquear"

-#: ../js/gdm/authPrompt.js:214
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sessão"

-#: ../js/gdm/loginDialog.js:285
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Escolher sessão"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:435
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Não está listada?"

 #. 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:854
+#: ../js/gdm/loginDialog.js:850
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(por ex., utilizador ou %s)"
@ -378,12 +375,12 @@ msgstr "(por ex., utilizador ou %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:859 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:855 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Utilizador: "

-#: ../js/gdm/loginDialog.js:1196
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Janela de início de sessão"

@ -519,36 +516,16 @@ msgstr "Adicionar aos favoritos"
 msgid "Show Details"
 msgstr "Mostrar detalhes"

-#: ../js/ui/appFavorites.js:134
+#: ../js/ui/appFavorites.js:133
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s foi adicionada aos seus favoritos."

-#: ../js/ui/appFavorites.js:168
+#: ../js/ui/appFavorites.js:167
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s foi removida dos seus favoritos."

-#: ../js/ui/audioDeviceSelection.js:59
-msgid "Select Audio Device"
-msgstr "Selecione o dispositivo de áudio"
-
-#: ../js/ui/audioDeviceSelection.js:69
-msgid "Sound Settings"
-msgstr "Definições de som"
-
-#: ../js/ui/audioDeviceSelection.js:78
-msgid "Headphones"
-msgstr "Auscultadores"
-
-#: ../js/ui/audioDeviceSelection.js:80
-msgid "Headset"
-msgstr "Auscultadores com microfone"
-
-#: ../js/ui/audioDeviceSelection.js:82 ../js/ui/status/volume.js:213
-msgid "Microphone"
-msgstr "Microfone"
-
 #: ../js/ui/backgroundMenu.js:19
 msgid "Change Background…"
 msgstr "Alterar o fundo…"
@ -557,12 +534,12 @@ msgstr "Alterar o fundo…"
 msgid "Display Settings"
 msgstr "Definições de ecrã"

-#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:371
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/status/system.js:366
 msgid "Settings"
 msgstr "Definições"

 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:47
+#: ../js/ui/calendar.js:55
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@ -572,96 +549,100 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:76
+#: ../js/ui/calendar.js:84
 msgctxt "grid sunday"
 msgid "S"
 msgstr "D"

 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:78
+#: ../js/ui/calendar.js:86
 msgctxt "grid monday"
 msgid "M"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:80
+#: ../js/ui/calendar.js:88
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "T"

 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:90
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "Q"

 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:84
+#: ../js/ui/calendar.js:92
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Q"

 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:86
+#: ../js/ui/calendar.js:94
 msgctxt "grid friday"
 msgid "F"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:96
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"

-#: ../js/ui/calendar.js:416
+#: ../js/ui/calendar.js:566
 msgid "Previous month"
 msgstr "Mês anterior"

-#: ../js/ui/calendar.js:426
+#: ../js/ui/calendar.js:576
 msgid "Next month"
 msgstr "Mês seguinte"

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

-#: ../js/ui/calendar.js:634
+#: ../js/ui/calendar.js:783
 msgid "Week %V"
 msgstr "Semana %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:695
+#: ../js/ui/calendar.js:1188
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Dia completo"

-#: ../js/ui/calendar.js:821
+#: ../js/ui/calendar.js:1295
+msgid "Clear section"
+msgstr "Limpar secção"
+
+#: ../js/ui/calendar.js:1522
 msgid "Events"
 msgstr "Eventos"

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

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

-#: ../js/ui/calendar.js:919
+#: ../js/ui/calendar.js:1620
 msgid "Notifications"
 msgstr "Notificações"

-#: ../js/ui/calendar.js:1070
+#: ../js/ui/calendar.js:1771
 msgid "No Notifications"
 msgstr "Sem notificações"

-#: ../js/ui/calendar.js:1073
+#: ../js/ui/calendar.js:1774
 msgid "No Events"
 msgstr "Sem eventos"

@ -799,7 +780,7 @@ msgstr "Desculpe, não resultou. Por favor, tente novamente."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:760
+#: ../js/ui/components/telepathyClient.js:759
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s é agora conhecido como %s"
@ -987,11 +968,11 @@ msgid "Keyboard"
 msgstr "Teclado"

 #. translators: 'Hide' is a verb
-#: ../js/ui/legacyTray.js:65
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Ocultar tabuleiro"

-#: ../js/ui/legacyTray.js:106
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Ícones de estado"

@ -1019,7 +1000,7 @@ msgstr "Ativo"

 #. 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 "Inativo"

@ -1043,26 +1024,10 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Página Web"

-#: ../js/ui/messageList.js:543
-msgid "Clear section"
-msgstr "Limpar secção"
-
 #: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Informação do sistema"

-#: ../js/ui/mpris.js:194
-msgid "Unknown artist"
-msgstr "Artista desconhecido"
-
-#: ../js/ui/mpris.js:195
-msgid "Unknown title"
-msgstr "Titulo desconhecido"
-
-#: ../js/ui/mpris.js:217
-msgid "Media"
-msgstr "Média"
-
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Desfazer"
@ -1139,7 +1104,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d nova notificação"
 msgstr[1] "%d novas notificações"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:379
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:374
 msgid "Lock"
 msgstr "Bloquear"

@ -1281,50 +1246,30 @@ msgstr "Luminosidade"
 msgid "Show Keyboard Layout"
 msgstr "Mostrar a disposição de teclado"

-#: ../js/ui/status/location.js:107 ../js/ui/status/location.js:215
+#: ../js/ui/status/location.js:71 ../js/ui/status/location.js:177
 msgid "Location Enabled"
 msgstr "Localização ativada"

-#: ../js/ui/status/location.js:108 ../js/ui/status/location.js:216
+#: ../js/ui/status/location.js:72 ../js/ui/status/location.js:178
 msgid "Disable"
 msgstr "Desativar"

-#: ../js/ui/status/location.js:109
+#: ../js/ui/status/location.js:73
 msgid "Privacy Settings"
 msgstr "Definições de privacidade"

-#: ../js/ui/status/location.js:214
+#: ../js/ui/status/location.js:176
 msgid "Location In Use"
 msgstr "Localização em uso"

-#: ../js/ui/status/location.js:218
+#: ../js/ui/status/location.js:180
 msgid "Location Disabled"
 msgstr "Localização desativada"

-#: ../js/ui/status/location.js:219
+#: ../js/ui/status/location.js:181
 msgid "Enable"
 msgstr "Ativar"

-#: ../js/ui/status/location.js:426
-msgid "Deny Access"
-msgstr "Negar acesso"
-
-#: ../js/ui/status/location.js:429
-msgid "Grant Access"
-msgstr "Conceder acesso"
-
-#. Translators: %s is an application name
-#: ../js/ui/status/location.js:435
-#, javascript-format
-msgid "Give %s access to your location?"
-msgstr "Dar a %s permissão para usar a localização?"
-
-#: ../js/ui/status/location.js:437
-msgid "Location access can be changed at any time from the privacy settings."
-msgstr ""
-"Acesso à localização pode ser alterado a qualquer altura a partir das "
-"definições de privacidade."
-
 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<desconhecido>"
@ -1547,27 +1492,27 @@ msgstr "%d %%"
 msgid "Airplane Mode On"
 msgstr "Modo Avião ligado"

-#: ../js/ui/status/system.js:348
+#: ../js/ui/status/system.js:343
 msgid "Switch User"
 msgstr "Alternar utilizador"

-#: ../js/ui/status/system.js:353
+#: ../js/ui/status/system.js:348
 msgid "Log Out"
 msgstr "Terminar sessão"

-#: ../js/ui/status/system.js:358
+#: ../js/ui/status/system.js:353
 msgid "Account Settings"
 msgstr "Definições de conta"

-#: ../js/ui/status/system.js:375
+#: ../js/ui/status/system.js:370
 msgid "Orientation Lock"
 msgstr "Orientação de bloqueio"

-#: ../js/ui/status/system.js:383
+#: ../js/ui/status/system.js:378
 msgid "Suspend"
 msgstr "Suspender"

-#: ../js/ui/status/system.js:386
+#: ../js/ui/status/system.js:381
 msgid "Power Off"
 msgstr "Desligar"

@ -1579,6 +1524,10 @@ msgstr "Volume alterado"
 msgid "Volume"
 msgstr "Volume"

+#: ../js/ui/status/volume.js:213
+msgid "Microphone"
+msgstr "Microfone"
+
 #: ../js/ui/unlockDialog.js:67
 msgid "Log in as another user"
 msgstr "Iniciar sessão como outro utilizador"
@ -1699,7 +1648,7 @@ msgstr "Calendário do Evolution"

 #. 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"
@ -1708,14 +1657,14 @@ msgstr[1] "%u saídas"

 #. 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 entrada"
 msgstr[1] "%u entradas"

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

@ -1758,9 +1707,6 @@ msgstr "A senha não pode estar vazia"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "O diálogo de autenticação foi fechado pelo utilizador"

-#~ msgid "%s is requesting access to your location."
-#~ msgstr "%s está a pedir acesso à sua localização."
-
 #~ msgid "GNOME Shell (wayland compositor)"
 #~ msgstr "Interface GNOME (compositor wayland)"

@ -1977,6 +1923,9 @@ msgstr "O diálogo de autenticação foi fechado pelo utilizador"
 #~ msgid "View account"
 #~ msgstr "Visualizar a conta"

+#~ msgid "Unknown reason"
+#~ msgstr "Motivo desconhecido"
+
 #~ msgid "Open Calendar"
 #~ msgstr "Abrir o Calendário"

@ -2082,6 +2031,9 @@ msgstr "O diálogo de autenticação foi fechado pelo utilizador"
 #~ msgid "Device %s wants access to the service '%s'"
 #~ msgstr "O dispositivo %s deseja aceder ao serviço '%s'"

+#~ msgid "Always grant access"
+#~ msgstr "Conceder sempre o acesso"
+
 #~ msgid "Grant this time only"
 #~ msgstr "Conceder apenas desta vez"

--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -12,7 +12,7 @@ SUBDIRS = gvc

 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR) -L$(MUTTER_TYPELIB_DIR)
+INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(MUTTER_TYPELIB_DIR)

 typelibdir = $(pkglibdir)
@ -201,7 +201,6 @@ 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_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)
 gnome_shell_DEPENDENCIES = libgnome-shell.la

 gnome_shell_extension_prefs_SOURCES = \
@ -213,7 +212,6 @@ nodist_gnome_shell_extension_prefs_SOURCES = \
 	$(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_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)

 if HAVE_NETWORKMANAGER

@ -227,7 +225,6 @@ nodist_gnome_shell_portal_helper_SOURCES = \
 	$(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_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR)

 endif

@ -282,7 +279,7 @@ noinst_PROGRAMS += run-js-test

 run_js_test_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
 run_js_test_LDADD = libgnome-shell.la $(GNOME_SHELL_JS_LIBS) $(MUTTER_LIBS)
-run_js_test_LDFLAGS = -export-dynamic -rpath $(MUTTER_TYPELIB_DIR)
+run_js_test_LDFLAGS = -export-dynamic

 run_js_test_SOURCES =			\
 	run-js-test.c
--- a/src/gvc
+++ b/src/gvc
--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -722,23 +722,6 @@ shell_app_get_last_user_time (ShellApp *app)
  return (int)last_user_time;
 }

-static gboolean
-shell_app_is_minimized (ShellApp *app)
-{
-  GSList *iter;
-
-  if (app->running_state == NULL)
-    return FALSE;
-
-  for (iter = app->running_state->windows; iter; iter = iter->next)
-    {
-      if (meta_window_showing_on_its_workspace (iter->data))
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
 /**
 * shell_app_compare:
 * @app:
@ -746,17 +729,13 @@ shell_app_is_minimized (ShellApp *app)
 *
 * Compare one #ShellApp instance to another, in the following way:
 *   - Running applications sort before not-running applications.
- *   - If one of them has non-minimized windows and the other does not,
- *     the one with visible windows is first.
- *   - Finally, the application which the user interacted with most recently
+ *   - The application which the user interacted with most recently
 *     compares earlier.
 */
 int
 shell_app_compare (ShellApp *app,
                   ShellApp *other)
 {
-  gboolean min_app, min_other;
-
  if (app->state != other->state)
    {
      if (app->state == SHELL_APP_STATE_RUNNING)
@ -764,16 +743,6 @@ shell_app_compare (ShellApp *app,
      return 1;
    }

-  min_app = shell_app_is_minimized (app);
-  min_other = shell_app_is_minimized (other);
-
-  if (min_app != min_other)
-    {
-      if (min_other)
-        return -1;
-      return 1;
-    }
-
  if (app->state == SHELL_APP_STATE_RUNNING)
    {
      if (app->running_state->windows && !other->running_state->windows)
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -944,9 +944,6 @@ get_absolute_path (char *maybe_relative)
  else
    {
      const char *video_dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS);
-      if (!g_file_test (video_dir, G_FILE_TEST_EXISTS))
-          video_dir = g_get_home_dir ();
-
      path = g_build_filename (video_dir, maybe_relative, NULL);
    }

--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@ -608,8 +608,6 @@ st_entry_key_press_event (ClutterActor    *actor,
  /* paste */
  if (((event->modifier_state & CLUTTER_CONTROL_MASK)
       && event->keyval == CLUTTER_KEY_v) ||
-      ((event->modifier_state & CLUTTER_CONTROL_MASK)
-       && event->keyval == CLUTTER_KEY_V) ||
      ((event->modifier_state & CLUTTER_SHIFT_MASK)
       && event->keyval == CLUTTER_KEY_Insert))
    {
@ -627,7 +625,7 @@ st_entry_key_press_event (ClutterActor    *actor,

  /* copy */
  if ((event->modifier_state & CLUTTER_CONTROL_MASK)
-      && (event->keyval == CLUTTER_KEY_c || event->keyval == CLUTTER_KEY_C) &&
+      && event->keyval == CLUTTER_KEY_c &&
      clutter_text_get_password_char ((ClutterText*) priv->entry) == 0)
    {
      StClipboard *clipboard;
@ -648,7 +646,7 @@ st_entry_key_press_event (ClutterActor    *actor,

  /* cut */
  if ((event->modifier_state & CLUTTER_CONTROL_MASK)
-      && (event->keyval == CLUTTER_KEY_x || event->keyval == CLUTTER_KEY_X) &&
+      && event->keyval == CLUTTER_KEY_x &&
      clutter_text_get_password_char ((ClutterText*) priv->entry) == 0)
    {
      StClipboard *clipboard;
@ -673,8 +671,8 @@ st_entry_key_press_event (ClutterActor    *actor,


  /* delete to beginning of line */
-  if ((event->modifier_state & CLUTTER_CONTROL_MASK) &&
-      (event->keyval == CLUTTER_KEY_u || event->keyval == CLUTTER_KEY_U))
+  if ((event->modifier_state & CLUTTER_CONTROL_MASK)
+      && event->keyval == CLUTTER_KEY_u)
    {
      int pos = clutter_text_get_cursor_position ((ClutterText *)priv->entry);
      clutter_text_delete_text ((ClutterText *)priv->entry, 0, pos);
@ -684,8 +682,8 @@ st_entry_key_press_event (ClutterActor    *actor,


  /* delete to end of line */
-  if ((event->modifier_state & CLUTTER_CONTROL_MASK) &&
-      (event->keyval == CLUTTER_KEY_k || event->keyval == CLUTTER_KEY_K))
+  if ((event->modifier_state & CLUTTER_CONTROL_MASK)
+      && event->keyval == CLUTTER_KEY_k)
    {
      ClutterTextBuffer *buffer = clutter_text_get_buffer ((ClutterText *)priv->entry);
      int pos = clutter_text_get_cursor_position ((ClutterText *)priv->entry);
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@ -347,7 +347,6 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,
 {
  ClutterBackend *backend = clutter_get_default_backend ();
  CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;

  static CoglPipeline *shadow_pipeline_template = NULL;

@ -378,13 +377,7 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,
                                                         COGL_PIXEL_FORMAT_A_8,
                                                         rowstride_out,
                                                         pixels_out,
-                                                         &error));
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
+                                                         NULL));

  g_free (pixels_out);

@ -402,10 +395,7 @@ _st_create_shadow_pipeline (StShadow    *shadow_spec,

  pipeline = cogl_pipeline_copy (shadow_pipeline_template);
  cogl_pipeline_set_layer_texture (pipeline, 0, texture);
-
-  if (texture)
-    cogl_object_unref (texture);
-
+  cogl_object_unref (texture);
  return pipeline;
 }

--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@ -461,24 +461,14 @@ pixbuf_to_cogl_texture (GdkPixbuf *pixbuf)
 {
  ClutterBackend *backend = clutter_get_default_backend ();
  CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;
-  CoglTexture2D *texture;

-  texture = cogl_texture_2d_new_from_data (ctx,
-                                           gdk_pixbuf_get_width (pixbuf),
-                                           gdk_pixbuf_get_height (pixbuf),
-                                           gdk_pixbuf_get_has_alpha (pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
-                                           gdk_pixbuf_get_rowstride (pixbuf),
-                                           gdk_pixbuf_get_pixels (pixbuf),
-                                           &error);
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
-
-  return texture ? COGL_TEXTURE (texture) : NULL;
+  return COGL_TEXTURE (cogl_texture_2d_new_from_data (ctx,
+                                                      gdk_pixbuf_get_width (pixbuf),
+                                                      gdk_pixbuf_get_height (pixbuf),
+                                                      gdk_pixbuf_get_has_alpha (pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
+                                                      gdk_pixbuf_get_rowstride (pixbuf),
+                                                      gdk_pixbuf_get_pixels (pixbuf),
+                                                      NULL));
 }

 static cairo_surface_t *
@ -642,8 +632,6 @@ st_texture_cache_reset_texture (StTextureCachePropertyBind *bind,
      (cairo_image_surface_get_format (surface) == CAIRO_FORMAT_ARGB32 ||
       cairo_image_surface_get_format (surface) == CAIRO_FORMAT_RGB24))
    {
-      CoglError *error = NULL;
-
      texdata = COGL_TEXTURE (cogl_texture_2d_new_from_data (ctx,
                                                             cairo_image_surface_get_width (surface),
                                                             cairo_image_surface_get_height (surface),
@ -651,18 +639,9 @@ st_texture_cache_reset_texture (StTextureCachePropertyBind *bind,
                                                             COGL_PIXEL_FORMAT_BGRA_8888 : COGL_PIXEL_FORMAT_BGR_888,
                                                             cairo_image_surface_get_stride (surface),
                                                             cairo_image_surface_get_data (surface),
-                                                             &error));
-
-      if (texdata)
-        {
-          clutter_texture_set_cogl_texture (bind->texture, texdata);
-          cogl_object_unref (texdata);
-        }
-      else if (error)
-        {
-          g_warning ("Failed to allocate texture: %s", error->message);
-          cogl_error_free (error);
-        }
+                                                             NULL));
+      clutter_texture_set_cogl_texture (bind->texture, texdata);
+      cogl_object_unref (texdata);

      clutter_actor_set_opacity (CLUTTER_ACTOR (bind->texture), 255);
    }
--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@ -71,7 +71,6 @@ create_corner_material (StCornerSpec *corner)
 {
  ClutterBackend *backend = clutter_get_default_backend ();
  CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;
  CoglHandle texture;
  cairo_t *cr;
  cairo_surface_t *surface;
@ -173,15 +172,9 @@ create_corner_material (StCornerSpec *corner)
                                                         CLUTTER_CAIRO_FORMAT_ARGB32,
                                                         rowstride,
                                                         data,
-                                                         &error));
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
-
+                                                         NULL));
  g_free (data);
+  g_assert (texture != COGL_INVALID_HANDLE);

  return texture;
 }
@ -354,7 +347,7 @@ st_theme_node_lookup_corner (StThemeNode    *node,
                             float           height,
                             StCorner        corner_id)
 {
-  CoglHandle texture, material = COGL_INVALID_HANDLE;
+  CoglHandle texture, material;
  char *key;
  StTextureCache *cache;
  StCornerSpec corner;
@ -403,12 +396,8 @@ st_theme_node_lookup_corner (StThemeNode    *node,

  key = corner_to_string (&corner);
  texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL);
-
-  if (texture)
-    {
-      material = _st_create_texture_pipeline (texture);
-      cogl_handle_unref (texture);
-    }
+  material = _st_create_texture_pipeline (texture);
+  cogl_handle_unref (texture);

  g_free (key);

@ -969,7 +958,6 @@ st_theme_node_prerender_background (StThemeNode *node,
 {
  ClutterBackend *backend = clutter_get_default_backend ();
  CoglContext *ctx = clutter_backend_get_cogl_context (backend);
-  CoglError *error = NULL;
  StBorderImage *border_image;
  CoglHandle texture;
  guint radius[4];
@ -1289,13 +1277,7 @@ st_theme_node_prerender_background (StThemeNode *node,
                                                         CLUTTER_CAIRO_FORMAT_ARGB32,
                                                         rowstride,
                                                         data,
-                                                         &error));
-
-  if (error)
-    {
-      g_warning ("Failed to allocate texture: %s", error->message);
-      cogl_error_free (error);
-    }
+                                                         NULL));

  cairo_destroy (cr);
  cairo_surface_destroy (surface);
@ -2224,7 +2206,6 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state)
  int max_borders[4];
  int center_radius, corner_id;
  CoglHandle buffer, offscreen = COGL_INVALID_HANDLE;
-  CoglError *error = NULL;

  /* Get infos from the node */
  if (state->alloc_width < node->box_shadow_min_width ||
@ -2265,12 +2246,10 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state)
                                       state->box_shadow_height,
                                       COGL_TEXTURE_NO_SLICING,
                                       COGL_PIXEL_FORMAT_ANY);
-  if (buffer == NULL)
-    return;
+  if (buffer != COGL_INVALID_HANDLE)
+    offscreen = cogl_offscreen_new_with_texture (buffer);

-  offscreen = cogl_offscreen_new_with_texture (buffer);
-
-  if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error))
+  if (offscreen != COGL_INVALID_HANDLE)
    {
      ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height};

@ -2280,17 +2259,14 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state)
      cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0);

      st_theme_node_paint_borders (state, offscreen, &box, 0xFF);
+      cogl_handle_unref (offscreen);

      state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node),
                                                               buffer);
    }
-  else
-    {
-      cogl_error_free (error);
-    }

-  cogl_handle_unref (offscreen);
-  cogl_handle_unref (buffer);
+  if (buffer != COGL_INVALID_HANDLE)
+    cogl_handle_unref (buffer);
 }

 static void
--- a/src/st/st-theme-node-transition.c
+++ b/src/st/st-theme-node-transition.c
@ -241,7 +241,6 @@ setup_framebuffers (StThemeNodeTransition *transition,
 {
  StThemeNodeTransitionPrivate *priv = transition->priv;
  guint width, height;
-  CoglError *catch_error = NULL;

  /* template material to avoid unnecessary shader compilation */
  static CoglHandle material_template = COGL_INVALID_HANDLE;
@ -264,33 +263,19 @@ setup_framebuffers (StThemeNodeTransition *transition,
                                                  COGL_TEXTURE_NO_SLICING,
                                                  COGL_PIXEL_FORMAT_ANY);

-  if (priv->old_texture == COGL_INVALID_HANDLE)
-    return FALSE;
-
-  if (priv->new_texture == COGL_INVALID_HANDLE)
-    return FALSE;
+  g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE);
+  g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE);

  if (priv->old_offscreen)
    cogl_handle_unref (priv->old_offscreen);
  priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture);
-  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), &catch_error))
-    {
-      cogl_object_unref (priv->old_offscreen);
-      cogl_error_free (catch_error);
-      priv->old_offscreen = COGL_INVALID_HANDLE;
-      return FALSE;
-    }

  if (priv->new_offscreen)
    cogl_handle_unref (priv->new_offscreen);
  priv->new_offscreen = cogl_offscreen_new_with_texture (priv->new_texture);
-  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->new_offscreen), &catch_error))
-    {
-      cogl_object_unref (priv->new_offscreen);
-      cogl_error_free (catch_error);
-      priv->new_offscreen = COGL_INVALID_HANDLE;
-      return FALSE;
-    }
+
+  g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE);
+  g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE);

  if (priv->material == NULL)
    {