Bump version to 3.15.4

Update NEWS.
windowManager: Kill a comment
2015-01-21 15:45:13 +01:00 · 2015-01-21 15:44:05 +01:00 · 2015-01-21 15:44:05 +01:00 · 2015-01-20 21:15:02 +00:00 · 2015-01-18 16:49:36 -08:00 · 2015-01-16 19:28:57 +01:00
104 changed files with 9618 additions and 6610 deletions
--- a/.gitignore
+++ b/.gitignore
@ -23,6 +23,7 @@ data/gnome-shell-wayland.desktop
 data/gnome-shell-wayland.desktop.in
 data/gnome-shell-extension-prefs.desktop
 data/gnome-shell-extension-prefs.desktop.in
+data/gnome-shell-theme.gresource
 data/gschemas.compiled
 data/perf-background.xml
 data/org.gnome.shell.gschema.xml
@ -85,6 +86,7 @@ src/gnome-shell-perf-helper
 src/gnome-shell-perf-tool
 src/gnome-shell-portal-helper
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
+src/org-gtk-application.[ch]
 src/run-js-test
 src/test-recorder
 src/test-recorder.ogg
--- a/83
+++ b/83
@ -1,3 +1,86 @@
+3.15.4
+======
+* Add mode parameter to AcceleratorActivated signal [Florian; #711682]
+* Fix PID based window/app association [Sebastian; #736527]
+* Fix current day highlight on day change [Sebastian; #742492]
+* Switch to vp9 for screencast recordings [Adel; #742744]
+* Disable IBus input sources on password entries [Takao; #730628]
+* Make slider scrolling smoother [Adel; #742648]
+* Allow move-up shortcut to move window above top workspace [Florian; #665764]
+* Misc. bug fixes [Adel, Rui; #742748, #742824, #741114]
+
+Contributors:
+  Cosimo Cecchi, Takao Fujiwara, Adel Gadllah, Sebastian Keller, Rui Matos,
+  Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Andika Triwidada [id], Matej Urbančič [sl], Saibal Ray [bn_IN],
+  Inaki Larranaga Murgoitio [eu], Stas Solovey [ru], Kjartan Maraas [nb],
+  Balázs Úr [hu], Marek Černocký [cs], Rafael Ferreira [pt_BR],
+  Bernd Homuth [de], Daniel Mustieles [es], Fabio Tomat [fur]
+
+3.15.3
+======
+* Add support for high-contrast themes [Florian; #740447]
+* Fix banner message on login screen without user list [Ray; #703972]
+* Fix flicker when activating windows on another workspace [Florian; #741680]
+* Misc. bug fixes [Giovanni, Florian; #735308, #740237]
+
+Contributors:
+  Giovanni Campagna, Florian Müllner, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Balázs Úr [hu], Josef Andersson [sv], Muhammet Kara [tr],
+  Baurzhan Muftakhidinov [kk], Inaki Larranaga Murgoitio [eu]
+
+3.15.2
+======
+* Fix visual glitch of window preview outline in overview [Chris; #699044]
+* Change user facing name of "Captive Portal" to "Network Login" [Elad; #737198]
+* Port to Python 3 [Slavek; #732478]
+* Hide Airplane mode indicator when g-s-d says so [Cosimo; #736292]
+* Allow translators to change non-work days [Lavi; #664645]
+* Delay invocation of caribou daemon until really needed [Daiki; #739712]
+* Don't lock screen after crash if locking is disabled [Adel; #704884]
+* Improve layout of extension installation dialog [William; #739888]
+* Fix workspace changes from app picker [Yuki; #737534]
+* Preload all ibus input sources in user configuration [Takao; #695428]
+* Properly remove network connections from list [Ryan; #740227]
+* Support CSS margin property [Carlos; #728437]
+* Improve handling of BUSY application state [Phillip; #736492]
+* Fix erroneous week numbers in calendar [Florian; #736722]
+* Misc. bugfixes and cleanups [Darcy, Yuki, Alexander, Eskild, Bastien, Cosimo, Colin,
+  Ray; #738725, #739497, #739241, #672500, #739822, #740074, #704163, #740141]
+
+Contributors:
+  Yuki, Lavi .A, Elad Alfassa, Cosimo Cecchi, Takao Fujiwara, Adel Gadllah,
+  Eskild Hustvedt, Chris Johns, William Jon McCann, Slavek Kabrda, Ryan Lortie,
+  Florian Müllner, Bastien Nocera, Christian Persch, Carlos Soriano,
+  Jasper St. Pierre, Ray Strode, Alexander Tsoy, Daiki Ueno, Colin Walters,
+  Phillip Wood
+
+Translations:
+  Jorge Perez Perez [an], Daniel Martinez [an], Daniel Mustieles [es],
+  Trần Ngọc Quân [vi], Changwoo Ryu [ko], Kjartan Maraas [nb],
+  Yosef Or Boczko [he], Marek Černocký [cs]
+
+3.15.1
+======
+* Use GResources for theme loading [Cosimo; #736936]
+* Reset the OSK to primary on monitor changes [Rui; #738536]
+* Use LC_TIME locale for format string translations [Florian; #738640]
+* Summarize queued up notifications [Devyani; #702460]
+* Improve handling of multi-day events [Andreas; #727302]
+* Support EXTERNAL scroll policy type [Florian; #739379]
+* Misc. bugfixes [Owen, Rui; #738652, #739252]
+
+Contributors:
+  Andreas Brauchli, Cosimo Cecchi, Devyani Kota, Rui Matos, Florian Müllner,
+  Jasper St. Pierre, Owen W. Taylor
+
+Translations:
+  Bahodir Mansurov [uz@cyrillic]
+
 3.14.1
 ======
 * Fix pulse animation for scrolled app folders [Florian; #736885]
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.14.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.15.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -37,7 +37,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 GLIB_GSETTINGS

 # Get a value to substitute into gnome-shell.in
-AM_PATH_PYTHON([2.5])
+AM_PATH_PYTHON([3])
 AC_SUBST(PYTHON)

 # We need at least this, since gst_plugin_register_static() was added
@ -76,8 +76,8 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.15.90
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.14.1
-GTK_MIN_VERSION=3.13.2
+MUTTER_MIN_VERSION=3.15.4
+GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
@ -97,7 +97,6 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
            gjs-internals-1.0 >= $GJS_MIN_VERSION
            $recorder_modules
            gdk-x11-3.0 libsoup-2.4
-            xtst
            clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
            clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
            libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
@ -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, 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.7.4)
+PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.13.1)
 PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)

 AC_ARG_ENABLE(browser-plugin,
@ -232,9 +231,17 @@ esac
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
 AC_SUBST(AM_CFLAGS)

-BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
+if test -z "${BROWSER_PLUGIN_DIR}"; then
+  BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
+fi
 AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])

+AC_ARG_VAR([GDBUS_CODEGEN],[the gdbus-codegen programme])
+AC_PATH_PROG([GDBUS_CODEGEN],[gdbus-codegen],[])
+if test -z "$GDBUS_CODEGEN"; then
+  AC_MSG_ERROR([gdbus-codegen not found])
+fi
+
 AC_CONFIG_FILES([
  Makefile
  data/Makefile
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -35,44 +35,11 @@ introspection_DATA =				\
 	org.gnome.ShellSearchProvider.xml	\
 	org.gnome.ShellSearchProvider2.xml

-themedir = $(pkgdatadir)/theme
-dist_theme_DATA =				\
-	theme/calendar-arrow-left.svg		\
-	theme/calendar-arrow-right.svg		\
-	theme/calendar-today.svg		\
-	theme/checkbox-focused.svg		\
-	theme/checkbox-off-focused.svg		\
-	theme/checkbox-off.svg			\
-	theme/checkbox.svg			\
-	theme/close-window.svg			\
-	theme/close.svg				\
-	theme/corner-ripple-ltr.png		\
-	theme/corner-ripple-rtl.png		\
-	theme/dash-placeholder.svg		\
-	theme/filter-selected-ltr.svg		\
-	theme/filter-selected-rtl.svg		\
-	theme/gnome-shell.css			\
-	theme/logged-in-indicator.svg		\
-	theme/message-tray-background.png	\
-	theme/more-results.svg			\
-	theme/noise-texture.png			\
-	theme/page-indicator-active.svg		\
-	theme/page-indicator-inactive.svg	\
-	theme/page-indicator-checked.svg	\
-	theme/page-indicator-hover.svg		\
-	theme/panel-button-border.svg		\
-	theme/panel-button-highlight-narrow.svg	\
-	theme/panel-button-highlight-wide.svg	\
-	theme/process-working.svg		\
-	theme/running-indicator.svg		\
-	theme/source-button-border.svg		\
-	theme/summary-counter.svg		\
-	theme/toggle-off-us.svg			\
-	theme/toggle-off-intl.svg		\
-	theme/toggle-on-us.svg			\
-	theme/toggle-on-intl.svg		\
-	theme/ws-switch-arrow-up.png		\
-	theme/ws-switch-arrow-down.png
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/theme --generate-dependencies $(srcdir)/gnome-shell-theme.gresource.xml)
+gnome-shell-theme.gresource: gnome-shell-theme.gresource.xml $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/theme $<
+resourcedir = $(pkgdatadir)
+resource_DATA = gnome-shell-theme.gresource

 backgrounddir = $(pkgdatadir)
 background_DATA = perf-background.xml
@ -116,7 +83,9 @@ EXTRA_DIST =						\
 	perf-background.xml.in				\
 	org.gnome.Shell.PortalHelper.desktop.in		\
 	org.gnome.Shell.PortalHelper.service.in		\
-	org.gnome.shell.gschema.xml.in.in
+	org.gnome.shell.gschema.xml.in.in		\
+	gnome-shell-theme.gresource.xml 		\
+	$(resource_files)

 CLEANFILES +=						\
 	gnome-shell.desktop.in				\
@ -128,4 +97,5 @@ CLEANFILES +=						\
 	perf-background.xml				\
 	gschemas.compiled				\
 	org.gnome.shell.gschema.valid			\
-	org.gnome.shell.gschema.xml.in
+	org.gnome.shell.gschema.xml.in			\
+	gnome-shell-theme.gresource
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell/theme">
+    <file>calendar-arrow-left.svg</file>
+    <file>calendar-arrow-right.svg</file>
+    <file>calendar-today.svg</file>
+    <file>checkbox-focused.svg</file>
+    <file>checkbox-off-focused.svg</file>
+    <file>checkbox-off.svg</file>
+    <file>checkbox.svg</file>
+    <file>close-window.svg</file>
+    <file>close.svg</file>
+    <file>corner-ripple-ltr.png</file>
+    <file>corner-ripple-rtl.png</file>
+    <file>dash-placeholder.svg</file>
+    <file>filter-selected-ltr.svg</file>
+    <file>filter-selected-rtl.svg</file>
+    <file>gnome-shell.css</file>
+    <file>gnome-shell-high-contrast.css</file>
+    <file>logged-in-indicator.svg</file>
+    <file>message-tray-background.png</file>
+    <file>more-results.svg</file>
+    <file>noise-texture.png</file>
+    <file>page-indicator-active.svg</file>
+    <file>page-indicator-inactive.svg</file>
+    <file>page-indicator-checked.svg</file>
+    <file>page-indicator-hover.svg</file>
+    <file>panel-button-border.svg</file>
+    <file>panel-button-highlight-narrow.svg</file>
+    <file>panel-button-highlight-wide.svg</file>
+    <file>process-working.svg</file>
+    <file>running-indicator.svg</file>
+    <file>source-button-border.svg</file>
+    <file>summary-counter.svg</file>
+    <file>toggle-off-us.svg</file>
+    <file>toggle-off-intl.svg</file>
+    <file>toggle-on-us.svg</file>
+    <file>toggle-on-intl.svg</file>
+    <file>ws-switch-arrow-up.png</file>
+    <file>ws-switch-arrow-down.png</file>
+  </gresource>
+</gresources>
--- a/data/org.gnome.Shell.PortalHelper.desktop.in
+++ b/data/org.gnome.Shell.PortalHelper.desktop.in
@ -1,9 +1,9 @@
 [Desktop Entry]
-_Name=Captive Portal
+_Name=Network Login
 Type=Application
 Exec=gapplication launch org.gnome.Shell.PortalHelper
 DBusActivatable=true
 NoDisplay=true
 Icon=network-workgroup
 StartupNotify=true
-OnlyShowIn=GNOME;
+OnlyShowIn=GNOME;
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@ -0,0 +1,20 @@
+/* Copyright 2014, Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+@import url("resource:///org/gnome/shell/theme/gnome-shell.css");
+
+stage {
+  -st-icon-style: symbolic;
+}
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -829,6 +829,7 @@ StScrollBar StButton#vhandle:active {
 .window-clone-border {
    border: 4px solid rgba(255, 255, 255, 0.5);
    border-radius: 4px;
+    box-shadow: inset 0px 0px 0px 1px rgba(255, 255, 255, 0.5);
 }

 .notification-close {
@ -1494,6 +1495,10 @@ StScrollBar StButton#vhandle:active {
    text-align: right;
 }

+.events-day-time-ellipses {
+    color: rgba(153, 153, 153, 1.0);
+}
+
 .events-day-time:rtl {
    text-align: left;
 }
@ -2102,6 +2107,15 @@ StScrollBar StButton#vhandle:active {
    font-size: 14pt;
 }

+/* Resize popup */
+.resize-popup {
+    border-radius: 10px;
+    background-color: rgba(0.0, 0.0, 0.0, 0.9);
+    border: 2px solid #868686;
+    padding: 16px;
+    font-size: 14pt;
+}
+
 /* ShellMountOperation Dialogs */
 .shell-mount-operation-icon {
    icon-size: 48px;
@ -2383,6 +2397,10 @@ StScrollBar StButton#vhandle:active {
 }

 /* Login Dialog */
+.login-dialog-banner-view {
+    padding-top: 24px;
+    max-width: 23em;
+}

 .framed-user-icon {
    border: 2px solid #8b8b8b;
@ -2395,11 +2413,7 @@ StScrollBar StButton#vhandle:active {
 }

 .login-dialog-banner {
-    font-size: 10pt;
-    font-weight: bold;
-    text-align: center;
    color: #666666;
-    padding-bottom: 1em;
 }

 .login-dialog {
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -126,7 +127,7 @@ const AuthPrompt = new Lang.Class({

        this._initButtons();

-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
        this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
        this._spinner.actor.opacity = 0;
        this._spinner.actor.show();
@ -260,6 +261,7 @@ const AuthPrompt = new Lang.Class({

    _onVerificationComplete: function() {
        this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
+	this.cancelButton.reactive = false;
    },

    _onReset: function() {
@ -431,6 +433,7 @@ const AuthPrompt = new Lang.Class({
    reset: function() {
        let oldStatus = this.verificationStatus;
        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
+        this.cancelButton.reactive = true;

        if (oldStatus == AuthPromptStatus.VERIFYING)
            this._userVerifier.cancel();
@ -499,6 +502,9 @@ const AuthPrompt = new Lang.Class({
    },

    cancel: function() {
+        if (this.verificationStatus == AuthPromptStatus.NOT_VERIFYING || this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
+            return;
+        }
        this.reset();
        this.emit('cancelled');
    }
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@ -26,6 +26,7 @@ const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -364,12 +365,12 @@ const LoginDialog = new Lang.Class({
    Name: 'LoginDialog',

    _init: function(parentActor) {
-        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
-                                     layout_manager: new Clutter.BinLayout(),
-                                     style_class: 'login-dialog',
-                                     visible: false });
+        this.actor = new Shell.GenericContainer({ style_class: 'login-dialog',
+                                                  visible: false });
+        this.actor.get_accessible().set_role(Atk.Role.WINDOW);

        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+        this.actor.connect('allocate', Lang.bind(this, this._onAllocate));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
        parentActor.add_child(this.actor);

@ -405,17 +406,10 @@ const LoginDialog = new Lang.Class({
        this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',
                                                    x_align: Clutter.ActorAlign.CENTER,
                                                    y_align: Clutter.ActorAlign.CENTER,
-                                                    x_expand: true,
-                                                    y_expand: true,
                                                    vertical: true,
                                                    visible: false });
        this.actor.add_child(this._userSelectionBox);

-        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
-                                           text: '' });
-        this._userSelectionBox.add(this._bannerLabel);
-        this._updateBanner();
-
        this._userList = new UserList();
        this._userSelectionBox.add(this._userList.actor,
                                   { expand: true,
@ -450,11 +444,25 @@ const LoginDialog = new Lang.Class({
                                     x_align: St.Align.START,
                                     x_fill: true });

+        this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
+                                               opacity: 0,
+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
+                                               hscrollbar_policy: Gtk.PolicyType.NEVER });
+        this.actor.add_child(this._bannerView);
+
+        let bannerBox = new St.BoxLayout({ vertical: true });
+
+        this._bannerView.add_actor(bannerBox);
+        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',
+                                           text: '' });
+        this._bannerLabel.clutter_text.line_wrap = true;
+        this._bannerLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        bannerBox.add_child(this._bannerLabel);
+        this._updateBanner();
+
        this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',
                                        x_align: Clutter.ActorAlign.CENTER,
-                                        y_align: Clutter.ActorAlign.END,
-                                        x_expand: true,
-                                        y_expand: true });
+                                        y_align: Clutter.ActorAlign.END });
        this.actor.add_child(this._logoBin);
        this._updateLogo();

@ -485,6 +493,180 @@ const LoginDialog = new Lang.Class({
                                                             Lang.bind(this, this._updateDisableUserList));
    },

+    _getBannerAllocation: function (dialogBox) {
+        let actorBox = new Clutter.ActorBox();
+
+        let [minWidth, minHeight, natWidth, natHeight] = this._bannerView.get_preferred_size();
+        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
+
+        actorBox.x1 = centerX - natWidth / 2;
+        actorBox.y1 = dialogBox.y1 + Main.layoutManager.panelBox.height;
+        actorBox.x2 = actorBox.x1 + natWidth;
+        actorBox.y2 = actorBox.y1 + natHeight;
+
+        return actorBox;
+    },
+
+    _getLogoBinAllocation: function (dialogBox) {
+        let actorBox = new Clutter.ActorBox();
+
+        let [minWidth, minHeight, natWidth, natHeight] = this._logoBin.get_preferred_size();
+        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
+
+        actorBox.x1 = centerX - natWidth / 2;
+        actorBox.y1 = dialogBox.y2 - natHeight;
+        actorBox.x2 = actorBox.x1 + natWidth;
+        actorBox.y2 = actorBox.y1 + natHeight;
+
+        return actorBox;
+    },
+
+    _getCenterActorAllocation: function (dialogBox, actor) {
+        let actorBox = new Clutter.ActorBox();
+
+        let [minWidth, minHeight, natWidth, natHeight] = actor.get_preferred_size();
+        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
+        let centerY = dialogBox.y1 + (dialogBox.y2 - dialogBox.y1) / 2;
+
+        actorBox.x1 = centerX - natWidth / 2;
+        actorBox.y1 = centerY - natHeight / 2;
+        actorBox.x2 = actorBox.x1 + natWidth;
+        actorBox.y2 = actorBox.y1 + natHeight;
+
+        return actorBox;
+    },
+
+    _onAllocate: function (actor, dialogBox, flags) {
+        let dialogWidth = dialogBox.x2 - dialogBox.x1;
+        let dialogHeight = dialogBox.y2 - dialogBox.y1;
+
+        // First find out what space the children require
+        let bannerAllocation = null;
+        let bannerHeight = 0;
+        let bannerWidth = 0;
+        if (this._bannerView.visible) {
+            bannerAllocation = this._getBannerAllocation(dialogBox, this._bannerView);
+            bannerHeight = bannerAllocation.y2 - bannerAllocation.y1;
+            bannerWidth = bannerAllocation.x2 - bannerAllocation.x1;
+        }
+
+        let authPromptAllocation = null;
+        let authPromptHeight = 0;
+        let authPromptWidth = 0;
+        if (this._authPrompt.actor.visible) {
+            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);
+            authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;
+            authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;
+        }
+
+        let userSelectionAllocation = null;
+        let userSelectionHeight = 0;
+        if (this._userSelectionBox.visible) {
+            userSelectionAllocation = this._getCenterActorAllocation(dialogBox, this._userSelectionBox);
+            userSelectionHeight = userSelectionAllocation.y2 - userSelectionAllocation.y1;
+        }
+
+        let logoAllocation = null;
+        let logoHeight = 0;
+        if (this._logoBin.visible) {
+            logoAllocation = this._getLogoBinAllocation(dialogBox);
+            logoHeight = logoAllocation.y2 - logoAllocation.y1;
+        }
+
+        // Then figure out if we're overly constrained and need to
+        // try a different layout, or if we have what extra space we
+        // can hand out
+        if (bannerAllocation) {
+            let leftOverYSpace = dialogHeight - bannerHeight - authPromptHeight - logoHeight;
+
+            if (leftOverYSpace > 0) {
+                 // First figure out how much left over space is up top
+                 let leftOverTopSpace = leftOverYSpace / 2;
+
+                 // Then, shift the banner into the middle of that extra space
+                 let yShift = leftOverTopSpace / 2;
+
+                 bannerAllocation.y1 += yShift;
+                 bannerAllocation.y2 += yShift;
+            } else {
+                 // Then figure out how much space there would be if we switched to a
+                 // wide layout with banner on one side and authprompt on the other.
+                 let leftOverXSpace = dialogWidth - authPromptWidth;
+
+                 // In a wide view, half of the available space goes to the banner,
+                 // and the other half goes to the margins.
+                 let wideBannerWidth = leftOverXSpace / 2;
+                 let wideSpacing  = leftOverXSpace - wideBannerWidth;
+
+                 // If we do go with a wide layout, we need there to be at least enough
+                 // space for the banner and the auth prompt to be the same width,
+                 // so it doesn't look unbalanced.
+                 if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {
+                     let centerX = dialogBox.x1 + dialogWidth / 2;
+                     let centerY = dialogBox.y1 + dialogHeight / 2;
+
+                     // A small portion of the spacing goes down the center of the
+                     // screen to help delimit the two columns of the wide view
+                     let centerGap = wideSpacing / 8;
+
+                     // place the banner along the left edge of the center margin
+                     bannerAllocation.x2 = centerX - centerGap / 2;
+                     bannerAllocation.x1 = bannerAllocation.x2 - wideBannerWidth;
+
+                     // figure out how tall it would like to be and try to accomodate
+                     // but don't let it get too close to the logo
+                     let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);
+
+                     let maxWideHeight = dialogHeight - 3 * logoHeight;
+                     wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
+                     bannerAllocation.y1 = centerY - wideBannerHeight / 2;
+                     bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
+
+                     // place the auth prompt along the right edge of the center margin
+                     authPromptAllocation.x1 = centerX + centerGap / 2;
+                     authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
+                 } else {
+                     // If we aren't going to do a wide view, then we need to limit
+                     // the height of the banner so it will present scrollbars
+
+                     // First figure out how much space there is without the banner
+                     leftOverYSpace += bannerHeight;
+
+                     // Then figure out how much of that space is up top
+                     let availableTopSpace = leftOverYSpace / 2;
+
+                     // Then give all of that space to the banner
+                     bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
+                 }
+            }
+        } else if (userSelectionAllocation) {
+            // Grow the user list to fill the space
+            let leftOverYSpace = dialogHeight - userSelectionHeight - logoHeight;
+
+            if (leftOverYSpace > 0) {
+                let topExpansion = leftOverYSpace / 2;
+                let bottomExpansion = topExpansion;
+
+                userSelectionAllocation.y1 -= topExpansion;
+                userSelectionAllocation.y2 += bottomExpansion;
+            }
+        }
+
+        // Finally hand out the allocations
+        if (bannerAllocation) {
+            this._bannerView.allocate(bannerAllocation, flags);
+        }
+
+        if (authPromptAllocation)
+            this._authPrompt.actor.allocate(authPromptAllocation, flags);
+
+        if (userSelectionAllocation)
+            this._userSelectionBox.allocate(userSelectionAllocation, flags);
+
+        if (logoAllocation)
+            this._logoBin.allocate(logoAllocation, flags);
+    },
+
    _ensureUserListLoaded: function() {
        if (!this._userManager.is_loaded) {
            this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',
@ -537,24 +719,36 @@ const LoginDialog = new Lang.Class({
        }
    },

-    _updateLogoTexture: function(cache, uri) {
-        if (this._logoFileUri != uri)
+    _fadeInBannerView: function() {
+        Tweener.addTween(this._bannerView,
+                         { opacity: 255,
+                           time: _FADE_ANIMATION_TIME,
+                           transition: 'easeOutQuad' });
+    },
+
+    _hideBannerView: function() {
+        Tweener.removeTweens(this._bannerView);
+        this._bannerView.opacity = 0;
+    },
+
+    _updateLogoTexture: function(cache, file) {
+        if (this._logoFile && !this._logoFile.equal(file))
            return;

        this._logoBin.destroy_all_children();
-        if (this._logoFileUri) {
+        if (this._logoFile) {
            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
-                                                                      -1, _LOGO_ICON_HEIGHT,
-                                                                      scaleFactor));
+            this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
+                                                                       -1, _LOGO_ICON_HEIGHT,
+                                                                       scaleFactor));
        }
    },

    _updateLogo: function() {
        let path = this._settings.get_string(GdmUtil.LOGO_KEY);

-        this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;
-        this._updateLogoTexture(this._textureCache, this._logoFileUri);
+        this._logoFile = path ? Gio.file_new_for_path(path) : null;
+        this._updateLogoTexture(this._textureCache, this._logoFile);
    },

    _onPrompted: function() {
@ -604,6 +798,7 @@ const LoginDialog = new Lang.Class({
                         { opacity: 255,
                           time: _FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad' });
+        this._fadeInBannerView();
    },

    _showRealmLoginHint: function(realmManager, hint) {
@ -643,6 +838,8 @@ const LoginDialog = new Lang.Class({
                                                        realmManager.release();
                                                    }));
        this._updateCancelButton();
+
+        this._authPrompt.updateSensitivity(true);
        this._showPrompt();
    },

@ -858,6 +1055,7 @@ const LoginDialog = new Lang.Class({
    _showUserList: function() {
        this._ensureUserListLoaded();
        this._authPrompt.hide();
+        this._hideBannerView();
        this._sessionMenuButton.close();
        this._setUserListExpanded(true);
        this._notListedButton.show();
@ -957,7 +1155,7 @@ const LoginDialog = new Lang.Class({
        this.actor.show();
        this.actor.opacity = 0;

-        Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOGIN_SCREEN });
+        Main.pushModal(this.actor, { actionMode: Shell.ActionMode.LOGIN_SCREEN });

        Tweener.addTween(this.actor,
                         { opacity: 255,
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@ -43,7 +43,7 @@ function getCurrentExtension() {
    let path = match[1];
    let file = Gio.File.new_for_path(path);

-    // Walk up the directory tree, looking for an extesion with
+    // Walk up the directory tree, looking for an extension with
    // the same UUID as a directory name.
    while (file != null) {
        let extension = extensions[file.get_basename()];
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@ -1,13 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Signals = imports.signals;

 try {
    var IBus = imports.gi.IBus;
-    if (!('new_async' in IBus.Bus))
-        throw "IBus version is too old";
+    _checkIBusVersion(1, 5, 2);
    const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
 } catch (e) {
    var IBus = null;
@ -16,6 +17,18 @@ try {

 let _ibusManager = null;

+function _checkIBusVersion(requiredMajor, requiredMinor, requiredMicro) {
+    if ((IBus.MAJOR_VERSION > requiredMajor) ||
+        (IBus.MAJOR_VERSION == requiredMajor && IBus.MINOR_VERSION > requiredMinor) ||
+        (IBus.MAJOR_VERSION == requiredMajor && IBus.MINOR_VERSION == requiredMinor &&
+         IBus.MICRO_VERSION >= requiredMicro))
+        return;
+
+    throw "Found IBus version %d.%d.%d but required is %d.%d.%d".
+        format(IBus.MAJOR_VERSION, IBus.MINOR_VERSION, IBus.MINOR_VERSION,
+               requiredMajor, requiredMinor, requiredMicro);
+}
+
 function getIBusManager() {
    if (_ibusManager == null)
        _ibusManager = new IBusManager();
@ -28,6 +41,7 @@ const IBusManager = new Lang.Class({
    // This is the longest we'll keep the keyboard frozen until an input
    // source is active.
    _MAX_INPUT_SOURCE_ACTIVATION_TIME: 4000, // ms
+    _PRELOAD_ENGINES_DELAY_TIME: 30, // sec

    _init: function() {
        if (!IBus)
@ -42,6 +56,7 @@ const IBusManager = new Lang.Class({
        this._ready = false;
        this._registerPropertiesId = 0;
        this._currentEngineName = null;
+        this._preloadEnginesId = 0;

        this._ibus = IBus.Bus.new_async();
        this._ibus.connect('connected', Lang.bind(this, this._onConnected));
@ -106,6 +121,16 @@ const IBusManager = new Lang.Class({
                                                         object_path: IBus.PATH_PANEL });
            this._candidatePopup.setPanelService(this._panelService);
            this._panelService.connect('update-property', Lang.bind(this, this._updateProperty));
+            try {
+                // IBus versions older than 1.5.10 have a bug which
+                // causes spurious set-content-type emissions when
+                // switching input focus that temporarily lose purpose
+                // and hints defeating its intended semantics and
+                // confusing users. We thus don't use it in that case.
+                _checkIBusVersion(1, 5, 10);
+                this._panelService.connect('set-content-type', Lang.bind(this, this._setContentType));
+            } catch (e) {
+            }
            // If an engine is already active we need to get its properties
            this._ibus.get_global_engine_async(-1, null, Lang.bind(this, function(i, result) {
                let engine;
@ -155,6 +180,10 @@ const IBusManager = new Lang.Class({
        this.emit('property-updated', this._currentEngineName, prop);
    },

+    _setContentType: function(panel, purpose, hints) {
+        this.emit('set-content-type', purpose, hints);
+    },
+
    activateProperty: function(key, state) {
        this._panelService.property_activate(key, state);
    },
@ -167,7 +196,10 @@ const IBusManager = new Lang.Class({
    },

    setEngine: function(id, callback) {
-        if (!IBus || !this._ready || id == this._currentEngineName) {
+        // Send id even if id == this._currentEngineName
+        // because 'properties-registered' signal can be emitted
+        // while this._ibusSources == null on a lock screen.
+        if (!IBus || !this._ready) {
            if (callback)
                callback();
            return;
@ -176,5 +208,27 @@ const IBusManager = new Lang.Class({
        this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
                                           null, callback);
    },
+
+    preloadEngines: function(ids) {
+        if (!IBus || !this._ibus || ids.length == 0)
+            return;
+
+        if (this._preloadEnginesId != 0) {
+            Mainloop.source_remove(this._preloadEnginesId);
+            this._preloadEnginesId = 0;
+        }
+
+        this._preloadEnginesId =
+            Mainloop.timeout_add_seconds(this._PRELOAD_ENGINES_DELAY_TIME,
+                                         Lang.bind(this, function() {
+                                             this._ibus.preload_engines_async(
+                                                 ids,
+                                                 -1,
+                                                 null,
+                                                 null);
+                                             this._preloadEnginesId = 0;
+                                             return GLib.SOURCE_REMOVE;
+                                         }));
+    },
 });
 Signals.addSignalMethods(IBusManager.prototype);
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@ -35,7 +35,7 @@ function releaseKeyboard() {
 }

 function holdKeyboard() {
-    global.freeze_keyboard(global.get_current_time());
+    global.display.freeze_keyboard(global.get_current_time());
 }

 const KeyboardManager = new Lang.Class({
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -81,7 +81,6 @@ const AppSwitcherPopup = new Lang.Class({
            let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
            let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
            let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
-            let vPadding = this.actor.get_theme_node().get_vertical_padding();
            let hPadding = leftPadding + rightPadding;

            let icon = this._items[this._selectedIndex].actor;
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@ -12,7 +12,7 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const Animation = new Lang.Class({
    Name: 'Animation',

-    _init: function(filename, width, height, speed) {
+    _init: function(file, width, height, speed) {
        this.actor = new St.Bin();
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
        this._speed = speed;
@ -23,7 +23,7 @@ const Animation = new Lang.Class({
        this._frame = 0;

        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
+        this._animations = St.TextureCache.get_default().load_sliced_image (file, width, height, scaleFactor,
                                                                            Lang.bind(this, this._animationsLoaded));
        this.actor.set_child(this._animations);
    },
@ -82,7 +82,7 @@ const AnimatedIcon = new Lang.Class({
    Name: 'AnimatedIcon',
    Extends: Animation,

-    _init: function(filename, size) {
-        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+    _init: function(file, size) {
+        this.parent(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
    }
 });
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -379,9 +379,7 @@ const AllView = new Lang.Class({
        this.actor.add_actor(this._scrollView);

        this._scrollView.set_policy(Gtk.PolicyType.NEVER,
-                                    Gtk.PolicyType.AUTOMATIC);
-        // we are only using ScrollView for the fade effect, hide scrollbars
-        this._scrollView.vscroll.hide();
+                                    Gtk.PolicyType.EXTERNAL);
        this._adjustment = this._scrollView.vscroll.adjustment;

        this._pageIndicators = new PageIndicators();
@ -1564,10 +1562,11 @@ const AppIcon = new Lang.Class({
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._menuTimeoutId = 0;
-        this._stateChangedId = this.app.connect('notify::state',
-                                                Lang.bind(this,
-                                                          this._onStateChanged));
-        this._onStateChanged();
+        this._stateChangedId = this.app.connect('notify::state', Lang.bind(this,
+            function () {
+                this._updateRunningStyle();
+            }));
+        this._updateRunningStyle();
    },

    _onDestroy: function() {
@ -1588,7 +1587,7 @@ const AppIcon = new Lang.Class({
        }
    },

-    _onStateChanged: function() {
+    _updateRunningStyle: function() {
        if (this.app.state != Shell.AppState.STOPPED)
            this.actor.add_style_class_name('running');
        else
--- a/js/ui/background.js
+++ b/js/ui/background.js
@ -106,6 +106,8 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;

+const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
+
 const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
 const PRIMARY_COLOR_KEY = 'primary-color';
 const SECONDARY_COLOR_KEY = 'secondary-color';
@ -125,6 +127,16 @@ const ANIMATION_MIN_WAKEUP_INTERVAL = 1.0;

 let _backgroundCache = null;

+function _fileEqual0(file1, file2) {
+    if (file1 == file2)
+        return true;
+
+    if (!file1 || !file2)
+        return false;
+
+    return file1.equal(file2);
+}
+
 const BackgroundCache = new Lang.Class({
    Name: 'BackgroundCache',

@ -134,25 +146,25 @@ const BackgroundCache = new Lang.Class({
        this._backgroundSources = {};
    },

-    monitorFile: function(filename) {
-        if (this._fileMonitors[filename])
+    monitorFile: function(file) {
+        let key = file.hash();
+        if (this._fileMonitors[key])
            return;

-        let file = Gio.File.new_for_path(filename);
        let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
        monitor.connect('changed',
                        Lang.bind(this, function() {
-                            this.emit('file-changed', filename);
+                            this.emit('file-changed', file);
                        }));

-        this._fileMonitors[filename] = monitor;
+        this._fileMonitors[key] = monitor;
    },

    getAnimation: function(params) {
-        params = Params.parse(params, { filename: null,
+        params = Params.parse(params, { file: null,
                                        onLoaded: null });

-        if (this._animationFilename == params.filename) {
+        if (_fileEqual0(this._animationFile, params.file)) {
            if (params.onLoaded) {
                let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
                    params.onLoaded(this._animation);
@ -160,12 +172,13 @@ const BackgroundCache = new Lang.Class({
                }));
                GLib.Source.set_name_by_id(id, '[gnome-shell] params.onLoaded');
            }
+            return;
        }

-        let animation = new Animation({ filename: params.filename });
+        let animation = new Animation({ file: params.file });

        animation.load(Lang.bind(this, function() {
-                           this._animationFilename = params.filename;
+                           this._animationFile = params.file;
                           this._animation = animation;

                           if (params.onLoaded) {
@ -218,14 +231,14 @@ const Background = new Lang.Class({
        params = Params.parse(params, { monitorIndex: 0,
                                        layoutManager: Main.layoutManager,
                                        settings: null,
-                                        filename: null,
+                                        file: null,
                                        style: null });

        this.background = new Meta.Background({ meta_screen: global.screen });
        this.background._delegate = this;

        this._settings = params.settings;
-        this._filename = params.filename;
+        this._file = params.file;
        this._style = params.style;
        this._monitorIndex = params.monitorIndex;
        this._layoutManager = params.layoutManager;
@ -292,20 +305,21 @@ const Background = new Lang.Class({
            this.background.set_gradient(shadingType, color, secondColor);
    },

-    _watchFile: function(filename) {
-        if (this._fileWatches[filename])
+    _watchFile: function(file) {
+        let key = file.hash();
+        if (this._fileWatches[key])
            return;

-        this._cache.monitorFile(filename);
+        this._cache.monitorFile(file);
        let signalId = this._cache.connect('file-changed',
                                           Lang.bind(this, function(cache, changedFile) {
-                                               if (changedFile == filename) {
+                                               if (changedFile.equal(file)) {
                                                   let imageCache = Meta.BackgroundImageCache.get_default();
                                                   imageCache.purge(changedFile);
                                                   this.emit('changed');
                                               }
                                           }));
-        this._fileWatches[filename] = signalId;
+        this._fileWatches[key] = signalId;
    },

    _removeAnimationTimeout: function() {
@ -328,9 +342,9 @@ const Background = new Lang.Class({
                                          this._animation.transitionProgress,
                                          this._style);
            } else if (files.length > 0) {
-                this.background.set_filename(files[0], this._style);
+                this.background.set_file(files[0], this._style);
            } else {
-                this.background.set_filename(null, this._style);
+                this.background.set_file(null, this._style);
            }
            this._queueUpdateAnimation();
        });
@ -387,28 +401,28 @@ const Background = new Lang.Class({
        GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
    },

-    _loadAnimation: function(filename) {
-        this._cache.getAnimation({ filename: filename,
-                                             onLoaded: Lang.bind(this, function(animation) {
-                                                 this._animation = animation;
+    _loadAnimation: function(file) {
+        this._cache.getAnimation({ file: file,
+                                         onLoaded: Lang.bind(this, function(animation) {
+                                             this._animation = animation;

-                                                 if (!this._animation || this._cancellable.is_cancelled()) {
-                                                     this._setLoaded();
-                                                     return;
-                                                 }
+                                             if (!this._animation || this._cancellable.is_cancelled()) {
+                                                 this._setLoaded();
+                                                 return;
+                                             }

-                                                 this._updateAnimation();
-                                                 this._watchFile(filename);
-                                             })
-                                           });
+                                             this._updateAnimation();
+                                             this._watchFile(file);
+                                         })
+                                 });
    },

-    _loadImage: function(filename) {
-        this.background.set_filename(filename, this._style);
-        this._watchFile(filename);
+    _loadImage: function(file) {
+        this.background.set_file(file, this._style);
+        this._watchFile(file);

        let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(filename);
+        let image = cache.load(file);
        if (image.is_loaded())
            this._setLoaded();
        else {
@ -420,11 +434,11 @@ const Background = new Lang.Class({
        }
    },

-    _loadFile: function(filename) {
-        if (filename.endsWith('.xml'))
-            this._loadAnimation(filename);
+    _loadFile: function(file) {
+        if (file.get_basename().endsWith('.xml'))
+            this._loadAnimation(file);
        else
-            this._loadImage(filename);
+            this._loadImage(file);
    },

    _load: function () {
@ -432,12 +446,12 @@ const Background = new Lang.Class({

        this._loadPattern();

-        if (!this._filename) {
+        if (!this._file) {
            this._setLoaded();
            return;
        }

-        this._loadFile(this._filename);
+        this._loadFile(this._file);
    },
 });
 Signals.addSignalMethods(Background.prototype);
@ -448,11 +462,12 @@ const SystemBackground = new Lang.Class({
    Name: 'SystemBackground',

    _init: function() {
-        let filename = global.datadir + '/theme/noise-texture.png';
+        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');

        if (_systemBackground == null) {
            _systemBackground = new Meta.Background({ meta_screen: global.screen });
-            _systemBackground.set_filename(filename, GDesktopEnums.BackgroundStyle.WALLPAPER);
+            _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
+            _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
        }

        this.actor = new Meta.BackgroundActor({ meta_screen: global.screen,
@ -460,7 +475,7 @@ const SystemBackground = new Lang.Class({
                                                background: _systemBackground });

        let cache = Meta.BackgroundImageCache.get_default();
-        let image = cache.load(filename);
+        let image = cache.load(file);
        if (image.is_loaded()) {
            image = null;
            let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
@ -509,20 +524,17 @@ const BackgroundSource = new Lang.Class({
    },

    getBackground: function(monitorIndex) {
-        let filename = null;
+        let file = null;
        let style;

        if (this._overrideImage != null) {
-            filename = this._overrideImage;
+            file = Gio.File.new_for_path(this._overrideImage);
            style = GDesktopEnums.BackgroundStyle.ZOOM; // Hardcode
        } else {
            style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
            if (style != GDesktopEnums.BackgroundStyle.NONE) {
                let uri = this._settings.get_string(PICTURE_URI_KEY);
-                if (GLib.uri_parse_scheme(uri) != null)
-                    filename = Gio.File.new_for_uri(uri).get_path();
-                else
-                    filename = uri;
+                file = Gio.File.new_for_commandline_arg(uri);
            }
        }

@ -530,7 +542,7 @@ const BackgroundSource = new Lang.Class({
        // they can have variants that depend on the aspect ratio and
        // size of the monitor; for other backgrounds we can use the
        // same background object for all monitors.
-        if (filename == null || !filename.endsWith('.xml'))
+        if (file == null || !file.get_basename().endsWith('.xml'))
            monitorIndex = 0;

        if (!(monitorIndex in this._backgrounds)) {
@ -538,7 +550,7 @@ const BackgroundSource = new Lang.Class({
                monitorIndex: monitorIndex,
                layoutManager: this._layoutManager,
                settings: this._settings,
-                filename: filename,
+                file: file,
                style: style
            });

@ -571,9 +583,9 @@ const Animation = new Lang.Class({
    Name: 'Animation',

    _init: function(params) {
-        params = Params.parse(params, { filename: null });
+        params = Params.parse(params, { file: null });

-        this.filename = params.filename;
+        this.file = params.file;
        this.keyFrameFiles = [];
        this.transitionProgress = 0.0;
        this.transitionDuration = 0.0;
@ -581,9 +593,7 @@ const Animation = new Lang.Class({
    },

    load: function(callback) {
-        let file = Gio.File.new_for_path(this.filename);
-
-        this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });
+        this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });

        this._show.load_async(null,
                              Lang.bind(this,
@ -603,16 +613,16 @@ const Animation = new Lang.Class({
        if (this._show.get_num_slides() < 1)
            return;

-        let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);
+        let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);

        this.transitionDuration = duration;
        this.transitionProgress = progress;

-        if (file1)
-            this.keyFrameFiles.push(file1);
+        if (filename1)
+            this.keyFrameFiles.push(Gio.File.new_for_path(filename1));

-        if (file2)
-            this.keyFrameFiles.push(file2);
+        if (filename2)
+            this.keyFrameFiles.push(Gio.File.new_for_path(filename2));
    },
 });
 Signals.addSignalMethods(Animation.prototype);
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -13,9 +13,11 @@ const Shell = imports.gi.Shell;

 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
+const ELLIPSIS_CHAR = '\u2026';

 // alias to prevent xgettext from picking up strings translated in GTK+
 const gtk30_ = Gettext_gtk30.gettext;
+const NC_ = function(context, str) { return str; };

 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';
@ -32,12 +34,10 @@ function _sameDay(dateA, dateB) {
    return _sameMonth(dateA, dateB) && (dateA.getDate() == dateB.getDate());
 }

-/* TODO: maybe needs config - right now we assume that Saturday and
- * Sunday are non-work days (not true in e.g. Israel, it's Sunday and
- * Monday there)
- */
 function _isWorkDay(date) {
-    return date.getDay() != 0 && date.getDay() != 6;
+    /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
+    let days = C_('calendar-no-work', "06");
+    return days.indexOf(date.getDay().toString()) == -1;
 }

 function _getBeginningOfDay(date) {
@ -58,19 +58,21 @@ function _getEndOfDay(date) {
    return ret;
 }

-function _formatEventTime(event, clockFormat) {
+function _formatEventTime(event, clockFormat, periodBegin, periodEnd) {
    let ret;
-    if (event.allDay) {
+    let allDay = (event.allDay || (event.date <= periodBegin && event.end >= periodEnd));
+    if (allDay) {
        /* Translators: Shown in calendar event list for all day events
         * Keep it short, best if you can use less then 10 characters
         */
        ret = C_("event list time", "All Day");
    } else {
+        let date = event.date >= periodBegin ? event.date : event.end;
        switch (clockFormat) {
        case '24h':
            /* Translators: Shown in calendar event list, if 24h format,
               \u2236 is a ratio character, similar to : */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
+            ret = date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
            break;

        default:
@ -79,30 +81,13 @@ function _formatEventTime(event, clockFormat) {
            /* Translators: Shown in calendar event list, if 12h format,
               \u2236 is a ratio character, similar to : and \u2009 is
               a thin space */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
+            ret = date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
            break;
        }
    }
    return ret;
 }

-function _getCalendarWeekForDate(date) {
-    // Based on the algorithms found here:
-    // http://en.wikipedia.org/wiki/Talk:ISO_week_date
-    let midnightDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-    // Need to get Monday to be 1 ... Sunday to be 7
-    let dayOfWeek = 1 + ((midnightDate.getDay() + 6) % 7);
-    let nearestThursday = new Date(midnightDate.getFullYear(), midnightDate.getMonth(),
-                                   midnightDate.getDate() + (4 - dayOfWeek));
-
-    let jan1st = new Date(nearestThursday.getFullYear(), 0, 1);
-    let diffDate = nearestThursday - jan1st;
-    let dayNumber = Math.floor(Math.abs(diffDate) / MSECS_IN_DAY);
-    let weekNumber = Math.floor(dayNumber / 7) + 1;
-
-    return weekNumber;
-}
-
 function _getCalendarDayAbbreviation(dayNumber) {
    let abbreviations = [
        /* Translators: Calendar grid abbreviation for Sunday.
@ -248,11 +233,24 @@ const DBusEventSource = new Lang.Class({
        this._initialized = false;
        this._dbusProxy = new CalendarServer();
        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
+            let loaded = false;
+
            try {
                this._dbusProxy.init_finish(result);
+                loaded = true;
            } catch(e) {
-                log('Error loading calendars: ' + e.message);
-                return;
+                if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
+                    // Ignore timeouts and install signals as normal, because with high
+                    // probability the service will appear later on, and we will get a
+                    // NameOwnerChanged which will finish loading
+                    //
+                    // (But still _initialized to false, because the proxy does not know
+                    // about the HasCalendars property and would cause an exception trying
+                    // to read it)
+                } else {
+                    log('Error loading calendars: ' + e.message);
+                    return;
+                }
            }

            this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
@ -268,9 +266,11 @@ const DBusEventSource = new Lang.Class({
                this.emit('notify::has-calendars');
            }));

-            this._initialized = true;
-            this.emit('notify::has-calendars');
-            this._onNameAppeared();
+            this._initialized = loaded;
+            if (loaded) {
+                this.emit('notify::has-calendars');
+                this._onNameAppeared();
+            }
        }));
    },

@ -292,6 +292,7 @@ const DBusEventSource = new Lang.Class({
    },

    _onNameAppeared: function(owner) {
+        this._initialized = true;
        this._resetCache();
        this._loadEvents(true);
    },
@ -361,6 +362,12 @@ const DBusEventSource = new Lang.Class({
                result.push(event);
            }
        }
+        result.sort(function(event1, event2) {
+            // sort events by end time on ending day
+            let d1 = event1.date < begin && event1.end <= end ? event1.end : event1.date;
+            let d2 = event2.date < begin && event2.end <= end ? event2.end : event2.date;
+            return d1.getTime() - d2.getTime();
+        });
        return result;
    },

@ -594,6 +601,7 @@ const Calendar = new Lang.Class({
        beginDate.setHours(12);

        this._calendarBegin = new Date(beginDate);
+        this._markedAsToday = now;

        let year = beginDate.getYear();

@ -661,7 +669,7 @@ const Calendar = new Lang.Class({
            this._buttons.push(button);

            if (this._useWeekdate && iter.getDay() == 4) {
-                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
+                let label = new St.Label({ text: iter.toLocaleFormat('%V'),
                                           style_class: 'calendar-day-base calendar-week-number'});
                layout.attach(label, rtl ? 7 : 0, row, 1, 1);
            }
@ -685,7 +693,7 @@ const Calendar = new Lang.Class({
        else
            this._monthLabel.text = this._selectedDate.toLocaleFormat(this._headerFormat);

-        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin))
+        if (!this._calendarBegin || !_sameMonth(this._selectedDate, this._calendarBegin) || !_sameDay(now, this._markedAsToday))
            this._rebuildCalendar();

        this._buttons.forEach(Lang.bind(this, function(button) {
@ -721,12 +729,16 @@ const EventsList = new Lang.Class({
        this._eventSource.connect('changed', Lang.bind(this, this._update));
    },

-    _addEvent: function(event, index, includeDayName) {
+    _addEvent: function(event, index, includeDayName, periodBegin, periodEnd) {
        let dayString;
-        if (includeDayName)
-            dayString = _getEventDayAbbreviation(event.date.getDay());
-        else
+        if (includeDayName) {
+            if (event.date >= periodBegin)
+                dayString = _getEventDayAbbreviation(event.date.getDay());
+            else /* show event end day if it began earlier */
+                dayString = _getEventDayAbbreviation(event.end.getDay());
+        } else {
            dayString = '';
+        }

        let dayLabel = new St.Label({ style_class: 'events-day-dayname',
                                      text: dayString,
@ -739,16 +751,30 @@ const EventsList = new Lang.Class({

        let layout = this.actor.layout_manager;
        layout.attach(dayLabel, rtl ? 2 : 0, index, 1, 1);
-
        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
-        let timeString = _formatEventTime(event, clockFormat);
+        let timeString = _formatEventTime(event, clockFormat, periodBegin, periodEnd);
        let timeLabel = new St.Label({ style_class: 'events-day-time',
                                       text: timeString,
                                       y_align: Clutter.ActorAlign.START });
        timeLabel.clutter_text.line_wrap = false;
        timeLabel.clutter_text.ellipsize = false;

-        layout.attach(timeLabel, 1, index, 1, 1);
+        let preEllipsisLabel = new St.Label({ style_class: 'events-day-time-ellipses',
+                                              text: ELLIPSIS_CHAR,
+                                              y_align: Clutter.ActorAlign.START });
+        let postEllipsisLabel = new St.Label({ style_class: 'events-day-time-ellipses',
+                                               text: ELLIPSIS_CHAR,
+                                               y_align: Clutter.ActorAlign.START });
+        if (event.allDay || event.date >= periodBegin)
+            preEllipsisLabel.opacity = 0;
+        if (event.allDay || event.end <= periodEnd)
+            postEllipsisLabel.opacity = 0;
+
+        let timeLabelBoxLayout = new St.BoxLayout();
+        timeLabelBoxLayout.add(preEllipsisLabel);
+        timeLabelBoxLayout.add(timeLabel);
+        timeLabelBoxLayout.add(postEllipsisLabel);
+        layout.attach(timeLabelBoxLayout, 1, index, 1, 1);

        let titleLabel = new St.Label({ style_class: 'events-day-task',
                                        text: event.summary,
@ -759,8 +785,8 @@ const EventsList = new Lang.Class({
        layout.attach(titleLabel, rtl ? 0 : 2, index, 1, 1);
    },

-    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
-        let events = this._eventSource.getEvents(begin, end);
+    _addPeriod: function(header, index, periodBegin, periodEnd, includeDayName, showNothingScheduled) {
+        let events = this._eventSource.getEvents(periodBegin, periodEnd);

        if (events.length == 0 && !showNothingScheduled)
            return index;
@ -771,15 +797,14 @@ const EventsList = new Lang.Class({
        index++;

        for (let n = 0; n < events.length; n++) {
-            this._addEvent(events[n], index, includeDayName);
+            this._addEvent(events[n], index, includeDayName, periodBegin, periodEnd);
            index++;
        }

        if (events.length == 0 && showNothingScheduled) {
-            let now = new Date();
            /* Translators: Text to show if there are no events */
-            let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
-            this._addEvent(nothingEvent, index, false);
+            let nothingEvent = new CalendarEvent(periodBegin, periodBegin, _("Nothing Scheduled"), true);
+            this._addEvent(nothingEvent, index, false, periodBegin, periodEnd);
            index++;
        }

@ -792,14 +817,17 @@ const EventsList = new Lang.Class({
        let dayBegin = _getBeginningOfDay(day);
        let dayEnd = _getEndOfDay(day);

-        let dayString;
+        let dayFormat;
        let now = new Date();
        if (_sameYear(day, now))
            /* Translators: Shown on calendar heading when selected day occurs on current year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d"));
+            dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
+                                                             "%A, %B %d"));
        else
            /* Translators: Shown on calendar heading when selected day occurs on different year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
+            dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
+                                                             "%A, %B %d, %Y"));
+        let dayString = day.toLocaleFormat(dayFormat);
        this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
    },

--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@ -36,6 +36,8 @@ const NotificationDirection = {
    RECEIVED: 'chat-received'
 };

+const N_ = function(s) { return s; };
+
 function makeMessageFromTpMessage(tpMessage, direction) {
    let [text, flags] = tpMessage.to_text();

@ -950,70 +952,70 @@ const ChatNotification = new Lang.Class({
            // Show only the time if date is on today
            if(daysAgo < 1){
                /* Translators: Time in 24h format */
-                format = _("%H\u2236%M");
+                format = N_("%H\u2236%M");
            }
            // Show the word "Yesterday" and time if date is on yesterday
            else if(daysAgo <2){
                /* Translators: this is the word "Yesterday" followed by a
                 time string in 24h format. i.e. "Yesterday, 14:30" */
                // xgettext:no-c-format
-                format = _("Yesterday, %H\u2236%M");
+                format = N_("Yesterday, %H\u2236%M");
            }
            // Show a week day and time if date is in the last week
            else if (daysAgo < 7) {
                /* Translators: this is the week day name followed by a time
                 string in 24h format. i.e. "Monday, 14:30" */
                // xgettext:no-c-format
-                format = _("%A, %H\u2236%M");
+                format = N_("%A, %H\u2236%M");

            } else if (date.getYear() == now.getYear()) {
                /* Translators: this is the month name and day number
                 followed by a time string in 24h format.
                 i.e. "May 25, 14:30" */
                // xgettext:no-c-format
-                format = _("%B %d, %H\u2236%M");
+                format = N_("%B %d, %H\u2236%M");
            } else {
                /* Translators: this is the month name, day number, year
                 number followed by a time string in 24h format.
                 i.e. "May 25 2012, 14:30" */
                // xgettext:no-c-format
-                format = _("%B %d %Y, %H\u2236%M");
+                format = N_("%B %d %Y, %H\u2236%M");
            }
        } else {
            // Show only the time if date is on today
            if(daysAgo < 1){
                /* Translators: Time in 24h format */
-                format = _("%l\u2236%M %p");
+                format = N_("%l\u2236%M %p");
            }
            // Show the word "Yesterday" and time if date is on yesterday
            else if(daysAgo <2){
                /* Translators: this is the word "Yesterday" followed by a
                 time string in 12h format. i.e. "Yesterday, 2:30 pm" */
                // xgettext:no-c-format
-                format = _("Yesterday, %l\u2236%M %p");
+                format = N_("Yesterday, %l\u2236%M %p");
            }
            // Show a week day and time if date is in the last week
            else if (daysAgo < 7) {
                /* Translators: this is the week day name followed by a time
                 string in 12h format. i.e. "Monday, 2:30 pm" */
                // xgettext:no-c-format
-                format = _("%A, %l\u2236%M %p");
+                format = N_("%A, %l\u2236%M %p");

            } else if (date.getYear() == now.getYear()) {
                /* Translators: this is the month name and day number
                 followed by a time string in 12h format.
                 i.e. "May 25, 2:30 pm" */
                // xgettext:no-c-format
-                format = _("%B %d, %l\u2236%M %p");
+                format = N_("%B %d, %l\u2236%M %p");
            } else {
                /* Translators: this is the month name, day number, year
                 number followed by a time string in 12h format.
                 i.e. "May 25 2012, 2:30 pm"*/
                // xgettext:no-c-format
-                format = _("%B %d %Y, %l\u2236%M %p");
+                format = N_("%B %d %Y, %l\u2236%M %p");
            }
        }
-        return date.toLocaleFormat(format);
+        return date.toLocaleFormat(Shell.util_translate_time_string(format));
    },

    appendTimestamp: function() {
@ -1264,9 +1266,8 @@ const SubscriptionRequestNotification = new Lang.Class({
        let file = contact.get_avatar_file();

        if (file) {
-            let uri = file.get_uri();
            let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
+            iconBox.child = textureCache.load_file_async(file, iconBox._size, iconBox._size, scaleFactor);
        }
        else {
            iconBox.child = new St.Icon({ icon_name: 'avatar-default',
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@ -100,7 +100,7 @@ const CtrlAltTabManager = new Lang.Class({
                    if (app)
                        icon = app.create_icon_texture(POPUP_APPICON_SIZE);
                    else
-                        icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
+                        icon = textureCache.bind_cairo_surface_property(windows[i], 'icon');
                }

                items.push({ name: windows[i].title,
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -129,7 +129,7 @@ const DateMenuButton = new Lang.Class({
                /* Translators: This is the date format to use when the calendar popup is
                 * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
                 */
-                let dateFormat = _("%A %B %e, %Y");
+                let dateFormat = Shell.util_translate_time_string (N_("%A %B %e, %Y"));
                this._date.set_label(now.toLocaleFormat(dateFormat));
            }
        }));
@ -147,7 +147,7 @@ const DateMenuButton = new Lang.Class({
        let now = new Date();
        return now.getYear() == date.getYear() &&
               now.getMonth() == date.getMonth() &&
-               now.getDay() == date.getDay();
+               now.getDate() == date.getDate();
    },

    _appInstalledChanged: function() {
@ -173,6 +173,10 @@ const DateMenuButton = new Lang.Class({
        }
    },

+    _getEventSource: function() {
+        return new Calendar.DBusEventSource();
+    },
+
    _setEventSource: function(eventSource) {
        if (this._eventSource)
            this._eventSource.destroy();
@ -190,7 +194,7 @@ const DateMenuButton = new Lang.Class({
        let eventSource;
        let showEvents = Main.sessionMode.showCalendarEvents;
        if (showEvents) {
-            eventSource = new Calendar.DBusEventSource();
+            eventSource = this._getEventSource();
        } else {
            eventSource = new Calendar.EmptyEventSource();
        }
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@ -6,6 +6,8 @@ const Meta = imports.gi.Meta;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;

+const Main = imports.ui.main;
+
 const EDGE_THRESHOLD = 20;
 const DRAG_DISTANCE = 80;

@ -13,9 +15,10 @@ const EdgeDragAction = new Lang.Class({
    Name: 'EdgeDragAction',
    Extends: Clutter.GestureAction,

-    _init : function(side) {
+    _init : function(side, allowedModes) {
        this.parent();
        this._side = side;
+        this._allowedModes = allowedModes;
        this.set_n_touch_points(1);

        global.display.connect('grab-op-begin', Lang.bind(this, function() {
@ -34,6 +37,9 @@ const EdgeDragAction = new Lang.Class({
        if (this.get_n_current_points() == 0)
            return false;

+        if (!(this._allowedModes & Main.actionMode))
+            return false;
+
        let [x, y] = this.get_press_coords(0);
        let monitorRect = this._getMonitorRect(x, y);

--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@ -77,6 +77,7 @@ function init() {
    window._ = Gettext.gettext;
    window.C_ = Gettext.pgettext;
    window.ngettext = Gettext.ngettext;
+    window.N_ = function(s) { return s; };

    // Miscellaneous monkeypatching
    _patchContainerClass(St.BoxLayout);
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@ -203,14 +203,16 @@ const InstallExtensionDialog = new Lang.Class({

        let message = _("Download and install “%s” from extensions.gnome.org?").format(info.name);

-        let box = new St.BoxLayout();
+        let box = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
+                                     vertical: false });
        this.contentLayout.add(box);

        let gicon = new Gio.FileIcon({ file: Gio.File.new_for_uri(REPOSITORY_URL_BASE + info.icon) })
        let icon = new St.Icon({ gicon: gicon });
        box.add(icon);

-        let label = new St.Label({ text: message });
+        let label = new St.Label({ style_class: 'prompt-dialog-headline',
+                                   text: message });
        box.add(label);
    },

--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -74,7 +74,7 @@ function disableExtension(uuid) {

    if (extension.stylesheet) {
        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-        theme.unload_stylesheet(extension.stylesheet.get_path());
+        theme.unload_stylesheet(extension.stylesheet);
    }

    try {
@ -118,7 +118,7 @@ function enableExtension(uuid) {
        let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
        if (stylesheetFile.query_exists(null)) {
            let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-            theme.load_stylesheet(stylesheetFile.get_path());
+            theme.load_stylesheet(stylesheetFile);
            extension.stylesheet = stylesheetFile;
            break;
        }
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@ -187,14 +187,7 @@ const Keyboard = new Lang.Class({
        this._watchNameId = Gio.bus_watch_name(Gio.BusType.SESSION, CURSOR_BUS_NAME, 0,
                                               Lang.bind(this, this._sync),
                                               Lang.bind(this, this._sync));
-        this._daemonProxy = new CaribouDaemonProxy(Gio.DBus.session, CARIBOU_BUS_NAME,
-                                                   CARIBOU_OBJECT_PATH,
-                                                   Lang.bind(this, function(proxy, error) {
-                                                       if (error) {
-                                                           log(error.message);
-                                                           return;
-                                                       }
-                                                   }));
+        this._daemonProxy = null;
        this._cursorProxy = new CursorManagerProxy(Gio.DBus.session, CURSOR_BUS_NAME,
                                                   CURSOR_OBJECT_PATH,
                                                   Lang.bind(this, function(proxy, error) {
@ -256,15 +249,28 @@ const Keyboard = new Lang.Class({
        this.actor = null;

        this._destroySource();
-        this._daemonProxy.QuitRemote(function (result, error) {
-            if (error) {
-                log(error.message);
-                return;
-            }
-        });
+        if (this._daemonProxy) {
+            this._daemonProxy.QuitRemote(function (result, error) {
+                if (error) {
+                    log(error.message);
+                    return;
+                }
+            });
+            this._daemonProxy = null;
+        }
    },

    _setupKeyboard: function() {
+        if (!this._daemonProxy) {
+            this._daemonProxy = new CaribouDaemonProxy(Gio.DBus.session, CARIBOU_BUS_NAME,
+                                                       CARIBOU_OBJECT_PATH,
+                                                       Lang.bind(this, function(proxy, error) {
+                                                           if (error) {
+                                                               log(error.message);
+                                                               return;
+                                                           }
+                                                       }));
+        }
        this._daemonProxy.RunRemote(function (result, error) {
            if (error) {
                log(error.message);
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@ -20,7 +20,6 @@ const Tweener = imports.ui.tweener;
 const STARTUP_ANIMATION_TIME = 0.5;
 const KEYBOARD_ANIMATION_TIME = 0.15;
 const BACKGROUND_FADE_ANIMATION_TIME = 1.0;
-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);

 // The message tray takes this much pressure
 // in the pressure barrier at once to release it.
@ -160,10 +159,10 @@ const LayoutManager = new Lang.Class({
        this._isPopupWindowVisible = false;
        this._startingUp = true;

-        // Normally, the stage is always covered so Clutter doesn't need to clear
-        // it; however it becomes visible during the startup animation
-        // See the comment below for a longer explanation
-        global.stage.background_color = DEFAULT_BACKGROUND_COLOR;
+        // We don't want to paint the stage background color because either
+        // the SystemBackground we create or the MetaBackgroundActor inside
+        // global.window_group covers the entirety of the screen.
+        global.stage.no_clear_hint = true;

        // Set up stage hierarchy to group all UI actors under one container.
        this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
@ -423,10 +422,7 @@ const LayoutManager = new Lang.Class({
        this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
        this.panelBox.set_size(this.primaryMonitor.width, -1);

-        if (this.keyboardIndex < 0)
-            this.keyboardIndex = this.primaryIndex;
-        else
-            this._updateKeyboardBox();
+        this.keyboardIndex = this.primaryIndex;

        this.trayBox.set_position(this.bottomMonitor.x,
                                  this.bottomMonitor.y + this.bottomMonitor.height);
@ -462,8 +458,8 @@ const LayoutManager = new Lang.Class({
    _setupTrayPressure: function() {
        this._trayPressure = new PressureBarrier(MESSAGE_TRAY_PRESSURE_THRESHOLD,
                                                 MESSAGE_TRAY_PRESSURE_TIMEOUT,
-                                                 Shell.KeyBindingMode.NORMAL |
-                                                 Shell.KeyBindingMode.OVERVIEW);
+                                                 Shell.ActionMode.NORMAL |
+                                                 Shell.ActionMode.OVERVIEW);
        this._trayPressure.setEventFilter(this._trayBarrierEventFilter);
        this._trayPressure.connect('trigger', function(barrier) {
            if (Main.layoutManager.bottomMonitor.inFullscreen)
@ -591,10 +587,6 @@ const LayoutManager = new Lang.Class({
    //
    // When starting a normal user session, we want to grow it out of the middle
    // of the screen.
-    //
-    // Usually, we don't want to paint the stage background color because the
-    // MetaBackgroundActor inside global.window_group covers the entirety of the
-    // screen. So, we set no_clear_hint at the end of the animation.

    _prepareStartupAnimation: function() {
        // During the initial transition, add a simple actor to block all events,
@ -675,10 +667,6 @@ const LayoutManager = new Lang.Class({
    },

    _startupAnimationComplete: function() {
-        // At this point, the UI group is covering everything, so
-        // we no longer need to clear the stage
-        global.stage.no_clear_hint = true;
-
        this._coverPane.destroy();
        this._coverPane = null;

@ -1079,8 +1067,8 @@ const HotCorner = new Lang.Class({

        this._pressureBarrier = new PressureBarrier(HOT_CORNER_PRESSURE_THRESHOLD,
                                                    HOT_CORNER_PRESSURE_TIMEOUT,
-                                                    Shell.KeyBindingMode.NORMAL |
-                                                    Shell.KeyBindingMode.OVERVIEW);
+                                                    Shell.ActionMode.NORMAL |
+                                                    Shell.ActionMode.OVERVIEW);
        this._pressureBarrier.connect('trigger', Lang.bind(this, this._toggleOverview));

        // Cache the three ripples instead of dynamically creating and destroying them.
@ -1257,10 +1245,10 @@ const HotCorner = new Lang.Class({
 const PressureBarrier = new Lang.Class({
    Name: 'PressureBarrier',

-    _init: function(threshold, timeout, keybindingMode) {
+    _init: function(threshold, timeout, actionMode) {
        this._threshold = threshold;
        this._timeout = timeout;
-        this._keybindingMode = keybindingMode;
+        this._actionMode = actionMode;
        this._barriers = [];
        this._eventFilter = null;

@ -1363,7 +1351,7 @@ const PressureBarrier = new Lang.Class({
            return;

        // Throw out all events not in the proper keybinding mode
-        if (!(this._keybindingMode & Main.keybindingMode))
+        if (!(this._actionMode & Main.actionMode))
            return;

        let slide = this._getDistanceAlongBarrier(barrier, event);
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -1086,7 +1086,7 @@ const LookingGlass = new Lang.Class({
        if (this._open)
            return;

-        if (!Main.pushModal(this._entry, { keybindingMode: Shell.KeyBindingMode.LOOKING_GLASS }))
+        if (!Main.pushModal(this._entry, { actionMode: Shell.ActionMode.LOOKING_GLASS }))
            return;

        this._notebook.selectIndex(0);
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -1198,12 +1198,7 @@ const ZoomRegion = new Lang.Class({

        // Add a background for when the magnified uiGroup is scrolled
        // out of view (don't want to see desktop showing through).
-        this._background = new Clutter.Actor({ background_color: Main.DEFAULT_BACKGROUND_COLOR,
-                                               layout_manager: new Clutter.BinLayout(),
-                                               width: global.screen_width,
-                                               height: global.screen_height });
-        let noiseTexture = (new Background.SystemBackground()).actor;
-        this._background.add_actor(noiseTexture);
+        this._background = (new Background.SystemBackground()).actor;
        mainGroup.add_actor(this._background);

        // Clone the group that contains all of UI on the screen.  This is the
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
@ -40,8 +41,6 @@ const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;

-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
-
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const STICKY_KEYS_ENABLE = 'stickykeys-enable';
 const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';
@ -64,7 +63,7 @@ let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let screencastService = null;
 let modalCount = 0;
-let keybindingMode = Shell.KeyBindingMode.NONE;
+let actionMode = Shell.ActionMode.NONE;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@ -77,18 +76,19 @@ let _cssStylesheet = null;
 let _a11ySettings = null;

 function _sessionUpdated() {
-    _loadDefaultStylesheet();
+    if (sessionMode.isPrimary)
+        _loadDefaultStylesheet();

    wm.setCustomKeybindingHandler('panel-main-menu',
-                                  Shell.KeyBindingMode.NORMAL |
-                                  Shell.KeyBindingMode.OVERVIEW,
+                                  Shell.ActionMode.NORMAL |
+                                  Shell.ActionMode.OVERVIEW,
                                  sessionMode.hasOverview ? Lang.bind(overview, overview.toggle) : null);
-    wm.allowKeybinding('overlay-key', Shell.KeyBindingMode.NORMAL |
-                                      Shell.KeyBindingMode.OVERVIEW);
+    wm.allowKeybinding('overlay-key', Shell.ActionMode.NORMAL |
+                                      Shell.ActionMode.OVERVIEW);

    wm.setCustomKeybindingHandler('panel-run-dialog',
-                                  Shell.KeyBindingMode.NORMAL |
-                                  Shell.KeyBindingMode.OVERVIEW,
+                                  Shell.ActionMode.NORMAL |
+                                  Shell.ActionMode.OVERVIEW,
                                  sessionMode.hasRunDialog ? openRunDialog : null);

    if (!sessionMode.hasRunDialog) {
@ -111,6 +111,8 @@ function start() {

    sessionMode = new SessionMode.SessionMode();
    sessionMode.connect('updated', _sessionUpdated);
+    Gtk.Settings.get_default().connect('notify::gtk-theme-name',
+                                       _loadDefaultStylesheet);
    _initializeUI();

    shellDBusService = new ShellDBus.GnomeShell();
@ -131,6 +133,9 @@ function _initializeUI() {
    Shell.WindowTracker.get_default();
    Shell.AppUsage.get_default();

+    let resource = Gio.Resource.load(global.datadir + '/gnome-shell-theme.gresource');
+    resource._register();
+
    _loadDefaultStylesheet();

    // Setup the stage hierarchy early
@ -204,8 +209,8 @@ function _initializeUI() {
    }

    layoutManager.connect('startup-complete', function() {
-        if (keybindingMode == Shell.KeyBindingMode.NONE) {
-            keybindingMode = Shell.KeyBindingMode.NORMAL;
+        if (actionMode == Shell.ActionMode.NONE) {
+            actionMode = Shell.ActionMode.NORMAL;
        }
        if (screenShield) {
            screenShield.lockIfWasLocked();
@ -224,12 +229,38 @@ function _initializeUI() {
    });
 }

-function _loadDefaultStylesheet() {
-    if (!sessionMode.isPrimary)
-        return;
+function _getStylesheet(name) {
+    let stylesheet;

-    let stylesheet = global.datadir + '/theme/' + sessionMode.stylesheetName;
-    if (_defaultCssStylesheet == stylesheet)
+    stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + name);
+    if (stylesheet.query_exists(null))
+        return stylesheet;
+
+    stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
+    if (stylesheet.query_exists(null))
+        return stylesheet;
+
+    return null;
+}
+
+function _getDefaultStylesheet() {
+    let stylesheet = null;
+    let name = sessionMode.stylesheetName;
+
+    // Look for a high-contrast variant first when using GTK+'s HighContrast
+    // theme
+    if (Gtk.Settings.get_default().gtk_theme_name == 'HighContrast')
+        stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css'));
+
+    if (stylesheet == null)
+        stylesheet = _getStylesheet(sessionMode.stylesheetName);
+
+    return stylesheet;
+}
+
+function _loadDefaultStylesheet() {
+    let stylesheet = _getDefaultStylesheet();
+    if (_defaultCssStylesheet && _defaultCssStylesheet.equal(stylesheet))
        return;

    _defaultCssStylesheet = stylesheet;
@ -241,7 +272,7 @@ function _loadDefaultStylesheet() {
 *
 * Get the theme CSS file that the shell will load
 *
- * Returns: A file path that contains the theme CSS,
+ * Returns: A #GFile that contains the theme CSS,
 *          null if using the default
 */
 function getThemeStylesheet() {
@ -256,7 +287,7 @@ function getThemeStylesheet() {
 * Set the theme CSS file that the shell will load
 */
 function setThemeStylesheet(cssStylesheet) {
-    _cssStylesheet = cssStylesheet;
+    _cssStylesheet = cssStylesheet ? Gio.File.new_for_path(cssStylesheet) : null;
 }

 /**
@ -341,7 +372,7 @@ function _findModal(actor) {
 *  - options: Meta.ModalOptions flags to indicate that the pointer is
 *             already grabbed
 *
- *  - keybindingMode: used to set the current Shell.KeyBindingMode to filter
+ *  - actionMode: used to set the current Shell.ActionMode to filter
 *                    global keybindings; the default of NONE will filter
 *                    out all keybindings
 *
@ -350,7 +381,7 @@ function _findModal(actor) {
 function pushModal(actor, params) {
    params = Params.parse(params, { timestamp: global.get_current_time(),
                                    options: 0,
-                                    keybindingMode: Shell.KeyBindingMode.NONE });
+                                    actionMode: Shell.ActionMode.NONE });

    if (modalCount == 0) {
        if (!global.begin_modal(params.timestamp, params.options)) {
@ -380,9 +411,9 @@ function pushModal(actor, params) {
                                destroyId: actorDestroyId,
                                prevFocus: prevFocus,
                                prevFocusDestroyId: prevFocusDestroyId,
-                                keybindingMode: keybindingMode });
+                                actionMode: actionMode });

-    keybindingMode = params.keybindingMode;
+    actionMode = params.actionMode;
    global.stage.set_key_focus(actor);
    return true;
 }
@ -408,7 +439,7 @@ function popModal(actor, timestamp) {
    if (focusIndex < 0) {
        global.stage.set_key_focus(null);
        global.end_modal(timestamp);
-        keybindingMode = Shell.KeyBindingMode.NORMAL;
+        actionMode = Shell.ActionMode.NORMAL;

        throw new Error('incorrect pop');
    }
@ -421,7 +452,7 @@ function popModal(actor, timestamp) {
    if (focusIndex == modalActorFocusStack.length - 1) {
        if (record.prevFocus)
            record.prevFocus.disconnect(record.prevFocusDestroyId);
-        keybindingMode = record.keybindingMode;
+        actionMode = record.actionMode;
        global.stage.set_key_focus(record.prevFocus);
    } else {
        // If we have:
@ -446,7 +477,7 @@ function popModal(actor, timestamp) {
        for (let i = modalActorFocusStack.length - 1; i > focusIndex; i--) {
            modalActorFocusStack[i].prevFocus = modalActorFocusStack[i - 1].prevFocus;
            modalActorFocusStack[i].prevFocusDestroyId = modalActorFocusStack[i - 1].prevFocusDestroyId;
-            modalActorFocusStack[i].keybindingMode = modalActorFocusStack[i - 1].keybindingMode;
+            modalActorFocusStack[i].actionMode = modalActorFocusStack[i - 1].actionMode;
        }
    }
    modalActorFocusStack.splice(focusIndex, 1);
@ -457,7 +488,7 @@ function popModal(actor, timestamp) {
    layoutManager.modalEnded();
    global.end_modal(timestamp);
    Meta.enable_unredirect_for_screen(global.screen);
-    keybindingMode = Shell.KeyBindingMode.NORMAL;
+    actionMode = Shell.ActionMode.NORMAL;
 }

 function createLookingGlass() {
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -1852,7 +1852,7 @@ const MessageTray = new Lang.Class({
        this.idleMonitor = Meta.IdleMonitor.get_core();

        this._grabHelper = new GrabHelper.GrabHelper(this.actor,
-                                                     { keybindingMode: Shell.KeyBindingMode.MESSAGE_TRAY });
+                                                     { actionMode: Shell.ActionMode.MESSAGE_TRAY });
        this._grabHelper.addActor(this._summaryBoxPointer.actor);
        this._grabHelper.addActor(this.actor);

@ -1916,16 +1916,16 @@ const MessageTray = new Lang.Class({
        Main.wm.addKeybinding('toggle-message-tray',
                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
-                              Shell.KeyBindingMode.MESSAGE_TRAY |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.NORMAL |
+                              Shell.ActionMode.MESSAGE_TRAY |
+                              Shell.ActionMode.OVERVIEW,
                              Lang.bind(this, this.toggleAndNavigate));
        Main.wm.addKeybinding('focus-active-notification',
                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
-                              Shell.KeyBindingMode.MESSAGE_TRAY |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.NORMAL |
+                              Shell.ActionMode.MESSAGE_TRAY |
+                              Shell.ActionMode.OVERVIEW,
                              Lang.bind(this, this._expandActiveNotification));

        this._sources = new Map();
@ -1951,7 +1951,9 @@ const MessageTray = new Lang.Class({
        this._messageTrayMenuButton.actor.connect('key-press-event',
                                                  Lang.bind(this, this._onTrayButtonKeyPress));

-        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM);
+        let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM,
+                                                        Shell.ActionMode.NORMAL |
+                                                        Shell.ActionMode.OVERVIEW);
        gesture.connect('activated', Lang.bind(this, this.toggle));
        global.stage.add_action(gesture);
    },
@ -2432,8 +2434,22 @@ const MessageTray = new Lang.Class({
            if (shouldShowNotification && nextNotification) {
                let limited = this._busy || Main.layoutManager.bottomMonitor.inFullscreen;
                let showNextNotification = (!limited || nextNotification.forFeedback || nextNotification.urgency == Urgency.CRITICAL);
-                if (showNextNotification)
-                    this._showNotification();
+                if (showNextNotification) {
+                    let len = this._notificationQueue.length;
+                    if (len > 1) {
+                        this._notificationQueue.length = 0;
+                        let source = new SystemNotificationSource();
+                        this.add(source);
+                        let notification = new Notification(source, ngettext("%d new message", "%d new messages", len).format(len));
+                        notification.setTransient(true);
+                        notification.connect('clicked', Lang.bind(this, function() {
+                            this.openTray();
+                        }));
+                        source.notify(notification);
+                    } else {
+                        this._showNotification();
+                    }
+                }
            }
        } else if (this._notificationState == State.SHOWN) {
            let expired = (this._userActiveWhileNotificationShown &&
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -41,14 +41,14 @@ const ModalDialog = new Lang.Class({
    _init: function(params) {
        params = Params.parse(params, { shellReactive: false,
                                        styleClass: null,
-                                        keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
+                                        actionMode: Shell.ActionMode.SYSTEM_MODAL,
                                        shouldFadeIn: true,
                                        shouldFadeOut: true,
                                        destroyOnClose: true });

        this.state = State.CLOSED;
        this._hasModal = false;
-        this._keybindingMode = params.keybindingMode;
+        this._actionMode = params.actionMode;
        this._shellReactive = params.shellReactive;
        this._shouldFadeIn = params.shouldFadeIn;
        this._shouldFadeOut = params.shouldFadeOut;
@ -194,7 +194,7 @@ const ModalDialog = new Lang.Class({
    },

    placeSpinner: function(layoutInfo) {
-        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
        this._workSpinner.actor.opacity = 0;
        this._workSpinner.actor.show();
@ -362,7 +362,7 @@ const ModalDialog = new Lang.Class({
        if (this._hasModal)
            return true;
        if (!Main.pushModal(this._group, { timestamp: timestamp,
-                                           keybindingMode: this._keybindingMode }))
+                                           actionMode: this._actionMode }))
            return false;

        this._hasModal = true;
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -509,7 +509,7 @@ const Overview = new Lang.Class({
            if (shouldBeModal) {
                if (!this._modal) {
                    if (Main.pushModal(this._overview,
-                                       { keybindingMode: Shell.KeyBindingMode.OVERVIEW })) {
+                                       { actionMode: Shell.ActionMode.OVERVIEW })) {
                        this._modal = true;
                    } else {
                        this.hide();
@ -605,9 +605,9 @@ const Overview = new Lang.Class({
                return;
        }

-        this._animateNotVisible();
-
        this._shown = false;
+
+        this._animateNotVisible();
        this._syncGrab();
    },

--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -181,6 +181,7 @@ const AppMenuButton = new Lang.Class({
        this._targetApp = null;
        this._appMenuNotifyId = 0;
        this._actionGroupNotifyId = 0;
+        this._busyNotifyId = 0;

        let bin = new St.Bin({ name: 'appMenu' });
        bin.connect('style-changed', Lang.bind(this, this._onStyleChanged));
@ -273,7 +274,7 @@ const AppMenuButton = new Lang.Class({
    _onStyleChanged: function(actor) {
        let node = actor.get_theme_node();
        let [success, icon] = node.lookup_url('spinner-image', false);
-        if (!success || this._spinnerIcon == icon)
+        if (!success || (this._spinnerIcon && this._spinnerIcon.equal(icon)))
            return;
        this._spinnerIcon = icon;
        this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
@ -457,12 +458,17 @@ const AppMenuButton = new Lang.Class({
                this._targetApp.disconnect(this._actionGroupNotifyId);
                this._actionGroupNotifyId = 0;
            }
+            if (this._busyNotifyId) {
+                this._targetApp.disconnect(this._busyNotifyId);
+                this._busyNotifyId = 0;
+            }

            this._targetApp = targetApp;

            if (this._targetApp) {
                this._appMenuNotifyId = this._targetApp.connect('notify::menu', Lang.bind(this, this._sync));
                this._actionGroupNotifyId = this._targetApp.connect('notify::action-group', Lang.bind(this, this._sync));
+                this._busyNotifyId = this._targetApp.connect('notify::busy', Lang.bind(this, this._sync));
                this._label.setText(this._targetApp.get_name());
                this.actor.set_accessible_name(this._targetApp.get_name());
            }
@ -476,7 +482,7 @@ const AppMenuButton = new Lang.Class({

        let isBusy = (this._targetApp != null &&
                      (this._targetApp.get_state() == Shell.AppState.STARTING ||
-                       this._targetApp.get_state() == Shell.AppState.BUSY));
+                       this._targetApp.get_busy()));
        if (isBusy)
            this.startAnimation();
        else
@ -887,7 +893,7 @@ const Panel = new Lang.Class({

        this.statusArea = {};

-        this.menuManager = new PopupMenu.PopupMenuManager(this, { keybindingMode: Shell.KeyBindingMode.TOPBAR_POPUP });
+        this.menuManager = new PopupMenu.PopupMenuManager(this, { actionMode: Shell.ActionMode.TOPBAR_POPUP });

        this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
        this.actor.add_actor(this._leftBox);
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@ -85,7 +85,8 @@ const Clock = new Lang.Class({
        let date = new Date();
        /* Translators: This is a time format for a date in
           long format */
-        this._date.text = date.toLocaleFormat(_("%A, %B %d"));
+        let dateFormat = Shell.util_translate_time_string(N_("%A, %B %d"));
+        this._date.text = date.toLocaleFormat(dateFormat);
    },

    destroy: function() {
@ -646,14 +647,14 @@ const ScreenShield = new Lang.Class({
        if (this._isModal)
            return true;

-        this._isModal = Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
+        this._isModal = Main.pushModal(this.actor, { actionMode: Shell.ActionMode.LOCK_SCREEN });
        if (this._isModal)
            return true;

        // We failed to get a pointer grab, it means that
        // something else has it. Try with a keyboard grab only
        this._isModal = Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED,
-                                                     keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
+                                                     actionMode: Shell.ActionMode.LOCK_SCREEN });
        return this._isModal;
    },

@ -669,7 +670,9 @@ const ScreenShield = new Lang.Class({
        if (this._lockScreenState != MessageTray.State.SHOWN)
            return Clutter.EVENT_PROPAGATE;

-        let isEnter = (symbol == Clutter.KEY_Return || symbol == Clutter.KEY_KP_Enter);
+        let isEnter = (symbol == Clutter.KEY_Return ||
+                       symbol == Clutter.KEY_KP_Enter ||
+                       symbol == Clutter.KEY_ISO_Enter);
        if (!isEnter && !(GLib.unichar_isprint(unichar) || symbol == Clutter.KEY_Escape))
            return Clutter.EVENT_PROPAGATE;

@ -1332,6 +1335,8 @@ const ScreenShield = new Lang.Class({

    // If the previous shell crashed, and gnome-session restarted us, then re-lock
    lockIfWasLocked: function() {
+        if (!this._settings.get_boolean(LOCK_ENABLED_KEY))
+            return;
        let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
        if (wasLocked === null)
            return;
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -199,12 +199,9 @@ const SearchResultsBase = new Lang.Class({
            this._cancellable.reset();

            this.provider.getResultMetas(metasNeeded, Lang.bind(this, function(metas) {
-                if (metas.length == 0) {
-                    callback(false);
-                    return;
-                }
                if (metas.length != metasNeeded.length) {
-                    log('Wrong number of result metas returned by search provider');
+                    log('Wrong number of result metas returned by search provider ' + this.provider.id +
+                        ': expected ' + metasNeeded.length + ' but got ' + metas.length);
                    callback(false);
                    return;
                }
@ -236,6 +233,7 @@ const SearchResultsBase = new Lang.Class({
            this._ensureResultActors(results, Lang.bind(this, function(successful) {
                if (!successful) {
                    this._clearResultDisplay();
+                    callback();
                    return;
                }

--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -44,8 +44,7 @@ const GnomeShellIface = '<node> \
 </method> \
 <signal name="AcceleratorActivated"> \
    <arg name="action" type="u" /> \
-    <arg name="deviceid" type="u" /> \
-    <arg name="timestamp" type="u" /> \
+    <arg name="parameters" type="a{sv}" /> \
 </signal> \
 <property name="Mode" type="s" access="read" /> \
 <property name="OverviewActive" type="b" access="readwrite" /> \
@ -90,6 +89,12 @@ const GnomeShell = new Lang.Class({
            function(display, action, deviceid, timestamp) {
                this._emitAcceleratorActivated(action, deviceid, timestamp);
            }));
+
+        this._cachedOverviewVisible = false;
+        Main.overview.connect('showing',
+                              Lang.bind(this, this._checkOverviewVisibleChanged));
+        Main.overview.connect('hidden',
+                              Lang.bind(this, this._checkOverviewVisibleChanged));
    },

    /**
@ -134,7 +139,7 @@ const GnomeShell = new Lang.Class({
            params[param] = params[param].deep_unpack();

        let monitorIndex = -1;
-        if (params['monitor'])
+        if (params['monitor'] >= 0)
            monitorIndex = params['monitor'];

        let icon = null;
@ -190,11 +195,14 @@ const GnomeShell = new Lang.Class({

        let connection = this._dbusImpl.get_connection();
        let info = this._dbusImpl.get_info();
+        let params = { 'device-id': GLib.Variant.new('u', deviceid),
+                       'timestamp': GLib.Variant.new('u', timestamp),
+                       'action-mode': GLib.Variant.new('u', Main.actionMode) };
        connection.emit_signal(destination,
                               this._dbusImpl.get_object_path(),
                               info ? info.name : null,
                               'AcceleratorActivated',
-                               GLib.Variant.new('(uuu)', [action, deviceid, timestamp]));
+                               GLib.Variant.new('(ua{sv})', [action, params]));
    },

    _grabAcceleratorForSender: function(accelerator, flags, sender) {
@ -235,8 +243,15 @@ const GnomeShell = new Lang.Class({

    Mode: global.session_mode,

+    _checkOverviewVisibleChanged: function() {
+        if (Main.overview.visible !== this._cachedOverviewVisible) {
+            this._cachedOverviewVisible = Main.overview.visible;
+            this._dbusImpl.emit_property_changed('OverviewActive', new GLib.Variant('b', this._cachedOverviewVisible));
+        }
+    },
+
    get OverviewActive() {
-        return Main.overview.visible;
+        return this._cachedOverviewVisible;
    },

    set OverviewActive(visible) {
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@ -7,7 +7,7 @@ const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;

-const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */
+const SLIDER_SCROLL_STEP = 0.02; /* Slider scrolling step in % */

 const Slider = new Lang.Class({
    Name: "Slider",
@ -197,7 +197,7 @@ const Slider = new Lang.Class({
            let [dx, dy] = event.get_scroll_delta();
            // Even though the slider is horizontal, use dy to match
            // the UP/DOWN above.
-            delta = -dy / 10;
+            delta = -dy * SLIDER_SCROLL_STEP;
        }

        this._value = Math.min(Math.max(0, this._value + delta), 1);
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -155,6 +155,7 @@ const InputSourceManager = new Lang.Class({
        this._ibusSources = {};

        this._currentSource = null;
+        this._backupSource = null;

        // All valid input sources currently in the gsettings
        // KEY_INPUT_SOURCES list ordered by most recently used
@ -163,13 +164,13 @@ const InputSourceManager = new Lang.Class({
            Main.wm.addKeybinding('switch-input-source',
                                  new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
                                  Meta.KeyBindingFlags.NONE,
-                                  Shell.KeyBindingMode.ALL,
+                                  Shell.ActionMode.ALL,
                                  Lang.bind(this, this._switchInputSource));
        this._keybindingActionBackward =
            Main.wm.addKeybinding('switch-input-source-backward',
                                  new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
                                  Meta.KeyBindingFlags.IS_REVERSED,
-                                  Shell.KeyBindingMode.ALL,
+                                  Shell.ActionMode.ALL,
                                  Lang.bind(this, this._switchInputSource));
        this._settings = new Gio.Settings({ schema_id: DESKTOP_INPUT_SOURCES_SCHEMA });
        this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
@ -183,6 +184,7 @@ const InputSourceManager = new Lang.Class({
        this._ibusManager.connect('ready', Lang.bind(this, this._ibusReadyCallback));
        this._ibusManager.connect('properties-registered', Lang.bind(this, this._ibusPropertiesRegistered));
        this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
+        this._ibusManager.connect('set-content-type', Lang.bind(this, this._ibusSetContentType));

        global.display.connect('modifiers-accelerator-activated', Lang.bind(this, this._modifiersSwitcher));

@ -192,6 +194,7 @@ const InputSourceManager = new Lang.Class({
        this._overviewHiddenId = 0;
        this._settings.connect('changed::per-window', Lang.bind(this, this._sourcesPerWindowChanged));
        this._sourcesPerWindowChanged();
+        this._disableIBus = false;
    },

    reload: function() {
@ -239,8 +242,8 @@ const InputSourceManager = new Lang.Class({
        // effect without considerable work to consolidate the usage
        // of pushModal/popModal and grabHelper. See
        // https://bugzilla.gnome.org/show_bug.cgi?id=695143 .
-        if (Main.keybindingMode == Shell.KeyBindingMode.MESSAGE_TRAY ||
-            Main.keybindingMode == Shell.KeyBindingMode.TOPBAR_POPUP) {
+        if (Main.actionMode == Shell.ActionMode.MESSAGE_TRAY ||
+            Main.actionMode == Shell.ActionMode.TOPBAR_POPUP) {
            this._modifiersSwitcher();
            return;
        }
@ -309,6 +312,8 @@ const InputSourceManager = new Lang.Class({
                [exists, displayName, shortName, , ] =
                    this._xkbInfo.get_layout_info(id);
            } else if (type == INPUT_SOURCE_TYPE_IBUS) {
+                if (this._disableIBus)
+                    continue;
                let engineDesc = this._ibusManager.getEngineDesc(id);
                if (engineDesc) {
                    let language = IBus.get_language_name(engineDesc.get_language());
@ -379,8 +384,24 @@ const InputSourceManager = new Lang.Class({
        }
        this._mruSources = mruSources.concat(sourcesList);

-        if (this._mruSources.length > 0)
+        if (this._mruSources.length > 0) {
+            if (!this._disableIBus && this._backupSource) {
+                for (let i = 0; i < this._mruSources.length; i++) {
+                    if (this._mruSources[i].type == this._backupSource.type &&
+                        this._mruSources[i].id == this._backupSource.id) {
+                        let currentSource = this._mruSources.splice(i, 1);
+                        this._mruSources = currentSource.concat(this._mruSources);
+                        break;
+                    }
+                }
+                this._backupSource = null;
+            }
            this._mruSources[0].activate();
+        }
+
+        // All ibus engines are preloaded here to reduce the launching time
+        // when users switch the input sources.
+        this._ibusManager.preloadEngines(Object.keys(this._ibusSources));
    },

    _makeEngineShortName: function(engineDesc) {
@ -433,6 +454,27 @@ const InputSourceManager = new Lang.Class({
        return false;
    },

+    _ibusSetContentType: function(im, purpose, hints) {
+        if (purpose == IBus.InputPurpose.PASSWORD) {
+            if (Object.keys(this._inputSources).length == Object.keys(this._ibusSources).length)
+                return;
+
+            if (this._disableIBus)
+                return;
+            this._disableIBus = true;
+            this._backupSource = this._currentSource;
+        } else {
+            if (!this._disableIBus)
+                return;
+            this._disableIBus = false;
+        }
+        // If this._mruSources is not cleared before this.reload() is called,
+        // the order is different from the original one as IM sources will
+        // be appended to XKB sources.
+        this._mruSources = [];
+        this.reload();
+    },
+
    _getNewInputSource: function(current) {
        for (let i in this._inputSources) {
            let is = this._inputSources[i];
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@ -876,7 +876,8 @@ const NMWirelessDialog = new Lang.Class({
                                                 x_align: Clutter.ActorAlign.CENTER,
                                                 y_align: Clutter.ActorAlign.CENTER });

-        this._noNetworksSpinner = new Animation.AnimatedIcon(global.datadir + '/theme/process-working.svg', 24, 24);
+        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        this._noNetworksSpinner = new Animation.AnimatedIcon(file, 24, 24);
        this._noNetworksBox.add_actor(this._noNetworksSpinner.actor);
        this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label',
                                                     text: _("No Networks") }));
@ -1866,7 +1867,7 @@ const NMApplet = new Lang.Class({
    _connectionRemoved: function(connection) {
        let pos = this._connections.indexOf(connection);
        if (pos != -1)
-            this._connections.splice(connection, 1);
+            this._connections.splice(pos, 1);

        let section = connection._section;

--- a/js/ui/status/rfkill.js
+++ b/js/ui/status/rfkill.js
@ -15,6 +15,7 @@ const RfkillManagerInterface = '<node> \
 <interface name="org.gnome.SettingsDaemon.Rfkill"> \
 <property name="AirplaneMode" type="b" access="readwrite" /> \
 <property name="HardwareAirplaneMode" type="b" access="read" /> \
+<property name="ShouldShowAirplaneMode" type="b" access="read" /> \
 </interface> \
 </node>';

@ -48,6 +49,10 @@ const RfkillManager = new Lang.Class({
        return this._proxy.HardwareAirplaneMode;
    },

+    get shouldShowAirplaneMode() {
+        return this._proxy.ShouldShowAirplaneMode;
+    },
+
    _changed: function() {
        this.emit('airplane-mode-changed');
    }
@ -101,11 +106,10 @@ const Indicator = new Lang.Class({
    _sync: function() {
        let airplaneMode = this._manager.airplaneMode;
        let hwAirplaneMode = this._manager.hwAirplaneMode;
-        let changed = (airplaneMode != this._indicator.visible) ||
-            (hwAirplaneMode != this._offItem.actor.visible);
+        let showAirplaneMode = this._manager.shouldShowAirplaneMode;

-        this._indicator.visible = airplaneMode;
-        this._item.actor.visible = airplaneMode;
+        this._indicator.visible = (airplaneMode && showAirplaneMode);
+        this._item.actor.visible = (airplaneMode && showAirplaneMode);
        this._offItem.setSensitive(!hwAirplaneMode);

        if (hwAirplaneMode)
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@ -87,8 +87,6 @@ const SwitcherPopup = new Lang.Class({

        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
-        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
-        let vPadding = this.actor.get_theme_node().get_vertical_padding();
        let hPadding = leftPadding + rightPadding;

        // Allocate the switcherList
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@ -154,7 +154,7 @@ const UnlockDialog = new Lang.Class({
            return true;

        if (!Main.pushModal(this.actor, { timestamp: timestamp,
-                                          keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN }))
+                                          actionMode: Shell.ActionMode.UNLOCK_SCREEN }))
            return false;

        this._isModal = true;
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -65,7 +65,8 @@ const ShowOverviewAction = new Lang.Class({
    },

    vfunc_gesture_prepare : function(action, actor) {
-        return this.get_n_current_points() == this.get_n_touch_points();
+        return Main.actionMode == Shell.ActionMode.NORMAL &&
+               this.get_n_current_points() == this.get_n_touch_points();
    },

    _getBoundingRect : function(motion) {
@ -193,27 +194,30 @@ const ViewSelector = new Lang.Class({
                // the windows to animate, but now we no longer want to
                // show it given that we are now on the apps page or
                // search page.
-                if (this._activePage != this._workspacesPage)
+                if (this._activePage != this._workspacesPage) {
                    this._workspacesPage.opacity = 0;
+                    this._workspacesPage.hide();
+                }
            }));

        Main.wm.addKeybinding('toggle-application-view',
                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.NORMAL |
+                              Shell.ActionMode.OVERVIEW,
                              Lang.bind(this, this._toggleAppsPage));

        Main.wm.addKeybinding('toggle-overview',
                              new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                              Meta.KeyBindingFlags.NONE,
-                              Shell.KeyBindingMode.NORMAL |
-                              Shell.KeyBindingMode.OVERVIEW,
+                              Shell.ActionMode.NORMAL |
+                              Shell.ActionMode.OVERVIEW,
                              Lang.bind(Main.overview, Main.overview.toggle));

        let gesture;

-        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT);
+        gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT,
+                                                    Shell.ActionMode.NORMAL);
        gesture.connect('activated', Lang.bind(this, function() {
            if (Main.overview.visible)
                Main.overview.hide();
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -478,7 +478,9 @@ const WorkspaceSwitchAction = new Lang.Class({
    },

    vfunc_gesture_prepare : function(action, actor) {
-        return this.get_n_current_points() == this.get_n_touch_points();
+        let allowedModes = Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW;
+        return this.get_n_current_points() == this.get_n_touch_points() &&
+               (allowedModes & Main.actionMode);
    },

    vfunc_gesture_end : function(action, actor) {
@ -526,7 +528,7 @@ const AppSwitchAction = new Lang.Class({
    },

    vfunc_gesture_prepare : function(action, actor) {
-        if (Main.overview.visible) {
+        if (Main.actionMode != Shell.ActionMode.NORMAL) {
            this.cancel();
            return false;
        }
@ -578,6 +580,35 @@ const AppSwitchAction = new Lang.Class({
 });
 Signals.addSignalMethods(AppSwitchAction.prototype);

+const ResizePopup = new Lang.Class({
+    Name: 'ResizePopup',
+
+    _init: function() {
+        this._widget = new St.Widget({ layout_manager: new Clutter.BinLayout() });
+        this._label = new St.Label({ style_class: 'resize-popup',
+                                     x_align: Clutter.ActorAlign.CENTER,
+                                     y_align: Clutter.ActorAlign.CENTER,
+                                     x_expand: true, y_expand: true });
+        this._widget.add_child(this._label);
+        Main.uiGroup.add_actor(this._widget);
+    },
+
+    set: function(rect, displayW, displayH) {
+        /* Translators: This represents the size of a window. The first number is
+         * the width of the window and the second is the height. */
+        let text = _("%d x %d").format(displayW, displayH);
+        this._label.set_text(text);
+
+        this._widget.set_position(rect.x, rect.y);
+        this._widget.set_size(rect.width, rect.height);
+    },
+
+    destroy: function() {
+        this._widget.destroy();
+        this._widget = null;
+    },
+});
+
 const WindowManager = new Lang.Class({
    Name: 'WindowManager',

@ -616,179 +647,182 @@ const WindowManager = new Lang.Class({
        this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
        this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));
        this._shellwm.connect('confirm-display-change', Lang.bind(this, this._confirmDisplayChange));
+        global.screen.connect('restacked', Lang.bind(this, this._syncStacking));

        this._workspaceSwitcherPopup = null;
        this._tilePreview = null;

        this.setCustomKeybindingHandler('switch-to-workspace-left',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-right',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-up',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-down',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-last',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-left',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-right',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-up',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-down',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-1',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-2',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-3',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-4',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-5',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-6',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-7',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-8',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-9',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-10',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-11',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-12',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('move-to-workspace-last',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._showWorkspaceSwitcher));
        this.setCustomKeybindingHandler('switch-applications',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-group',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-applications-backward',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-group-backward',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startAppSwitcher));
        this.setCustomKeybindingHandler('switch-windows',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startWindowSwitcher));
        this.setCustomKeybindingHandler('switch-windows-backward',
-                                        Shell.KeyBindingMode.NORMAL,
+                                        Shell.ActionMode.NORMAL,
                                        Lang.bind(this, this._startWindowSwitcher));
        this.setCustomKeybindingHandler('switch-panels',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW |
-                                        Shell.KeyBindingMode.LOCK_SCREEN |
-                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
-                                        Shell.KeyBindingMode.LOGIN_SCREEN,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW |
+                                        Shell.ActionMode.LOCK_SCREEN |
+                                        Shell.ActionMode.UNLOCK_SCREEN |
+                                        Shell.ActionMode.LOGIN_SCREEN,
                                        Lang.bind(this, this._startA11ySwitcher));
        this.setCustomKeybindingHandler('switch-panels-backward',
-                                        Shell.KeyBindingMode.NORMAL |
-                                        Shell.KeyBindingMode.OVERVIEW |
-                                        Shell.KeyBindingMode.LOCK_SCREEN |
-                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
-                                        Shell.KeyBindingMode.LOGIN_SCREEN,
+                                        Shell.ActionMode.NORMAL |
+                                        Shell.ActionMode.OVERVIEW |
+                                        Shell.ActionMode.LOCK_SCREEN |
+                                        Shell.ActionMode.UNLOCK_SCREEN |
+                                        Shell.ActionMode.LOGIN_SCREEN,
                                        Lang.bind(this, this._startA11ySwitcher));

        this.addKeybinding('pause-resume-tweens',
                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                           Meta.KeyBindingFlags.NONE,
-                           Shell.KeyBindingMode.ALL,
+                           Shell.ActionMode.ALL,
                           Lang.bind(this, this._toggleTweens));

        this.addKeybinding('open-application-menu',
                           new Gio.Settings({ schema_id: SHELL_KEYBINDINGS_SCHEMA }),
                           Meta.KeyBindingFlags.NONE,
-                           Shell.KeyBindingMode.NORMAL |
-                           Shell.KeyBindingMode.TOPBAR_POPUP,
+                           Shell.ActionMode.NORMAL |
+                           Shell.ActionMode.TOPBAR_POPUP,
                           Lang.bind(this, this._toggleAppMenu));

+        global.display.connect('show-resize-popup', Lang.bind(this, this._showResizePopup));
+
        Main.overview.connect('showing', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
                this._undimWindow(this._dimmedWindows[i]);
@ -854,6 +888,44 @@ const WindowManager = new Lang.Class({
        Main.activateWindow(nextWindow);
    },

+    insertWorkspace: function(pos) {
+        if (!Meta.prefs_get_dynamic_workspaces())
+            return;
+
+        let windows = global.get_window_actors().map(function(winActor) {
+            return winActor.meta_window;
+        });
+
+        // To create a new workspace, we slide all the windows on workspaces
+        // below us to the next workspace, leaving a blank workspace for us
+        // to recycle.
+        windows.forEach(function(window) {
+            // If the window is attached to an ancestor, we don't need/want
+            // to move it
+            if (window.get_transient_for() != null)
+                return;
+            // Same for OR windows
+            if (window.is_override_redirect())
+                return;
+            // Windows on workspaces below pos don't need moving
+            let index = window.get_workspace().index();
+            if (index < pos)
+                return;
+            window.change_workspace_by_index(index + 1, true);
+        });
+
+        // If the new workspace was inserted before the active workspace,
+        // activate the workspace to which its windows went
+        let activeIndex = global.screen.get_active_workspace_index();
+        if (activeIndex >= pos) {
+            let newWs = global.screen.get_workspace_by_index(activeIndex + 1);
+            this._blockAnimations = true;
+            newWs.activate(global.get_current_time());
+            this._blockAnimations = false;
+        }
+    },
+
+
    keepWorkspaceAlive: function(workspace, duration) {
        if (!this._workspaceTracker)
            return;
@ -875,7 +947,7 @@ const WindowManager = new Lang.Class({

    removeKeybinding: function(name) {
        if (global.display.remove_keybinding(name))
-            this.allowKeybinding(name, Shell.KeyBindingMode.NONE);
+            this.allowKeybinding(name, Shell.ActionMode.NONE);
    },

    allowKeybinding: function(name, modes) {
@ -883,7 +955,7 @@ const WindowManager = new Lang.Class({
    },

    _shouldAnimate: function() {
-        return !Main.overview.visible;
+        return !(Main.overview.visible || this._blockAnimations);
    },

    _shouldAnimateActor: function(actor, types) {
@ -1074,10 +1146,8 @@ const WindowManager = new Lang.Class({
            return;
        }

-        if (actor.meta_window.is_attached_dialog()) {
-            /* Scale the window from the center of the parent */
+        if (actor.meta_window.is_attached_dialog())
            this._checkDimming(actor.get_meta_window().get_transient_for());
-        }

        switch (actor._windowType) {
        case Meta.WindowType.NORMAL:
@ -1232,18 +1302,36 @@ const WindowManager = new Lang.Class({
    },

    _filterKeybinding: function(shellwm, binding) {
-        if (Main.keybindingMode == Shell.KeyBindingMode.NONE)
+        if (Main.actionMode == Shell.ActionMode.NONE)
            return true;

        // There's little sense in implementing a keybinding in mutter and
        // not having it work in NORMAL mode; handle this case generically
        // so we don't have to explicitly allow all builtin keybindings in
        // NORMAL mode.
-        if (Main.keybindingMode == Shell.KeyBindingMode.NORMAL &&
+        if (Main.actionMode == Shell.ActionMode.NORMAL &&
            binding.is_builtin())
            return false;

-        return !(this._allowedKeybindings[binding.get_name()] & Main.keybindingMode);
+        return !(this._allowedKeybindings[binding.get_name()] & Main.actionMode);
+    },
+
+    _syncStacking: function() {
+        if (this._switchData == null)
+            return;
+
+        // Update stacking of windows in inGroup (aka the workspace we are
+        // switching to). Windows in outGroup are about to be hidden anyway,
+        // so we just ignore them here.
+        let windows = global.get_window_actors();
+        let sibling = null;
+        for (let i = 0; i < windows.length; i++) {
+            if (windows[i].get_parent() != this._switchData.inGroup)
+                continue;
+
+            this._switchData.inGroup.set_child_above_sibling(windows[i], sibling);
+            sibling = windows[i];
+        }
    },

    _switchWorkspace : function(shellwm, from, to, direction) {
@ -1437,6 +1525,11 @@ const WindowManager = new Lang.Class({
            direction = Meta.MotionDirection.DOWN;
            newWs = screen.get_workspace_by_index(screen.n_workspaces - 1);
        } else if (isNaN(target)) {
+            // Prepend a new workspace dynamically
+            if (screen.get_active_workspace_index() == 0 &&
+                action == 'move' && target == 'up')
+                this.insertWorkspace(0);
+
            direction = Meta.MotionDirection[target.toUpperCase()];
            newWs = screen.get_active_workspace().get_neighbor(direction);
        } else if (target > 0) {
@ -1501,4 +1594,18 @@ const WindowManager = new Lang.Class({
        let dialog = new DisplayChangeDialog(this._shellwm);
        dialog.open();
    },
+
+    _showResizePopup: function(display, show, rect, displayW, displayH) {
+        if (show) {
+            if (!this._resizePopup)
+                this._resizePopup = new ResizePopup();
+
+            this._resizePopup.set(rect, displayW, displayH);
+        } else {
+            if (this._resizePopup) {
+                this._resizePopup.destroy();
+                this._resizePopup = null;
+            }
+        }
+    },
 });
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -795,35 +795,13 @@ const ThumbnailsBox = new Lang.Class({

            let isWindow = !!source.realWindow;

-            // To create a new workspace, we first slide all the windows on workspaces
-            // below us to the next workspace, leaving a blank workspace for us to recycle.
            let newWorkspaceIndex;
            [newWorkspaceIndex, this._dropPlaceholderPos] = [this._dropPlaceholderPos, -1];
-
-            // Nab all the windows below us.
-            let windows = global.get_window_actors().filter(function(winActor) {
-                // If the window is attached to an ancestor, we don't need/want to move it
-                let window = winActor.meta_window;
-
-                if (window.get_transient_for() != null)
-                    return false;
-
-                if (isWindow)
-                    return window.get_workspace().index() >= newWorkspaceIndex && winActor != source;
-                else
-                    return window.get_workspace().index() >= newWorkspaceIndex;
-            });
-
            this._spliceIndex = newWorkspaceIndex;

-            // ... move them down one.
-            windows.forEach(function(winActor) {
-                let window = winActor.meta_window;
-                window.change_workspace_by_index(window.get_workspace().index() + 1, true);
-            });
+            Main.wm.insertWorkspace(newWorkspaceIndex);

            if (isWindow) {
-                // ... and bam, a workspace, good as new.
                // Move the window to our monitor first if necessary.
                let thumbMonitor = this._thumbnails[newWorkspaceIndex].monitorIndex;
                if (source.metaWindow.get_monitor() != thumbMonitor)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -18,8 +18,6 @@ const Workspace = imports.ui.workspace;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

 const WORKSPACE_SWITCH_TIME = 0.25;
-// Note that mutter has a compile-time limit of 36
-const MAX_WORKSPACES = 16;

 const AnimationType = {
    ZOOM: 0,
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -68,6 +68,7 @@ th
 tr
 ug 
 uk
+uz@cyrillic
 vi
 zh_CN
 zh_HK
--- a/po/an.po
+++ b/po/an.po
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/es.po
+++ b/po/es.po
@ -3,15 +3,15 @@
 # This file is distributed under the same license as the gnome-shell package.
 # Jorge González <jorgegonz@svn.gnome.org>, 2009, 2010, 2011.
 # Benjamín Valero Espinosa <benjavalero@gmail.com>, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 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: 2014-10-06 07:46+0000\n"
-"PO-Revision-Date: 2014-10-06 13:00+0200\n"
+"POT-Creation-Date: 2015-01-12 08:33+0000\n"
+"PO-Revision-Date: 2015-01-12 12:05+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@ -304,8 +304,8 @@ msgstr ""
 "Retardo al cambiar el foco del ratón hasta que el puntero deja de moverse"

 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
-msgid "Captive Portal"
-msgstr "Portal captivo"
+msgid "Network Login"
+msgstr "Inicio de sesión de la red"

 #: ../js/extensionPrefs/main.js:123
 #, javascript-format
@ -319,7 +319,7 @@ msgstr "Extensiones de GNOME Shell"
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:915
+#: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Cancelar"

@ -337,33 +337,33 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"

-#: ../js/gdm/loginDialog.js:269
+#: ../js/gdm/loginDialog.js:276
 msgid "Choose Session"
 msgstr "Elegir sesión"

-#: ../js/gdm/loginDialog.js:429
+#: ../js/gdm/loginDialog.js:428
 msgid "Not listed?"
 msgstr "¿No está en la lista?"

-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:814
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(ej., usuario o %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:819 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "Nombre de usuario:"

-#: ../js/gdm/loginDialog.js:922
+#: ../js/gdm/loginDialog.js:1151
 msgid "Login Window"
 msgstr "Ventana de inicio de sesión"

-#: ../js/gdm/util.js:323
+#: ../js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "Error de autenticación"

-#: ../js/gdm/util.js:453
+#: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(o pase el dedo)"

@ -384,31 +384,31 @@ msgstr "Falló la ejecución de «%s»:"
 msgid "Web Authentication Redirect"
 msgstr "Redirección para autenticación web"

-#: ../js/ui/appDisplay.js:772
+#: ../js/ui/appDisplay.js:770
 msgid "Frequently used applications will appear here"
 msgstr "Las aplicaciones usadas frecuentemente aparecerán aquí"

-#: ../js/ui/appDisplay.js:883
+#: ../js/ui/appDisplay.js:881
 msgid "Frequent"
 msgstr "Frecuentes"

-#: ../js/ui/appDisplay.js:890
+#: ../js/ui/appDisplay.js:888
 msgid "All"
 msgstr "Todas"

-#: ../js/ui/appDisplay.js:1790
+#: ../js/ui/appDisplay.js:1789
 msgid "New Window"
 msgstr "Ventana nueva"

-#: ../js/ui/appDisplay.js:1816 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1815 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"

-#: ../js/ui/appDisplay.js:1822
+#: ../js/ui/appDisplay.js:1821
 msgid "Add to Favorites"
 msgstr "Añadir a los favoritos"

-#: ../js/ui/appDisplay.js:1831
+#: ../js/ui/appDisplay.js:1830
 msgid "Show Details"
 msgstr "Mostrar detalles"

@ -422,7 +422,7 @@ msgstr "Se ha añadido %s a sus favoritos."
 msgid "%s has been removed from your favorites."
 msgstr "Se ha quitado %s de sus favoritos."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:813
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:819
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Configuración"
@ -431,17 +431,23 @@ msgstr "Configuración"
 msgid "Change Background…"
 msgstr "Cambiar el fondo…"

+#. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
+#: ../js/ui/calendar.js:39
+msgctxt "calendar-no-work"
+msgid "06"
+msgstr "06"
+
 #. 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:67
+#: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Todo el día"

 #. Translators: Shown in calendar event list, if 24h format,
 #. \u2236 is a ratio character, similar to : */
-#: ../js/ui/calendar.js:73
+#: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%H∶%M"
 msgstr "%H∶%M"
@ -449,7 +455,7 @@ msgstr "%H∶%M"
 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:84
 msgctxt "event list time"
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
@ -459,43 +465,43 @@ msgstr "%l∶%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:113
+#: ../js/ui/calendar.js:98
 msgctxt "grid sunday"
 msgid "S"
 msgstr "D"

 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:115
+#: ../js/ui/calendar.js:100
 msgctxt "grid monday"
 msgid "M"
 msgstr "L"

 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:117
+#: ../js/ui/calendar.js:102
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "M"

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:104
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "X"

 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:106
 msgctxt "grid thursday"
 msgid "T"
 msgstr "J"

 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:108
 msgctxt "grid friday"
 msgid "F"
 msgstr "V"

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:110
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
@ -506,85 +512,83 @@ msgstr "S"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #. */
-#: ../js/ui/calendar.js:138
+#: ../js/ui/calendar.js:123
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Dom"

 #. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:140
+#: ../js/ui/calendar.js:125
 msgctxt "list monday"
 msgid "M"
 msgstr "L"

 #. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:127
 msgctxt "list tuesday"
 msgid "T"
 msgstr "M"

 #. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:129
 msgctxt "list wednesday"
 msgid "W"
 msgstr "X"

 #. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:131
 msgctxt "list thursday"
 msgid "Th"
 msgstr "J"

 #. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:133
 msgctxt "list friday"
 msgid "F"
 msgstr "V"

 #. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:135
 msgctxt "list saturday"
 msgid "S"
 msgstr "S"

-#: ../js/ui/calendar.js:453
+#: ../js/ui/calendar.js:460
 msgid "Previous month"
 msgstr "Mes anterior"

-#: ../js/ui/calendar.js:463
+#: ../js/ui/calendar.js:470
 msgid "Next month"
 msgstr "Siguiente mes"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:806
 msgid "Nothing Scheduled"
 msgstr "Nada programado"

-#. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:799
+#: ../js/ui/calendar.js:825
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

-#. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:802
+#: ../js/ui/calendar.js:829
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"

-#: ../js/ui/calendar.js:813
+#: ../js/ui/calendar.js:841
 msgid "Today"
 msgstr "Hoy"

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:845
 msgid "Tomorrow"
 msgstr "Mañana"

-#: ../js/ui/calendar.js:828
+#: ../js/ui/calendar.js:856
 msgid "This week"
 msgstr "Esta semana"

-#: ../js/ui/calendar.js:836
+#: ../js/ui/calendar.js:864
 msgid "Next week"
 msgstr "La semana que viene"

@ -618,7 +622,7 @@ msgid "Type again:"
 msgstr "Escriba de nuevo:"

 #: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:918
+#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Conectar"

@ -712,102 +716,102 @@ msgstr "Autenticar"
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Inténtelo de nuevo,"

-#: ../js/ui/components/telepathyClient.js:240
+#: ../js/ui/components/telepathyClient.js:242
 msgid "Invitation"
 msgstr "Invitación"

-#: ../js/ui/components/telepathyClient.js:300
+#: ../js/ui/components/telepathyClient.js:302
 msgid "Call"
 msgstr "Llamar"

-#: ../js/ui/components/telepathyClient.js:316
+#: ../js/ui/components/telepathyClient.js:318
 msgid "File Transfer"
 msgstr "Transferencia de archivos"

-#: ../js/ui/components/telepathyClient.js:420
+#: ../js/ui/components/telepathyClient.js:422
 msgid "Chat"
 msgstr "Chat"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Unmute"
 msgstr "Dar voz"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Mute"
 msgstr "Silenciar"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:953
+#: ../js/ui/components/telepathyClient.js:955
 msgid "%H∶%M"
 msgstr "%H∶%M"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:960
+#: ../js/ui/components/telepathyClient.js:962
 msgid "Yesterday, %H∶%M"
 msgstr "Ayer, %H∶%M"

 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:967
+#: ../js/ui/components/telepathyClient.js:969
 msgid "%A, %H∶%M"
 msgstr "%A, %H∶%M"

 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
-#: ../js/ui/components/telepathyClient.js:974
+#: ../js/ui/components/telepathyClient.js:976
 msgid "%B %d, %H∶%M"
 msgstr "%d de %B, %H∶%M"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30" */
-#: ../js/ui/components/telepathyClient.js:980
+#: ../js/ui/components/telepathyClient.js:982
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d de %B de %Y, %H∶%M"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:986
+#: ../js/ui/components/telepathyClient.js:988
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:993
+#: ../js/ui/components/telepathyClient.js:995
 msgid "Yesterday, %l∶%M %p"
 msgstr "Ayer a las %l∶%M %p"

 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1000
+#: ../js/ui/components/telepathyClient.js:1002
 msgid "%A, %l∶%M %p"
 msgstr "%A, %l∶%M %p"

 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1007
+#: ../js/ui/components/telepathyClient.js:1009
 msgid "%B %d, %l∶%M %p"
 msgstr "%d de %B, %l∶%M %p"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"*/
-#: ../js/ui/components/telepathyClient.js:1013
+#: ../js/ui/components/telepathyClient.js:1015
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d de %B de %Y, %l∶%M %p"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:1045
+#: ../js/ui/components/telepathyClient.js:1047
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1149
+#: ../js/ui/components/telepathyClient.js:1151
 #, javascript-format
 msgid "Invitation to %s"
 msgstr "Invitación a %s"
@ -815,38 +819,38 @@ msgstr "Invitación a %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example. */
-#: ../js/ui/components/telepathyClient.js:1157
+#: ../js/ui/components/telepathyClient.js:1159
 #, javascript-format
 msgid "%s is inviting you to join %s"
 msgstr "%s le está invitando a unirse a %s"

-#: ../js/ui/components/telepathyClient.js:1159
-#: ../js/ui/components/telepathyClient.js:1194
-#: ../js/ui/components/telepathyClient.js:1228
-#: ../js/ui/components/telepathyClient.js:1286
+#: ../js/ui/components/telepathyClient.js:1161
+#: ../js/ui/components/telepathyClient.js:1196
+#: ../js/ui/components/telepathyClient.js:1230
+#: ../js/ui/components/telepathyClient.js:1287
 msgid "Decline"
 msgstr "Rechazar"

-#: ../js/ui/components/telepathyClient.js:1165
-#: ../js/ui/components/telepathyClient.js:1234
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1167
+#: ../js/ui/components/telepathyClient.js:1236
+#: ../js/ui/components/telepathyClient.js:1292
 msgid "Accept"
 msgstr "Aceptar"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1184
+#: ../js/ui/components/telepathyClient.js:1186
 #, javascript-format
 msgid "Video call from %s"
 msgstr "Videollamada de %s"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1187
+#: ../js/ui/components/telepathyClient.js:1189
 #, javascript-format
 msgid "Call from %s"
 msgstr "Llamada de %s"

 #. translators: this is a button label (verb), not a noun */
-#: ../js/ui/components/telepathyClient.js:1201
+#: ../js/ui/components/telepathyClient.js:1203
 msgid "Answer"
 msgstr "Responder"

@ -855,112 +859,112 @@ msgstr "Responder"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #. */
-#: ../js/ui/components/telepathyClient.js:1222
+#: ../js/ui/components/telepathyClient.js:1224
 #, javascript-format
 msgid "%s is sending you %s"
 msgstr "%s le está enviando %s"

 #. To translators: The parameter is the contact's alias */
-#: ../js/ui/components/telepathyClient.js:1251
+#: ../js/ui/components/telepathyClient.js:1253
 #, javascript-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicita permiso para ver cuándo está en línea"

-#: ../js/ui/components/telepathyClient.js:1337
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Network error"
 msgstr "Error de la red"

-#: ../js/ui/components/telepathyClient.js:1339
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Authentication failed"
 msgstr "Falló la autenticación"

-#: ../js/ui/components/telepathyClient.js:1341
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Encryption error"
 msgstr "Error de cifrado"

-#: ../js/ui/components/telepathyClient.js:1343
+#: ../js/ui/components/telepathyClient.js:1344
 msgid "Certificate not provided"
 msgstr "Certificado no proporcionado"

-#: ../js/ui/components/telepathyClient.js:1345
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Certificate untrusted"
 msgstr "No se confía en el certificado"

-#: ../js/ui/components/telepathyClient.js:1347
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Certificate expired"
 msgstr "Certificado caducado"

-#: ../js/ui/components/telepathyClient.js:1349
+#: ../js/ui/components/telepathyClient.js:1350
 msgid "Certificate not activated"
 msgstr "Certificado no activado"

-#: ../js/ui/components/telepathyClient.js:1351
+#: ../js/ui/components/telepathyClient.js:1352
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del servidor dle certificado no coincide"

-#: ../js/ui/components/telepathyClient.js:1353
+#: ../js/ui/components/telepathyClient.js:1354
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"

-#: ../js/ui/components/telepathyClient.js:1355
+#: ../js/ui/components/telepathyClient.js:1356
 msgid "Certificate self-signed"
 msgstr "Certificado autofirmado"

-#: ../js/ui/components/telepathyClient.js:1357
+#: ../js/ui/components/telepathyClient.js:1358
 msgid "Status is set to offline"
 msgstr "El estado está establecido a «desconectado»"

-#: ../js/ui/components/telepathyClient.js:1359
+#: ../js/ui/components/telepathyClient.js:1360
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"

-#: ../js/ui/components/telepathyClient.js:1361
+#: ../js/ui/components/telepathyClient.js:1362
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1364
 msgid "Connection has been refused"
 msgstr "Se ha rechazado la conexión"

-#: ../js/ui/components/telepathyClient.js:1365
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Connection can't be established"
 msgstr "No se puede establecer la conexión"

-#: ../js/ui/components/telepathyClient.js:1367
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Connection has been lost"
 msgstr "Se ha perdido la conexión"

-#: ../js/ui/components/telepathyClient.js:1369
+#: ../js/ui/components/telepathyClient.js:1370
 msgid "This account is already connected to the server"
 msgstr "Esta cuenta ya está conectada al servidor"

-#: ../js/ui/components/telepathyClient.js:1371
+#: ../js/ui/components/telepathyClient.js:1372
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Se ha sustituido la conexión por una nueva conexión usando el mismo recurso"

-#: ../js/ui/components/telepathyClient.js:1373
+#: ../js/ui/components/telepathyClient.js:1374
 msgid "The account already exists on the server"
 msgstr "La cuenta ya existe en el servidor"

-#: ../js/ui/components/telepathyClient.js:1375
+#: ../js/ui/components/telepathyClient.js:1376
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Actualmente el servidor está muy ocupado intentando gestionar la conexión"

-#: ../js/ui/components/telepathyClient.js:1377
+#: ../js/ui/components/telepathyClient.js:1378
 msgid "Certificate has been revoked"
 msgstr "Se ha revocado el certificado"

-#: ../js/ui/components/telepathyClient.js:1379
+#: ../js/ui/components/telepathyClient.js:1380
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificado usa un algoritmo de cifrado inseguro o es criptográficamente "
 "débil"

-#: ../js/ui/components/telepathyClient.js:1381
+#: ../js/ui/components/telepathyClient.js:1382
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -969,26 +973,26 @@ msgstr ""
 "certificado del servidor exceden los límites impuestos por la biblioteca de "
 "criptografía"

-#: ../js/ui/components/telepathyClient.js:1383
+#: ../js/ui/components/telepathyClient.js:1384
 msgid "Internal error"
 msgstr "Error interno"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1393
+#: ../js/ui/components/telepathyClient.js:1394
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"

-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1399
 msgid "View account"
 msgstr "Ver cuenta"

-#: ../js/ui/components/telepathyClient.js:1435
+#: ../js/ui/components/telepathyClient.js:1436
 msgid "Unknown reason"
 msgstr "Razón desconocida"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:154
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
 msgid "Windows"
 msgstr "Ventanas"

@ -1159,7 +1163,7 @@ msgstr "Instalar"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "¿Descargar e instalar «%s» desde extensions.gnome.org?"

-#: ../js/ui/keyboard.js:700 ../js/ui/status/keyboard.js:523
+#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:539
 msgid "Keyboard"
 msgstr "Teclado"

@ -1215,54 +1219,55 @@ msgstr "Ver fuente"
 msgid "Web Page"
 msgstr "Página web"

-#: ../js/ui/messageTray.js:1327
+#: ../js/ui/messageTray.js:1332
 msgid "Open"
 msgstr "Abrir"

-#: ../js/ui/messageTray.js:1334
+#: ../js/ui/messageTray.js:1339
 msgid "Remove"
 msgstr "Quitar"

-#: ../js/ui/messageTray.js:1631
+#: ../js/ui/messageTray.js:1636
 msgid "Notifications"
 msgstr "Notificaciones"

-#: ../js/ui/messageTray.js:1638
+#: ../js/ui/messageTray.js:1643
 msgid "Clear Messages"
 msgstr "Limpiar mensajes"

-#: ../js/ui/messageTray.js:1657
+#: ../js/ui/messageTray.js:1662
 msgid "Notification Settings"
 msgstr "Configuración de las notificaciones"

-#: ../js/ui/messageTray.js:1710
+#: ../js/ui/messageTray.js:1715
 msgid "Tray Menu"
 msgstr "Bandeja de menú"

-#: ../js/ui/messageTray.js:1934
+#: ../js/ui/messageTray.js:1939
 msgid "No Messages"
 msgstr "No hay mensajes"

-#: ../js/ui/messageTray.js:1979
+#: ../js/ui/messageTray.js:1986
 msgid "Message Tray"
 msgstr "Bandeja de mensajes"

-#: ../js/ui/messageTray.js:2992
-msgid "System Information"
-msgstr "Información del sistema"
-
-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
-msgctxt "program"
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: ../js/ui/overviewControls.js:482 ../js/ui/screenShield.js:151
+#: ../js/ui/messageTray.js:2443 ../js/ui/overviewControls.js:483
+#: ../js/ui/screenShield.js:152
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mensaje nuevo"
 msgstr[1] "%d mensajes nuevos"

+#: ../js/ui/messageTray.js:3013
+msgid "System Information"
+msgstr "Información del sistema"
+
+#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:439
+msgctxt "program"
+msgid "Unknown"
+msgstr "Desconocido"
+
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Deshacer"
@ -1279,17 +1284,17 @@ msgstr "Vista general"
 msgid "Type to search…"
 msgstr "Escribir para buscar…"

-#: ../js/ui/panel.js:515
+#: ../js/ui/panel.js:521
 msgid "Quit"
 msgstr "Salir"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:573
 msgid "Activities"
 msgstr "Actividades"

-#: ../js/ui/panel.js:918
+#: ../js/ui/panel.js:924
 msgid "Top Bar"
 msgstr "Barra superior"

@ -1315,34 +1320,34 @@ msgstr "Reiniciando…"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

-#: ../js/ui/screenShield.js:153
+#: ../js/ui/screenShield.js:154
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d notificación nueva"
 msgstr[1] "%d notificaciones nuevas"

-#: ../js/ui/screenShield.js:472 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Bloquear"

-#: ../js/ui/screenShield.js:706
+#: ../js/ui/screenShield.js:709
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME necesita bloquear la pantalla"

-#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1304
+#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1312
 msgid "Unable to lock"
 msgstr "No se pudo bloquear"

-#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1305
+#: ../js/ui/screenShield.js:837 ../js/ui/screenShield.js:1313
 msgid "Lock was blocked by an application"
 msgstr "Una aplicación impidió el bloqueo"

-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:609
 msgid "Searching…"
 msgstr "Buscando…"

-#: ../js/ui/search.js:613
+#: ../js/ui/search.js:611
 msgid "No results."
 msgstr "No se encontraron resultados."

@ -1419,9 +1424,9 @@ msgid "Bluetooth"
 msgstr "Bluetooth"

 #: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1281
-#: ../js/ui/status/network.js:1392 ../js/ui/status/rfkill.js:86
-#: ../js/ui/status/rfkill.js:114
+#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
+#: ../js/ui/status/rfkill.js:118
 msgid "Turn Off"
 msgstr "Apagar"

@ -1436,7 +1441,7 @@ msgid_plural "%d Connected Devices"
 msgstr[0] "%d dispositivo conectado"
 msgstr[1] "%d dispositivos conectados"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1309
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
 msgid "Not Connected"
 msgstr "No conectado"

@ -1444,7 +1449,7 @@ msgstr "No conectado"
 msgid "Brightness"
 msgstr "Brillo"

-#: ../js/ui/status/keyboard.js:547
+#: ../js/ui/status/keyboard.js:563
 msgid "Show Keyboard Layout"
 msgstr "Mostrar la distribución del teclado"

@ -1472,8 +1477,8 @@ msgstr "Activar"
 msgid "<unknown>"
 msgstr "<desconocido>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
-#: ../js/ui/status/network.js:1511
+#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
+#: ../js/ui/status/network.js:1512
 msgid "Off"
 msgstr "Desconectado"

@ -1491,7 +1496,7 @@ msgstr "Sin gestionar"
 msgid "Disconnecting"
 msgstr "Desconectando"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1301
+#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
 msgid "Connecting"
 msgstr "Conectando"

@ -1512,7 +1517,7 @@ msgstr "Falta el «firmware»"
 msgid "Unavailable"
 msgstr "No disponible"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1695
+#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
 msgid "Connection failed"
 msgstr "Falló la conexión"

@ -1524,7 +1529,7 @@ msgstr "Configuración de red cableada"
 msgid "Mobile Broadband Settings"
 msgstr "Configuración de banda ancha móvil"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
 msgid "Hardware Disabled"
 msgstr "Hardware desactivado"

@ -1564,60 +1569,60 @@ msgstr "Redes Wi-Fi"
 msgid "Select a network"
 msgstr "Seleccionar una red"

-#: ../js/ui/status/network.js:882
+#: ../js/ui/status/network.js:883
 msgid "No Networks"
 msgstr "No hay redes"

-#: ../js/ui/status/network.js:903 ../js/ui/status/rfkill.js:112
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
 msgid "Use hardware switch to turn off"
 msgstr "Usar el interruptor hardware para apagar"

-#: ../js/ui/status/network.js:1173
+#: ../js/ui/status/network.js:1174
 msgid "Select Network"
 msgstr "Seleccionar red"

-#: ../js/ui/status/network.js:1179
+#: ../js/ui/status/network.js:1180
 msgid "Wi-Fi Settings"
 msgstr "Configuración de Wi-Fi"

-#: ../js/ui/status/network.js:1281
+#: ../js/ui/status/network.js:1282
 msgid "Turn On"
 msgstr "Encender"

-#: ../js/ui/status/network.js:1298
+#: ../js/ui/status/network.js:1299
 msgid "Hotspot Active"
 msgstr "Punto de acceso activo"

-#: ../js/ui/status/network.js:1409
+#: ../js/ui/status/network.js:1410
 msgid "connecting..."
 msgstr "conectando…"

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1412
+#: ../js/ui/status/network.js:1413
 msgid "authentication required"
 msgstr "se necesita autenticación"

-#: ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:1415
 msgid "connection failed"
 msgstr "falló la conexión"

-#: ../js/ui/status/network.js:1480 ../js/ui/status/rfkill.js:89
+#: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
 msgid "Network Settings"
 msgstr "Configuración de la red"

-#: ../js/ui/status/network.js:1482
+#: ../js/ui/status/network.js:1483
 msgid "VPN Settings"
 msgstr "Configuración de VPN"

-#: ../js/ui/status/network.js:1501
+#: ../js/ui/status/network.js:1502
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1656
+#: ../js/ui/status/network.js:1657
 msgid "Network Manager"
 msgstr "Gestor de la red"

-#: ../js/ui/status/network.js:1696
+#: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Falló la activación de la conexión de red"

@ -1651,11 +1656,11 @@ msgstr "SAI"
 msgid "Battery"
 msgstr "Batería"

-#: ../js/ui/status/rfkill.js:83
+#: ../js/ui/status/rfkill.js:88
 msgid "Airplane Mode"
 msgstr "Modo avión"

-#: ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/rfkill.js:90
 msgid "On"
 msgstr "Encender"

@ -1699,11 +1704,11 @@ msgstr "Iniciar sesión como otro usuario"
 msgid "Unlock Window"
 msgstr "Desbloquear ventana"

-#: ../js/ui/viewSelector.js:158
+#: ../js/ui/viewSelector.js:159
 msgid "Applications"
 msgstr "Aplicaciones"

-#: ../js/ui/viewSelector.js:162
+#: ../js/ui/viewSelector.js:163
 msgid "Search"
 msgstr "Buscar"

@ -1734,6 +1739,13 @@ msgid_plural "Settings changes will revert in %d seconds"
 msgstr[0] "La configuración se revertirá en %d segundo"
 msgstr[1] "La configuración se revertirá en %d segundos"

+#. Translators: This represents the size of a window. The first number is
+#. * the width of the window and the second is the height. */
+#: ../js/ui/windowManager.js:599
+#, javascript-format
+msgid "%d x %d"
+msgstr "%d x %d"
+
 #: ../js/ui/windowMenu.js:34
 msgid "Minimize"
 msgstr "Minimizar"
@ -1818,7 +1830,7 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Listar los modos posibles"

-#: ../src/shell-app.c:666
+#: ../src/shell-app.c:680
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Falló al lanzar «%s»"
@ -1835,6 +1847,9 @@ msgstr "La contraseña no puede estar vacía"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "El usuario rechazó el diálogo de autenticación"

+#~ msgid "Captive Portal"
+#~ msgstr "Portal captivo"
+
 #~ msgid "The maximum accuracy level of location."
 #~ msgstr "El nivel máximo de precisión de la ubicación."

--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/he.po
+++ b/po/he.po
@ -10,8 +10,8 @@ msgid ""
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-13 23:32+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-24 20:00+0200\n"
 "PO-Revision-Date: 2014-11-24 20:03+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
@ -292,8 +292,8 @@ msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Delay focus changes in mouse mode until the pointer stops moving"

-#: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
-msgid "Captive Portal"
+#: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
+msgid "Network Login"
 msgstr "Network Login"

 #: ../js/extensionPrefs/main.js:123
@ -307,7 +307,7 @@ msgstr "הרחבות GNOME Shell"

 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
-#: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
+#: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "ביטול"
@ -325,20 +325,20 @@ msgctxt "button"
 msgctxt "button"
 msgid "Sign In"
 msgstr "כניסה"
-
+
 #: ../js/gdm/loginDialog.js:275
 msgid "Choose Session"
 msgstr "בחירת הפעלה"

 #. 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.
+#. manually entering the username.
 #: ../js/gdm/loginDialog.js:434
 msgid "Not listed?"
 msgstr "לא רשום?"

 #. Translators: this message is shown below the username entry field
-#. to clue the user in on how to login to the local network realm
+#. to clue the user in on how to login to the local network realm
 #: ../js/gdm/loginDialog.js:619
 #, javascript-format
 msgid "(e.g., user or %s)"
@ -346,16 +346,16 @@ msgstr "(משתמש או %s לדוגמה)"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
-#. (and don't even care of which one)
+#. (and don't even care of which one)
 #: ../js/gdm/loginDialog.js:624 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "שם משתמש:"
-
+
 #: ../js/gdm/loginDialog.js:955
 msgid "Login Window"
 msgstr "חלון כניסה"
-
+
 #: ../js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "שגיאת אימות"
@ -364,7 +364,7 @@ msgstr "שגיאת אימות"
 #. not the main auth service. Instead we use the messages
 #. as a cue to display our own message.
 #. Translators: this message is shown below the password entry field
-#. to indicate the user can swipe their finger instead
+#. to indicate the user can swipe their finger instead
 #: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(או להעביר אצבע)"
@ -389,15 +389,15 @@ msgstr "ההרצה של „%s” נכשלה:"
 #: ../js/portalHelper/main.js:85
 msgid "Web Authentication Redirect"
 msgstr "אימות ניתוב הרשת"
-
+
 #: ../js/ui/appDisplay.js:770
 msgid "Frequently used applications will appear here"
 msgstr "יישומים בשימוש תדיר יופיעו כאן"
-
+
 #: ../js/ui/appDisplay.js:881
 msgid "Frequent"
 msgstr "תדיר"
-
+
 #: ../js/ui/appDisplay.js:888
 msgid "All"
 msgstr "הכול"
@ -417,12 +417,12 @@ msgstr "הוספה למועדפים"
 #: ../js/ui/appDisplay.js:1830
 msgid "Show Details"
 msgstr "הצגת פרטים"
-
+
 #: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "‏%s נוסף למועדפים שלך."
-
+
 #: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
@ -436,17 +436,23 @@ msgstr "הגדרות"
 #: ../js/ui/backgroundMenu.js:21
 msgid "Change Background…"
 msgstr "החלפת הרקע…"
+
+#. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
+#: ../js/ui/calendar.js:39
+msgctxt "calendar-no-work"
+msgid "06"
+msgstr "65"

 #. 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:68
 msgctxt "event list time"
 msgid "All Day"
 msgstr "יום שלם"

 #. Translators: Shown in calendar event list, if 24h format,
-#. \u2236 is a ratio character, similar to :
+#. \u2236 is a ratio character, similar to :
 #: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%H∶%M"
@ -454,7 +460,7 @@ msgstr "%H:%M"

 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
-#. a thin space
+#. a thin space
 #: ../js/ui/calendar.js:84
 msgctxt "event list time"
 msgid "%l∶%M %p"
@ -464,43 +470,43 @@ msgstr "%l\\u2236%M %p"
 #. *
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
-#.
+#.
 #: ../js/ui/calendar.js:115
 msgctxt "grid sunday"
 msgid "S"
 msgstr "א"

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

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

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

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

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

-#. Translators: Calendar grid abbreviation for Saturday
+#. Translators: Calendar grid abbreviation for Saturday
 #: ../js/ui/calendar.js:127
 msgctxt "grid saturday"
 msgid "S"
@ -511,85 +517,83 @@ msgstr "ש"
 #. * NOTE: These list abbreviations are normally not shown together
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
-#.
+#.
 #: ../js/ui/calendar.js:140
 msgctxt "list sunday"
 msgid "Su"
 msgstr "א׳"

-#. Translators: Event list abbreviation for Monday
+#. Translators: Event list abbreviation for Monday
 #: ../js/ui/calendar.js:142
 msgctxt "list monday"
 msgid "M"
 msgstr "ב׳"

-#. Translators: Event list abbreviation for Tuesday
+#. Translators: Event list abbreviation for Tuesday
 #: ../js/ui/calendar.js:144
 msgctxt "list tuesday"
 msgid "T"
 msgstr "ג׳"

-#. Translators: Event list abbreviation for Wednesday
+#. Translators: Event list abbreviation for Wednesday
 #: ../js/ui/calendar.js:146
 msgctxt "list wednesday"
 msgid "W"
 msgstr "ד׳"

-#. Translators: Event list abbreviation for Thursday
+#. Translators: Event list abbreviation for Thursday
 #: ../js/ui/calendar.js:148
 msgctxt "list thursday"
 msgid "Th"
 msgstr "ה"

-#. Translators: Event list abbreviation for Friday
+#. Translators: Event list abbreviation for Friday
 #: ../js/ui/calendar.js:150
 msgctxt "list friday"
 msgid "F"
 msgstr "ו׳"

-#. Translators: Event list abbreviation for Saturday
+#. Translators: Event list abbreviation for Saturday
 #: ../js/ui/calendar.js:152
 msgctxt "list saturday"
 msgid "S"
 msgstr "ש׳"
-
+
 #: ../js/ui/calendar.js:461
 msgid "Previous month"
 msgstr "חודש קודם"
-
+
 #: ../js/ui/calendar.js:471
 msgid "Next month"
 msgstr "חודש הבא"

-#. Translators: Text to show if there are no events
+#. Translators: Text to show if there are no events
 #: ../js/ui/calendar.js:806
 msgid "Nothing Scheduled"
 msgstr "היומן ריק"
-
-#. Translators: Shown on calendar heading when selected day occurs on current year
+
 #: ../js/ui/calendar.js:825
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, ה־%e ב%B"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
+
 #: ../js/ui/calendar.js:829
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, ה־%e ב%B, %Y"
-
+
 #: ../js/ui/calendar.js:841
 msgid "Today"
 msgstr "היום"
-
+
 #: ../js/ui/calendar.js:845
 msgid "Tomorrow"
 msgstr "מחר"
-
+
 #: ../js/ui/calendar.js:856
 msgid "This week"
 msgstr "השבוע"
-
+
 #: ../js/ui/calendar.js:864
 msgid "Next week"
 msgstr "בשבוע הבא"
@ -623,7 +627,7 @@ msgid "Type again:"
 msgid "Type again:"
 msgstr "נא להקליד שוב:"

-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
 #: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "התחברות"
@ -719,47 +723,47 @@ msgstr "פעולה זו לא הצליחה, נא לנסות שוב. עמך הסל
 msgstr "פעולה זו לא הצליחה, נא לנסות שוב. עמך הסליחה."

 #. FIXME: We don't have a 'chat room' icon (bgo #653737) use
-#. system-users for now as Empathy does.
+#. system-users for now as Empathy does.
 #: ../js/ui/components/telepathyClient.js:242
 msgid "Invitation"
 msgstr "הזמנה"

-#. We got the TpContact
+#. We got the TpContact
 #: ../js/ui/components/telepathyClient.js:302
 msgid "Call"
 msgstr "התקשרות"

-#. We got the TpContact
+#. We got the TpContact
 #: ../js/ui/components/telepathyClient.js:318
 msgid "File Transfer"
 msgstr "העברת קבצים"
-
+
 #: ../js/ui/components/telepathyClient.js:422
 msgid "Chat"
 msgstr "שיחה"
-
+
 #: ../js/ui/components/telepathyClient.js:485
 msgid "Unmute"
 msgstr "ביטול ההשתקה"
-
+
 #: ../js/ui/components/telepathyClient.js:485
 msgid "Mute"
 msgstr "השתקה"

-#. Translators: Time in 24h format
+#. Translators: Time in 24h format
 #: ../js/ui/components/telepathyClient.js:955
 msgid "%H∶%M"
 msgstr "%H:%M"

 #. Translators: this is the word "Yesterday" followed by a
-#. time string in 24h format. i.e. "Yesterday, 14:30"
+#. time string in 24h format. i.e. "Yesterday, 14:30"
 #: ../js/ui/components/telepathyClient.js:962
 #, no-c-format
 msgid "Yesterday, %H∶%M"
 msgstr "אתמול, %H\\u2236%M"

 #. Translators: this is the week day name followed by a time
-#. string in 24h format. i.e. "Monday, 14:30"
+#. string in 24h format. i.e. "Monday, 14:30"
 #: ../js/ui/components/telepathyClient.js:969
 #, no-c-format
 msgid "%A, %H∶%M"
@ -767,7 +771,7 @@ msgstr "%A, %H:%M"

 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
-#. i.e. "May 25, 14:30"
+#. i.e. "May 25, 14:30"
 #: ../js/ui/components/telepathyClient.js:976
 #, no-c-format
 msgid "%B %d, %H∶%M"
@ -775,26 +779,26 @@ msgstr "%d ב%B, %H:%M"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
-#. i.e. "May 25 2012, 14:30"
+#. i.e. "May 25 2012, 14:30"
 #: ../js/ui/components/telepathyClient.js:982
 #, no-c-format
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d ב%B, %H:%M"

-#. Translators: Time in 24h format
+#. Translators: Time in 24h format
 #: ../js/ui/components/telepathyClient.js:988
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"

 #. Translators: this is the word "Yesterday" followed by a
-#. time string in 12h format. i.e. "Yesterday, 2:30 pm"
+#. time string in 12h format. i.e. "Yesterday, 2:30 pm"
 #: ../js/ui/components/telepathyClient.js:995
 #, no-c-format
 msgid "Yesterday, %l∶%M %p"
 msgstr "אתמול, %l\\u2236%M %p"

 #. Translators: this is the week day name followed by a time
-#. string in 12h format. i.e. "Monday, 2:30 pm"
+#. string in 12h format. i.e. "Monday, 2:30 pm"
 #: ../js/ui/components/telepathyClient.js:1002
 #, no-c-format
 msgid "%A, %l∶%M %p"
@ -802,7 +806,7 @@ msgstr "%l:%M %p"

 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
-#. i.e. "May 25, 2:30 pm"
+#. i.e. "May 25, 2:30 pm"
 #: ../js/ui/components/telepathyClient.js:1009
 #, no-c-format
 msgid "%B %d, %l∶%M %p"
@ -810,21 +814,21 @@ msgstr "%d ב%B, %H:%M"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
-#. i.e. "May 25 2012, 2:30 pm"
+#. i.e. "May 25 2012, 2:30 pm"
 #: ../js/ui/components/telepathyClient.js:1015
 #, no-c-format
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d ב%B %Y, %l\\u2236%M %p"

 #. Translators: this is the other person changing their old IM name to their new
-#. IM name.
+#. IM name.
 #: ../js/ui/components/telepathyClient.js:1047
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "השם של %s הוחלף ל־%s"

 #. translators: argument is a room name like
-#. * room@jabber.org for example.
+#. * room@jabber.org for example.
 #: ../js/ui/components/telepathyClient.js:1151
 #, javascript-format
 msgid "Invitation to %s"
@ -832,38 +836,38 @@ msgstr "הזמנה ל־%s"

 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
-#. * for example.
+#. * for example.
 #: ../js/ui/components/telepathyClient.js:1159
 #, javascript-format
 msgid "%s is inviting you to join %s"
 msgstr "הוזמנת על ידי %s להצטרף אל %s"
-
-#: ../js/ui/components/telepathyClient.js:1159
-#: ../js/ui/components/telepathyClient.js:1194
-#: ../js/ui/components/telepathyClient.js:1228
+
+#: ../js/ui/components/telepathyClient.js:1161
+#: ../js/ui/components/telepathyClient.js:1196
+#: ../js/ui/components/telepathyClient.js:1230
 #: ../js/ui/components/telepathyClient.js:1287
 msgid "Decline"
 msgstr "דחייה"
-
-#: ../js/ui/components/telepathyClient.js:1165
-#: ../js/ui/components/telepathyClient.js:1234
+
+#: ../js/ui/components/telepathyClient.js:1167
+#: ../js/ui/components/telepathyClient.js:1236
 #: ../js/ui/components/telepathyClient.js:1292
 msgid "Accept"
 msgstr "אישור"

-#. translators: argument is a contact name like Alice for example.
+#. translators: argument is a contact name like Alice for example.
 #: ../js/ui/components/telepathyClient.js:1186
 #, javascript-format
 msgid "Video call from %s"
 msgstr "שיחת וידאו מאת %s"

-#. translators: argument is a contact name like Alice for example.
+#. translators: argument is a contact name like Alice for example.
 #: ../js/ui/components/telepathyClient.js:1189
 #, javascript-format
 msgid "Call from %s"
 msgstr "שיחה מאת %s"

-#. translators: this is a button label (verb), not a noun
+#. translators: this is a button label (verb), not a noun
 #: ../js/ui/components/telepathyClient.js:1203
 msgid "Answer"
 msgstr "מענה"
@ -872,108 +876,108 @@ msgstr "מענה"
 #. * the contact's alias and the second one is the
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
-#.
+#.
 #: ../js/ui/components/telepathyClient.js:1224
 #, javascript-format
 msgid "%s is sending you %s"
 msgstr "‏%s שולח/ת אליך %s"

-#. To translators: The parameter is the contact's alias
+#. To translators: The parameter is the contact's alias
 #: ../js/ui/components/telepathyClient.js:1253
 #, javascript-format
 msgid "%s would like permission to see when you are online"
 msgstr "‏%s רוצה לקבל הרשאות כדי לראות מתי מצבך הוא מקוון"
-
+
 #: ../js/ui/components/telepathyClient.js:1338
 msgid "Network error"
 msgstr "שגיאת רשת"
-
+
 #: ../js/ui/components/telepathyClient.js:1340
 msgid "Authentication failed"
 msgstr "האימות נכשל"
-
+
 #: ../js/ui/components/telepathyClient.js:1342
 msgid "Encryption error"
 msgstr "שגיאת הצפנה"
-
+
 #: ../js/ui/components/telepathyClient.js:1344
 msgid "Certificate not provided"
 msgstr "לא סופק אישור"
-
+
 #: ../js/ui/components/telepathyClient.js:1346
 msgid "Certificate untrusted"
 msgstr "האישור אינו מהימן"
-
+
 #: ../js/ui/components/telepathyClient.js:1348
 msgid "Certificate expired"
 msgstr "האישור פג"
-
+
 #: ../js/ui/components/telepathyClient.js:1350
 msgid "Certificate not activated"
 msgstr "האישור לא מופעל"
-
+
 #: ../js/ui/components/telepathyClient.js:1352
 msgid "Certificate hostname mismatch"
 msgstr "שם המארח באישור אינו תואם"
-
+
 #: ../js/ui/components/telepathyClient.js:1354
 msgid "Certificate fingerprint mismatch"
 msgstr "חוסר התאמה בטביעת האצבע של האישור"
-
+
 #: ../js/ui/components/telepathyClient.js:1356
 msgid "Certificate self-signed"
 msgstr "אישור בחתימה עצמית"
-
+
 #: ../js/ui/components/telepathyClient.js:1358
 msgid "Status is set to offline"
 msgstr "המצב הוגדר ל'מנותק'"
-
+
 #: ../js/ui/components/telepathyClient.js:1360
 msgid "Encryption is not available"
 msgstr "ההצפנה אינה זמינה"
-
+
 #: ../js/ui/components/telepathyClient.js:1362
 msgid "Certificate is invalid"
 msgstr "האישור אינו תקף"
-
+
 #: ../js/ui/components/telepathyClient.js:1364
 msgid "Connection has been refused"
 msgstr "ההתחברות נשללה"
-
+
 #: ../js/ui/components/telepathyClient.js:1366
 msgid "Connection can't be established"
 msgstr "לא ניתן להפעיל את החיבור"
-
+
 #: ../js/ui/components/telepathyClient.js:1368
 msgid "Connection has been lost"
 msgstr "החיבור אבד"
-
+
 #: ../js/ui/components/telepathyClient.js:1370
 msgid "This account is already connected to the server"
 msgstr "חשבון זה כבר מחובר לשרת"
-
+
 #: ../js/ui/components/telepathyClient.js:1372
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "החיבור הוחלף בחיבור חדש באמצעות אותו המשאב"
-
+
 #: ../js/ui/components/telepathyClient.js:1374
 msgid "The account already exists on the server"
 msgstr "החשבון כבר קיים בשרת"
-
+
 #: ../js/ui/components/telepathyClient.js:1376
 msgid "Server is currently too busy to handle the connection"
 msgstr "השרת עסוק ברגע זה מכדי לטפל בחיבור"
-
+
 #: ../js/ui/components/telepathyClient.js:1378
 msgid "Certificate has been revoked"
 msgstr "האישור נשלל"
-
+
 #: ../js/ui/components/telepathyClient.js:1380
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "האישור משתמש באלגוריתם הצפנה שאינו בטוח או חלש מבחינת הצפנה"
-
+
 #: ../js/ui/components/telepathyClient.js:1382
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
@ -981,22 +985,22 @@ msgstr ""
 msgstr ""
 "אורך אישור השרת, או עומק שרשרת אישור השרת, חורגים מהמגבלות שנכפו על ידי "
 "ספריית ההצפנה"
-
+
 #: ../js/ui/components/telepathyClient.js:1384
 msgid "Internal error"
 msgstr "שגיאה פנימית"

 #. translators: argument is the account name, like
-#. * name@jabber.org for example.
+#. * name@jabber.org for example.
 #: ../js/ui/components/telepathyClient.js:1394
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "לא ניתן להתחבר אל %s"
-
+
 #: ../js/ui/components/telepathyClient.js:1399
 msgid "View account"
 msgstr "צפייה בחשבון"
-
+
 #: ../js/ui/components/telepathyClient.js:1436
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
@ -1014,22 +1018,22 @@ msgstr "הצגת יישומים"
 #: ../js/ui/dash.js:445
 msgid "Dash"
 msgstr "חלונית"
-
+
 #: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "פתיחת היומן"
-
+
 #: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "פתיחת השעונים"
-
+
 #: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "הגדרות תאריך ושעה"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
-#.
+#.
 #: ../js/ui/dateMenu.js:132
 msgid "%A %B %e, %Y"
 msgstr "%A ה־%e ב%B, %Y"
@ -1168,7 +1172,7 @@ msgstr "התקנה"
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "הורדה והתקנה של „%s” מ־extensions.gnome.org?"
-
+
 #: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:539
 msgid "Keyboard"
 msgstr "מקלדת"
@ -1224,39 +1228,48 @@ msgstr "צפייה במקור"
 #: ../js/ui/lookingGlass.js:758
 msgid "Web Page"
 msgstr "דף אינטרנט"
-
+
 #: ../js/ui/messageTray.js:1332
 msgid "Open"
 msgstr "פתיחה"
-
+
 #: ../js/ui/messageTray.js:1339
 msgid "Remove"
 msgstr "הסרה"
-
+
 #: ../js/ui/messageTray.js:1636
 msgid "Notifications"
 msgstr "התרעות"
-
+
 #: ../js/ui/messageTray.js:1643
 msgid "Clear Messages"
 msgstr "פינוי ההודעות"
-
+
 #: ../js/ui/messageTray.js:1662
 msgid "Notification Settings"
 msgstr "הגדרות התרעה"
-
+
 #: ../js/ui/messageTray.js:1715
 msgid "Tray Menu"
 msgstr "תפריט מגש"
-
+
 #: ../js/ui/messageTray.js:1939
 msgid "No Messages"
 msgstr "אין הודעות"
-
+
 #: ../js/ui/messageTray.js:1984
 msgid "Message Tray"
 msgstr "אזור דיווח ההודעות"
-
+
+# javascript-format
+#: ../js/ui/messageTray.js:2441 ../js/ui/overviewControls.js:483
+#: ../js/ui/screenShield.js:152
+#, c-format
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "הודעה חדשה אחת"
+msgstr[1] "%d הודעות חדשות"
+
 #: ../js/ui/messageTray.js:3011
 msgid "System Information"
 msgstr "פרטי המערכת"
@ -1265,14 +1278,6 @@ msgctxt "program"
 msgctxt "program"
 msgid "Unknown"
 msgstr "לא ידוע"
-
-# javascript-format
-#: ../js/ui/overviewControls.js:482 ../js/ui/screenShield.js:151
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "הודעה חדשה אחת"
-msgstr[1] "%d הודעות חדשות"

 #: ../js/ui/overview.js:84
 msgid "Undo"
@ -1331,18 +1336,18 @@ msgid "%A, %B %d"
 msgid "%A, %B %d"
 msgstr "%A, ה־%d ב%B"

-# javascript-format
+# javascript-format
 #: ../js/ui/screenShield.js:154
 #, c-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "התרעה חדשה אחת"
 msgstr[1] "%d התרעות חדשות"
-
+
 #: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "נעילה"
-
+
 #: ../js/ui/screenShield.js:709
 msgid "GNOME needs to lock the screen"
 msgstr "על GNOME לנעול את המסך"
@ -1353,19 +1358,19 @@ msgstr "על GNOME לנעול את המסך"
 #. Just tell him to stop using this app
 #.
 #. XXX: another option is to kick the user into the gdm login
-#. screen, where we're not affected by grabs
+#. screen, where we're not affected by grabs
 #: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1312
 msgid "Unable to lock"
 msgstr "לא ניתן לנעול"
-
+
 #: ../js/ui/screenShield.js:837 ../js/ui/screenShield.js:1313
 msgid "Lock was blocked by an application"
 msgstr "הנעילה נחסמה ע״י היישום"
-
+
 #: ../js/ui/search.js:611
 msgid "Searching…"
 msgstr "בחיפוש…"
-
+
 #: ../js/ui/search.js:613
 msgid "No results."
 msgstr "אין תוצאות."
@ -1444,9 +1449,9 @@ msgid "Bluetooth"
 msgid "Bluetooth"
 msgstr "Bluetooth"

-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1281
-#: ../js/ui/status/network.js:1392 ../js/ui/status/rfkill.js:86
+#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
+#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
 #: ../js/ui/status/rfkill.js:118
 msgid "Turn Off"
 msgstr "כיבוי"
@ -1462,7 +1467,7 @@ msgid_plural "%d Connected Devices"
 msgid_plural "%d Connected Devices"
 msgstr[0] "התקן אחד מחובר"
 msgstr[1] "%d התקנים מחוברים"
-
+
 #: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
 msgid "Not Connected"
 msgstr "לא מחובר"
@ -1470,7 +1475,7 @@ msgstr "לא מחובר"
 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
 msgstr "בהירות"
-
+
 #: ../js/ui/status/keyboard.js:563
 msgid "Show Keyboard Layout"
 msgstr "הצגת פריסת המקלדת"
@ -1498,8 +1503,8 @@ msgstr "אפשור"
 #: ../js/ui/status/network.js:101
 msgid "<unknown>"
 msgstr "<לא ידוע>"
-
-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
+
+#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
 #: ../js/ui/status/network.js:1512
 msgid "Off"
 msgstr "כבוי"
@ -1517,7 +1522,7 @@ msgstr "לא מנוהל"
 #: ../js/ui/status/network.js:465
 msgid "Disconnecting"
 msgstr "בהליכי ניתוק"
-
+
 #: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
 msgid "Connecting"
 msgstr "בהתחברות"
@ -1538,7 +1543,7 @@ msgstr "הקושחה חסרה"
 #: ../js/ui/status/network.js:486
 msgid "Unavailable"
 msgstr "לא זמין"
-
+
 #: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
 msgid "Connection failed"
 msgstr "ההתחברות נכשלה"
@ -1550,7 +1555,7 @@ msgstr "הגדרות רשת קווית"
 #: ../js/ui/status/network.js:546 ../js/ui/status/network.js:624
 msgid "Mobile Broadband Settings"
 msgstr "הגדרות פס־רחב נייד"
-
+
 #: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
 msgid "Hardware Disabled"
 msgstr "מנוטרל חומרתית"
@ -1590,60 +1595,60 @@ msgstr "רשתות אלחוטיות"
 #: ../js/ui/status/network.js:853
 msgid "Select a network"
 msgstr "בחירת רשת"
-
+
 #: ../js/ui/status/network.js:883
 msgid "No Networks"
 msgstr "אין רשתות"
-
+
 #: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
 msgid "Use hardware switch to turn off"
 msgstr "שימוש במתג של החומרה לכיבוי"
-
+
 #: ../js/ui/status/network.js:1174
 msgid "Select Network"
 msgstr "בחירת רשת"
-
+
 #: ../js/ui/status/network.js:1180
 msgid "Wi-Fi Settings"
 msgstr "הגדרות רשת אלחוטית"
-
+
 #: ../js/ui/status/network.js:1282
 msgid "Turn On"
 msgstr "הפעלה"
-
+
 #: ../js/ui/status/network.js:1299
 msgid "Hotspot Active"
 msgstr "נקודה חמה פעילה"
-
+
 #: ../js/ui/status/network.js:1410
 msgid "connecting..."
 msgstr "בהתחברות..."

-#. Translators: this is for network connections that require some kind of key or password
+#. Translators: this is for network connections that require some kind of key or password
 #: ../js/ui/status/network.js:1413
 msgid "authentication required"
 msgstr "נדרש אימות"
-
+
 #: ../js/ui/status/network.js:1415
 msgid "connection failed"
 msgstr "ההתחברות נכשלה"
-
+
 #: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
 msgid "Network Settings"
 msgstr "הגדרות הרשת"
-
+
 #: ../js/ui/status/network.js:1483
 msgid "VPN Settings"
 msgstr "הגדרות VPN"
-
+
 #: ../js/ui/status/network.js:1502
 msgid "VPN"
 msgstr "VPN"
-
+
 #: ../js/ui/status/network.js:1657
 msgid "Network Manager"
 msgstr "מנהל הרשתות"
-
+
 #: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "הפעלת חיבור הרשת נכשלה"
@ -1684,11 +1689,11 @@ msgstr "סוללה"

 #. 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.
+#. changing the menu contents.
 #: ../js/ui/status/rfkill.js:88
 msgid "Airplane Mode"
 msgstr "מצב טיסה"
-
+
 #: ../js/ui/status/rfkill.js:90
 msgid "On"
 msgstr "פועל"
@ -1867,6 +1872,9 @@ msgstr "הססמה לא יכולה להישאר ריקה"
 #: ../src/shell-polkit-authentication-agent.c:346
 msgid "Authentication dialog was dismissed by the user"
 msgstr "המשתמש בחר להתעלם מתיבת דו־שיח האימות"
+
+#~ msgid "Captive Portal"
+#~ msgstr "Captive Portal"

 #~ msgid "The maximum accuracy level of location."
 #~ msgstr "The maximum accuracy level of location."
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
@ -10,8 +10,8 @@ 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: 2014-09-13 07:37+0000\n"
-"PO-Revision-Date: 2014-09-13 19:20+0700\n"
+"POT-Creation-Date: 2014-12-23 20:37+0000\n"
+"PO-Revision-Date: 2014-12-24 11:51+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.7.1\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@ -301,8 +301,8 @@ msgstr ""
 "Tunda perubahan fokus dalam mode tetikus sampai penunjuk berhenti bergerak"

 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
-msgid "Captive Portal"
-msgstr "Portal Captive"
+msgid "Network Login"
+msgstr "Log Masuk Jaringan"

 #: ../js/extensionPrefs/main.js:123
 #, javascript-format
@ -316,7 +316,7 @@ msgstr "Ekstensi GNOME Shell"
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:915
+#: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Batal"

@ -334,33 +334,33 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Masuk"

-#: ../js/gdm/loginDialog.js:269
+#: ../js/gdm/loginDialog.js:276
 msgid "Choose Session"
 msgstr "Pilih Sesi"

-#: ../js/gdm/loginDialog.js:429
+#: ../js/gdm/loginDialog.js:428
 msgid "Not listed?"
 msgstr "Tak masuk daftar?"

-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:814
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(cth., pengguna dari %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:819 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "Nama pengguna: "

-#: ../js/gdm/loginDialog.js:922
+#: ../js/gdm/loginDialog.js:1151
 msgid "Login Window"
 msgstr "Jendela Log Masuk"

-#: ../js/gdm/util.js:323
+#: ../js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "Galat otentikasi"

-#: ../js/gdm/util.js:453
+#: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(atau gesekkan jari)"

@ -381,15 +381,15 @@ msgstr "Eksekusi \"%s\" gagal:"
 msgid "Web Authentication Redirect"
 msgstr "Pengalihan Otentikasi Web"

-#: ../js/ui/appDisplay.js:772
+#: ../js/ui/appDisplay.js:770
 msgid "Frequently used applications will appear here"
 msgstr "Aplikasi yang sering dipakai akan muncul di sini"

-#: ../js/ui/appDisplay.js:883
+#: ../js/ui/appDisplay.js:881
 msgid "Frequent"
 msgstr "Sering"

-#: ../js/ui/appDisplay.js:890
+#: ../js/ui/appDisplay.js:888
 msgid "All"
 msgstr "Semua"

@ -409,17 +409,17 @@ msgstr "Tambah ke Favorit"
 msgid "Show Details"
 msgstr "Tampilkan Rincian"

-#: ../js/ui/appFavorites.js:124
+#: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s telah ditambahkan ke favorit Anda."

-#: ../js/ui/appFavorites.js:158
+#: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s telah dihapus dari favorit Anda."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:813
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:819
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Pengaturan"
@ -428,17 +428,23 @@ msgstr "Pengaturan"
 msgid "Change Background…"
 msgstr "Ubah Latar…"

+#. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
+#: ../js/ui/calendar.js:39
+msgctxt "calendar-no-work"
+msgid "06"
+msgstr "06"
+
 #. 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:67
+#: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Sepanjang Hari"

 #. Translators: Shown in calendar event list, if 24h format,
 #. \u2236 is a ratio character, similar to : */
-#: ../js/ui/calendar.js:73
+#: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%H∶%M"
 msgstr "%H∶%M"
@ -446,7 +452,7 @@ msgstr "%H∶%M"
 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:84
 msgctxt "event list time"
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
@ -456,43 +462,43 @@ msgstr "%l∶%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:113
+#: ../js/ui/calendar.js:98
 msgctxt "grid sunday"
 msgid "S"
 msgstr "M"

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

 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:117
+#: ../js/ui/calendar.js:102
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:104
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "R"

 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:106
 msgctxt "grid thursday"
 msgid "T"
 msgstr "K"

 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:108
 msgctxt "grid friday"
 msgid "F"
 msgstr "J"

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:110
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
@ -503,85 +509,83 @@ msgstr "S"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #. */
-#: ../js/ui/calendar.js:138
+#: ../js/ui/calendar.js:123
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Min"

 #. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:140
+#: ../js/ui/calendar.js:125
 msgctxt "list monday"
 msgid "M"
 msgstr "Sen"

 #. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:127
 msgctxt "list tuesday"
 msgid "T"
 msgstr "Sel"

 #. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:129
 msgctxt "list wednesday"
 msgid "W"
 msgstr "Rab"

 #. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:131
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Kam"

 #. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:133
 msgctxt "list friday"
 msgid "F"
 msgstr "Jum"

 #. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:135
 msgctxt "list saturday"
 msgid "S"
 msgstr "Sab"

-#: ../js/ui/calendar.js:453
+#: ../js/ui/calendar.js:460
 msgid "Previous month"
 msgstr "Bulan sebelumnya"

-#: ../js/ui/calendar.js:463
+#: ../js/ui/calendar.js:470
 msgid "Next month"
 msgstr "Bulan selanjutnya"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:805
 msgid "Nothing Scheduled"
 msgstr "Tak Ada Jadwal"

-#. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:799
+#: ../js/ui/calendar.js:824
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:802
+#: ../js/ui/calendar.js:828
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"

-#: ../js/ui/calendar.js:813
+#: ../js/ui/calendar.js:840
 msgid "Today"
 msgstr "Hari ini"

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:844
 msgid "Tomorrow"
 msgstr "Besok"

-#: ../js/ui/calendar.js:828
+#: ../js/ui/calendar.js:855
 msgid "This week"
 msgstr "Minggu ini"

-#: ../js/ui/calendar.js:836
+#: ../js/ui/calendar.js:863
 msgid "Next week"
 msgstr "Minggu depan"

@ -615,7 +619,7 @@ msgid "Type again:"
 msgstr "Ketik lagi:"

 #: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:918
+#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Sambung"

@ -709,102 +713,102 @@ msgstr "Otentikasi"
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Maaf, tidak berhasil. Silakan coba lagi."

-#: ../js/ui/components/telepathyClient.js:240
+#: ../js/ui/components/telepathyClient.js:242
 msgid "Invitation"
 msgstr "Undangan"

-#: ../js/ui/components/telepathyClient.js:300
+#: ../js/ui/components/telepathyClient.js:302
 msgid "Call"
 msgstr "Panggil"

-#: ../js/ui/components/telepathyClient.js:316
+#: ../js/ui/components/telepathyClient.js:318
 msgid "File Transfer"
 msgstr "Transfer Berkas"

-#: ../js/ui/components/telepathyClient.js:420
+#: ../js/ui/components/telepathyClient.js:422
 msgid "Chat"
 msgstr "Obrolan"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Unmute"
 msgstr "Bersuara"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Mute"
 msgstr "Bisu"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:953
+#: ../js/ui/components/telepathyClient.js:955
 msgid "%H∶%M"
 msgstr "%H∶%M"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:960
+#: ../js/ui/components/telepathyClient.js:962
 msgid "Yesterday, %H∶%M"
 msgstr "Kemarin, %H:%M"

 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:967
+#: ../js/ui/components/telepathyClient.js:969
 msgid "%A, %H∶%M"
 msgstr "%A, %H∶%M"

 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
-#: ../js/ui/components/telepathyClient.js:974
+#: ../js/ui/components/telepathyClient.js:976
 msgid "%B %d, %H∶%M"
 msgstr "%d %B, %H∶%M"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30" */
-#: ../js/ui/components/telepathyClient.js:980
+#: ../js/ui/components/telepathyClient.js:982
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d %B %Y, %H∶%M"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:986
+#: ../js/ui/components/telepathyClient.js:988
 msgid "%l∶%M %p"
 msgstr "%H∶%M"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:993
+#: ../js/ui/components/telepathyClient.js:995
 msgid "Yesterday, %l∶%M %p"
 msgstr "Kemarin, %l∶%M %p"

 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1000
+#: ../js/ui/components/telepathyClient.js:1002
 msgid "%A, %l∶%M %p"
 msgstr "%A, %l∶%M %p"

 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1007
+#: ../js/ui/components/telepathyClient.js:1009
 msgid "%B %d, %l∶%M %p"
 msgstr "%d %B, %l∶%M %p"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"*/
-#: ../js/ui/components/telepathyClient.js:1013
+#: ../js/ui/components/telepathyClient.js:1015
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d %B %Y, %l∶%M %p"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:1045
+#: ../js/ui/components/telepathyClient.js:1047
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s sekarang dikenal sebagai %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1149
+#: ../js/ui/components/telepathyClient.js:1151
 #, javascript-format
 msgid "Invitation to %s"
 msgstr "Undangan ke %s"
@ -812,38 +816,38 @@ msgstr "Undangan ke %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example. */
-#: ../js/ui/components/telepathyClient.js:1157
+#: ../js/ui/components/telepathyClient.js:1159
 #, javascript-format
 msgid "%s is inviting you to join %s"
 msgstr "%s mengundang Anda untuk bergabung dengan %s"

-#: ../js/ui/components/telepathyClient.js:1159
-#: ../js/ui/components/telepathyClient.js:1194
-#: ../js/ui/components/telepathyClient.js:1228
-#: ../js/ui/components/telepathyClient.js:1286
+#: ../js/ui/components/telepathyClient.js:1161
+#: ../js/ui/components/telepathyClient.js:1196
+#: ../js/ui/components/telepathyClient.js:1230
+#: ../js/ui/components/telepathyClient.js:1287
 msgid "Decline"
 msgstr "Tolak"

-#: ../js/ui/components/telepathyClient.js:1165
-#: ../js/ui/components/telepathyClient.js:1234
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1167
+#: ../js/ui/components/telepathyClient.js:1236
+#: ../js/ui/components/telepathyClient.js:1292
 msgid "Accept"
 msgstr "Terima"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1184
+#: ../js/ui/components/telepathyClient.js:1186
 #, javascript-format
 msgid "Video call from %s"
 msgstr "Panggilan video dari %s"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1187
+#: ../js/ui/components/telepathyClient.js:1189
 #, javascript-format
 msgid "Call from %s"
 msgstr "Panggilan dari %s"

 #. translators: this is a button label (verb), not a noun */
-#: ../js/ui/components/telepathyClient.js:1201
+#: ../js/ui/components/telepathyClient.js:1203
 msgid "Answer"
 msgstr "Jawab"

@ -852,111 +856,111 @@ msgstr "Jawab"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #. */
-#: ../js/ui/components/telepathyClient.js:1222
+#: ../js/ui/components/telepathyClient.js:1224
 #, javascript-format
 msgid "%s is sending you %s"
 msgstr "%s sedang mengirimi Anda %s"

 #. To translators: The parameter is the contact's alias */
-#: ../js/ui/components/telepathyClient.js:1251
+#: ../js/ui/components/telepathyClient.js:1253
 #, javascript-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ingin minta izin melihat Anda ketika Anda daring"

-#: ../js/ui/components/telepathyClient.js:1337
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Network error"
 msgstr "Galat jaringan"

-#: ../js/ui/components/telepathyClient.js:1339
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Authentication failed"
 msgstr "Otentikasi gagal"

-#: ../js/ui/components/telepathyClient.js:1341
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Encryption error"
 msgstr "Galat enkripsi"

-#: ../js/ui/components/telepathyClient.js:1343
+#: ../js/ui/components/telepathyClient.js:1344
 msgid "Certificate not provided"
 msgstr "Sertifikat tidak disediakan"

-#: ../js/ui/components/telepathyClient.js:1345
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Certificate untrusted"
 msgstr "Sertifikat tidak dipercaya"

-#: ../js/ui/components/telepathyClient.js:1347
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Certificate expired"
 msgstr "Sertifikat kadaluarsa"

-#: ../js/ui/components/telepathyClient.js:1349
+#: ../js/ui/components/telepathyClient.js:1350
 msgid "Certificate not activated"
 msgstr "Sertifikat tidak diaktifkan"

-#: ../js/ui/components/telepathyClient.js:1351
+#: ../js/ui/components/telepathyClient.js:1352
 msgid "Certificate hostname mismatch"
 msgstr "Nama host sertifikat tidak cocok"

-#: ../js/ui/components/telepathyClient.js:1353
+#: ../js/ui/components/telepathyClient.js:1354
 msgid "Certificate fingerprint mismatch"
 msgstr "Sidik jari sertifikat tidak cocok"

-#: ../js/ui/components/telepathyClient.js:1355
+#: ../js/ui/components/telepathyClient.js:1356
 msgid "Certificate self-signed"
 msgstr "Sertifikat ditandatangani sendiri"

-#: ../js/ui/components/telepathyClient.js:1357
+#: ../js/ui/components/telepathyClient.js:1358
 msgid "Status is set to offline"
 msgstr "Status diatur ke luring"

-#: ../js/ui/components/telepathyClient.js:1359
+#: ../js/ui/components/telepathyClient.js:1360
 msgid "Encryption is not available"
 msgstr "Enkripsi tidak tersedia"

-#: ../js/ui/components/telepathyClient.js:1361
+#: ../js/ui/components/telepathyClient.js:1362
 msgid "Certificate is invalid"
 msgstr "Sertifikat tidak valid"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1364
 msgid "Connection has been refused"
 msgstr "Koneksi telah ditolak"

-#: ../js/ui/components/telepathyClient.js:1365
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Connection can't be established"
 msgstr "Koneksi tak dapat dijalin"

-#: ../js/ui/components/telepathyClient.js:1367
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Connection has been lost"
 msgstr "Koneksi telah terputus"

-#: ../js/ui/components/telepathyClient.js:1369
+#: ../js/ui/components/telepathyClient.js:1370
 msgid "This account is already connected to the server"
 msgstr "Akun ini telah tersambung pada server"

-#: ../js/ui/components/telepathyClient.js:1371
+#: ../js/ui/components/telepathyClient.js:1372
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Koneksi telah digantikan oleh koneksi baru memakai sumberdaya yang sama"

-#: ../js/ui/components/telepathyClient.js:1373
+#: ../js/ui/components/telepathyClient.js:1374
 msgid "The account already exists on the server"
 msgstr "Akun ini sudah ada di server"

-#: ../js/ui/components/telepathyClient.js:1375
+#: ../js/ui/components/telepathyClient.js:1376
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server kini terlalu sibuk untuk menangani koneksi"

-#: ../js/ui/components/telepathyClient.js:1377
+#: ../js/ui/components/telepathyClient.js:1378
 msgid "Certificate has been revoked"
 msgstr "Sertifikat telah dicabut"

-#: ../js/ui/components/telepathyClient.js:1379
+#: ../js/ui/components/telepathyClient.js:1380
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikat memakai algorima cipher yang tak aman atau lemah secara "
 "kriptografi"

-#: ../js/ui/components/telepathyClient.js:1381
+#: ../js/ui/components/telepathyClient.js:1382
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -964,26 +968,26 @@ msgstr ""
 "Panjang sertifikat server, atau kedalaman rantai sertifikat server, "
 "melampaui batas yang diberlakukan oleh pustaka kriptografi"

-#: ../js/ui/components/telepathyClient.js:1383
+#: ../js/ui/components/telepathyClient.js:1384
 msgid "Internal error"
 msgstr "Galat internal"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1393
+#: ../js/ui/components/telepathyClient.js:1394
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "Tak bisa menyambung ke %s"

-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1399
 msgid "View account"
 msgstr "Tilik akun"

-#: ../js/ui/components/telepathyClient.js:1435
+#: ../js/ui/components/telepathyClient.js:1436
 msgid "Unknown reason"
 msgstr "Alasan yang tidak diketahui"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:154
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
 msgid "Windows"
 msgstr "Jendela"

@ -995,22 +999,22 @@ msgstr "Tampilkan Aplikasi"
 msgid "Dash"
 msgstr "Dash"

-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "Buka Kalender"

-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "Buka Jam"

-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "Pengaturan Waktu & Tanggal"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:132
 msgid "%A %B %e, %Y"
 msgstr "%A, %e %B %Y"

@ -1147,7 +1151,7 @@ msgstr "Pasang"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Unduh dan pasang \"%s\" dari extensions.gnome.org?"

-#: ../js/ui/keyboard.js:692 ../js/ui/status/keyboard.js:523
+#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:539
 msgid "Keyboard"
 msgstr "Papan Ketik"

@ -1203,53 +1207,54 @@ msgstr "Tilik Sumber"
 msgid "Web Page"
 msgstr "Halaman Web"

-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1332
 msgid "Open"
 msgstr "Buka"

-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1339
 msgid "Remove"
 msgstr "Hapus"

-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1636
 msgid "Notifications"
 msgstr "Pemberitahuan"

-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1643
 msgid "Clear Messages"
 msgstr "Bersihkan Pesan"

-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1662
 msgid "Notification Settings"
 msgstr "Pengaturan Pemberitahuan"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1715
 msgid "Tray Menu"
 msgstr "Menu Baki"

-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1939
 msgid "No Messages"
 msgstr "Tiada Pesan"

-#: ../js/ui/messageTray.js:1968
+#: ../js/ui/messageTray.js:1986
 msgid "Message Tray"
 msgstr "Baki Pesan"

-#: ../js/ui/messageTray.js:2971
-msgid "System Information"
-msgstr "Informasi Sistem"
-
-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
-msgctxt "program"
-msgid "Unknown"
-msgstr "Tak dikenal"
-
-#: ../js/ui/overviewControls.js:482 ../js/ui/screenShield.js:151
+#: ../js/ui/messageTray.js:2443 ../js/ui/overviewControls.js:483
+#: ../js/ui/screenShield.js:152
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d pesan baru"

+#: ../js/ui/messageTray.js:3013
+msgid "System Information"
+msgstr "Informasi Sistem"
+
+#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:439
+msgctxt "program"
+msgid "Unknown"
+msgstr "Tak dikenal"
+
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Batal"
@ -1266,17 +1271,17 @@ msgstr "Gambaran"
 msgid "Type to search…"
 msgstr "Ketik untuk mencari…"

-#: ../js/ui/panel.js:515
+#: ../js/ui/panel.js:521
 msgid "Quit"
 msgstr "Keluar"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:573
 msgid "Activities"
 msgstr "Aktivitas"

-#: ../js/ui/panel.js:918
+#: ../js/ui/panel.js:924
 msgid "Top Bar"
 msgstr "Bar Atas"

@ -1303,33 +1308,33 @@ msgstr "Memulai ulang..."
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#: ../js/ui/screenShield.js:153
+#: ../js/ui/screenShield.js:154
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d pemberitahuan baru"

-#: ../js/ui/screenShield.js:472 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Kunci"

-#: ../js/ui/screenShield.js:706
+#: ../js/ui/screenShield.js:709
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME perlu mengunci layar"

-#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1304
+#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1312
 msgid "Unable to lock"
 msgstr "Tak bisa mengunci"

-#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1305
+#: ../js/ui/screenShield.js:837 ../js/ui/screenShield.js:1313
 msgid "Lock was blocked by an application"
 msgstr "Kunci diblokir oleh suatu aplikasi"

-#: ../js/ui/search.js:594
+#: ../js/ui/search.js:611
 msgid "Searching…"
 msgstr "Mencari…"

-#: ../js/ui/search.js:596
+#: ../js/ui/search.js:613
 msgid "No results."
 msgstr "Tak ada yang cocok."

@ -1406,9 +1411,9 @@ msgid "Bluetooth"
 msgstr "Bluetooth"

 #: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1281
-#: ../js/ui/status/network.js:1392 ../js/ui/status/rfkill.js:86
-#: ../js/ui/status/rfkill.js:114
+#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
+#: ../js/ui/status/rfkill.js:118
 msgid "Turn Off"
 msgstr "Matikan"

@ -1422,7 +1427,7 @@ msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d Perangkat Tersambung"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1309
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
 msgid "Not Connected"
 msgstr "Tak Tersambung"

@ -1430,7 +1435,7 @@ msgstr "Tak Tersambung"
 msgid "Brightness"
 msgstr "Kecerahan"

-#: ../js/ui/status/keyboard.js:547
+#: ../js/ui/status/keyboard.js:563
 msgid "Show Keyboard Layout"
 msgstr "Tampilkan Tata Letak Papan Tik"

@ -1458,8 +1463,8 @@ msgstr "Fungsikan"
 msgid "<unknown>"
 msgstr "<tak dikenal>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
-#: ../js/ui/status/network.js:1511
+#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
+#: ../js/ui/status/network.js:1512
 msgid "Off"
 msgstr "Mati"

@ -1477,7 +1482,7 @@ msgstr "Tak Dikelola"
 msgid "Disconnecting"
 msgstr "Memutus"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1301
+#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
 msgid "Connecting"
 msgstr "Menyambung"

@ -1498,7 +1503,7 @@ msgstr "Firmware hilang"
 msgid "Unavailable"
 msgstr "Tak tersedia"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1695
+#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
 msgid "Connection failed"
 msgstr "Koneksi gagal"

@ -1510,7 +1515,7 @@ msgstr "Pengaturan Kabel"
 msgid "Mobile Broadband Settings"
 msgstr "Pengaturan Data Seluler"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
 msgid "Hardware Disabled"
 msgstr "Perangkat Keras Dinonaktifkan"

@ -1550,60 +1555,60 @@ msgstr "Jaringan Wi-Fi"
 msgid "Select a network"
 msgstr "Pilih jaringan"

-#: ../js/ui/status/network.js:882
+#: ../js/ui/status/network.js:883
 msgid "No Networks"
 msgstr "Tiada Jaringan"

-#: ../js/ui/status/network.js:903 ../js/ui/status/rfkill.js:112
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
 msgid "Use hardware switch to turn off"
 msgstr "Pakai saklar perangkat keras untuk mematikan"

-#: ../js/ui/status/network.js:1173
+#: ../js/ui/status/network.js:1174
 msgid "Select Network"
 msgstr "Pilih Jaringan"

-#: ../js/ui/status/network.js:1179
+#: ../js/ui/status/network.js:1180
 msgid "Wi-Fi Settings"
 msgstr "Pengaturan Wi-Fi"

-#: ../js/ui/status/network.js:1281
+#: ../js/ui/status/network.js:1282
 msgid "Turn On"
 msgstr "Nyalakan"

-#: ../js/ui/status/network.js:1298
+#: ../js/ui/status/network.js:1299
 msgid "Hotspot Active"
 msgstr "Hotspot Aktif"

-#: ../js/ui/status/network.js:1409
+#: ../js/ui/status/network.js:1410
 msgid "connecting..."
 msgstr "menghubungi..."

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1412
+#: ../js/ui/status/network.js:1413
 msgid "authentication required"
 msgstr "diperlukan otentikasi"

-#: ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:1415
 msgid "connection failed"
 msgstr "koneksi gagal"

-#: ../js/ui/status/network.js:1480 ../js/ui/status/rfkill.js:89
+#: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
 msgid "Network Settings"
 msgstr "Pengaturan Jaringan"

-#: ../js/ui/status/network.js:1482
+#: ../js/ui/status/network.js:1483
 msgid "VPN Settings"
 msgstr "Pengaturan VPN"

-#: ../js/ui/status/network.js:1501
+#: ../js/ui/status/network.js:1502
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1656
+#: ../js/ui/status/network.js:1657
 msgid "Network Manager"
 msgstr "Manajer Jaringan"

-#: ../js/ui/status/network.js:1696
+#: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Aktivasi koneksi jaringan gagal"

@ -1637,11 +1642,11 @@ msgstr "UPS"
 msgid "Battery"
 msgstr "Baterai"

-#: ../js/ui/status/rfkill.js:83
+#: ../js/ui/status/rfkill.js:88
 msgid "Airplane Mode"
 msgstr "Mode Pesawat Terbang"

-#: ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/rfkill.js:90
 msgid "On"
 msgstr "Nyala"

@ -1685,11 +1690,11 @@ msgstr "Masuk sebagai pengguna lain"
 msgid "Unlock Window"
 msgstr "Buka Kunci Jendela"

-#: ../js/ui/viewSelector.js:158
+#: ../js/ui/viewSelector.js:159
 msgid "Applications"
 msgstr "Aplikasi"

-#: ../js/ui/viewSelector.js:162
+#: ../js/ui/viewSelector.js:163
 msgid "Search"
 msgstr "Cari"

@ -1799,7 +1804,7 @@ msgstr "Menggunakan mode tertentu, mis. \"gdm\" untuk layar masuk"
 msgid "List possible modes"
 msgstr "Menampilkan mode yang mungkin"

-#: ../src/shell-app.c:666
+#: ../src/shell-app.c:680
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Gagal meluncurkan \"%s\""
--- a/po/kk.po
+++ b/po/kk.po
--- a/po/ko.po
+++ b/po/ko.po
@ -19,7 +19,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: 2014-09-13 07:37+0000\n"
-"PO-Revision-Date: 2014-09-18 01:41+0900\n"
+"PO-Revision-Date: 2014-11-16 03:54+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: Korean\n"
@ -1444,7 +1444,7 @@ msgstr "<알 수 없음>"
 #: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
 #: ../js/ui/status/network.js:1511
 msgid "Off"
-msgstr "끄기"
+msgstr "끔"

 #: ../js/ui/status/network.js:459
 msgid "Connected"
@ -1626,7 +1626,7 @@ msgstr "비행기 모드"

 #: ../js/ui/status/rfkill.js:85
 msgid "On"
-msgstr "켜기"
+msgstr "켬"

 #: ../js/ui/status/system.js:317
 msgid "Switch User"
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sl.po
+++ b/po/sl.po
@ -9,8 +9,8 @@ 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: 2014-09-13 16:14+0000\n"
-"PO-Revision-Date: 2014-09-13 21:02+0100\n"
+"POT-Creation-Date: 2014-12-19 16:26+0000\n"
+"PO-Revision-Date: 2014-12-25 19:18+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: Slovenian\n"
@ -125,11 +125,11 @@ msgstr ""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "App Picker View"
-msgstr ""
+msgstr "Pogled izbirnika programov"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid "Index of the currently selected view in the application picker."
-msgstr ""
+msgstr "Kazalo trenutno izbranega pogleda v izbirniku programa."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@ -224,6 +224,8 @@ msgstr "Tipkovna bližnjica za prikaz dejavnega obvestila."
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
+"Tipkovna bližnjica,  ki omogoča ustavljanje in ponovni zagon vseh zagnanih "
+"programov  za razhroščevanje."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Which keyboard to use"
@ -242,6 +244,9 @@ msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
 msgstr ""
+"Izbrana možnost določa, da bodo v trenutnem pogledu prikazana le okna, ki so "
+"v izbrani delovni površini v preklopniku. V nasprotnem primeru so prikazana "
+"vsa okna."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid "The application icon mode."
@ -262,6 +267,8 @@ msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
 msgstr ""
+"Izbrana možnost določa, da bodo v trenutnem pogledu prikazana le okna v "
+"preklopniku. V nasprotnem primeru so prikazana vsa okna."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Attach modal dialog to the parent window"
@ -293,7 +300,7 @@ msgstr ""

 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
 msgid "Captive Portal"
-msgstr ""
+msgstr "Združen pogled"

 #: ../js/extensionPrefs/main.js:123
 #, javascript-format
@ -304,54 +311,54 @@ msgstr "Prišlo je do napake med nalaganjem pogovornega okna z možnosti za %s:"
 msgid "GNOME Shell Extensions"
 msgstr "Razširitve lupine Gnome"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../js/gdm/authPrompt.js:146 ../js/ui/components/networkAgent.js:143
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
 #: ../js/ui/status/network.js:915
 msgid "Cancel"
 msgstr "Prekliči"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:168 ../js/gdm/authPrompt.js:216
 msgid "Next"
 msgstr "Naslednji"

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

-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:214
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prijava"

-#: ../js/gdm/loginDialog.js:269
+#: ../js/gdm/loginDialog.js:275
 msgid "Choose Session"
 msgstr "Izbor seje"

-#: ../js/gdm/loginDialog.js:429
+#: ../js/gdm/loginDialog.js:434
 msgid "Not listed?"
 msgstr "Ali je ni na seznamu?"

-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:619
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(na primer, uporabnika ali %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:624 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "Uporabniško ime: "

-#: ../js/gdm/loginDialog.js:922
+#: ../js/gdm/loginDialog.js:955
 msgid "Login Window"
 msgstr "Prijavno okno"

-#: ../js/gdm/util.js:323
+#: ../js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "Napaka overitve"

-#: ../js/gdm/util.js:453
+#: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(ali pa povlecite prst)"

@ -384,28 +391,28 @@ msgstr "Pogosto"
 msgid "All"
 msgstr "Vse"

-#: ../js/ui/appDisplay.js:1789
+#: ../js/ui/appDisplay.js:1791
 msgid "New Window"
 msgstr "Novo okno"

-#: ../js/ui/appDisplay.js:1815 ../js/ui/dash.js:285
+#: ../js/ui/appDisplay.js:1817 ../js/ui/dash.js:285
 msgid "Remove from Favorites"
 msgstr "Odstrani iz priljubljenih"

-#: ../js/ui/appDisplay.js:1821
+#: ../js/ui/appDisplay.js:1823
 msgid "Add to Favorites"
 msgstr "Dodaj med priljubljene"

-#: ../js/ui/appDisplay.js:1830
+#: ../js/ui/appDisplay.js:1832
 msgid "Show Details"
 msgstr "Pokaži besedilo"

-#: ../js/ui/appFavorites.js:124
+#: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Program \"%s\" je dodan med priljubljeno."

-#: ../js/ui/appFavorites.js:158
+#: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Program \"%s\" je odstranjen iz priljubljenih."
@ -422,14 +429,14 @@ msgstr "Spremeni ozadje ..."
 #. 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:67
+#: ../js/ui/calendar.js:70
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celodnevno"

 #. Translators: Shown in calendar event list, if 24h format,
 #. \u2236 is a ratio character, similar to : */
-#: ../js/ui/calendar.js:73
+#: ../js/ui/calendar.js:77
 msgctxt "event list time"
 msgid "%H∶%M"
 msgstr "%H∶%M"
@ -437,7 +444,7 @@ msgstr "%H∶%M"
 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:86
 msgctxt "event list time"
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
@ -447,43 +454,43 @@ msgstr "%l∶%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:113
+#: ../js/ui/calendar.js:100
 msgctxt "grid sunday"
 msgid "S"
 msgstr "N"

 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:115
+#: ../js/ui/calendar.js:102
 msgctxt "grid monday"
 msgid "M"
 msgstr "P"

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

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:106
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:108
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Č"

 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:110
 msgctxt "grid friday"
 msgid "F"
 msgstr "P"

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:112
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
@ -494,85 +501,85 @@ msgstr "S"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #. */
-#: ../js/ui/calendar.js:138
+#: ../js/ui/calendar.js:125
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Ne"

 #. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:140
+#: ../js/ui/calendar.js:127
 msgctxt "list monday"
 msgid "M"
 msgstr "P"

 #. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:129
 msgctxt "list tuesday"
 msgid "T"
 msgstr "T"

 #. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:131
 msgctxt "list wednesday"
 msgid "W"
 msgstr "S"

 #. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:133
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Če"

 #. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:135
 msgctxt "list friday"
 msgid "F"
 msgstr "Pe"

 #. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:137
 msgctxt "list saturday"
 msgid "S"
 msgstr "S"

-#: ../js/ui/calendar.js:453
+#: ../js/ui/calendar.js:462
 msgid "Previous month"
 msgstr "Predhodni mesec"

-#: ../js/ui/calendar.js:463
+#: ../js/ui/calendar.js:472
 msgid "Next month"
 msgstr "Naslednji mesec"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:810
 msgid "Nothing Scheduled"
 msgstr "Nič ni razporejeno"

 #. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:799
+#: ../js/ui/calendar.js:826
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d. %m."

 #. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:802
+#: ../js/ui/calendar.js:829
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"

-#: ../js/ui/calendar.js:813
+#: ../js/ui/calendar.js:839
 msgid "Today"
 msgstr "Danes"

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:843
 msgid "Tomorrow"
 msgstr "Jutri"

-#: ../js/ui/calendar.js:828
+#: ../js/ui/calendar.js:854
 msgid "This week"
 msgstr "Ta teden"

-#: ../js/ui/calendar.js:836
+#: ../js/ui/calendar.js:862
 msgid "Next week"
 msgstr "Naslednji teden"

@ -972,7 +979,7 @@ msgstr "Poglej račun"
 msgid "Unknown reason"
 msgstr "Neznan vzrok"

-#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:154
+#: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
 msgid "Windows"
 msgstr "Okna"

@ -984,22 +991,22 @@ msgstr "Pokaži programe"
 msgid "Dash"
 msgstr "Pregledna plošča"

-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "Odpri koledar"

-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "Odpri ure"

-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "Nastavitve časa in datuma"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:132
 msgid "%A %B %e, %Y"
 msgstr "%a, %e. %b., %R"

@ -1155,7 +1162,7 @@ msgstr "Namesti"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Prejmi in namesti “%s” preko povezave na extensions.gnome.org?"

-#: ../js/ui/keyboard.js:692 ../js/ui/status/keyboard.js:523
+#: ../js/ui/keyboard.js:700 ../js/ui/status/keyboard.js:535
 msgid "Keyboard"
 msgstr "Tipkovnica"

@ -1211,48 +1218,40 @@ msgstr "Poglej vir"
 msgid "Web Page"
 msgstr "Spletna stran"

-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1332
 msgid "Open"
 msgstr "Odpri"

-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1339
 msgid "Remove"
 msgstr "Odstrani"

-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1636
 msgid "Notifications"
 msgstr "Obvestila"

-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1643
 msgid "Clear Messages"
 msgstr "Počisti sporočila"

-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1662
 msgid "Notification Settings"
 msgstr "Nastavitve obvestil"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1715
 msgid "Tray Menu"
 msgstr "Meni sistemske vrstice"

-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1939
 msgid "No Messages"
 msgstr "Ni sporočil"

-#: ../js/ui/messageTray.js:1968
+#: ../js/ui/messageTray.js:1986
 msgid "Message Tray"
 msgstr "Sporočilna vrstica"

-#: ../js/ui/messageTray.js:2971
-msgid "System Information"
-msgstr "Podrobnosti sistema"
-
-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
-msgctxt "program"
-msgid "Unknown"
-msgstr "Neznano"
-
-#: ../js/ui/overviewControls.js:482 ../js/ui/screenShield.js:151
+#: ../js/ui/messageTray.js:2443 ../js/ui/overviewControls.js:483
+#: ../js/ui/screenShield.js:151
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@ -1261,6 +1260,15 @@ msgstr[1] "%d novo sporočilo"
 msgstr[2] "%d novi sporočili"
 msgstr[3] "%d nova sporočila"

+#: ../js/ui/messageTray.js:3013
+msgid "System Information"
+msgstr "Podrobnosti sistema"
+
+#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
+msgctxt "program"
+msgid "Unknown"
+msgstr "Neznano"
+
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Razveljavi"
@ -1330,19 +1338,19 @@ msgstr "Zakleni"
 msgid "GNOME needs to lock the screen"
 msgstr "Zakleniti je treba zaslon"

-#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1304
+#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1309
 msgid "Unable to lock"
 msgstr "Zaklep ni mogoč"

-#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1305
+#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1310
 msgid "Lock was blocked by an application"
 msgstr "Zaklep je preprečil program"

-#: ../js/ui/search.js:594
+#: ../js/ui/search.js:611
 msgid "Searching…"
 msgstr "Iskanje ..."

-#: ../js/ui/search.js:596
+#: ../js/ui/search.js:613
 msgid "No results."
 msgstr "Ni najdenih zadetkov."

@ -1446,7 +1454,7 @@ msgstr "Ni vzpostavljene povezave"
 msgid "Brightness"
 msgstr "Svetlost"

-#: ../js/ui/status/keyboard.js:547
+#: ../js/ui/status/keyboard.js:559
 msgid "Show Keyboard Layout"
 msgstr "Pokaži razporeditev tipkovnice"

@ -1701,11 +1709,11 @@ msgstr "Prijava kot drug uporabnik"
 msgid "Unlock Window"
 msgstr "Odkleni okno"

-#: ../js/ui/viewSelector.js:158
+#: ../js/ui/viewSelector.js:159
 msgid "Applications"
 msgstr "Programi"

-#: ../js/ui/viewSelector.js:162
+#: ../js/ui/viewSelector.js:163
 msgid "Search"
 msgstr "Poišči"

--- a/po/sv.po
+++ b/po/sv.po
@ -3,22 +3,23 @@
 # This file is distributed under the same license as the gnome-shell package.
 # Daniel Nylander <po@danielnylander.se>, 2009, 2010, 2011, 2012.
 # Marcus Lundblad <ml@update.uu.se>, 2014.
+# Åke Engelbrektson <eson57@gmail.com, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-12 21:57+0000\n"
-"PO-Revision-Date: 2014-09-15 09:47+0100\n"
-"Last-Translator: Mattias Eriksson <snaggen@gmail.com>\n"
+"POT-Creation-Date: 2014-12-11 08:30+0000\n"
+"PO-Revision-Date: 2014-12-11 08:57+0100\n"
+"Last-Translator: Åke Engelbrektson <eson57@gmail.com>\n"
 "Language-Team: svenska <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\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: Poedit 1.7.1\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@ -292,8 +293,8 @@ msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Fördröj fokusändringar i musläge tills pekare slutar röra sig"

 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
-msgid "Captive Portal"
-msgstr "Fångstportal"
+msgid "Network Login"
+msgstr "Nätverksinloggning"

 #: ../js/extensionPrefs/main.js:123
 #, javascript-format
@ -307,7 +308,7 @@ msgstr "Tillägg för GNOME-skal"
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:915
+#: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "Avbryt"

@ -325,33 +326,33 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Logga in"

-#: ../js/gdm/loginDialog.js:269
+#: ../js/gdm/loginDialog.js:275
 msgid "Choose Session"
 msgstr "Välj session"

-#: ../js/gdm/loginDialog.js:429
+#: ../js/gdm/loginDialog.js:434
 msgid "Not listed?"
 msgstr "Inte listad?"

-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:619
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(till exempel användare eller %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:624 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "Användarnamn: "

-#: ../js/gdm/loginDialog.js:922
+#: ../js/gdm/loginDialog.js:955
 msgid "Login Window"
 msgstr "Inloggningsfönster"

-#: ../js/gdm/util.js:323
+#: ../js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "Autentiseringsfel"

-#: ../js/gdm/util.js:453
+#: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(eller dra fingret)"

@ -372,15 +373,15 @@ msgstr "Körning av ”%s” misslyckades:"
 msgid "Web Authentication Redirect"
 msgstr "Omdirigering för webautentisering"

-#: ../js/ui/appDisplay.js:772
+#: ../js/ui/appDisplay.js:770
 msgid "Frequently used applications will appear here"
 msgstr "Ofta använda program kommer visas här"

-#: ../js/ui/appDisplay.js:883
+#: ../js/ui/appDisplay.js:881
 msgid "Frequent"
 msgstr "Ofta använda"

-#: ../js/ui/appDisplay.js:890
+#: ../js/ui/appDisplay.js:888
 msgid "All"
 msgstr "Alla"

@ -400,17 +401,17 @@ msgstr "Lägg till som favorit"
 msgid "Show Details"
 msgstr "Visa detaljer"

-#: ../js/ui/appFavorites.js:124
+#: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s har lagts till i dina favoriter."

-#: ../js/ui/appFavorites.js:158
+#: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s har tagits bort från dina favoriter."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:813
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:819
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Inställningar"
@ -419,17 +420,23 @@ msgstr "Inställningar"
 msgid "Change Background…"
 msgstr "Ändra bakgrund…"

+#. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
+#: ../js/ui/calendar.js:39
+msgctxt "calendar-no-work"
+msgid "06"
+msgstr ""
+
 #. 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:67
+#: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Hela dagen"

 #. Translators: Shown in calendar event list, if 24h format,
 #. \u2236 is a ratio character, similar to : */
-#: ../js/ui/calendar.js:73
+#: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%H∶%M"
 msgstr "%H∶%M"
@ -437,7 +444,7 @@ msgstr "%H∶%M"
 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:84
 msgctxt "event list time"
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
@ -447,43 +454,43 @@ msgstr "%l∶%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:113
+#: ../js/ui/calendar.js:98
 msgctxt "grid sunday"
 msgid "S"
 msgstr "S"

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

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

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

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

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

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:110
 msgctxt "grid saturday"
 msgid "S"
 msgstr "L"
@ -494,85 +501,83 @@ msgstr "L"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #. */
-#: ../js/ui/calendar.js:138
+#: ../js/ui/calendar.js:123
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Sö"

 #. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:140
+#: ../js/ui/calendar.js:125
 msgctxt "list monday"
 msgid "M"
 msgstr "Må"

 #. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:127
 msgctxt "list tuesday"
 msgid "T"
 msgstr "Ti"

 #. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:129
 msgctxt "list wednesday"
 msgid "W"
 msgstr "On"

 #. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:131
 msgctxt "list thursday"
 msgid "Th"
 msgstr "To"

 #. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:133
 msgctxt "list friday"
 msgid "F"
 msgstr "Fr"

 #. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:135
 msgctxt "list saturday"
 msgid "S"
 msgstr "Lö"

-#: ../js/ui/calendar.js:453
+#: ../js/ui/calendar.js:444
 msgid "Previous month"
 msgstr "Föregående månad"

-#: ../js/ui/calendar.js:463
+#: ../js/ui/calendar.js:454
 msgid "Next month"
 msgstr "Nästa månad"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:789
 msgid "Nothing Scheduled"
 msgstr "Ingenting i schemat"

-#. Translators: Shown on calendar heading when selected day occurs on current year */
-#: ../js/ui/calendar.js:799
+#: ../js/ui/calendar.js:808
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#. Translators: Shown on calendar heading when selected day occurs on different year */
-#: ../js/ui/calendar.js:802
+#: ../js/ui/calendar.js:812
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"

-#: ../js/ui/calendar.js:813
+#: ../js/ui/calendar.js:824
 msgid "Today"
 msgstr "Idag"

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:828
 msgid "Tomorrow"
 msgstr "Imorgon"

-#: ../js/ui/calendar.js:828
+#: ../js/ui/calendar.js:839
 msgid "This week"
 msgstr "Denna vecka"

-#: ../js/ui/calendar.js:836
+#: ../js/ui/calendar.js:847
 msgid "Next week"
 msgstr "Nästa vecka"

@ -606,7 +611,7 @@ msgid "Type again:"
 msgstr "Skriv igen:"

 #: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:918
+#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Anslut"

@ -700,102 +705,102 @@ msgstr "Autentisera"
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Tyvärr, det fungerade inte. Försök igen."

-#: ../js/ui/components/telepathyClient.js:240
+#: ../js/ui/components/telepathyClient.js:242
 msgid "Invitation"
 msgstr "Inbjudan"

-#: ../js/ui/components/telepathyClient.js:300
+#: ../js/ui/components/telepathyClient.js:302
 msgid "Call"
 msgstr "Samtal"

-#: ../js/ui/components/telepathyClient.js:316
+#: ../js/ui/components/telepathyClient.js:318
 msgid "File Transfer"
 msgstr "Filöverföring"

-#: ../js/ui/components/telepathyClient.js:420
+#: ../js/ui/components/telepathyClient.js:422
 msgid "Chat"
 msgstr "Chatt"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Unmute"
 msgstr "Aktivera ljud"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Mute"
 msgstr "Tyst"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:953
+#: ../js/ui/components/telepathyClient.js:955
 msgid "%H∶%M"
 msgstr "%H∶%M"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:960
+#: ../js/ui/components/telepathyClient.js:962
 msgid "Yesterday, %H∶%M"
 msgstr "Igår, %H∶%M"

 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:967
+#: ../js/ui/components/telepathyClient.js:969
 msgid "%A, %H∶%M"
 msgstr "%A, %H∶%M"

 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
-#: ../js/ui/components/telepathyClient.js:974
+#: ../js/ui/components/telepathyClient.js:976
 msgid "%B %d, %H∶%M"
 msgstr "%d %B, %H∶%M"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30" */
-#: ../js/ui/components/telepathyClient.js:980
+#: ../js/ui/components/telepathyClient.js:982
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d %B %Y, %H∶%M"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:986
+#: ../js/ui/components/telepathyClient.js:988
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:993
+#: ../js/ui/components/telepathyClient.js:995
 msgid "Yesterday, %l∶%M %p"
 msgstr "Igår, %l∶%M %p"

 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1000
+#: ../js/ui/components/telepathyClient.js:1002
 msgid "%A, %l∶%M %p"
 msgstr "%A, %I∶%M %p"

 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1007
+#: ../js/ui/components/telepathyClient.js:1009
 msgid "%B %d, %l∶%M %p"
 msgstr "%d %B, %l∶%M %p"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"*/
-#: ../js/ui/components/telepathyClient.js:1013
+#: ../js/ui/components/telepathyClient.js:1015
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d %B %Y, %l∶%M %p"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:1045
+#: ../js/ui/components/telepathyClient.js:1047
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"

 #. translators: argument is a room name like
 #. * room@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1149
+#: ../js/ui/components/telepathyClient.js:1151
 #, javascript-format
 msgid "Invitation to %s"
 msgstr "Inbjudan till %s"
@ -803,38 +808,38 @@ msgstr "Inbjudan till %s"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example. */
-#: ../js/ui/components/telepathyClient.js:1157
+#: ../js/ui/components/telepathyClient.js:1159
 #, javascript-format
 msgid "%s is inviting you to join %s"
 msgstr "%s bjuder in dig till %s"

-#: ../js/ui/components/telepathyClient.js:1159
-#: ../js/ui/components/telepathyClient.js:1194
-#: ../js/ui/components/telepathyClient.js:1228
-#: ../js/ui/components/telepathyClient.js:1286
+#: ../js/ui/components/telepathyClient.js:1161
+#: ../js/ui/components/telepathyClient.js:1196
+#: ../js/ui/components/telepathyClient.js:1230
+#: ../js/ui/components/telepathyClient.js:1287
 msgid "Decline"
 msgstr "Neka"

-#: ../js/ui/components/telepathyClient.js:1165
-#: ../js/ui/components/telepathyClient.js:1234
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1167
+#: ../js/ui/components/telepathyClient.js:1236
+#: ../js/ui/components/telepathyClient.js:1292
 msgid "Accept"
 msgstr "Acceptera"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1184
+#: ../js/ui/components/telepathyClient.js:1186
 #, javascript-format
 msgid "Video call from %s"
 msgstr "Videosamtal från %s"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1187
+#: ../js/ui/components/telepathyClient.js:1189
 #, javascript-format
 msgid "Call from %s"
 msgstr "Samtal från %s"

 #. translators: this is a button label (verb), not a noun */
-#: ../js/ui/components/telepathyClient.js:1201
+#: ../js/ui/components/telepathyClient.js:1203
 msgid "Answer"
 msgstr "Svara"

@ -843,109 +848,109 @@ msgstr "Svara"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #. */
-#: ../js/ui/components/telepathyClient.js:1222
+#: ../js/ui/components/telepathyClient.js:1224
 #, javascript-format
 msgid "%s is sending you %s"
 msgstr "%s skickar dig %s"

 #. To translators: The parameter is the contact's alias */
-#: ../js/ui/components/telepathyClient.js:1251
+#: ../js/ui/components/telepathyClient.js:1253
 #, javascript-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vill få behörighet att se när du är ansluten"

-#: ../js/ui/components/telepathyClient.js:1337
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Network error"
 msgstr "Nätverksfel"

-#: ../js/ui/components/telepathyClient.js:1339
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"

-#: ../js/ui/components/telepathyClient.js:1341
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Encryption error"
 msgstr "Krypteringsfel"

-#: ../js/ui/components/telepathyClient.js:1343
+#: ../js/ui/components/telepathyClient.js:1344
 msgid "Certificate not provided"
 msgstr "Certifikat tillhandahålls inte"

-#: ../js/ui/components/telepathyClient.js:1345
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte pålitligt"

-#: ../js/ui/components/telepathyClient.js:1347
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Certificate expired"
 msgstr "Certifikatet är utgånget"

-#: ../js/ui/components/telepathyClient.js:1349
+#: ../js/ui/components/telepathyClient.js:1350
 msgid "Certificate not activated"
 msgstr "Certifikatet är inte aktiverat"

-#: ../js/ui/components/telepathyClient.js:1351
+#: ../js/ui/components/telepathyClient.js:1352
 msgid "Certificate hostname mismatch"
 msgstr "Certifikatets värdnamn stämmer inte"

-#: ../js/ui/components/telepathyClient.js:1353
+#: ../js/ui/components/telepathyClient.js:1354
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikatets fingeravtryck stämmer inte"

-#: ../js/ui/components/telepathyClient.js:1355
+#: ../js/ui/components/telepathyClient.js:1356
 msgid "Certificate self-signed"
 msgstr "Certifikatet är självsignerat"

-#: ../js/ui/components/telepathyClient.js:1357
+#: ../js/ui/components/telepathyClient.js:1358
 msgid "Status is set to offline"
 msgstr "Status är inställd till frånkopplad"

-#: ../js/ui/components/telepathyClient.js:1359
+#: ../js/ui/components/telepathyClient.js:1360
 msgid "Encryption is not available"
 msgstr "Kryptering är inte tillgänglig"

-#: ../js/ui/components/telepathyClient.js:1361
+#: ../js/ui/components/telepathyClient.js:1362
 msgid "Certificate is invalid"
 msgstr "Certifikatet är ogiltigt"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1364
 msgid "Connection has been refused"
 msgstr "Anslutningen har nekats"

-#: ../js/ui/components/telepathyClient.js:1365
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Connection can't be established"
 msgstr "Anslutningen kan inte etableras"

-#: ../js/ui/components/telepathyClient.js:1367
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Connection has been lost"
 msgstr "Anslutningen har förlorats"

-#: ../js/ui/components/telepathyClient.js:1369
+#: ../js/ui/components/telepathyClient.js:1370
 msgid "This account is already connected to the server"
 msgstr "Detta konto är redan anslutet till servern"

-#: ../js/ui/components/telepathyClient.js:1371
+#: ../js/ui/components/telepathyClient.js:1372
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs"

-#: ../js/ui/components/telepathyClient.js:1373
+#: ../js/ui/components/telepathyClient.js:1374
 msgid "The account already exists on the server"
 msgstr "Kontot finns redan på servern"

-#: ../js/ui/components/telepathyClient.js:1375
+#: ../js/ui/components/telepathyClient.js:1376
 msgid "Server is currently too busy to handle the connection"
 msgstr "Servern är för närvarande för upptagen för att hantera anslutningen"

-#: ../js/ui/components/telepathyClient.js:1377
+#: ../js/ui/components/telepathyClient.js:1378
 msgid "Certificate has been revoked"
 msgstr "Certifikatet har spärrats"

-#: ../js/ui/components/telepathyClient.js:1379
+#: ../js/ui/components/telepathyClient.js:1380
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svagt"

-#: ../js/ui/components/telepathyClient.js:1381
+#: ../js/ui/components/telepathyClient.js:1382
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@ -953,22 +958,22 @@ msgstr ""
 "Längden på serverns certifikat, eller djupet av serverns certifikatkedja, "
 "överstiger gränserna som satts av det kryptografiska biblioteket"

-#: ../js/ui/components/telepathyClient.js:1383
+#: ../js/ui/components/telepathyClient.js:1384
 msgid "Internal error"
 msgstr "Internt fel"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1393
+#: ../js/ui/components/telepathyClient.js:1394
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "Misslyckades att ansluta till %s"

-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1399
 msgid "View account"
 msgstr "Visa konto"

-#: ../js/ui/components/telepathyClient.js:1435
+#: ../js/ui/components/telepathyClient.js:1436
 msgid "Unknown reason"
 msgstr "Okänd anledning"

@ -982,24 +987,24 @@ msgstr "Visa program"

 #: ../js/ui/dash.js:445
 msgid "Dash"
-msgstr "Favoriter"
+msgstr "Snabbstartspanel"

-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "Öppna kalender"

-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "Öppna klockor"

-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "Inställningar för datum och tid"

 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:132
 msgid "%A %B %e, %Y"
 msgstr "%A %e %B, %Y"

@ -1144,7 +1149,7 @@ msgstr "Installera"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Hämta och installera ”%s” från extensions.gnome.org?"

-#: ../js/ui/keyboard.js:692 ../js/ui/status/keyboard.js:523
+#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:539
 msgid "Keyboard"
 msgstr "Tangentbord"

@ -1200,54 +1205,55 @@ msgstr "Visa källa"
 msgid "Web Page"
 msgstr "Webbsida"

-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1332
 msgid "Open"
 msgstr "Öppna"

-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1339
 msgid "Remove"
 msgstr "Ta bort"

-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1636
 msgid "Notifications"
 msgstr "Notifieringar"

-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1643
 msgid "Clear Messages"
 msgstr "Rensa meddelanden"

-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1662
 msgid "Notification Settings"
 msgstr "Inställningar för notifieringar"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1715
 msgid "Tray Menu"
 msgstr "Fältmeny"

-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1939
 msgid "No Messages"
 msgstr "Inga meddelanden"

-#: ../js/ui/messageTray.js:1968
+#: ../js/ui/messageTray.js:1984
 msgid "Message Tray"
 msgstr "Meddelandefält"

-#: ../js/ui/messageTray.js:2971
-msgid "System Information"
-msgstr "Systeminformation"
-
-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
-msgctxt "program"
-msgid "Unknown"
-msgstr "Okänt"
-
-#: ../js/ui/overviewControls.js:482 ../js/ui/screenShield.js:151
+#: ../js/ui/messageTray.js:2441 ../js/ui/overviewControls.js:483
+#: ../js/ui/screenShield.js:152
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nytt meddelande"
 msgstr[1] "%d nya meddelanden"

+#: ../js/ui/messageTray.js:3011
+msgid "System Information"
+msgstr "Systeminformation"
+
+#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:439
+msgctxt "program"
+msgid "Unknown"
+msgstr "Okänt"
+
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Ångra"
@ -1264,17 +1270,17 @@ msgstr "Översikt"
 msgid "Type to search…"
 msgstr "Skriv för att söka…"

-#: ../js/ui/panel.js:515
+#: ../js/ui/panel.js:521
 msgid "Quit"
 msgstr "Avsluta"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:573
 msgid "Activities"
 msgstr "Aktiviteter"

-#: ../js/ui/panel.js:918
+#: ../js/ui/panel.js:924
 msgid "Top Bar"
 msgstr "Systemrad"

@ -1300,34 +1306,34 @@ msgstr "Startar om…"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#: ../js/ui/screenShield.js:153
+#: ../js/ui/screenShield.js:154
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d ny notifiering"
 msgstr[1] "%d nya notifieringar"

-#: ../js/ui/screenShield.js:472 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Lås"

-#: ../js/ui/screenShield.js:706
+#: ../js/ui/screenShield.js:709
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME behöver låsa skärmen"

-#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1304
+#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1312
 msgid "Unable to lock"
 msgstr "Kunde inte låsa"

-#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1305
+#: ../js/ui/screenShield.js:837 ../js/ui/screenShield.js:1313
 msgid "Lock was blocked by an application"
 msgstr "Låsning hindrades av ett program"

-#: ../js/ui/search.js:594
+#: ../js/ui/search.js:611
 msgid "Searching…"
 msgstr "Söker…"

-#: ../js/ui/search.js:596
+#: ../js/ui/search.js:613
 msgid "No results."
 msgstr "Inga sökträffar."

@ -1404,9 +1410,9 @@ msgid "Bluetooth"
 msgstr "Bluetooth"

 #: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1281
-#: ../js/ui/status/network.js:1392 ../js/ui/status/rfkill.js:86
-#: ../js/ui/status/rfkill.js:114
+#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
+#: ../js/ui/status/rfkill.js:118
 msgid "Turn Off"
 msgstr "Stäng av"

@ -1421,7 +1427,7 @@ msgid_plural "%d Connected Devices"
 msgstr[0] "%d ansluten enhet"
 msgstr[1] "%d anslutna enheter"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1309
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
 msgid "Not Connected"
 msgstr "Ej ansluten"

@ -1429,7 +1435,7 @@ msgstr "Ej ansluten"
 msgid "Brightness"
 msgstr "Ljusstyrka"

-#: ../js/ui/status/keyboard.js:547
+#: ../js/ui/status/keyboard.js:563
 msgid "Show Keyboard Layout"
 msgstr "Visa tangentbordslayout"

@ -1442,7 +1448,6 @@ msgid "Disable"
 msgstr "Inaktivera"

 #: ../js/ui/status/location.js:73
-#| msgid "Power Settings"
 msgid "Privacy Settings"
 msgstr "Sekretessinställningar"

@ -1458,8 +1463,8 @@ msgstr "Aktivera"
 msgid "<unknown>"
 msgstr "<okänd>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
-#: ../js/ui/status/network.js:1511
+#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
+#: ../js/ui/status/network.js:1512
 msgid "Off"
 msgstr "Frånkopplad"

@ -1477,7 +1482,7 @@ msgstr "Ohanterade"
 msgid "Disconnecting"
 msgstr "Kopplar från"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1301
+#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
 msgid "Connecting"
 msgstr "Ansluter"

@ -1498,7 +1503,7 @@ msgstr "Fast programvara saknas"
 msgid "Unavailable"
 msgstr "Inte tillgänglig"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1695
+#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"

@ -1510,7 +1515,7 @@ msgstr "Trådbundna inställningar"
 msgid "Mobile Broadband Settings"
 msgstr "Inställningar för mobilt bredband"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
 msgid "Hardware Disabled"
 msgstr "Maskinvara inaktiverad"

@ -1551,60 +1556,60 @@ msgstr "Trådlösa nätverk"
 msgid "Select a network"
 msgstr "Välj ett nätverk"

-#: ../js/ui/status/network.js:882
+#: ../js/ui/status/network.js:883
 msgid "No Networks"
 msgstr "Inga nätverk"

-#: ../js/ui/status/network.js:903 ../js/ui/status/rfkill.js:112
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
 msgid "Use hardware switch to turn off"
 msgstr "Använd hårdvarubrytare för att slå av"

-#: ../js/ui/status/network.js:1173
+#: ../js/ui/status/network.js:1174
 msgid "Select Network"
 msgstr "Välj nätverk"

-#: ../js/ui/status/network.js:1179
+#: ../js/ui/status/network.js:1180
 msgid "Wi-Fi Settings"
 msgstr "Inställningar för trådlösa nätverk"

-#: ../js/ui/status/network.js:1281
+#: ../js/ui/status/network.js:1282
 msgid "Turn On"
 msgstr "Slå på"

-#: ../js/ui/status/network.js:1298
+#: ../js/ui/status/network.js:1299
 msgid "Hotspot Active"
-msgstr "Surfpunkt Aktiv"
+msgstr "Surfzon aktiv"

-#: ../js/ui/status/network.js:1409
+#: ../js/ui/status/network.js:1410
 msgid "connecting..."
 msgstr "ansluter..."

 #. Translators: this is for network connections that require some kind of key or password */
-#: ../js/ui/status/network.js:1412
+#: ../js/ui/status/network.js:1413
 msgid "authentication required"
 msgstr "autentisering krävs"

-#: ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:1415
 msgid "connection failed"
 msgstr "anslutningen misslyckades"

-#: ../js/ui/status/network.js:1480 ../js/ui/status/rfkill.js:89
+#: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
 msgid "Network Settings"
 msgstr "Nätverksinställningar"

-#: ../js/ui/status/network.js:1482
+#: ../js/ui/status/network.js:1483
 msgid "VPN Settings"
 msgstr "VPN-inställningar"

-#: ../js/ui/status/network.js:1501
+#: ../js/ui/status/network.js:1502
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1656
+#: ../js/ui/status/network.js:1657
 msgid "Network Manager"
 msgstr "Nätverkshanterare"

-#: ../js/ui/status/network.js:1696
+#: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nätverksanslutning misslyckades"

@ -1638,11 +1643,11 @@ msgstr "Avbrottsfri kraftförsörjning (UPS)"
 msgid "Battery"
 msgstr "Batteri"

-#: ../js/ui/status/rfkill.js:83
+#: ../js/ui/status/rfkill.js:88
 msgid "Airplane Mode"
 msgstr "Flygplansläge"

-#: ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/rfkill.js:90
 msgid "On"
 msgstr "På"

@ -1803,7 +1808,7 @@ msgstr "Använd ett specifikt läge, t.ex. ”gdm” för inloggningsskärm"
 msgid "List possible modes"
 msgstr "Lista möjliga lägen"

-#: ../src/shell-app.c:666
+#: ../src/shell-app.c:680
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Misslyckades med att starta ”%s”"
@ -1820,6 +1825,9 @@ msgstr "Lösenordet får inte vara blankt"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "Autentiseringsdialogen stängdes av användaren"

+#~ msgid "Captive Portal"
+#~ msgstr "Fångstportal"
+
 #~ msgid "The maximum accuracy level of location."
 #~ msgstr "Högsta grad av noggrannhet för plats."

--- a/po/tr.po
+++ b/po/tr.po
@ -7,14 +7,15 @@
 # Osman Karagöz <osmank3@gmail.com>, 2013.
 # Bayram Güçlü <byrmgcl@yandex.com.tr>, 2014.
 # sabri ünal <yakushabb@gmail.com>, 2014.
+# Gökhan Gurbetoğlu <ggurbet@gmail.com>, 2014.
 # Muhammet Kara <muhammetk@gmail.com>, 2011, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-09-15 09:30+0000\n"
-"PO-Revision-Date: 2014-09-16 09:01+0000\n"
+"POT-Creation-Date: 2014-12-13 08:33+0000\n"
+"PO-Revision-Date: 2014-12-13 17:43+0000\n"
 "Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
@ -267,8 +268,8 @@ msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Fare kipinde odak değişikliklerini işaretçi hareketi durana kadar beklet"

 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
-msgid "Captive Portal"
-msgstr "Esir Portal"
+msgid "Network Login"
+msgstr "Ağ Girişi"

 #: ../js/extensionPrefs/main.js:123
 #, javascript-format
@ -282,7 +283,7 @@ msgstr "GNOME Kabuğu Uzantıları"
 #: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
 #: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
-#: ../js/ui/status/network.js:915
+#: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "İptal"

@ -300,33 +301,33 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Giriş"

-#: ../js/gdm/loginDialog.js:269
+#: ../js/gdm/loginDialog.js:275
 msgid "Choose Session"
 msgstr "Oturum Seçin"

-#: ../js/gdm/loginDialog.js:429
+#: ../js/gdm/loginDialog.js:434
 msgid "Not listed?"
 msgstr "Listede yok mu?"

-#: ../js/gdm/loginDialog.js:614
+#: ../js/gdm/loginDialog.js:619
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(örneğin, kullanıcı veya %s)"

-#: ../js/gdm/loginDialog.js:619 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:624 ../js/ui/components/networkAgent.js:269
 #: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "Kullanıcı Adı: "

-#: ../js/gdm/loginDialog.js:922
+#: ../js/gdm/loginDialog.js:955
 msgid "Login Window"
 msgstr "Oturum Açma Penceresi"

-#: ../js/gdm/util.js:323
+#: ../js/gdm/util.js:341
 msgid "Authentication error"
 msgstr "Kimlik doğrulama hatası"

-#: ../js/gdm/util.js:453
+#: ../js/gdm/util.js:473
 msgid "(or swipe finger)"
 msgstr "(ya da parmak izi okutun)"

@ -347,15 +348,15 @@ msgstr "“%s” çalıştırılması başarısız:"
 msgid "Web Authentication Redirect"
 msgstr "Web Kimlik Doğrulama Yönlendirmesi"

-#: ../js/ui/appDisplay.js:772
+#: ../js/ui/appDisplay.js:770
 msgid "Frequently used applications will appear here"
 msgstr "Sık kullanılan uygulamalar burada yer alacak"

-#: ../js/ui/appDisplay.js:883
+#: ../js/ui/appDisplay.js:881
 msgid "Frequent"
 msgstr "Sık sık"

-#: ../js/ui/appDisplay.js:890
+#: ../js/ui/appDisplay.js:888
 msgid "All"
 msgstr "Hepsi"

@ -375,17 +376,17 @@ msgstr "Sık Kullanılanlara Ekle"
 msgid "Show Details"
 msgstr "Ayrıntıları Göster"

-#: ../js/ui/appFavorites.js:124
+#: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s sık kullanılanlarınıza eklendi."

-#: ../js/ui/appFavorites.js:158
+#: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s sık kullanılanlarınızdan çıkarıldı."

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:813
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:819
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Ayarlar"
@ -394,17 +395,24 @@ msgstr "Ayarlar"
 msgid "Change Background…"
 msgstr "Arkaplanı Değiştir…"

+#. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0"
+#. (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
+#: ../js/ui/calendar.js:39
+msgctxt "calendar-no-work"
+msgid "06"
+msgstr "06"
+
 #. 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:67
+#: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Tüm Gün"

 #. Translators: Shown in calendar event list, if 24h format,
 #. \u2236 is a ratio character, similar to : */
-#: ../js/ui/calendar.js:73
+#: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%H∶%M"
 msgstr "%H∶%M"
@ -412,7 +420,7 @@ msgstr "%H∶%M"
 #. Translators: Shown in calendar event list, if 12h format,
 #. \u2236 is a ratio character, similar to : and \u2009 is
 #. a thin space */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:84
 msgctxt "event list time"
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
@ -422,43 +430,43 @@ msgstr "%l∶%M %p"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:113
+#: ../js/ui/calendar.js:98
 msgctxt "grid sunday"
 msgid "S"
 msgstr "P"

 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:115
+#: ../js/ui/calendar.js:100
 msgctxt "grid monday"
 msgid "M"
 msgstr "P"

 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:117
+#: ../js/ui/calendar.js:102
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "S"

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:104
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "Ç"

 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:106
 msgctxt "grid thursday"
 msgid "T"
 msgstr "P"

 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:108
 msgctxt "grid friday"
 msgid "F"
 msgstr "C"

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:125
+#: ../js/ui/calendar.js:110
 msgctxt "grid saturday"
 msgid "S"
 msgstr "C"
@ -469,87 +477,83 @@ msgstr "C"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #. */
-#: ../js/ui/calendar.js:138
+#: ../js/ui/calendar.js:123
 msgctxt "list sunday"
 msgid "Su"
 msgstr "Pa"

 #. Translators: Event list abbreviation for Monday */
-#: ../js/ui/calendar.js:140
+#: ../js/ui/calendar.js:125
 msgctxt "list monday"
 msgid "M"
 msgstr "Pz"

 #. Translators: Event list abbreviation for Tuesday */
-#: ../js/ui/calendar.js:142
+#: ../js/ui/calendar.js:127
 msgctxt "list tuesday"
 msgid "T"
 msgstr "S"

 #. Translators: Event list abbreviation for Wednesday */
-#: ../js/ui/calendar.js:144
+#: ../js/ui/calendar.js:129
 msgctxt "list wednesday"
 msgid "W"
 msgstr "Ç"

 #. Translators: Event list abbreviation for Thursday */
-#: ../js/ui/calendar.js:146
+#: ../js/ui/calendar.js:131
 msgctxt "list thursday"
 msgid "Th"
 msgstr "Pe"

 #. Translators: Event list abbreviation for Friday */
-#: ../js/ui/calendar.js:148
+#: ../js/ui/calendar.js:133
 msgctxt "list friday"
 msgid "F"
 msgstr "C"

 #. Translators: Event list abbreviation for Saturday */
-#: ../js/ui/calendar.js:150
+#: ../js/ui/calendar.js:135
 msgctxt "list saturday"
 msgid "S"
 msgstr "Ct"

-#: ../js/ui/calendar.js:453
+#: ../js/ui/calendar.js:444
 msgid "Previous month"
 msgstr "Önceki ay"

-#: ../js/ui/calendar.js:463
+#: ../js/ui/calendar.js:454
 msgid "Next month"
 msgstr "Gelecek ay"

 #. Translators: Text to show if there are no events */
-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:789
 msgid "Nothing Scheduled"
 msgstr "Planınız Boş"

-#. Translators: Shown on calendar heading when selected day occurs on current
-#. year */
-#: ../js/ui/calendar.js:799
+#: ../js/ui/calendar.js:808
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"

-#. Translators: Shown on calendar heading when selected day occurs on
-#. different year */
-#: ../js/ui/calendar.js:802
+#: ../js/ui/calendar.js:812
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"

-#: ../js/ui/calendar.js:813
+#: ../js/ui/calendar.js:824
 msgid "Today"
 msgstr "Bugün"

-#: ../js/ui/calendar.js:817
+#: ../js/ui/calendar.js:828
 msgid "Tomorrow"
 msgstr "Yarın"

-#: ../js/ui/calendar.js:828
+#: ../js/ui/calendar.js:839
 msgid "This week"
 msgstr "Bu hafta"

-#: ../js/ui/calendar.js:836
+#: ../js/ui/calendar.js:847
 msgid "Next week"
 msgstr "Gelecek hafta"

@ -583,7 +587,7 @@ msgid "Type again:"
 msgstr "Terkar yazın:"

 #: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:918
+#: ../js/ui/status/network.js:359 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Bağlan"

@ -675,103 +679,103 @@ msgstr "Doğrula"
 msgid "Sorry, that didn't work. Please try again."
 msgstr "Üzgünüm ama işe yaramadı. Lütfen tekrar deneyin."

-#: ../js/ui/components/telepathyClient.js:240
+#: ../js/ui/components/telepathyClient.js:242
 msgid "Invitation"
 msgstr "Davet"

-#: ../js/ui/components/telepathyClient.js:300
+#: ../js/ui/components/telepathyClient.js:302
 msgid "Call"
 msgstr "Çağrı"

-#: ../js/ui/components/telepathyClient.js:316
+#: ../js/ui/components/telepathyClient.js:318
 msgid "File Transfer"
 msgstr "Dosya Aktarımı"

-#: ../js/ui/components/telepathyClient.js:420
+#: ../js/ui/components/telepathyClient.js:422
 msgid "Chat"
 msgstr "Sohbet"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Unmute"
 msgstr "Sesi Aç"

-#: ../js/ui/components/telepathyClient.js:483
+#: ../js/ui/components/telepathyClient.js:485
 msgid "Mute"
 msgstr "Sesi Kapat"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:953
+#: ../js/ui/components/telepathyClient.js:955
 msgid "%H∶%M"
 msgstr "%H∶%M"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 24h format. i.e. "Yesterday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:960
+#: ../js/ui/components/telepathyClient.js:962
 msgid "Yesterday, %H∶%M"
 msgstr "Dün, %H∶%M"

 #. Translators: this is the week day name followed by a time
 #. string in 24h format. i.e. "Monday, 14:30" */
-#: ../js/ui/components/telepathyClient.js:967
+#: ../js/ui/components/telepathyClient.js:969
 msgid "%A, %H∶%M"
 msgstr "%A, %H∶%M"

 #. Translators: this is the month name and day number
 #. followed by a time string in 24h format.
 #. i.e. "May 25, 14:30" */
-#: ../js/ui/components/telepathyClient.js:974
+#: ../js/ui/components/telepathyClient.js:976
 msgid "%B %d, %H∶%M"
 msgstr "%d %B, %H∶%M"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 24h format.
 #. i.e. "May 25 2012, 14:30" */
-#: ../js/ui/components/telepathyClient.js:980
+#: ../js/ui/components/telepathyClient.js:982
 msgid "%B %d %Y, %H∶%M"
 msgstr "%d %B %Y, %H∶%M"

 #. Translators: Time in 24h format */
-#: ../js/ui/components/telepathyClient.js:986
+#: ../js/ui/components/telepathyClient.js:988
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"

 #. Translators: this is the word "Yesterday" followed by a
 #. time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:993
+#: ../js/ui/components/telepathyClient.js:995
 msgid "Yesterday, %l∶%M %p"
 msgstr "Dün, %l∶%M %p"

 #. Translators: this is the week day name followed by a time
 #. string in 12h format. i.e. "Monday, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1000
+#: ../js/ui/components/telepathyClient.js:1002
 msgid "%A, %l∶%M %p"
 msgstr "%A, %l∶%M %p"

 #. Translators: this is the month name and day number
 #. followed by a time string in 12h format.
 #. i.e. "May 25, 2:30 pm" */
-#: ../js/ui/components/telepathyClient.js:1007
+#: ../js/ui/components/telepathyClient.js:1009
 msgid "%B %d, %l∶%M %p"
 msgstr "%d %B, %l∶%M %p"

 #. Translators: this is the month name, day number, year
 #. number followed by a time string in 12h format.
 #. i.e. "May 25 2012, 2:30 pm"*/
-#: ../js/ui/components/telepathyClient.js:1013
+#: ../js/ui/components/telepathyClient.js:1015
 msgid "%B %d %Y, %l∶%M %p"
 msgstr "%d %B %Y, %l∶%M %p"

 #. Translators: this is the other person changing their old IM name to their
 #. new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:1045
+#: ../js/ui/components/telepathyClient.js:1047
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s, şimdi %s olarak biliniyor"

 #. translators: argument is a room name like
 #. * room@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1149
+#: ../js/ui/components/telepathyClient.js:1151
 #, javascript-format
 msgid "Invitation to %s"
 msgstr "%s'e Davet"
@ -779,38 +783,38 @@ msgstr "%s'e Davet"
 #. translators: first argument is the name of a contact and the second
 #. * one the name of a room. "Alice is inviting you to join room@jabber.org
 #. * for example. */
-#: ../js/ui/components/telepathyClient.js:1157
+#: ../js/ui/components/telepathyClient.js:1159
 #, javascript-format
 msgid "%s is inviting you to join %s"
 msgstr "%s, sizi %s'e katılmanız için davet ediyor"

-#: ../js/ui/components/telepathyClient.js:1159
-#: ../js/ui/components/telepathyClient.js:1194
-#: ../js/ui/components/telepathyClient.js:1228
-#: ../js/ui/components/telepathyClient.js:1286
+#: ../js/ui/components/telepathyClient.js:1161
+#: ../js/ui/components/telepathyClient.js:1196
+#: ../js/ui/components/telepathyClient.js:1230
+#: ../js/ui/components/telepathyClient.js:1287
 msgid "Decline"
 msgstr "Reddet"

-#: ../js/ui/components/telepathyClient.js:1165
-#: ../js/ui/components/telepathyClient.js:1234
-#: ../js/ui/components/telepathyClient.js:1291
+#: ../js/ui/components/telepathyClient.js:1167
+#: ../js/ui/components/telepathyClient.js:1236
+#: ../js/ui/components/telepathyClient.js:1292
 msgid "Accept"
 msgstr "Kabul Et"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1184
+#: ../js/ui/components/telepathyClient.js:1186
 #, javascript-format
 msgid "Video call from %s"
 msgstr "%s'den görüntülü arama"

 #. translators: argument is a contact name like Alice for example. */
-#: ../js/ui/components/telepathyClient.js:1187
+#: ../js/ui/components/telepathyClient.js:1189
 #, javascript-format
 msgid "Call from %s"
 msgstr "%s'den çağrı"

 #. translators: this is a button label (verb), not a noun */
-#: ../js/ui/components/telepathyClient.js:1201
+#: ../js/ui/components/telepathyClient.js:1203
 msgid "Answer"
 msgstr "Cevapla"

@ -819,129 +823,129 @@ msgstr "Cevapla"
 #. * file name. The string will be something
 #. * like: "Alice is sending you test.ogg"
 #. */
-#: ../js/ui/components/telepathyClient.js:1222
+#: ../js/ui/components/telepathyClient.js:1224
 #, javascript-format
 msgid "%s is sending you %s"
 msgstr "%s, size %s dosyasını gönderiyor"

 #. To translators: The parameter is the contact's alias */
-#: ../js/ui/components/telepathyClient.js:1251
+#: ../js/ui/components/telepathyClient.js:1253
 #, javascript-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s, ne zaman çevrimiçi olduğunuzu görmek için izin istiyor"

-#: ../js/ui/components/telepathyClient.js:1337
+#: ../js/ui/components/telepathyClient.js:1338
 msgid "Network error"
 msgstr "Ağ hatası"

-#: ../js/ui/components/telepathyClient.js:1339
+#: ../js/ui/components/telepathyClient.js:1340
 msgid "Authentication failed"
 msgstr "Kimlik doğrulama başarısız"

-#: ../js/ui/components/telepathyClient.js:1341
+#: ../js/ui/components/telepathyClient.js:1342
 msgid "Encryption error"
 msgstr "Şifreleme hatası"

-#: ../js/ui/components/telepathyClient.js:1343
+#: ../js/ui/components/telepathyClient.js:1344
 msgid "Certificate not provided"
 msgstr "Sertifika sağlanmamış"

-#: ../js/ui/components/telepathyClient.js:1345
+#: ../js/ui/components/telepathyClient.js:1346
 msgid "Certificate untrusted"
 msgstr "Sertifika güvenilmez"

-#: ../js/ui/components/telepathyClient.js:1347
+#: ../js/ui/components/telepathyClient.js:1348
 msgid "Certificate expired"
 msgstr "Sertifikanın süresi dolmuş"

-#: ../js/ui/components/telepathyClient.js:1349
+#: ../js/ui/components/telepathyClient.js:1350
 msgid "Certificate not activated"
 msgstr "Sertifika etkinleştirilmemiş"

-#: ../js/ui/components/telepathyClient.js:1351
+#: ../js/ui/components/telepathyClient.js:1352
 msgid "Certificate hostname mismatch"
 msgstr "Sertifikanın makine adı uyuşmuyor"

-#: ../js/ui/components/telepathyClient.js:1353
+#: ../js/ui/components/telepathyClient.js:1354
 msgid "Certificate fingerprint mismatch"
 msgstr "Sertifikanın parmak izi uyuşmuyor"

-#: ../js/ui/components/telepathyClient.js:1355
+#: ../js/ui/components/telepathyClient.js:1356
 msgid "Certificate self-signed"
 msgstr "Sertifika kendinden-imzalı"

-#: ../js/ui/components/telepathyClient.js:1357
+#: ../js/ui/components/telepathyClient.js:1358
 msgid "Status is set to offline"
 msgstr "Durum çevrimdışına ayarlı"

-#: ../js/ui/components/telepathyClient.js:1359
+#: ../js/ui/components/telepathyClient.js:1360
 msgid "Encryption is not available"
 msgstr "Şifreleme kullanılabilir değil"

-#: ../js/ui/components/telepathyClient.js:1361
+#: ../js/ui/components/telepathyClient.js:1362
 msgid "Certificate is invalid"
 msgstr "Sertifika geçersiz"

-#: ../js/ui/components/telepathyClient.js:1363
+#: ../js/ui/components/telepathyClient.js:1364
 msgid "Connection has been refused"
 msgstr "Bağlantı reddedildi"

-#: ../js/ui/components/telepathyClient.js:1365
+#: ../js/ui/components/telepathyClient.js:1366
 msgid "Connection can't be established"
 msgstr "Bağlantı kurulamıyor"

-#: ../js/ui/components/telepathyClient.js:1367
+#: ../js/ui/components/telepathyClient.js:1368
 msgid "Connection has been lost"
 msgstr "Bağlantı koptu"

-#: ../js/ui/components/telepathyClient.js:1369
+#: ../js/ui/components/telepathyClient.js:1370
 msgid "This account is already connected to the server"
 msgstr "Bu hesap zaten sunucuya bağlı"

-#: ../js/ui/components/telepathyClient.js:1371
+#: ../js/ui/components/telepathyClient.js:1372
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Bağlantı, aynı kaynağı kullanan yeni bir bağlantı ile değiştirildi"

-#: ../js/ui/components/telepathyClient.js:1373
+#: ../js/ui/components/telepathyClient.js:1374
 msgid "The account already exists on the server"
 msgstr "Sunucuda böyle bir hesap zaten var"

-#: ../js/ui/components/telepathyClient.js:1375
+#: ../js/ui/components/telepathyClient.js:1376
 msgid "Server is currently too busy to handle the connection"
 msgstr "Sunucu, şu anda bağlantıyı işleyemeyecek kadar meşgul"

-#: ../js/ui/components/telepathyClient.js:1377
+#: ../js/ui/components/telepathyClient.js:1378
 msgid "Certificate has been revoked"
 msgstr "Sertifika hükümsüz kılınmış"

-#: ../js/ui/components/telepathyClient.js:1379
+#: ../js/ui/components/telepathyClient.js:1380
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Sertifika güvensiz bir şifreleme algoritması kullanıyor ya da kriptografik olarak zayıf"

-#: ../js/ui/components/telepathyClient.js:1381
+#: ../js/ui/components/telepathyClient.js:1382
 msgid ""
 "The length of the server certificate, or the depth of the server certificate"
 " chain, exceed the limits imposed by the cryptography library"
 msgstr "Sunucu sertifikasının uzunluğu ya da sunucu sertifikası zincirinin derinliği, şifreleme kütüphanesi tarafından koyulan sınırları aşıyor"

-#: ../js/ui/components/telepathyClient.js:1383
+#: ../js/ui/components/telepathyClient.js:1384
 msgid "Internal error"
 msgstr "İç hata"

 #. translators: argument is the account name, like
 #. * name@jabber.org for example. */
-#: ../js/ui/components/telepathyClient.js:1393
+#: ../js/ui/components/telepathyClient.js:1394
 #, javascript-format
 msgid "Unable to connect to %s"
 msgstr "%s bağlantısı sağlanamadı"

-#: ../js/ui/components/telepathyClient.js:1398
+#: ../js/ui/components/telepathyClient.js:1399
 msgid "View account"
 msgstr "Hesabı göster"

-#: ../js/ui/components/telepathyClient.js:1435
+#: ../js/ui/components/telepathyClient.js:1436
 msgid "Unknown reason"
 msgstr "Bilinmeyen sebep"

@ -957,15 +961,15 @@ msgstr "Uygulamaları Göster"
 msgid "Dash"
 msgstr "Konsol"

-#: ../js/ui/dateMenu.js:96
+#: ../js/ui/dateMenu.js:97
 msgid "Open Calendar"
 msgstr "Takvimi Aç"

-#: ../js/ui/dateMenu.js:100
+#: ../js/ui/dateMenu.js:101
 msgid "Open Clocks"
 msgstr "Saati Aç"

-#: ../js/ui/dateMenu.js:107
+#: ../js/ui/dateMenu.js:108
 msgid "Date & Time Settings"
 msgstr "Tarih ve Saat Ayarları"

@ -973,9 +977,9 @@ msgstr "Tarih ve Saat Ayarları"
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29
 #. AM").
 #. */
-#: ../js/ui/dateMenu.js:204
+#: ../js/ui/dateMenu.js:132
 msgid "%A %B %e, %Y"
-msgstr "%e %B %A, %Y"
+msgstr "%e %B %Y %A"

 #: ../js/ui/endSessionDialog.js:64
 #, javascript-format
@ -1108,7 +1112,7 @@ msgstr "Kur"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "extensions.gnome.org adresinden “%s” indirilip kurulsun mu?"

-#: ../js/ui/keyboard.js:692 ../js/ui/status/keyboard.js:523
+#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:539
 msgid "Keyboard"
 msgstr "Klavye"

@ -1164,53 +1168,54 @@ msgstr "Kaynağı Görüntüle"
 msgid "Web Page"
 msgstr "Web Sayfası"

-#: ../js/ui/messageTray.js:1326
+#: ../js/ui/messageTray.js:1332
 msgid "Open"
 msgstr "Aç"

-#: ../js/ui/messageTray.js:1333
+#: ../js/ui/messageTray.js:1339
 msgid "Remove"
 msgstr "Sil"

-#: ../js/ui/messageTray.js:1630
+#: ../js/ui/messageTray.js:1636
 msgid "Notifications"
 msgstr "Bildirimler"

-#: ../js/ui/messageTray.js:1637
+#: ../js/ui/messageTray.js:1643
 msgid "Clear Messages"
 msgstr "Mesajları Temizle"

-#: ../js/ui/messageTray.js:1656
+#: ../js/ui/messageTray.js:1662
 msgid "Notification Settings"
 msgstr "Bildirim Ayarları"

-#: ../js/ui/messageTray.js:1709
+#: ../js/ui/messageTray.js:1715
 msgid "Tray Menu"
 msgstr "Tepsi Menüsü"

-#: ../js/ui/messageTray.js:1926
+#: ../js/ui/messageTray.js:1939
 msgid "No Messages"
 msgstr "Mesaj Yok"

-#: ../js/ui/messageTray.js:1968
+#: ../js/ui/messageTray.js:1984
 msgid "Message Tray"
 msgstr "Mesaj Tepsisi"

-#: ../js/ui/messageTray.js:2971
-msgid "System Information"
-msgstr "Sistem Bilgisi"
-
-#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:425
-msgctxt "program"
-msgid "Unknown"
-msgstr "Bilinmeyen"
-
-#: ../js/ui/overviewControls.js:482 ../js/ui/screenShield.js:151
+#: ../js/ui/messageTray.js:2441 ../js/ui/overviewControls.js:483
+#: ../js/ui/screenShield.js:152
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d yeni mesaj"

+#: ../js/ui/messageTray.js:3011
+msgid "System Information"
+msgstr "Sistem Bilgisi"
+
+#: ../js/ui/notificationDaemon.js:513 ../src/shell-app.c:439
+msgctxt "program"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
 #: ../js/ui/overview.js:84
 msgid "Undo"
 msgstr "Geri Al"
@ -1227,17 +1232,17 @@ msgstr "Genel Görünüm"
 msgid "Type to search…"
 msgstr "Aramak için buraya yazın..."

-#: ../js/ui/panel.js:515
+#: ../js/ui/panel.js:521
 msgid "Quit"
 msgstr "Kapat"

 #. Translators: If there is no suitable word for "Activities"
 #. in your language, you can use the word for "Overview". */
-#: ../js/ui/panel.js:567
+#: ../js/ui/panel.js:573
 msgid "Activities"
 msgstr "Etkinlikler"

-#: ../js/ui/panel.js:918
+#: ../js/ui/panel.js:924
 msgid "Top Bar"
 msgstr "Tepe Çubuğu"

@ -1261,35 +1266,35 @@ msgstr "Yeniden başlatılıyor..."
 #. long format */
 #: ../js/ui/screenShield.js:88
 msgid "%A, %B %d"
-msgstr "%d %B, %A"
+msgstr "%d %B %A"

-#: ../js/ui/screenShield.js:153
+#: ../js/ui/screenShield.js:154
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d yeni bildirim"

-#: ../js/ui/screenShield.js:472 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:473 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Kilitle"

-#: ../js/ui/screenShield.js:706
+#: ../js/ui/screenShield.js:709
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME'un ekranı kilitlemesi gerekiyor"

-#: ../js/ui/screenShield.js:833 ../js/ui/screenShield.js:1304
+#: ../js/ui/screenShield.js:836 ../js/ui/screenShield.js:1312
 msgid "Unable to lock"
 msgstr "Kilitlenemedi"

-#: ../js/ui/screenShield.js:834 ../js/ui/screenShield.js:1305
+#: ../js/ui/screenShield.js:837 ../js/ui/screenShield.js:1313
 msgid "Lock was blocked by an application"
 msgstr "Kilitleme bir uygulama tarafından engellendi"

-#: ../js/ui/search.js:594
+#: ../js/ui/search.js:611
 msgid "Searching…"
 msgstr "Aranıyor…"

-#: ../js/ui/search.js:596
+#: ../js/ui/search.js:613
 msgid "No results."
 msgstr "Sonuç yok."

@ -1366,9 +1371,9 @@ msgid "Bluetooth"
 msgstr "Bluetooth"

 #: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1281
-#: ../js/ui/status/network.js:1392 ../js/ui/status/rfkill.js:86
-#: ../js/ui/status/rfkill.js:114
+#: ../js/ui/status/network.js:360 ../js/ui/status/network.js:1282
+#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
+#: ../js/ui/status/rfkill.js:118
 msgid "Turn Off"
 msgstr "Kapat"

@ -1382,7 +1387,7 @@ msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d Bağlı Cihaz"

-#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1309
+#: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
 msgid "Not Connected"
 msgstr "Bağlı Değil"

@ -1390,7 +1395,7 @@ msgstr "Bağlı Değil"
 msgid "Brightness"
 msgstr "Parlaklık"

-#: ../js/ui/status/keyboard.js:547
+#: ../js/ui/status/keyboard.js:563
 msgid "Show Keyboard Layout"
 msgstr "Klavye Düzenini Göster"

@ -1418,8 +1423,8 @@ msgstr "Etkinleştir"
 msgid "<unknown>"
 msgstr "<bilinmeyen>"

-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1307
-#: ../js/ui/status/network.js:1511
+#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
+#: ../js/ui/status/network.js:1512
 msgid "Off"
 msgstr "Kapalı"

@ -1438,7 +1443,7 @@ msgstr "Yönetilmeyen"
 msgid "Disconnecting"
 msgstr "Bağlantı Kesiliyor"

-#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1301
+#: ../js/ui/status/network.js:471 ../js/ui/status/network.js:1302
 msgid "Connecting"
 msgstr "Bağlantı Kuruluyor"

@ -1462,7 +1467,7 @@ msgstr "Ürün Bilgisi eksik"
 msgid "Unavailable"
 msgstr "Kullanılamaz"

-#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1695
+#: ../js/ui/status/network.js:488 ../js/ui/status/network.js:1696
 msgid "Connection failed"
 msgstr "Bağlantı başarısız oldu"

@ -1474,7 +1479,7 @@ msgstr "Kablolu Ağ Ayarları"
 msgid "Mobile Broadband Settings"
 msgstr "Mobil Geniş Bant Ayarları"

-#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1305
+#: ../js/ui/status/network.js:588 ../js/ui/status/network.js:1306
 msgid "Hardware Disabled"
 msgstr "Donanım Devre Dışı"

@ -1514,61 +1519,61 @@ msgstr "Kablosuz Ağlar"
 msgid "Select a network"
 msgstr "Bir ağ seçin"

-#: ../js/ui/status/network.js:882
+#: ../js/ui/status/network.js:883
 msgid "No Networks"
 msgstr "Ağ Yok"

-#: ../js/ui/status/network.js:903 ../js/ui/status/rfkill.js:112
+#: ../js/ui/status/network.js:904 ../js/ui/status/rfkill.js:116
 msgid "Use hardware switch to turn off"
 msgstr "Kapatmak için donanım anahtarını kullanın."

-#: ../js/ui/status/network.js:1173
+#: ../js/ui/status/network.js:1174
 msgid "Select Network"
 msgstr "Ağ Seç"

-#: ../js/ui/status/network.js:1179
+#: ../js/ui/status/network.js:1180
 msgid "Wi-Fi Settings"
 msgstr "Kablosuz Ağ Ayarları"

-#: ../js/ui/status/network.js:1281
+#: ../js/ui/status/network.js:1282
 msgid "Turn On"
 msgstr "Aç"

-#: ../js/ui/status/network.js:1298
+#: ../js/ui/status/network.js:1299
 msgid "Hotspot Active"
 msgstr "Hotspot Etkin"

-#: ../js/ui/status/network.js:1409
+#: ../js/ui/status/network.js:1410
 msgid "connecting..."
 msgstr "bağlanıyor..."

 #. Translators: this is for network connections that require some kind of key
 #. or password */
-#: ../js/ui/status/network.js:1412
+#: ../js/ui/status/network.js:1413
 msgid "authentication required"
 msgstr "kimlik doğrulaması gerekli"

-#: ../js/ui/status/network.js:1414
+#: ../js/ui/status/network.js:1415
 msgid "connection failed"
 msgstr "bağlantı başarısız"

-#: ../js/ui/status/network.js:1480 ../js/ui/status/rfkill.js:89
+#: ../js/ui/status/network.js:1481 ../js/ui/status/rfkill.js:94
 msgid "Network Settings"
 msgstr "Ağ Ayarları"

-#: ../js/ui/status/network.js:1482
+#: ../js/ui/status/network.js:1483
 msgid "VPN Settings"
 msgstr "VPN Ayarları"

-#: ../js/ui/status/network.js:1501
+#: ../js/ui/status/network.js:1502
 msgid "VPN"
 msgstr "VPN"

-#: ../js/ui/status/network.js:1656
+#: ../js/ui/status/network.js:1657
 msgid "Network Manager"
 msgstr "Ağ Yöneticisi"

-#: ../js/ui/status/network.js:1696
+#: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Ağ bağlantısının etkinleştirilmesi başarısız oldu"

@ -1602,11 +1607,11 @@ msgstr "UPS"
 msgid "Battery"
 msgstr "Pil"

-#: ../js/ui/status/rfkill.js:83
+#: ../js/ui/status/rfkill.js:88
 msgid "Airplane Mode"
 msgstr "Uçak Kipi"

-#: ../js/ui/status/rfkill.js:85
+#: ../js/ui/status/rfkill.js:90
 msgid "On"
 msgstr "Açık"

@ -1764,7 +1769,7 @@ msgstr "Oturum açma için -\"gdm\" gibi- özel bir kip kullan"
 msgid "List possible modes"
 msgstr "Mevcut kipleri listele"

-#: ../src/shell-app.c:666
+#: ../src/shell-app.c:680
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "“%s” başlatılamadı"
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -51,6 +51,13 @@ gnome-shell-extension-tool: gnome-shell-extension-tool.in Makefile
 gnome-shell-perf-tool: gnome-shell-perf-tool.in Makefile
 	$(AM_V_GEN) sed $(generated_script_substitutions) $< > $@.tmp && mv $@.tmp $@ && chmod a+x $@

+org-gtk-application.c org-gtk-application.h: org.gtk.Application.xml Makefile
+	$(AM_V_GEN) $(GDBUS_CODEGEN) \
+			--generate-c-code org-gtk-application \
+			--c-namespace Shell \
+			$<
+
+EXTRA_DIST += org.gtk.Application.xml
 CLEANFILES += gnome-shell $(bin_SCRIPTS)

 include Makefile-st.am
@ -75,6 +82,8 @@ privlib_LTLIBRARIES = libgnome-shell-js.la libgnome-shell-menu.la libgnome-shell
 noinst_LTLIBRARIES += libgnome-shell-base.la

 shell_built_sources = \
+	org-gtk-application.h \
+	org-gtk-application.c \
 	shell-enum-types.h \
 	shell-enum-types.c

@ -90,7 +99,7 @@ shell_public_headers_h =		\
 	shell-gtk-embed.h		\
 	shell-global.h			\
 	shell-invert-lightness-effect.h	\
-	shell-keybinding-modes.h	\
+	shell-action-modes.h		\
 	shell-mount-operation.h		\
 	shell-perf-log.h		\
 	shell-screenshot.h		\
@ -178,8 +187,12 @@ libgnome_shell_built_sources =		\
 libgnome_shell_la_SOURCES = $(libgnome_shell_sources)
 nodist_libgnome_shell_la_SOURCES = $(libgnome_shell_built_sources)

+shell_no_gir_sources = \
+	org-gtk-application.h \
+	org-gtk-application.c
+
 libgnome_shell_la_gir_sources = \
-	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources) $(libgnome_shell_built_sources))
+	$(filter-out %-private.h $(shell_private_sources) $(shell_no_gir_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources) $(libgnome_shell_built_sources))

 gnome_shell_SOURCES = main.c
 gnome_shell_CPPFLAGS = \
--- a/src/calendar-server/calendar-sources.c
+++ b/src/calendar-server/calendar-sources.c
@ -176,18 +176,54 @@ static void
 calendar_sources_init (CalendarSources *sources)
 {
  GError *error = NULL;
+  GDBusConnection *session_bus;
+  GVariant *result;

  sources->priv = CALENDAR_SOURCES_GET_PRIVATE (sources);

-  /* XXX Not sure what to do if this fails.
-   *     Should this class implement GInitable or pass the
-   *     registry in as a G_PARAM_CONSTRUCT_ONLY property? */
-  sources->priv->registry = e_source_registry_new_sync (NULL, &error);
+  /* WORKAROUND: the hardcoded timeout for e_source_registry_new_sync()
+     (and other library calls that eventually call g_dbus_proxy_new[_sync]())
+     is 25 seconds. This has been shown to be too small for
+     evolution-source-registry in certain cases (slow disk, concurrent IO,
+     many configured sources), so we first ensure that the service
+     starts with a manual call and a higher timeout.
+
+     HACK: every time the DBus API is bumped in e-d-s we need
+     to update this!
+  */
+  session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+  if (session_bus == NULL)
+    {
+      g_error ("Failed to connect to the session bus: %s", error->message);
+    }
+
+  result = g_dbus_connection_call_sync (session_bus, "org.freedesktop.DBus",
+                                        "/", "org.freedesktop.DBus",
+                                        "StartServiceByName",
+                                        g_variant_new ("(su)",
+                                                       "org.gnome.evolution.dataserver.Sources3",
+                                                       0),
+                                        NULL,
+                                        G_DBUS_CALL_FLAGS_NONE,
+                                        60 * 1000,
+                                        NULL, &error);
+  if (result != NULL)
+    {
+      g_variant_unref (result);
+      sources->priv->registry = e_source_registry_new_sync (NULL, &error);
+    }
+
  if (error != NULL)
    {
-      g_error ("%s: %s", G_STRFUNC, error->message);
+      /* Any error is fatal, but we don't want to crash gnome-shell-calendar-server
+         because of e-d-s problems. So just exit here.
+      */
+      g_warning ("Failed to start evolution-source-registry: %s", error->message);
+      exit(EXIT_FAILURE);
    }

+  g_object_unref (session_bus);
+
  sources->priv->source_added_id   = g_signal_connect (sources->priv->registry,
                                                       "source-added",
                                                       G_CALLBACK (calendar_sources_registry_source_changed_cb),
--- a/src/gnome-shell-extension-tool.in
+++ b/src/gnome-shell-extension-tool.in
@ -14,7 +14,7 @@ except ImportError:
    try:
        import simplejson as json
    except ImportError:
-        print 'The Python simplejson module is required'
+        print('The Python simplejson module is required')
        sys.exit(1)

 from gi.repository import Gio
@ -88,36 +88,36 @@ function disable() {
 }

 def create_extension():
-    print
-    print '''Name should be a very short (ideally descriptive) string.
+    print()
+    print('''Name should be a very short (ideally descriptive) string.
 Examples are: "Click To Focus",  "Adblock", "Shell Window Shrinker".
-'''
-    name = raw_input('Name: ').strip()
-    print
-    print '''Description is a single-sentence explanation of what your extension does.
+''')
+    name = input('Name: ').strip()
+    print()
+    print('''Description is a single-sentence explanation of what your extension does.
 Examples are: "Make windows visible on click", "Block advertisement popups"
              "Animate windows shrinking on minimize"
-'''
-    description = raw_input('Description: ').strip()
+''')
+    description = input('Description: ').strip()
    underifier = re.compile('[^A-Za-z]')
    sample_uuid = underifier.sub('_', name)
    # TODO use evolution data server
    hostname = socket.gethostname()
    sample_uuid = sample_uuid + '@' + hostname

-    print
-    print '''Uuid is a globally-unique identifier for your extension.
+    print()
+    print('''Uuid is a globally-unique identifier for your extension.
 This should be in the format of an email address (foo.bar@extensions.example.com), but
 need not be an actual email address, though it's a good idea to base the uuid on your
 email address.  For example, if your email address is janedoe@example.com, you might
-use an extension title clicktofocus@janedoe.example.com.'''
-    uuid = raw_input('Uuid [%s]: ' % (sample_uuid, )).strip()
+use an extension title clicktofocus@janedoe.example.com.''')
+    uuid = input('Uuid [%s]: ' % (sample_uuid, )).strip()
    if uuid == '':
        uuid = sample_uuid

    extension_path = os.path.join(os.path.expanduser('~/.local'), 'share', 'gnome-shell', 'extensions', uuid)
    if os.path.exists(extension_path):
-        print "Extension path %r already exists" % (extension_path, )
+        print("Extension path %r already exists" % (extension_path, ))
        sys.exit(0)
    os.makedirs(extension_path)
    meta = { 'name': name,
@ -132,13 +132,13 @@ use an extension title clicktofocus@janedoe.example.com.'''
        f.write(json.write(meta) + '\n')
    f.close()

-    for filename, contents in SAMPLE_EXTENSION_FILES.iteritems():
+    for filename, contents in SAMPLE_EXTENSION_FILES.items():
        path = os.path.join(extension_path, filename)
        f = open(path, 'w')
        f.write(contents)
        f.close()

-    print "Created extension in %r" % (extension_path, )
+    print("Created extension in %r" % (extension_path, ))
    extensionjs_path = os.path.join(extension_path, 'extension.js')
    subprocess.Popen(['xdg-open', extensionjs_path])

@ -149,19 +149,19 @@ def enable_extension(uuid):
    extensions = settings.get_strv(ENABLED_EXTENSIONS_KEY)

    if uuid in extensions:
-        print >> sys.stderr, "%r is already enabled." % (uuid,)
+        print("%r is already enabled." % (uuid,), file=sys.stderr)
        sys.exit(1)

    extensions.append(uuid)
    settings.set_strv(ENABLED_EXTENSIONS_KEY, extensions)
-    print >> sys.stderr, "%r is now enabled." % (uuid,)
+    print("%r is now enabled." % (uuid,), file=sys.stderr)

 def disable_extension(uuid):
    settings = Gio.Settings(schema='org.gnome.shell')
    extensions = settings.get_strv(ENABLED_EXTENSIONS_KEY)

    if uuid not in extensions:
-        print >> sys.stderr, "%r is not enabled or installed." % (uuid,)
+        print("%r is not enabled or installed." % (uuid,), file=sys.stderr)
        sys.exit(1)

    # Use a while loop here to remove *all* mentions instances
@ -170,7 +170,7 @@ def disable_extension(uuid):
        extensions.remove(uuid)

    settings.set_strv(ENABLED_EXTENSIONS_KEY, extensions)
-    print >> sys.stderr, "%r is now disabled." % (uuid,)
+    print("%r is now disabled." % (uuid,), file=sys.stderr)

 def main():
    parser = optparse.OptionParser()
--- a/src/gnome-shell-perf-tool.in
+++ b/src/gnome-shell-perf-tool.in
@ -14,15 +14,14 @@ import subprocess
 import sys
 import tempfile
 import base64
-from ConfigParser import RawConfigParser
+from configparser import RawConfigParser
 import hashlib
 import hmac
-import httplib
-import urlparse
-import urllib
+from http import client
+from urllib import parse

 def show_version(option, opt_str, value, parser):
-    print "GNOME Shell Performance Test @VERSION@"
+    print("GNOME Shell Performance Test @VERSION@")
    sys.exit()

 def wait_for_dbus_name(wait_name):
@ -41,7 +40,7 @@ def wait_for_dbus_name(wait_name):
                                  None)

    def on_timeout():
-        print "\nFailed to start %s: timed out" % (wait_name,)
+        print("\nFailed to start %s: timed out" % (wait_name,))
        sys.exit(1)
    GLib.timeout_add_seconds(7, on_timeout)

@ -131,15 +130,15 @@ def upload_performance_report(report_text):
        base_url = config.get('upload', 'url')
        system_name = config.get('upload', 'name')
        secret_key = config.get('upload', 'key')
-    except Exception, e:
-        print "Can't read upload configuration from %s: %s" % (config_file, str(e))
+    except Exception as e:
+        print("Can't read upload configuration from %s: %s" % (config_file, str(e)))
        sys.exit(1)

    # Determine host, port and upload URL from provided data, we're
    # a bit extra-careful about normalization since the URL is part
    # of the signature.

-    split = urlparse.urlsplit(base_url)
+    split = parse.urlsplit(base_url)
    scheme = split[0].lower()
    netloc = split[1]
    base_path = split[2]
@ -151,7 +150,7 @@ def upload_performance_report(report_text):
        host, port = m.group(1), None

    if scheme != "http":
-        print "'%s' is not a HTTP URL" % base_url
+        print("'%s' is not a HTTP URL" % base_url)
        sys.exit(1)

    if port is None:
@ -166,7 +165,7 @@ def upload_performance_report(report_text):
        normalized_base = "%s://%s:%d%s" % (scheme, host, port, base_path)

    upload_url = normalized_base + '/system/%s/upload' % system_name
-    upload_path = urlparse.urlsplit(upload_url)[2] # path portion
+    upload_path = parse.urlsplit(upload_url)[2] # path portion

    # Create signature based on upload URL and the report data

@ -174,7 +173,7 @@ def upload_performance_report(report_text):
    h = hmac.new(secret_key, digestmod=hashlib.sha1)
    h.update(signature_data)
    h.update(report_text)
-    signature = urllib.quote(base64.b64encode(h.digest()), "~")
+    signature = parse.quote(base64.b64encode(h.digest()), "~")

    headers = {
        'User-Agent': 'gnome-shell-performance-tool/@VERSION@',
@ -182,15 +181,15 @@ def upload_performance_report(report_text):
        'X-Shell-Signature': 'HMAC-SHA1 ' + signature
    };

-    connection = httplib.HTTPConnection(host, port)
+    connection = client.HTTPConnection(host, port)
    connection.request('POST', upload_path, report_text, headers)
    response = connection.getresponse()

    if response.status == 200:
-        print "Performance report upload succeeded"
+        print("Performance report upload succeeded")
    else:
-        print "Performance report upload failed with status %d" % response.status
-        print response.read()
+        print("Performance report upload failed with status %d" % response.status)
+        print(response.read())

 def gnome_hwtest_log(*args):
    command = ['gnome-hwtest-log', '-t', 'gnome-shell-perf-tool']
@ -207,7 +206,7 @@ def run_performance_test():

    start_perf_helper()

-    for i in xrange(0, iters):
+    for i in range(0, iters):
        # We create an empty temporary file that the shell will overwrite
        # with the contents.
        handle, output_file = tempfile.mkstemp(".json", "gnome-shell-perf.")
@ -306,12 +305,12 @@ def run_performance_test():
        gnome_hwtest_log('--finished')
    else:
        # Write a human readable summary
-        print '------------------------------------------------------------';
+        print('------------------------------------------------------------')
        for metric in sorted(metric_summaries.keys()):
            summary = metric_summaries[metric]
-            print "#", summary['description']
-            print metric, ", ".join((str(x) for x in summary['values']))
-        print '------------------------------------------------------------';
+            print("#", summary['description'])
+            print(metric, ", ".join((str(x) for x in summary['values'])))
+        print('------------------------------------------------------------')

    return True

--- a/src/org.gtk.Application.xml
+++ b/src/org.gtk.Application.xml
@ -0,0 +1,19 @@
+<node>
+  <interface name='org.gtk.Application'>
+    <method name='Activate'>
+      <arg type='a{sv}' name='platform_data' direction='in'/>
+    </method>
+    <method name='Open'>
+      <arg type='as' name='uris' direction='in'/>
+      <arg type='s' name='hint' direction='in'/>
+      <arg type='a{sv}' name='platform_data' direction='in'/>
+    </method>
+    <method name='CommandLine'>
+      <arg type='o' name='path' direction='in'/>
+      <arg type='aay' name='arguments' direction='in'/>
+      <arg type='a{sv}' name='platform_data' direction='in'/>
+      <arg type='i' name='exit_status' direction='out'/>
+    </method>
+    <property name='Busy' type='b' access='read'/>
+  </interface>
+</node>
--- a/src/shell-action-modes.h
+++ b/src/shell-action-modes.h
@ -0,0 +1,39 @@
+/**
+ * ShellActionMode:
+ * @SHELL_ACTION_MODE_NONE: block action
+ * @SHELL_ACTION_MODE_NORMAL: allow action when in window mode,
+ *     e.g. when the focus is in an application window
+ * @SHELL_ACTION_MODE_OVERVIEW: allow action while the overview
+ *     is active
+ * @SHELL_ACTION_MODE_LOCK_SCREEN: allow action when the screen
+ *     is locked, e.g. when the screen shield is shown
+ * @SHELL_ACTION_MODE_UNLOCK_SCREEN: allow action in the unlock
+ *     dialog
+ * @SHELL_ACTION_MODE_LOGIN_SCREEN: allow action in the login screen
+ * @SHELL_ACTION_MODE_MESSAGE_TRAY: allow action while the message
+ *     tray is popped up
+ * @SHELL_ACTION_MODE_SYSTEM_MODAL: allow action when a system modal
+ *     dialog (e.g. authentification or session dialogs) is open
+ * @SHELL_ACTION_MODE_LOOKING_GLASS: allow action in looking glass
+ * @SHELL_ACTION_MODE_TOPBAR_POPUP: allow action while a top bar menu
+ *     is open
+ * @SHELL_ACTION_MODE_ALL: always allow action
+ *
+ * Controls in which GNOME Shell states an action (like keybindings and gestures)
+ * should be handled.
+*/
+typedef enum {
+  SHELL_ACTION_MODE_NONE          = 0,
+  SHELL_ACTION_MODE_NORMAL        = 1 << 0,
+  SHELL_ACTION_MODE_OVERVIEW      = 1 << 1,
+  SHELL_ACTION_MODE_LOCK_SCREEN   = 1 << 2,
+  SHELL_ACTION_MODE_UNLOCK_SCREEN = 1 << 3,
+  SHELL_ACTION_MODE_LOGIN_SCREEN  = 1 << 4,
+  SHELL_ACTION_MODE_MESSAGE_TRAY  = 1 << 5,
+  SHELL_ACTION_MODE_SYSTEM_MODAL  = 1 << 6,
+  SHELL_ACTION_MODE_LOOKING_GLASS = 1 << 7,
+  SHELL_ACTION_MODE_TOPBAR_POPUP  = 1 << 8,
+
+  SHELL_ACTION_MODE_ALL = ~0,
+} ShellActionMode;
+
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@ -335,7 +335,6 @@ _shell_app_system_notify_app_state_changed (ShellAppSystem *self,
  switch (state)
    {
    case SHELL_APP_STATE_RUNNING:
-    case SHELL_APP_STATE_BUSY:
      g_hash_table_insert (self->priv->running_apps, g_object_ref (app), NULL);
      break;
    case SHELL_APP_STATE_STARTING:
--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -16,6 +16,7 @@
 #include "shell-window-tracker-private.h"
 #include "st.h"
 #include "gtkactionmuxer.h"
+#include "org-gtk-application.h"

 #ifdef HAVE_SYSTEMD
 #include <systemd/sd-journal.h>
@ -47,14 +48,16 @@ typedef struct {
  /* Whether or not we need to resort the windows; this is done on demand */
  guint window_sort_stale : 1;

-  /* DBus property notification subscription */
-  guint properties_changed_id : 1;
-
  /* See GApplication documentation */
  GDBusMenuModel   *remote_menu;
  GtkActionMuxer   *muxer;
  char             *unique_bus_name;
  GDBusConnection  *session;
+
+  /* GDBus Proxy for getting application busy state */
+  ShellOrgGtkApplication *application_proxy;
+  GCancellable           *cancellable;
+
 } ShellAppRunningState;

 /**
@ -89,6 +92,7 @@ struct _ShellApp
 enum {
  PROP_0,
  PROP_STATE,
+  PROP_BUSY,
  PROP_ID,
  PROP_DBUS_ID,
  PROP_ACTION_GROUP,
@ -120,6 +124,9 @@ shell_app_get_property (GObject    *gobject,
    case PROP_STATE:
      g_value_set_enum (value, app->state);
      break;
+    case PROP_BUSY:
+      g_value_set_boolean (value, shell_app_get_busy (app));
+      break;
    case PROP_ID:
      g_value_set_string (value, shell_app_get_id (app));
      break;
@ -182,9 +189,9 @@ window_backed_app_get_icon (ShellApp *app,
    }

  window = window_backed_app_get_window (app);
-  actor = st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
-                                                               G_OBJECT (window),
-                                                               "icon");
+  actor = st_texture_cache_bind_cairo_surface_property (st_texture_cache_get_default (),
+                                                        G_OBJECT (window),
+                                                        "icon");
  g_object_set (actor, "width", (float) size, "height", (float) size, NULL);
  return actor;
 }
@ -202,27 +209,23 @@ shell_app_create_icon_texture (ShellApp   *app,
                               int         size)
 {
  GIcon *icon;
-  gint scale;
  ClutterActor *ret;
-  ShellGlobal *global;
-  StThemeContext *context;
-
-  global = shell_global_get ();
-  context = st_theme_context_get_for_stage (shell_global_get_stage (global));
-  g_object_get (context, "scale-factor", &scale, NULL);
-  ret = NULL;

  if (app->info == NULL)
    return window_backed_app_get_icon (app, size);

+  ret = st_icon_new ();
+  st_icon_set_icon_size (ST_ICON (ret), size);
+
  icon = g_app_info_get_icon (G_APP_INFO (app->info));
  if (icon != NULL)
-    ret = st_texture_cache_load_gicon (st_texture_cache_get_default (), NULL, icon, size, scale);
-
-  if (ret == NULL)
+    {
+      st_icon_set_gicon (ST_ICON (ret), icon);
+    }
+  else
    {
      icon = g_themed_icon_new ("application-x-executable");
-      ret = st_texture_cache_load_gicon (st_texture_cache_get_default (), NULL, icon, size, scale);
+      st_icon_set_gicon (ST_ICON (ret), icon);
      g_object_unref (icon);
    }

@ -234,6 +237,7 @@ typedef struct {
  int size;
  int scale;
  ClutterTextDirection direction;
+  StThemeNode *theme_node;
 } CreateFadedIconData;

 static CoglHandle
@ -261,19 +265,28 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
  guint8 *pixels;
  GIcon *icon;
  GtkIconInfo *info;
+  GtkIconLookupFlags lookup_flags;
+  StIconStyle icon_style;

  app = data->app;
  size = data->size;
  scale = data->scale;
+  icon_style = st_theme_node_get_icon_style (data->theme_node);

  info = NULL;

+  lookup_flags = GTK_ICON_LOOKUP_FORCE_SIZE;
+  if (icon_style == ST_ICON_STYLE_REGULAR)
+    lookup_flags |= GTK_ICON_LOOKUP_FORCE_REGULAR;
+  else if (icon_style == ST_ICON_STYLE_SYMBOLIC)
+    lookup_flags |= GTK_ICON_LOOKUP_FORCE_SYMBOLIC;
+
  icon = g_app_info_get_icon (G_APP_INFO (app->info));
  if (icon != NULL)
    {
      info = gtk_icon_theme_lookup_by_gicon_for_scale (gtk_icon_theme_get_default (),
                                                       icon, size, scale,
-                                                       GTK_ICON_LOOKUP_FORCE_SIZE);
+                                                       lookup_flags);
    }

  if (info == NULL)
@ -281,7 +294,7 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
      icon = g_themed_icon_new ("application-x-executable");
      info = gtk_icon_theme_lookup_by_gicon_for_scale (gtk_icon_theme_get_default (),
                                                       icon, size, scale,
-                                                       GTK_ICON_LOOKUP_FORCE_SIZE);
+                                                       lookup_flags);
      g_object_unref (icon);
    }

@ -388,6 +401,7 @@ shell_app_get_faded_icon (ShellApp *app, int size, ClutterTextDirection directio
  data.size = size;
  data.scale = scale;
  data.direction = direction;
+  data.theme_node = st_theme_context_get_root_node (context);
  texture = st_texture_cache_load (st_texture_cache_get_default (),
                                   cache_key,
                                   ST_TEXTURE_CACHE_POLICY_FOREVER,
@ -675,7 +689,6 @@ shell_app_activate_full (ShellApp      *app,
      case SHELL_APP_STATE_STARTING:
        break;
      case SHELL_APP_STATE_RUNNING:
-      case SHELL_APP_STATE_BUSY:
        shell_app_activate_window (app, NULL, timestamp);
        break;
    }
@ -1057,38 +1070,55 @@ shell_app_on_ws_switch (MetaScreen         *screen,
  g_signal_emit (app, shell_app_signals[WINDOWS_CHANGED], 0);
 }

+gboolean
+shell_app_get_busy (ShellApp *app)
+{
+  if (app->running_state != NULL &&
+      app->running_state->application_proxy != NULL &&
+      shell_org_gtk_application_get_busy (app->running_state->application_proxy))
+    return TRUE;
+
+  return FALSE;
+}
+
 static void
-application_properties_changed (GDBusConnection *connection,
-                                const gchar     *sender_name,
-                                const gchar     *object_path,
-                                const gchar     *interface_name,
-                                const gchar     *signal_name,
-                                GVariant        *parameters,
-                                gpointer         user_data)
+busy_changed_cb (GObject    *object,
+                 GParamSpec *pspec,
+                 gpointer    user_data)
 {
  ShellApp *app = user_data;
-  GVariant *changed_properties;
-  gboolean busy = FALSE;
-  const gchar *interface_name_for_signal;

-  g_variant_get (parameters,
-                 "(&s@a{sv}as)",
-                 &interface_name_for_signal,
-                 &changed_properties,
-                 NULL);
+  g_assert (SHELL_IS_APP (app));

-  if (g_strcmp0 (interface_name_for_signal, "org.gtk.Application") != 0)
-    return;
+  g_object_notify (G_OBJECT (app), "busy");
+}

-  g_variant_lookup (changed_properties, "Busy", "b", &busy);
+static void
+get_application_proxy (GObject      *source,
+                       GAsyncResult *result,
+                       gpointer      user_data)
+{
+  ShellApp *app = user_data;
+  ShellOrgGtkApplication *proxy;

-  if (busy)
-    shell_app_state_transition (app, SHELL_APP_STATE_BUSY);
-  else
-    shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
+  g_assert (SHELL_IS_APP (app));

-  if (changed_properties != NULL)
-    g_variant_unref (changed_properties);
+  proxy = shell_org_gtk_application_proxy_new_finish (result, NULL);
+  if (proxy != NULL)
+    {
+      app->running_state->application_proxy = proxy;
+      g_signal_connect (proxy,
+                        "notify::busy",
+                        G_CALLBACK (busy_changed_cb),
+                        app);
+      if (shell_org_gtk_application_get_busy (proxy))
+        g_object_notify (G_OBJECT (app), "busy");
+    }
+
+  if (app->running_state != NULL)
+    g_clear_object (&app->running_state->cancellable);
+
+  g_object_unref (app);
 }

 static void
@ -1098,7 +1128,8 @@ shell_app_ensure_busy_watch (ShellApp *app)
  MetaWindow *window;
  const gchar *object_path;

-  if (running_state->properties_changed_id != 0)
+  if (running_state->application_proxy != NULL ||
+      running_state->cancellable != NULL)
    return;

  if (running_state->unique_bus_name == NULL)
@ -1110,15 +1141,16 @@ shell_app_ensure_busy_watch (ShellApp *app)
  if (object_path == NULL)
    return;

-  running_state->properties_changed_id =
-    g_dbus_connection_signal_subscribe (running_state->session,
-                                        running_state->unique_bus_name,
-                                        "org.freedesktop.DBus.Properties",
-                                        "PropertiesChanged",
-                                        object_path,
-                                        "org.gtk.Application",
-                                        G_DBUS_SIGNAL_FLAGS_NONE,
-                                        application_properties_changed, app, NULL);
+  running_state->cancellable = g_cancellable_new();
+  /* Take a reference to app to make sure it isn't finalized before
+     get_application_proxy runs */
+  shell_org_gtk_application_proxy_new (running_state->session,
+                                       G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                                       running_state->unique_bus_name,
+                                       object_path,
+                                       running_state->cancellable,
+                                       get_application_proxy,
+                                       g_object_ref (app));
 }

 void
@ -1268,24 +1300,6 @@ shell_app_request_quit (ShellApp   *app)
  return TRUE;
 }

-static void
-_gather_pid_callback (GDesktopAppInfo   *gapp,
-                      GPid               pid,
-                      gpointer           data)
-{
-  ShellApp *app;
-  ShellWindowTracker *tracker;
-
-  g_return_if_fail (data != NULL);
-
-  app = SHELL_APP (data);
-  tracker = shell_window_tracker_get_default ();
-
-  _shell_window_tracker_add_child_process_app (tracker,
-                                               pid,
-                                               app);
-}
-
 #ifdef HAVE_SYSTEMD
 /* This sets up the launched application to log to the journal
 * using its own identifier, instead of just "gnome-session".
@ -1337,13 +1351,13 @@ shell_app_launch (ShellApp     *app,

  ret = g_desktop_app_info_launch_uris_as_manager (app->info, NULL,
                                                   context,
-                                                   G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+                                                   G_SPAWN_SEARCH_PATH,
 #ifdef HAVE_SYSTEMD
                                                   app_child_setup, (gpointer)shell_app_get_id (app),
 #else
                                                   NULL, NULL,
 #endif
-                                                   _gather_pid_callback, app,
+                                                   NULL, NULL,
                                                   error);
  g_object_unref (context);

@ -1461,8 +1475,13 @@ unref_running_state (ShellAppRunningState *state)
  screen = shell_global_get_screen (shell_global_get ());
  g_signal_handler_disconnect (screen, state->workspace_switch_id);

-  if (state->properties_changed_id != 0)
-    g_dbus_connection_signal_unsubscribe (state->session, state->properties_changed_id);
+  g_clear_object (&state->application_proxy);
+
+  if (state->cancellable != NULL)
+    {
+      g_cancellable_cancel (state->cancellable);
+      g_clear_object (&state->cancellable);
+    }

  g_clear_object (&state->remote_menu);
  g_clear_object (&state->muxer);
@ -1555,6 +1574,19 @@ shell_app_class_init(ShellAppClass *klass)
                                                      SHELL_APP_STATE_STOPPED,
                                                      G_PARAM_READABLE));

+  /**
+   * ShellApp:busy:
+   *
+   * Whether the application has marked itself as busy.
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_BUSY,
+                                   g_param_spec_boolean ("busy",
+                                                         "Busy",
+                                                         "Busy state",
+                                                         FALSE,
+                                                         G_PARAM_READABLE));
+
  /**
   * ShellApp:id:
   *
--- a/src/shell-app.h
+++ b/src/shell-app.h
@ -30,8 +30,7 @@ struct _ShellAppClass
 typedef enum {
  SHELL_APP_STATE_STOPPED,
  SHELL_APP_STATE_STARTING,
-  SHELL_APP_STATE_RUNNING,
-  SHELL_APP_STATE_BUSY
+  SHELL_APP_STATE_RUNNING
 } ShellAppState;

 GType shell_app_get_type (void) G_GNUC_CONST;
@ -87,6 +86,8 @@ int shell_app_compare (ShellApp *app, ShellApp *other);
 void shell_app_update_window_actions (ShellApp *app, MetaWindow *window);
 void shell_app_update_app_menu       (ShellApp *app, MetaWindow *window);

+gboolean shell_app_get_busy          (ShellApp *app);
+
 G_END_DECLS

 #endif /* __SHELL_APP_H__ */
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -1132,14 +1132,6 @@ shell_global_end_modal (ShellGlobal *global,
  sync_input_region (global);
 }

-void
-shell_global_freeze_keyboard (ShellGlobal *global,
-                              guint32      timestamp)
-{
-  if (global->stage_xwindow != None)
-    meta_display_freeze_keyboard (global->meta_display, global->stage_xwindow, timestamp);
-}
-
 /* Code to close all file descriptors before we exec; copied from gspawn.c in GLib.
 *
 * Authors: Padraig O'Briain, Matthias Clasen, Lennart Poettering
--- a/src/shell-global.h
+++ b/src/shell-global.h
@ -45,8 +45,6 @@ gboolean shell_global_begin_modal            (ShellGlobal         *global,
                                              MetaModalOptions    options);
 void     shell_global_end_modal              (ShellGlobal         *global,
                                              guint32              timestamp);
-void     shell_global_freeze_keyboard        (ShellGlobal         *global,
-                                              guint32              timestamp);

 void     shell_global_set_stage_input_region (ShellGlobal         *global,
                                              GSList              *rectangles);
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@ -106,9 +106,6 @@ shell_gtk_embed_window_created_cb (MetaDisplay   *display,
                                             0, 0 /* offset x/y */);
      cairo_region_destroy (empty_region);

-      /* Set the actor as unreative so Clutter doesn't pick it, either */
-      clutter_actor_set_reactive (window_actor, FALSE);
-
      gdk_window_lower (gdk_window);

      /* Now that we've found the window we don't need to listen for
--- a/src/shell-keybinding-modes.h
+++ b/src/shell-keybinding-modes.h
@ -1,38 +0,0 @@
-/**
- * ShellKeyBindingMode:
- * @SHELL_KEYBINDING_MODE_NONE: block keybinding
- * @SHELL_KEYBINDING_MODE_NORMAL: allow keybinding when in window mode,
- *     e.g. when the focus is in an application window
- * @SHELL_KEYBINDING_MODE_OVERVIEW: allow keybinding while the overview
- *     is active
- * @SHELL_KEYBINDING_MODE_LOCK_SCREEN: allow keybinding when the screen
- *     is locked, e.g. when the screen shield is shown
- * @SHELL_KEYBINDING_MODE_UNLOCK_SCREEN: allow keybinding in the unlock
- *     dialog
- * @SHELL_KEYBINDING_MODE_LOGIN_SCREEN: allow keybinding in the login screen
- * @SHELL_KEYBINDING_MODE_MESSAGE_TRAY: allow keybinding while the message
- *     tray is popped up
- * @SHELL_KEYBINDING_MODE_SYSTEM_MODAL: allow keybinding when a system modal
- *     dialog (e.g. authentification or session dialogs) is open
- * @SHELL_KEYBINDING_MODE_LOOKING_GLASS: allow keybinding in looking glass
- * @SHELL_KEYBINDING_MODE_TOPBAR_POPUP: allow keybinding while a top bar menu
- *     is open
- * @SHELL_KEYBINDING_MODE_ALL: always allow keybinding
- *
- * Controls in which GNOME Shell states a keybinding should be handled.
-*/
-typedef enum {
-  SHELL_KEYBINDING_MODE_NONE          = 0,
-  SHELL_KEYBINDING_MODE_NORMAL        = 1 << 0,
-  SHELL_KEYBINDING_MODE_OVERVIEW      = 1 << 1,
-  SHELL_KEYBINDING_MODE_LOCK_SCREEN   = 1 << 2,
-  SHELL_KEYBINDING_MODE_UNLOCK_SCREEN = 1 << 3,
-  SHELL_KEYBINDING_MODE_LOGIN_SCREEN  = 1 << 4,
-  SHELL_KEYBINDING_MODE_MESSAGE_TRAY  = 1 << 5,
-  SHELL_KEYBINDING_MODE_SYSTEM_MODAL  = 1 << 6,
-  SHELL_KEYBINDING_MODE_LOOKING_GLASS = 1 << 7,
-  SHELL_KEYBINDING_MODE_TOPBAR_POPUP  = 1 << 8,
-
-  SHELL_KEYBINDING_MODE_ALL = ~0,
-} ShellKeyBindingMode;
-
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -156,7 +156,7 @@ G_DEFINE_TYPE(ShellRecorder, shell_recorder, G_TYPE_OBJECT);
 * (Theora does have some support for frames at non-uniform times, but
 * things seem to break down if there are large gaps.)
 */
-#define DEFAULT_PIPELINE "vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux"
+#define DEFAULT_PIPELINE "vp9enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux"

 /* If we can find the amount of memory on the machine, we use half
 * of that for memory_target, otherwise, we use this value, in kB.
@ -437,14 +437,14 @@ recorder_record_frame (ShellRecorder *recorder)

  size = recorder->area.width * recorder->area.height * 4;

-  data = g_malloc (recorder->area.width * 4 * recorder->area.height);
-  cogl_read_pixels (recorder->area.x,
-                    recorder->area.y,
-                    recorder->area.width,
-                    recorder->area.height,
-                    COGL_READ_PIXELS_COLOR_BUFFER,
-                    CLUTTER_CAIRO_FORMAT_ARGB32,
-                    data);
+  data = g_malloc (size);
+  cogl_framebuffer_read_pixels (cogl_get_draw_framebuffer (),
+                                recorder->area.x,
+                                recorder->area.y,
+                                recorder->area.width,
+                                recorder->area.height,
+                                CLUTTER_CAIRO_FORMAT_ARGB32,
+                                data);

  buffer = gst_buffer_new();
  gst_buffer_insert_memory (buffer, -1,
@ -1261,7 +1261,7 @@ recorder_pipeline_closed (RecorderPipeline *pipeline)

 /*
 * Replaces '%T' in the passed pipeline with the thread count,
- * the maximum possible value is 64 (limit of what vp8enc supports)
+ * the maximum possible value is 64 (limit of what vp9enc supports)
 *
 * It is assumes that %T occurs only once.
 */
@ -1291,7 +1291,7 @@ substitute_thread_count (const char *pipeline)
  g_string_append_printf (result, "%d", n_threads);
  g_string_append (result, tmp + 2);

-  return g_string_free (result, FALSE);;
+  return g_string_free (result, FALSE);
 }

 static gboolean
@ -1303,7 +1303,7 @@ recorder_open_pipeline (ShellRecorder *recorder)
  GError *error = NULL;
  GstBus *bus;

-  pipeline = g_new0(RecorderPipeline, 1);
+  pipeline = g_new0 (RecorderPipeline, 1);
  pipeline->recorder = g_object_ref (recorder);
  pipeline->outfile = - 1;

@ -1459,7 +1459,7 @@ shell_recorder_set_draw_cursor (ShellRecorder *recorder,
 * might be used to send the output to an icecast server
 * via shout2send or similar.
 *
- * The default value is 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux'
+ * The default value is 'vp9enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux'
 */
 void
 shell_recorder_set_pipeline (ShellRecorder *recorder,
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@ -37,6 +37,7 @@ struct _ShellScreenshotPrivate
  cairo_rectangle_int_t screenshot_area;

  gboolean include_cursor;
+  gboolean include_frame;

  ShellScreenshotCallback callback;
 };
@ -73,6 +74,8 @@ on_screenshot_written (GObject *source,
  g_clear_pointer (&priv->image, cairo_surface_destroy);
  g_clear_pointer (&priv->filename, g_free);
  g_clear_pointer (&priv->filename_used, g_free);
+
+  meta_enable_unredirect_for_screen (shell_global_get_screen (priv->global));
 }

 /* called in an I/O thread */
@ -407,6 +410,56 @@ grab_area_screenshot (ClutterActor *stage,
  g_object_unref (result);
 }

+static void
+grab_window_screenshot (ClutterActor *stage,
+                        ShellScreenshot *screenshot)
+{
+  ShellScreenshotPrivate *priv = screenshot->priv;
+  GSimpleAsyncResult *result;
+  GSettings *settings;
+  MetaScreen *screen = shell_global_get_screen (priv->global);
+  MetaCursorTracker *tracker;
+  MetaDisplay *display = meta_screen_get_display (screen);
+  MetaWindow *window = meta_display_get_focus_window (display);
+  ClutterActor *window_actor;
+  gfloat actor_x, actor_y;
+  MetaShapedTexture *stex;
+  MetaRectangle rect;
+  cairo_rectangle_int_t clip;
+
+  window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
+  clutter_actor_get_position (window_actor, &actor_x, &actor_y);
+
+  meta_window_get_frame_rect (window, &rect);
+
+  if (!priv->include_frame)
+    meta_window_frame_rect_to_client_rect (window, &rect, &rect);
+
+  priv->screenshot_area.x = rect.x;
+  priv->screenshot_area.y = rect.y;
+  clip.x = rect.x - (gint) actor_x;
+  clip.y = rect.y - (gint) actor_y;
+
+  clip.width = priv->screenshot_area.width = rect.width;
+  clip.height = priv->screenshot_area.height = rect.height;
+
+  stex = META_SHAPED_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor)));
+  priv->image = meta_shaped_texture_get_image (stex, &clip);
+
+  settings = g_settings_new (A11Y_APPS_SCHEMA);
+  if (priv->include_cursor && !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY))
+    {
+      tracker = meta_cursor_tracker_get_for_screen (screen);
+      _draw_cursor_image (tracker, priv->image, priv->screenshot_area);
+    }
+  g_object_unref (settings);
+
+  g_signal_handlers_disconnect_by_func (stage, (void *)grab_window_screenshot, (gpointer)screenshot);
+  result = g_simple_async_result_new (G_OBJECT (screenshot), on_screenshot_written, NULL, grab_window_screenshot);
+  g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL);
+  g_object_unref (result);
+}
+
 /**
 * shell_screenshot_screenshot:
 * @screenshot: the #ShellScreenshot
@ -440,6 +493,8 @@ shell_screenshot_screenshot (ShellScreenshot *screenshot,

  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));

+  meta_disable_unredirect_for_screen (shell_global_get_screen (priv->global));
+
  g_signal_connect_after (stage, "paint", G_CALLBACK (grab_screenshot), (gpointer)screenshot);

  clutter_actor_queue_redraw (stage);
@ -487,6 +542,8 @@ shell_screenshot_screenshot_area (ShellScreenshot *screenshot,

  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));

+  meta_disable_unredirect_for_screen (shell_global_get_screen (shell_global_get ()));
+
  g_signal_connect_after (stage, "paint", G_CALLBACK (grab_area_screenshot), (gpointer)screenshot);

  clutter_actor_queue_redraw (stage);
@ -512,19 +569,11 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,
                                    const char *filename,
                                    ShellScreenshotCallback callback)
 {
-  GSimpleAsyncResult *result;
-  GSettings *settings;
  ShellScreenshotPrivate *priv = screenshot->priv;
-
  MetaScreen *screen = shell_global_get_screen (priv->global);
-  MetaCursorTracker *tracker;
+  ClutterActor *stage;
  MetaDisplay *display = meta_screen_get_display (screen);
  MetaWindow *window = meta_display_get_focus_window (display);
-  ClutterActor *window_actor;
-  gfloat actor_x, actor_y;
-  MetaShapedTexture *stex;
-  MetaRectangle rect;
-  cairo_rectangle_int_t clip;

  if (priv->filename != NULL || !window) {
    if (callback)
@ -534,37 +583,16 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,

  priv->filename = g_strdup (filename);
  priv->callback = callback;
+  priv->include_frame = include_frame;
+  priv->include_cursor = include_cursor;

-  window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
-  clutter_actor_get_position (window_actor, &actor_x, &actor_y);
+  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));

-  meta_window_get_frame_rect (window, &rect);
+  meta_disable_unredirect_for_screen (shell_global_get_screen (shell_global_get ()));

-  if (!include_frame)
-    meta_window_frame_rect_to_client_rect (window, &rect, &rect);
+  g_signal_connect_after (stage, "paint", G_CALLBACK (grab_window_screenshot), (gpointer)screenshot);

-  priv->screenshot_area.x = rect.x;
-  priv->screenshot_area.y = rect.y;
-  clip.x = rect.x - (gint) actor_x;
-  clip.y = rect.y - (gint) actor_y;
-
-  clip.width = priv->screenshot_area.width = rect.width;
-  clip.height = priv->screenshot_area.height = rect.height;
-
-  stex = META_SHAPED_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor)));
-  priv->image = meta_shaped_texture_get_image (stex, &clip);
-
-  settings = g_settings_new (A11Y_APPS_SCHEMA);
-  if (include_cursor && !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY))
-    {
-      tracker = meta_cursor_tracker_get_for_screen (screen);
-      _draw_cursor_image (tracker, priv->image, priv->screenshot_area);
-    }
-  g_object_unref (settings);
-
-  result = g_simple_async_result_new (G_OBJECT (screenshot), on_screenshot_written, NULL, shell_screenshot_screenshot_window);
-  g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL);
-  g_object_unref (result);
+  clutter_actor_queue_redraw (stage);
 }

 ShellScreenshot *
--- a/src/shell-util.c
+++ b/src/shell-util.c
@ -10,8 +10,8 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkx.h>
-#include <X11/extensions/XTest.h>

+#include <locale.h>
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
 #include <langinfo.h>
 #endif
@ -208,6 +208,32 @@ shell_util_get_week_start ()
  return week_start;
 }

+/**
+ * shell_util_translate_time_string:
+ * @str: String to translate
+ *
+ * Translate @str according to the locale defined by LC_TIME; unlike
+ * dcgettext(), the translations is still taken from the LC_MESSAGES
+ * catalogue and not the LC_TIME one.
+ *
+ * Returns: the translated string
+ */
+const char *
+shell_util_translate_time_string (const char *str)
+{
+  const char *locale = g_getenv ("LC_TIME");
+  const char *res;
+
+  if (locale)
+    setlocale (LC_MESSAGES, locale);
+
+  res = gettext (str);
+
+  setlocale (LC_MESSAGES, "");
+
+  return res;
+}
+
 /**
 * shell_write_string_to_stream:
 * @stream: a #GOutputStream
--- a/src/shell-util.h
+++ b/src/shell-util.h
@ -21,6 +21,7 @@ int      shell_util_get_week_start             (void);

 char    *shell_util_format_date                (const char       *format,
                                                gint64            time_ms);
+const char *shell_util_translate_time_string   (const char *str);

 gboolean shell_write_string_to_stream          (GOutputStream    *stream,
                                                const char       *str,
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@ -47,9 +47,6 @@ struct _ShellWindowTracker

  /* <MetaWindow * window, ShellApp *app> */
  GHashTable *window_to_app;
-
-  /* <int, ShellApp *app> */
-  GHashTable *launched_pid_to_app;
 };

 G_DEFINE_TYPE (ShellWindowTracker, shell_window_tracker, G_TYPE_OBJECT);
@ -293,7 +290,7 @@ get_app_from_window_group (ShellWindowTracker  *tracker,
 * @window: a #MetaWindow
 *
 * Check if the pid associated with @window corresponds to an
- * application we launched.
+ * application.
 *
 * Return value: (transfer full): A newly-referenced #ShellApp, or %NULL
 */
@ -312,7 +309,7 @@ get_app_from_window_pid (ShellWindowTracker  *tracker,
  if (pid == -1)
    return NULL;

-  result = g_hash_table_lookup (tracker->launched_pid_to_app, GINT_TO_POINTER (pid));
+  result = shell_window_tracker_get_app_from_pid (tracker, pid);
  if (result != NULL)
    g_object_ref (result);

@ -631,8 +628,6 @@ shell_window_tracker_init (ShellWindowTracker *self)
  self->window_to_app = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                               NULL, (GDestroyNotify) g_object_unref);

-  self->launched_pid_to_app = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_object_unref);
-
  screen = shell_global_get_screen (shell_global_get ());

  g_signal_connect (G_OBJECT (screen), "startup-sequence-changed",
@ -648,7 +643,6 @@ shell_window_tracker_finalize (GObject *object)
  ShellWindowTracker *self = SHELL_WINDOW_TRACKER (object);

  g_hash_table_destroy (self->window_to_app);
-  g_hash_table_destroy (self->launched_pid_to_app);

  G_OBJECT_CLASS (shell_window_tracker_parent_class)->finalize(object);
 }
@ -717,40 +711,6 @@ shell_window_tracker_get_app_from_pid (ShellWindowTracker *tracker,
  return result;
 }

-static void
-on_child_exited (GPid      pid,
-                 gint      status,
-                 gpointer  unused_data)
-{
-  ShellWindowTracker *tracker;
-
-  tracker = shell_window_tracker_get_default ();
-
-  g_hash_table_remove (tracker->launched_pid_to_app, GINT_TO_POINTER((gint)pid));
-}
-
-void
-_shell_window_tracker_add_child_process_app (ShellWindowTracker *tracker,
-                                             GPid                pid,
-                                             ShellApp           *app)
-{
-  gpointer pid_ptr = GINT_TO_POINTER((int)pid);
-
-  if (g_hash_table_lookup (tracker->launched_pid_to_app,
-                           &pid_ptr))
-    return;
-
-  g_hash_table_insert (tracker->launched_pid_to_app,
-                       pid_ptr,
-                       g_object_ref (app));
-  g_child_watch_add (pid, on_child_exited, NULL);
-  /* TODO: rescan unassociated windows
-   * Unlikely in practice that the launched app gets ahead of us
-   * enough to map an X window before we get scheduled after the fork(),
-   * but adding this note for future reference.
-   */
-}
-
 static void
 set_focus_app (ShellWindowTracker  *tracker,
               ShellApp            *new_focus_app)
--- a/src/st/st-border-image.c
+++ b/src/st/st-border-image.c
@ -27,7 +27,7 @@
 struct _StBorderImage {
  GObject parent;

-  char *filename;
+  GFile *file;
  int border_top;
  int border_right;
  int border_bottom;
@ -48,7 +48,7 @@ st_border_image_finalize (GObject *object)
 {
  StBorderImage *image = ST_BORDER_IMAGE (object);

-  g_free (image->filename);
+  g_object_unref (image->file);

  G_OBJECT_CLASS (st_border_image_parent_class)->finalize (object);
 }
@ -67,18 +67,18 @@ st_border_image_init (StBorderImage *image)
 }

 StBorderImage *
-st_border_image_new (const char *filename,
-                       int         border_top,
-                       int         border_right,
-                       int         border_bottom,
-                       int         border_left,
-                       int         scale_factor)
+st_border_image_new (GFile *file,
+                     int    border_top,
+                     int    border_right,
+                     int    border_bottom,
+                     int    border_left,
+                     int    scale_factor)
 {
  StBorderImage *image;

  image = g_object_new (ST_TYPE_BORDER_IMAGE, NULL);

-  image->filename = g_strdup (filename);
+  image->file = g_object_ref (file);
  image->border_top = border_top;
  image->border_right = border_right;
  image->border_bottom = border_bottom;
@ -88,12 +88,18 @@ st_border_image_new (const char *filename,
  return image;
 }

-const char *
-st_border_image_get_filename (StBorderImage *image)
+/**
+ * st_border_image_get_file:
+ * @image: a #StBorder_Image
+ *
+ * Returns: (transfer none): the #GFile for the #StBorder_Image
+ */
+GFile *
+st_border_image_get_file (StBorderImage *image)
 {
  g_return_val_if_fail (ST_IS_BORDER_IMAGE (image), NULL);

-  return image->filename;
+  return image->file;
 }

 void
@ -135,5 +141,5 @@ st_border_image_equal (StBorderImage *image,
          image->border_right == other->border_right &&
          image->border_bottom == other->border_bottom &&
          image->border_left == other->border_left &&
-          strcmp (image->filename, other->filename) == 0);
+          g_file_equal (image->file, other->file));
 }
--- a/src/st/st-border-image.h
+++ b/src/st/st-border-image.h
@ -22,6 +22,7 @@
 #define __ST_BORDER_IMAGE_H__

 #include <glib-object.h>
+#include <gio/gio.h>

 G_BEGIN_DECLS

@ -39,14 +40,14 @@ typedef struct _StBorderImageClass StBorderImageClass;

 GType             st_border_image_get_type          (void) G_GNUC_CONST;

-StBorderImage *st_border_image_new (const char *filename,
+StBorderImage *st_border_image_new (GFile      *file,
                                    int         border_top,
                                    int         border_right,
                                    int         border_bottom,
                                    int         border_left,
                                    int         scale_factor);

-const char *st_border_image_get_filename (StBorderImage *image);
+GFile      *st_border_image_get_file     (StBorderImage *image);
 void        st_border_image_get_borders  (StBorderImage *image,
                                          int           *border_top,
                                          int           *border_right,
--- a/src/st/st-button.c
+++ b/src/st/st-button.c
@ -267,7 +267,8 @@ st_button_key_press (ClutterActor    *actor,
    {
      if (event->keyval == CLUTTER_KEY_space ||
          event->keyval == CLUTTER_KEY_Return ||
-          event->keyval == CLUTTER_KEY_KP_Enter)
+          event->keyval == CLUTTER_KEY_KP_Enter ||
+          event->keyval == CLUTTER_KEY_ISO_Enter)
        {
          st_button_press (button, NULL, ST_BUTTON_ONE, NULL);
          return TRUE;
@ -287,7 +288,8 @@ st_button_key_release (ClutterActor    *actor,
    {
      if (event->keyval == CLUTTER_KEY_space ||
          event->keyval == CLUTTER_KEY_Return ||
-          event->keyval == CLUTTER_KEY_KP_Enter)
+          event->keyval == CLUTTER_KEY_KP_Enter ||
+          event->keyval == CLUTTER_KEY_ISO_Enter)
        {
          gboolean is_click;

--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@ -373,6 +373,7 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
      break;
    case GTK_POLICY_ALWAYS:
    case GTK_POLICY_AUTOMATIC:
+    case GTK_POLICY_EXTERNAL:
      /* Should theoretically use the min width of the hscrollbar,
       * but that's not cleanly defined at the moment */
      min_width = 0;
@ -382,6 +383,7 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
  switch (priv->vscrollbar_policy)
    {
    case GTK_POLICY_NEVER:
+    case GTK_POLICY_EXTERNAL:
      account_for_vscrollbar = FALSE;
      break;
    case GTK_POLICY_ALWAYS:
@ -443,6 +445,7 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
  switch (priv->vscrollbar_policy)
    {
    case GTK_POLICY_NEVER:
+    case GTK_POLICY_EXTERNAL:
      break;
    case GTK_POLICY_ALWAYS:
    case GTK_POLICY_AUTOMATIC:
@ -454,6 +457,7 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
  switch (priv->hscrollbar_policy)
    {
    case GTK_POLICY_NEVER:
+    case GTK_POLICY_EXTERNAL:
      account_for_hscrollbar = FALSE;
      break;
    case GTK_POLICY_ALWAYS:
@ -480,6 +484,7 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
      break;
    case GTK_POLICY_ALWAYS:
    case GTK_POLICY_AUTOMATIC:
+    case GTK_POLICY_EXTERNAL:
      /* Should theoretically use the min height of the vscrollbar,
       * but that's not cleanly defined at the moment */
      min_height = 0;
@ -567,7 +572,7 @@ st_scroll_view_allocate (ClutterActor          *actor,
            }
          else
            {
-              hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
+              hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;

              /* try without a vertical scrollbar */
              clutter_actor_get_preferred_height (priv->child, avail_width, &child_min_height, NULL);
@ -576,18 +581,20 @@ st_scroll_view_allocate (ClutterActor          *actor,
        }
      else
        {
-          vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;
+          vscrollbar_visible = priv->vscrollbar_policy == GTK_POLICY_ALWAYS;

          if (priv->hscrollbar_policy == GTK_POLICY_AUTOMATIC)
            hscrollbar_visible = child_min_width > avail_height - (vscrollbar_visible ? 0 : sb_width);
          else
-            hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
+            hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;
        }
    }
  else
    {
-      hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
-      vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;
+      hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER &&
+                           priv->hscrollbar_policy != GTK_POLICY_EXTERNAL;
+      vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER &&
+                           priv->vscrollbar_policy != GTK_POLICY_EXTERNAL;
    }

  /* Whether or not we show the scrollbars, if the scrollbars are visible
@ -629,15 +636,19 @@ st_scroll_view_allocate (ClutterActor          *actor,

  clutter_actor_allocate (priv->hscroll, &child_box, flags);

-  /* In case the scrollbar policy is NEVER or scrollbars should be
-   * overlayed, we don't trim the content box allocation by the
-   * scrollbar size.
+  /* In case the scrollbar policy is NEVER or EXTERNAL or scrollbars
+   * should be overlayed, we don't trim the content box allocation by
+   * the scrollbar size.
   * Fold this into the scrollbar sizes to simplify the rest of the
   * computations.
   */
-  if (priv->hscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
+  if (priv->hscrollbar_policy == GTK_POLICY_NEVER ||
+      priv->hscrollbar_policy == GTK_POLICY_EXTERNAL ||
+      priv->overlay_scrollbars)
    sb_height = 0;
-  if (priv->vscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
+  if (priv->vscrollbar_policy == GTK_POLICY_NEVER ||
+      priv->vscrollbar_policy == GTK_POLICY_EXTERNAL ||
+      priv->overlay_scrollbars)
    sb_width = 0;

  /* Child */
--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@ -28,8 +28,8 @@
 #include <glib.h>

 #define CACHE_PREFIX_ICON "icon:"
-#define CACHE_PREFIX_URI "uri:"
-#define CACHE_PREFIX_URI_FOR_CAIRO "uri-for-cairo:"
+#define CACHE_PREFIX_FILE "file:"
+#define CACHE_PREFIX_FILE_FOR_CAIRO "file-for-cairo:"

 struct _StTextureCachePrivate
 {
@ -101,7 +101,7 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
                  G_SIGNAL_RUN_LAST,
                  0, /* no default handler slot */
                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, G_TYPE_STRING);
+                  G_TYPE_NONE, 1, G_TYPE_FILE);
 }

 /* Evicts all cached textures for named icons */
@ -147,7 +147,7 @@ st_texture_cache_init (StTextureCache *self)
                                                   g_free, cogl_object_unref);
  self->priv->outstanding_requests = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                            g_free, NULL);
-  self->priv->file_monitors = g_hash_table_new_full (g_str_hash, g_str_equal,
+  self->priv->file_monitors = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
                                                     g_object_unref, g_object_unref);

 }
@ -268,7 +268,7 @@ typedef struct {

  GtkIconInfo *icon_info;
  StIconColors *colors;
-  char *uri;
+  GFile *file;
 } AsyncTextureLoadData;

 static void
@ -282,8 +282,8 @@ texture_load_data_free (gpointer p)
      if (data->colors)
        st_icon_colors_unref (data->colors);
    }
-  else if (data->uri)
-    g_free (data->uri);
+  else if (data->file)
+    g_object_unref (data->file);

  if (data->key)
    g_free (data->key);
@ -405,83 +405,17 @@ out:
  return rotated_pixbuf;
 }

-static GdkPixbuf*
-decode_image (const char *val)
-{
-  int i;
-  GError *error = NULL;
-  GdkPixbuf *res = NULL;
-  struct {
-    const char *prefix;
-    const char *mime_type;
-  } formats[] = {
-    { "data:image/x-icon;base64,", "image/x-icon" },
-    { "data:image/png;base64,", "image/png" }
-  };
-
-  g_return_val_if_fail (val, NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (formats); i++)
-    {
-      if (g_str_has_prefix (val, formats[i].prefix))
-        {
-          gsize len;
-          guchar *data = NULL;
-          char *unescaped;
-
-          unescaped = g_uri_unescape_string (val + strlen (formats[i].prefix), NULL);
-          if (unescaped)
-            {
-              data = g_base64_decode (unescaped, &len);
-              g_free (unescaped);
-            }
-
-          if (data)
-            {
-              GdkPixbufLoader *loader;
-
-              loader = gdk_pixbuf_loader_new_with_mime_type (formats[i].mime_type, &error);
-              if (loader &&
-                  gdk_pixbuf_loader_write (loader, data, len, &error) &&
-                  gdk_pixbuf_loader_close (loader, &error))
-                {
-                  res = gdk_pixbuf_loader_get_pixbuf (loader);
-                  g_object_ref (res);
-                }
-              g_object_unref (loader);
-              g_free (data);
-            }
-        }
-    }
-  if (!res)
-    {
-      if (error)
-        {
-          g_warning ("%s\n", error->message);
-          g_error_free (error);
-        }
-      else
-        g_warning ("incorrect data uri");
-    }
-  return res;
-}
-
 static GdkPixbuf *
-impl_load_pixbuf_file (const char     *uri,
+impl_load_pixbuf_file (GFile          *file,
                       int             available_width,
                       int             available_height,
                       int             scale,
                       GError        **error)
 {
  GdkPixbuf *pixbuf = NULL;
-  GFile *file;
  char *contents = NULL;
  gsize size;

-  if (g_str_has_prefix (uri, "data:"))
-    return decode_image (uri);
-
-  file = g_file_new_for_uri (uri);
  if (g_file_load_contents (file, NULL, &contents, &size, NULL, error))
    {
      pixbuf = impl_load_pixbuf_data ((const guchar *) contents, size,
@ -490,7 +424,6 @@ impl_load_pixbuf_file (const char     *uri,
                                      error);
    }

-  g_object_unref (file);
  g_free (contents);

  return pixbuf;
@ -507,9 +440,9 @@ load_pixbuf_thread (GSimpleAsyncResult *result,

  data = g_async_result_get_user_data (G_ASYNC_RESULT (result));
  g_assert (data != NULL);
-  g_assert (data->uri != NULL);
+  g_assert (data->file != NULL);

-  pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, data->scale, &error);
+  pixbuf = impl_load_pixbuf_file (data->file, data->width, data->height, data->scale, &error);

  if (error != NULL)
    {
@ -647,7 +580,7 @@ static void
 load_texture_async (StTextureCache       *cache,
                    AsyncTextureLoadData *data)
 {
-  if (data->uri)
+  if (data->file)
    {
      GSimpleAsyncResult *result;
      result = g_simple_async_result_new (G_OBJECT (cache), on_pixbuf_loaded, data, load_texture_async);
@ -695,18 +628,26 @@ static void
 st_texture_cache_reset_texture (StTextureCachePropertyBind *bind,
                                const char                 *propname)
 {
-  GdkPixbuf *pixbuf;
+  cairo_surface_t *surface;
  CoglTexture *texdata;
+  ClutterBackend *backend = clutter_get_default_backend ();
+  CoglContext *ctx = clutter_backend_get_cogl_context (backend);

-  g_object_get (bind->source, propname, &pixbuf, NULL);
+  g_object_get (bind->source, propname, &surface, NULL);

-  g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
-
-  if (pixbuf != NULL)
+  if (surface != NULL &&
+      cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE &&
+      (cairo_image_surface_get_format (surface) == CAIRO_FORMAT_ARGB32 ||
+       cairo_image_surface_get_format (surface) == CAIRO_FORMAT_RGB24))
    {
-      texdata = pixbuf_to_cogl_texture (pixbuf);
-      g_object_unref (pixbuf);
-
+      texdata = COGL_TEXTURE (cogl_texture_2d_new_from_data (ctx,
+                                                             cairo_image_surface_get_width (surface),
+                                                             cairo_image_surface_get_height (surface),
+                                                             cairo_image_surface_get_format (surface) == CAIRO_FORMAT_ARGB32 ?
+                                                             COGL_PIXEL_FORMAT_BGRA_8888 : COGL_PIXEL_FORMAT_BGR_888,
+                                                             cairo_image_surface_get_stride (surface),
+                                                             cairo_image_surface_get_data (surface),
+                                                             NULL));
      clutter_texture_set_cogl_texture (bind->texture, texdata);
      cogl_object_unref (texdata);

@ -744,12 +685,12 @@ st_texture_cache_free_bind (gpointer data)
 }

 /**
- * st_texture_cache_bind_pixbuf_property:
+ * st_texture_cache_bind_cairo_surface_property:
 * @cache:
 * @object: A #GObject with a property @property_name of type #GdkPixbuf
 * @property_name: Name of a property
 *
- * Create a #ClutterTexture which tracks the #GdkPixbuf value of a GObject property
+ * Create a #ClutterTexture which tracks the #cairo_surface_t value of a GObject property
 * named by @property_name.  Unlike other methods in StTextureCache, the underlying
 * #CoglTexture is not shared by default with other invocations to this method.
 *
@ -759,9 +700,9 @@ st_texture_cache_free_bind (gpointer data)
 * Return value: (transfer none): A new #ClutterActor
 */
 ClutterActor *
-st_texture_cache_bind_pixbuf_property (StTextureCache    *cache,
-                                       GObject           *object,
-                                       const char        *property_name)
+st_texture_cache_bind_cairo_surface_property (StTextureCache    *cache,
+                                              GObject           *object,
+                                              const char        *property_name)
 {
  ClutterTexture *texture;
  gchar *notify_key;
@ -879,12 +820,27 @@ ensure_request (StTextureCache        *cache,
  return had_pending;
 }

-static ClutterActor *
-load_gicon_with_colors (StTextureCache    *cache,
-                        GIcon             *icon,
-                        gint               size,
-                        gint               scale,
-                        StIconColors      *colors)
+/**
+ * st_texture_cache_load_gicon:
+ * @cache: The texture cache instance
+ * @theme_node: (nullable): The #StThemeNode to use for colors, or NULL
+ *                            if the icon must not be recolored
+ * @icon: the #GIcon to load
+ * @size: Size of themed
+ * @scale: Scale factor of display
+ *
+ * This method returns a new #ClutterActor for a given #GIcon. If the
+ * icon isn't loaded already, the texture will be filled
+ * asynchronously.
+ *
+ * Return Value: (transfer none): A new #ClutterActor for the icon, or %NULL if not found
+ */
+ClutterActor *
+st_texture_cache_load_gicon (StTextureCache    *cache,
+                             StThemeNode       *theme_node,
+                             GIcon             *icon,
+                             gint               size,
+                             gint               scale)
 {
  AsyncTextureLoadData *request;
  ClutterActor *texture;
@ -893,13 +849,26 @@ load_gicon_with_colors (StTextureCache    *cache,
  GtkIconTheme *theme;
  GtkIconInfo *info;
  StTextureCachePolicy policy;
+  StIconColors *colors = NULL;
+  StIconStyle icon_style = ST_ICON_STYLE_REQUESTED;
  GtkIconLookupFlags lookup_flags;

+  if (theme_node)
+    {
+      colors = st_theme_node_get_icon_colors (theme_node);
+      icon_style = st_theme_node_get_icon_style (theme_node);
+    }
+
  /* Do theme lookups in the main thread to avoid thread-unsafety */
  theme = cache->priv->icon_theme;

  lookup_flags = GTK_ICON_LOOKUP_USE_BUILTIN;

+  if (icon_style == ST_ICON_STYLE_REGULAR)
+    lookup_flags |= GTK_ICON_LOOKUP_FORCE_REGULAR;
+  else if (icon_style == ST_ICON_STYLE_SYMBOLIC)
+    lookup_flags |= GTK_ICON_LOOKUP_FORCE_SYMBOLIC;
+
  if (clutter_get_default_text_direction () == CLUTTER_TEXT_DIRECTION_RTL)
    lookup_flags |= GTK_ICON_LOOKUP_DIR_RTL;
  else
@ -919,8 +888,8 @@ load_gicon_with_colors (StTextureCache    *cache,
  if (colors)
    {
      /* This raises some doubts about the practice of using string keys */
-      key = g_strdup_printf (CACHE_PREFIX_ICON "%s,size=%d,scale=%d,colors=%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x",
-                             gicon_string, size, scale,
+      key = g_strdup_printf (CACHE_PREFIX_ICON "%s,size=%d,scale=%d,style=%d,colors=%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x",
+                             gicon_string, size, scale, icon_style,
                             colors->foreground.red, colors->foreground.blue, colors->foreground.green, colors->foreground.alpha,
                             colors->warning.red, colors->warning.blue, colors->warning.green, colors->warning.alpha,
                             colors->error.red, colors->error.blue, colors->error.green, colors->error.alpha,
@ -928,8 +897,8 @@ load_gicon_with_colors (StTextureCache    *cache,
    }
  else
    {
-      key = g_strdup_printf (CACHE_PREFIX_ICON "%s,size=%d,scale=%d",
-                             gicon_string, size, scale);
+      key = g_strdup_printf (CACHE_PREFIX_ICON "%s,size=%d,scale=%d,style=%d",
+                             gicon_string, size, scale, icon_style);
    }
  g_free (gicon_string);

@ -961,31 +930,6 @@ load_gicon_with_colors (StTextureCache    *cache,
  return CLUTTER_ACTOR (texture);
 }

-/**
- * st_texture_cache_load_gicon:
- * @cache: The texture cache instance
- * @theme_node: (nullable): The #StThemeNode to use for colors, or NULL
- *                            if the icon must not be recolored
- * @icon: the #GIcon to load
- * @size: Size of themed
- * @scale: Scale factor of display
- *
- * This method returns a new #ClutterActor for a given #GIcon. If the
- * icon isn't loaded already, the texture will be filled
- * asynchronously.
- *
- * Return Value: (transfer none): A new #ClutterActor for the icon, or %NULL if not found
- */
-ClutterActor *
-st_texture_cache_load_gicon (StTextureCache    *cache,
-                             StThemeNode       *theme_node,
-                             GIcon             *icon,
-                             gint               size,
-                             gint               scale)
-{
-  return load_gicon_with_colors (cache, icon, size, scale, theme_node ? st_theme_node_get_icon_colors (theme_node) : NULL);
-}
-
 static ClutterActor *
 load_from_pixbuf (GdkPixbuf *pixbuf)
 {
@ -1014,46 +958,43 @@ file_changed_cb (GFileMonitor      *monitor,
                 gpointer           user_data)
 {
  StTextureCache *cache = user_data;
-  char *uri, *key;
+  char *key;
+  guint file_hash;

  if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
    return;

-  uri = g_file_get_uri (file);
+  file_hash = g_file_hash (file);

-  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", file_hash);
  g_hash_table_remove (cache->priv->keyed_cache, key);
  g_free (key);

-  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", file_hash);
  g_hash_table_remove (cache->priv->keyed_cache, key);
  g_free (key);

-  g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, uri);
-
-  g_free (uri);
+  g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, file);
 }

 static void
-ensure_monitor_for_uri (StTextureCache *cache,
-                        const gchar    *uri)
+ensure_monitor_for_file (StTextureCache *cache,
+                         GFile          *file)
 {
  StTextureCachePrivate *priv = cache->priv;
-  GFile *file = g_file_new_for_uri (uri);

-  if (g_hash_table_lookup (priv->file_monitors, uri) == NULL)
+  if (g_hash_table_lookup (priv->file_monitors, file) == NULL)
    {
      GFileMonitor *monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE,
                                                   NULL, NULL);
      g_signal_connect (monitor, "changed",
                        G_CALLBACK (file_changed_cb), cache);
-      g_hash_table_insert (priv->file_monitors, g_strdup (uri), monitor);
+      g_hash_table_insert (priv->file_monitors, g_object_ref (file), monitor);
    }
-  g_object_unref (file);
 }

 typedef struct {
-  gchar *path;
+  GFile *gfile;
  gint   grid_width, grid_height;
  gint   scale_factor;
  ClutterActor *actor;
@ -1065,7 +1006,7 @@ static void
 on_data_destroy (gpointer data)
 {
  AsyncImageData *d = (AsyncImageData *)data;
-  g_free (d->path);
+  g_object_unref (d->gfile);
  g_object_unref (d->actor);
  g_free (d);
 }
@ -1138,7 +1079,7 @@ load_sliced_image (GSimpleAsyncResult *result,
  loader = gdk_pixbuf_loader_new ();
  g_signal_connect (loader, "size-prepared", G_CALLBACK (on_loader_size_prepared), data);

-  if (!g_file_get_contents (data->path, &buffer, &length, NULL))
+  if (!g_file_load_contents (data->gfile, NULL, &buffer, &length, NULL, NULL))
    goto out;

  if (!gdk_pixbuf_loader_write (loader, (const guchar *) buffer, length, NULL))
@ -1173,7 +1114,7 @@ load_sliced_image (GSimpleAsyncResult *result,
 /**
 * st_texture_cache_load_sliced_image:
 * @cache: A #StTextureCache
- * @path: Path to a filename
+ * @file: A #GFile
 * @grid_width: Width in pixels
 * @grid_height: Height in pixels
 * @scale: Scale factor of the display
@ -1189,7 +1130,7 @@ load_sliced_image (GSimpleAsyncResult *result,
 */
 ClutterActor *
 st_texture_cache_load_sliced_image (StTextureCache *cache,
-                                    const gchar    *path,
+                                    GFile          *file,
                                    gint            grid_width,
                                    gint            grid_height,
                                    gint            scale,
@ -1204,7 +1145,7 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
  data->grid_width = grid_width;
  data->grid_height = grid_height;
  data->scale_factor = scale;
-  data->path = g_strdup (path);
+  data->gfile = g_object_ref (file);
  data->actor = actor;
  data->load_callback = load_callback;
  data->load_callback_data = user_data;
@ -1221,9 +1162,9 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
 }

 /**
- * st_texture_cache_load_uri_async:
+ * st_texture_cache_load_file_async:
 * @cache: The texture cache instance
- * @uri: uri of the image file from which to create a pixbuf
+ * @file: a #GFile of the image file from which to create a pixbuf
 * @available_width: available width for the image, can be -1 if not limited
 * @available_height: available height for the image, can be -1 if not limited
 * @scale: scale factor of the display
@ -1235,18 +1176,18 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
 * Return value: (transfer none): A new #ClutterActor with no image loaded initially.
 */
 ClutterActor *
-st_texture_cache_load_uri_async (StTextureCache *cache,
-                                 const gchar    *uri,
-                                 int             available_width,
-                                 int             available_height,
-                                 int             scale)
+st_texture_cache_load_file_async (StTextureCache *cache,
+                                  GFile          *file,
+                                  int             available_width,
+                                  int             available_height,
+                                  int             scale)
 {
  ClutterActor *texture;
  AsyncTextureLoadData *request;
  StTextureCachePolicy policy;
  gchar *key;

-  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));

  policy = ST_TEXTURE_CACHE_POLICY_NONE; /* XXX */

@ -1264,7 +1205,7 @@ st_texture_cache_load_uri_async (StTextureCache *cache,
      request->cache = cache;
      /* Transfer ownership of key */
      request->key = key;
-      request->uri = g_strdup (uri);
+      request->file = g_object_ref (file);
      request->policy = policy;
      request->width = available_width;
      request->height = available_height;
@ -1273,31 +1214,31 @@ st_texture_cache_load_uri_async (StTextureCache *cache,
      load_texture_async (cache, request);
    }

-  ensure_monitor_for_uri (cache, uri);
+  ensure_monitor_for_file (cache, file);

  return CLUTTER_ACTOR (texture);
 }

 static CoglTexture *
-st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
-                                                StTextureCachePolicy policy,
-                                                const gchar    *uri,
-                                                int             available_width,
-                                                int             available_height,
-                                                int             scale,
-                                                GError         **error)
+st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
+                                                 StTextureCachePolicy policy,
+                                                 GFile          *file,
+                                                 int             available_width,
+                                                 int             available_height,
+                                                 int             scale,
+                                                 GError         **error)
 {
  CoglTexture *texdata;
  GdkPixbuf *pixbuf;
  char *key;

-  key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));

  texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);

  if (texdata == NULL)
    {
-      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
      if (!pixbuf)
        goto out;

@ -1313,7 +1254,7 @@ st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
  else
    cogl_object_ref (texdata);

-  ensure_monitor_for_uri (cache, uri);
+  ensure_monitor_for_file (cache, file);

 out:
  g_free (key);
@ -1321,25 +1262,25 @@ out:
 }

 static cairo_surface_t *
-st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
-                                                 StTextureCachePolicy   policy,
-                                                 const gchar           *uri,
-                                                 int                    available_width,
-                                                 int                    available_height,
-                                                 int                    scale,
-                                                 GError               **error)
+st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache        *cache,
+                                                  StTextureCachePolicy   policy,
+                                                  GFile                 *file,
+                                                  int                    available_width,
+                                                  int                    available_height,
+                                                  int                    scale,
+                                                  GError               **error)
 {
  cairo_surface_t *surface;
  GdkPixbuf *pixbuf;
  char *key;

-  key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
+  key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", g_file_hash (file));

  surface = g_hash_table_lookup (cache->priv->keyed_cache, key);

  if (surface == NULL)
    {
-      pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
+      pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
      if (!pixbuf)
        goto out;

@ -1355,7 +1296,7 @@ st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache        *cache,
  else
    cairo_surface_reference (surface);

-  ensure_monitor_for_uri (cache, uri);
+  ensure_monitor_for_file (cache, file);

 out:
  g_free (key);
@ -1365,7 +1306,7 @@ out:
 /**
 * st_texture_cache_load_file_to_cogl_texture: (skip)
 * @cache: A #StTextureCache
- * @file_path: Path to a file in supported image format
+ * @file: A #GFile in supported image format
 * @scale: Scale factor of the display
 *
 * This function synchronously loads the given file path
@ -1376,35 +1317,30 @@ out:
 */
 CoglTexture *
 st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                            const gchar    *file_path,
+                                            GFile          *file,
                                            gint            scale)
 {
  CoglTexture *texture;
-  GFile *file;
-  char *uri;
  GError *error = NULL;

-  file = g_file_new_for_path (file_path);
-  uri = g_file_get_uri (file);
-
-  texture = st_texture_cache_load_uri_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-                                                            uri, -1, -1, scale, &error);
-  g_object_unref (file);
-  g_free (uri);
+  texture = st_texture_cache_load_file_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
+                                                             file, -1, -1, scale, &error);

  if (texture == NULL)
    {
-      g_warning ("Failed to load %s: %s", file_path, error->message);
+      char *uri = g_file_get_uri (file);
+      g_warning ("Failed to load %s: %s", uri, error->message);
      g_clear_error (&error);
-      return NULL;
+      g_free (uri);
    }
+
  return texture;
 }

 /**
 * st_texture_cache_load_file_to_cairo_surface:
 * @cache: A #StTextureCache
- * @file_path: Path to a file in supported image format
+ * @file: A #GFile in supported image format
 * @scale: Scale factor of the display
 *
 * This function synchronously loads the given file path
@ -1415,28 +1351,23 @@ st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
 */
 cairo_surface_t *
 st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                             const gchar    *file_path,
+                                             GFile          *file,
                                             gint            scale)
 {
  cairo_surface_t *surface;
-  GFile *file;
-  char *uri;
  GError *error = NULL;

-  file = g_file_new_for_path (file_path);
-  uri = g_file_get_uri (file);
-
-  surface = st_texture_cache_load_uri_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
-                                                             uri, -1, -1, scale, &error);
-  g_object_unref (file);
-  g_free (uri);
+  surface = st_texture_cache_load_file_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
+                                                              file, -1, -1, scale, &error);

  if (surface == NULL)
    {
-      g_warning ("Failed to load %s: %s", file_path, error->message);
+      char *uri = g_file_get_uri (file);
+      g_warning ("Failed to load %s: %s", uri, error->message);
      g_clear_error (&error);
-      return NULL;
+      g_free (uri);
    }
+
  return surface;
 }

--- a/src/st/st-texture-cache.h
+++ b/src/st/st-texture-cache.h
@ -28,7 +28,6 @@

 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <clutter/clutter.h>

 #include <st/st-types.h>
@ -70,16 +69,16 @@ StTextureCache* st_texture_cache_get_default (void);

 ClutterActor *
 st_texture_cache_load_sliced_image (StTextureCache *cache,
-                                    const gchar    *path,
+                                    GFile          *file,
                                    gint            grid_width,
                                    gint            grid_height,
                                    gint            scale,
                                    GFunc           load_callback,
                                    gpointer        user_data);

-ClutterActor *st_texture_cache_bind_pixbuf_property (StTextureCache    *cache,
-                                                     GObject           *object,
-                                                     const char        *property_name);
+ClutterActor *st_texture_cache_bind_cairo_surface_property (StTextureCache    *cache,
+                                                            GObject           *object,
+                                                            const char        *property_name);

 ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache,
                                           StThemeNode    *theme_node,
@ -87,18 +86,18 @@ ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache,
                                           gint            size,
                                           gint            scale);

-ClutterActor *st_texture_cache_load_uri_async (StTextureCache    *cache,
-                                               const gchar       *uri,
-                                               int                available_width,
-                                               int                available_height,
-                                               int                scale);
+ClutterActor *st_texture_cache_load_file_async (StTextureCache    *cache,
+                                                GFile             *file,
+                                                int                available_width,
+                                                int                available_height,
+                                                int                scale);

 CoglTexture     *st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
-                                                             const gchar    *file_path,
+                                                             GFile          *file,
                                                             gint            scale);

 cairo_surface_t *st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
-                                                              const gchar    *file_path,
+                                                              GFile          *file,
                                                              gint            scale);

 /**
--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@ -600,7 +600,7 @@ create_cairo_pattern_of_background_image (StThemeNode *node,
  cairo_pattern_t *pattern;
  cairo_content_t  content;
  cairo_matrix_t   matrix;
-  const char *file;
+  GFile *file;

  StTextureCache *texture_cache;

@ -1037,7 +1037,7 @@ st_theme_node_prerender_background (StThemeNode *node,
    }
  else
    {
-      const char *background_image;
+      GFile *background_image;

      background_image = st_theme_node_get_background_image (node);

@ -1303,14 +1303,14 @@ st_theme_node_load_border_image (StThemeNode *node)
      if (border_image == NULL)
        goto out;

-      const char *filename;
-      filename = st_border_image_get_filename (border_image);
+      GFile *file;
+      file = st_border_image_get_file (border_image);

      int scale_factor;
      g_object_get (node->context, "scale-factor", &scale_factor, NULL);

      node->border_slices_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
-                                                                                filename, scale_factor);
+                                                                                file, scale_factor);
      if (node->border_slices_texture == COGL_INVALID_HANDLE)
        goto out;

@ -1348,7 +1348,7 @@ st_theme_node_load_background_image (StThemeNode *node)
 {
  if (node->background_texture == COGL_INVALID_HANDLE)
    {
-      const char *background_image;
+      GFile *background_image;
      StShadow *background_image_shadow_spec;

      background_image = st_theme_node_get_background_image (node);
--- a/src/st/st-theme-node-private.h
+++ b/src/st/st-theme-node-private.h
@ -25,6 +25,7 @@
 #include <gdk/gdk.h>

 #include "st-theme-node.h"
+#include <libcroco/libcroco.h>
 #include "st-types.h"

 G_BEGIN_DECLS
@ -58,6 +59,7 @@ struct _StThemeNode {
  int border_radius[4];
  int outline_width;
  guint padding[4];
+  guint margin[4];

  int width;
  int height;
@ -68,7 +70,7 @@ struct _StThemeNode {

  int transition_duration;

-  char *background_image;
+  GFile *background_image;
  StBorderImage *border_image;
  StShadow *box_shadow;
  StShadow *background_image_shadow;
@ -90,6 +92,8 @@ struct _StThemeNode {
  guint background_position_set : 1;
  guint background_repeat : 1;

+  gboolean margin_set : 4;
+
  guint properties_computed : 1;
  guint geometry_computed : 1;
  guint background_computed : 1;
@ -121,6 +125,8 @@ struct _StThemeNodeClass {

 void _st_theme_node_ensure_background (StThemeNode *node);
 void _st_theme_node_ensure_geometry (StThemeNode *node);
+void _st_theme_node_apply_margins (StThemeNode *node,
+                                   ClutterActor *actor);

 G_END_DECLS

--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@ -158,7 +158,10 @@ st_theme_node_finalize (GObject *object)
    }

  if (node->background_image)
-    g_free (node->background_image);
+    {
+      g_object_unref (node->background_image);
+      node->background_image = NULL;
+    }

  if (node->background_texture != COGL_INVALID_HANDLE)
    cogl_handle_unref (node->background_texture);
@ -905,7 +908,7 @@ st_theme_node_get_double (StThemeNode *node,
 *   parent's parent, and so forth. Note that if the property has a
 *   value of 'inherit' it will be inherited even if %FALSE is passed
 *   in for @inherit; this only affects the default behavior for inheritance.
- * @value: (out): location to store the newly allocated value that was
+ * @file: (out) (transfer full): location to store the newly allocated value that was
 *   determined. If the property is not found, the value in this location
 *   will not be changed.
 *
@ -920,7 +923,7 @@ gboolean
 st_theme_node_lookup_url (StThemeNode  *node,
                          const char   *property_name,
                          gboolean      inherit,
-                          char        **value)
+                          GFile       **file)
 {
  gboolean result = FALSE;
  int i;
@ -935,7 +938,6 @@ st_theme_node_lookup_url (StThemeNode  *node,
        {
          CRTerm *term = decl->value;
          CRStyleSheet *base_stylesheet;
-          GFile *file;

          if (term->type != TERM_URI && term->type != TERM_STRING)
            continue;
@ -945,23 +947,21 @@ st_theme_node_lookup_url (StThemeNode  *node,
          else
            base_stylesheet = NULL;

-          file = _st_theme_resolve_url (node->theme,
-                                        base_stylesheet,
-                                        decl->value->content.str->stryng->str);
-          *value = g_file_get_path (file);
-          g_object_unref (file);
+          *file = _st_theme_resolve_url (node->theme,
+                                         base_stylesheet,
+                                         decl->value->content.str->stryng->str);
          result = TRUE;
          break;
        }
    }

  if (!result && inherit && node->parent_node)
-    result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, value);
+    result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, file);

  return result;
 }

-/*
+/**
 * st_theme_node_get_url:
 * @node: a #StThemeNode
 * @property_name: The name of the string property
@ -972,18 +972,18 @@ st_theme_node_lookup_url (StThemeNode  *node,
 * and lets you handle the case where the theme does not specify the
 * indicated value.
 *
- * Return value: the newly allocated value if found.
+ * Returns: (transfer full): the newly allocated value if found.
 *  If @property_name is not found, a warning will be logged and %NULL
 *  will be returned.
 */
-char *
+GFile *
 st_theme_node_get_url (StThemeNode *node,
                       const char  *property_name)
 {
-  char *value;
+  GFile *file;

-  if (st_theme_node_lookup_url (node, property_name, FALSE, &value))
-    return value;
+  if (st_theme_node_lookup_url (node, property_name, FALSE, &file))
+    return file;
  else
    {
      g_warning ("Did not find string property '%s'", property_name);
@ -1657,6 +1657,100 @@ do_padding_property (StThemeNode   *node,
    }
 }

+static void
+do_margin_property_term (StThemeNode *node,
+                         CRTerm      *term,
+                         gboolean     left,
+                         gboolean     right,
+                         gboolean     top,
+                         gboolean     bottom)
+{
+  int value;
+
+  if (get_length_from_term_int (node, term, FALSE, &value) != VALUE_FOUND)
+    return;
+
+  if (left)
+    {
+      node->margin[ST_SIDE_LEFT] = value;
+      node->margin_set |= 1 << ST_SIDE_LEFT;
+    }
+  if (right)
+    {
+      node->margin[ST_SIDE_RIGHT] = value;
+      node->margin_set |= 1 << ST_SIDE_RIGHT;
+    }
+  if (top)
+    {
+      node->margin[ST_SIDE_TOP] = value;
+      node->margin_set |= 1 << ST_SIDE_TOP;
+    }
+  if (bottom)
+    {
+      node->margin[ST_SIDE_BOTTOM] = value;
+      node->margin_set |= 1 << ST_SIDE_BOTTOM;
+    }
+}
+
+static void
+do_margin_property (StThemeNode   *node,
+                    CRDeclaration *decl)
+{
+  const char *property_name = decl->property->stryng->str + 6; /* Skip 'margin' */
+
+  if (strcmp (property_name, "") == 0)
+    {
+      /* Slight deviation ... if we don't understand some of the terms and understand others,
+       * then we set the ones we understand and ignore the others instead of ignoring the
+       * whole thing
+       */
+      if (decl->value == NULL) /* 0 values */
+        return;
+      else if (decl->value->next == NULL) /* 1 value */
+        {
+          do_margin_property_term (node, decl->value, TRUE, TRUE, TRUE, TRUE); /* left/right/top/bottom */
+          return;
+        }
+      else if (decl->value->next->next == NULL) /* 2 values */
+        {
+          do_margin_property_term (node, decl->value,       FALSE, FALSE, TRUE,  TRUE);  /* top/bottom */
+          do_margin_property_term (node, decl->value->next, TRUE, TRUE,   FALSE, FALSE); /* left/right */
+        }
+      else if (decl->value->next->next->next == NULL) /* 3 values */
+        {
+          do_margin_property_term (node, decl->value,             FALSE, FALSE, TRUE,  FALSE); /* top */
+          do_margin_property_term (node, decl->value->next,       TRUE,  TRUE,  FALSE, FALSE); /* left/right */
+          do_margin_property_term (node, decl->value->next->next, FALSE, FALSE, FALSE, TRUE);  /* bottom */
+        }
+      else if (decl->value->next->next->next->next == NULL) /* 4 values */
+        {
+          do_margin_property_term (node, decl->value,                   FALSE, FALSE, TRUE,  FALSE); /* top */
+          do_margin_property_term (node, decl->value->next,             FALSE, TRUE,  FALSE, FALSE); /* right */
+          do_margin_property_term (node, decl->value->next->next,       FALSE, FALSE, FALSE, TRUE);  /* bottom */
+          do_margin_property_term (node, decl->value->next->next->next, TRUE,  FALSE, FALSE, FALSE); /* left */
+        }
+      else
+        {
+          g_warning ("Too many values for margin property");
+          return;
+        }
+    }
+  else
+    {
+      if (decl->value == NULL || decl->value->next != NULL)
+        return;
+
+      if (strcmp (property_name, "-left") == 0)
+        do_margin_property_term (node, decl->value, TRUE,  FALSE, FALSE, FALSE);
+      else if (strcmp (property_name, "-right") == 0)
+        do_margin_property_term (node, decl->value, FALSE, TRUE,  FALSE, FALSE);
+      else if (strcmp (property_name, "-top") == 0)
+        do_margin_property_term (node, decl->value, FALSE, FALSE, TRUE,  FALSE);
+      else if (strcmp (property_name, "-bottom") == 0)
+        do_margin_property_term (node, decl->value, FALSE, FALSE, FALSE, TRUE);
+    }
+}
+
 static void
 do_size_property (StThemeNode   *node,
                  CRDeclaration *decl,
@ -1707,6 +1801,8 @@ _st_theme_node_ensure_geometry (StThemeNode *node)
        do_outline_property (node, decl);
      else if (g_str_has_prefix (property_name, "padding"))
        do_padding_property (node, decl);
+      else if (g_str_has_prefix (property_name, "margin"))
+        do_margin_property (node, decl);
      else if (strcmp (property_name, "width") == 0)
        do_size_property (node, decl, &width);
      else if (strcmp (property_name, "height") == 0)
@ -1926,8 +2022,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
          CRTerm *term;
          /* background: property sets all terms to specified or default values */
          node->background_color = TRANSPARENT_COLOR;
-          g_free (node->background_image);
-          node->background_image = NULL;
+          g_clear_object (&node->background_image);
          node->background_position_set = FALSE;
          node->background_size = ST_BACKGROUND_SIZE_AUTO;

@ -1943,7 +2038,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
                  if (node->parent_node)
                    {
                      st_theme_node_get_background_color (node->parent_node, &node->background_color);
-                      node->background_image = g_strdup (st_theme_node_get_background_image (node->parent_node));
+                      node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
                    }
                }
              else if (term_is_none (term))
@ -1964,8 +2059,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
                                                base_stylesheet,
                                                term->content.str->stryng->str);

-                  node->background_image = g_file_get_path (file);
-                  g_object_unref (file);
+                  node->background_image = file;
                }
            }
        }
@ -2062,30 +2156,25 @@ _st_theme_node_ensure_background (StThemeNode *node)
          if (decl->value->type == TERM_URI)
            {
              CRStyleSheet *base_stylesheet;
-              GFile *file;

              if (decl->parent_statement != NULL)
                base_stylesheet = decl->parent_statement->parent_sheet;
              else
                base_stylesheet = NULL;

-              g_free (node->background_image);
-              file = _st_theme_resolve_url (node->theme,
-                                            base_stylesheet,
-                                            decl->value->content.str->stryng->str);
-
-              node->background_image = g_file_get_path (file);
-              g_object_unref (file);
+              g_clear_object (&node->background_image);
+              node->background_image = _st_theme_resolve_url (node->theme,
+                                                              base_stylesheet,
+                                                              decl->value->content.str->stryng->str);
            }
          else if (term_is_inherit (decl->value))
            {
-              g_free (node->background_image);
-              node->background_image = g_strdup (st_theme_node_get_background_image (node->parent_node));
+              g_clear_object (&node->background_image);
+              node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
            }
          else if (term_is_none (decl->value))
            {
-              g_free (node->background_image);
-              node->background_image = NULL;
+              g_clear_object (&node->background_image);
            }
        }
      else if (strcmp (property_name, "-gradient-direction") == 0)
@ -2142,7 +2231,13 @@ st_theme_node_get_background_color (StThemeNode  *node,
  *color = node->background_color;
 }

-const char *
+/**
+ * st_theme_node_get_background_image:
+ * @node: a #StThemeNode
+ *
+ * Returns: (transfer none): @node's background image.
+ */
+GFile *
 st_theme_node_get_background_image (StThemeNode *node)
 {
  g_return_val_if_fail (ST_IS_THEME_NODE (node), NULL);
@ -2258,6 +2353,18 @@ st_theme_node_get_padding (StThemeNode *node,
  return node->padding[side];
 }

+double
+st_theme_node_get_margin (StThemeNode *node,
+                          StSide side)
+{
+  g_return_val_if_fail (ST_IS_THEME_NODE (node), 0.);
+  g_return_val_if_fail (side >= ST_SIDE_TOP && side <= ST_SIDE_LEFT, 0.);
+
+  _st_theme_node_ensure_geometry (node);
+
+  return node->margin[side];
+}
+
 /**
 * st_theme_node_get_transition_duration:
 * @node: an #StThemeNode
@ -2285,6 +2392,48 @@ st_theme_node_get_transition_duration (StThemeNode *node)
  return st_slow_down_factor * node->transition_duration;
 }

+StIconStyle
+st_theme_node_get_icon_style (StThemeNode *node)
+{
+  int i;
+
+  ensure_properties (node);
+
+  for (i = node->n_properties - 1; i >= 0; i--)
+    {
+      CRDeclaration *decl = node->properties[i];
+
+      if (strcmp (decl->property->stryng->str, "-st-icon-style") == 0)
+        {
+          CRTerm *term;
+
+          for (term = decl->value; term; term = term->next)
+            {
+              if (term->type != TERM_IDENT)
+                goto next_decl;
+
+              if (strcmp (term->content.str->stryng->str, "requested") == 0)
+                return ST_ICON_STYLE_REQUESTED;
+              else if (strcmp (term->content.str->stryng->str, "regular") == 0)
+                return ST_ICON_STYLE_REGULAR;
+              else if (strcmp (term->content.str->stryng->str, "symbolic") == 0)
+                return ST_ICON_STYLE_SYMBOLIC;
+              else
+                g_warning ("Unknown -st-icon-style \"%s\"",
+                           term->content.str->stryng->str);
+            }
+        }
+
+    next_decl:
+      ;
+    }
+
+  if (node->parent_node)
+    return st_theme_node_get_icon_style (node->parent_node);
+
+  return ST_ICON_STYLE_REQUESTED;
+}
+
 StTextDecoration
 st_theme_node_get_text_decoration (StThemeNode *node)
 {
@ -2894,7 +3043,6 @@ st_theme_node_get_border_image (StThemeNode *node)
          int border_left;

          GFile *file;
-          char *filename;

          /* Support border-image: none; to suppress a previously specified border image */
          if (term_is_none (term))
@ -2973,17 +3121,15 @@ st_theme_node_get_border_image (StThemeNode *node)
            base_stylesheet = NULL;

          file = _st_theme_resolve_url (node->theme, base_stylesheet, url);
-          filename = g_file_get_path (file);
-          g_object_unref (file);

-          if (filename == NULL)
+          if (file == NULL)
            goto next_property;

-          node->border_image = st_border_image_new (filename,
+          node->border_image = st_border_image_new (file,
                                                    border_top, border_right, border_bottom, border_left,
                                                    scale_factor);

-          g_free (filename);
+          g_object_unref (file);

          return node->border_image;
        }
@ -3033,6 +3179,28 @@ st_theme_node_get_vertical_padding (StThemeNode *node)
  return padding;
 }

+void
+_st_theme_node_apply_margins (StThemeNode *node,
+                              ClutterActor *actor)
+{
+  g_return_if_fail (ST_IS_THEME_NODE (node));
+
+  _st_theme_node_ensure_geometry (node);
+
+  // In the case that a CSS margin is not specified, we don't to set a value
+  // of 0 to the clutter actor margin. In this manner it allows to use Clutter
+  // margin values set in the code. However, the margins that are set both in
+  // the code and in the CSS on the same side, the result is unpredictable.
+  if (node->margin_set & 1 << ST_SIDE_LEFT)
+     clutter_actor_set_margin_left (actor, st_theme_node_get_margin(node, ST_SIDE_LEFT));
+  if (node->margin_set & 1 << ST_SIDE_RIGHT)
+     clutter_actor_set_margin_right (actor, st_theme_node_get_margin(node, ST_SIDE_RIGHT));
+  if (node->margin_set & 1 << ST_SIDE_TOP)
+     clutter_actor_set_margin_top (actor, st_theme_node_get_margin(node, ST_SIDE_TOP));
+  if (node->margin_set & 1 << ST_SIDE_BOTTOM)
+     clutter_actor_set_margin_bottom (actor, st_theme_node_get_margin(node, ST_SIDE_BOTTOM));
+}
+
 static GetFromTermResult
 parse_shadow_property (StThemeNode       *node,
                       CRDeclaration     *decl,
@ -3853,7 +4021,9 @@ st_theme_node_paint_equal (StThemeNode *node,
      !clutter_color_equal (&node->background_gradient_end, &other->background_gradient_end))
    return FALSE;

-  if (g_strcmp0 (node->background_image, other->background_image) != 0)
+  if ((node->background_image != NULL) &&
+      (other->background_image != NULL) &&
+      !g_file_equal (node->background_image, other->background_image))
    return FALSE;

  _st_theme_node_ensure_geometry (node);
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@ -94,6 +94,12 @@ typedef enum {
  ST_GRADIENT_RADIAL
 } StGradientType;

+typedef enum {
+  ST_ICON_STYLE_REQUESTED,
+  ST_ICON_STYLE_REGULAR,
+  ST_ICON_STYLE_SYMBOLIC
+} StIconStyle;
+
 typedef struct _StThemeNodePaintState StThemeNodePaintState;

 struct _StThemeNodePaintState {
@ -162,7 +168,7 @@ gboolean st_theme_node_lookup_shadow (StThemeNode  *node,
 gboolean st_theme_node_lookup_url    (StThemeNode  *node,
                                      const char   *property_name,
                                      gboolean      inherit,
-                                      char        **value);
+                                      GFile       **file);

 /* Easier-to-use variants of the above, for application-level use */
 void          st_theme_node_get_color  (StThemeNode  *node,
@ -174,7 +180,7 @@ gdouble       st_theme_node_get_length (StThemeNode  *node,
                                        const char   *property_name);
 StShadow     *st_theme_node_get_shadow (StThemeNode  *node,
                                        const char   *property_name);
-char         *st_theme_node_get_url    (StThemeNode  *node,
+GFile        *st_theme_node_get_url    (StThemeNode  *node,
                                        const char   *property_name);

 /* Specific getters for particular properties: cached
@ -188,7 +194,7 @@ void st_theme_node_get_background_gradient (StThemeNode   *node,
                                            ClutterColor   *start,
                                            ClutterColor   *end);

-const char *st_theme_node_get_background_image (StThemeNode *node);
+GFile *st_theme_node_get_background_image (StThemeNode *node);

 int    st_theme_node_get_border_width  (StThemeNode  *node,
                                        StSide        side);
@ -208,6 +214,9 @@ double st_theme_node_get_padding       (StThemeNode  *node,
 double st_theme_node_get_horizontal_padding (StThemeNode *node);
 double st_theme_node_get_vertical_padding   (StThemeNode *node);

+double st_theme_node_get_margin       (StThemeNode  *node,
+                                       StSide        side);
+
 int    st_theme_node_get_width         (StThemeNode  *node);
 int    st_theme_node_get_height        (StThemeNode  *node);
 int    st_theme_node_get_min_width     (StThemeNode  *node);
@ -217,6 +226,8 @@ int    st_theme_node_get_max_height    (StThemeNode  *node);

 int    st_theme_node_get_transition_duration (StThemeNode *node);

+StIconStyle st_theme_node_get_icon_style (StThemeNode *node);
+
 StTextDecoration st_theme_node_get_text_decoration (StThemeNode *node);

 StTextAlign st_theme_node_get_text_align (StThemeNode *node);
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@ -60,13 +60,13 @@ struct _StTheme
 {
  GObject parent;

-  char *application_stylesheet;
-  char *default_stylesheet;
-  char *theme_stylesheet;
+  GFile *application_stylesheet;
+  GFile *default_stylesheet;
+  GFile *theme_stylesheet;
  GSList *custom_stylesheets;

-  GHashTable *stylesheets_by_filename;
-  GHashTable *filenames_by_stylesheet;
+  GHashTable *stylesheets_by_file;
+  GHashTable *files_by_stylesheet;

  CRCascade *cascade;
 };
@ -98,12 +98,25 @@ G_DEFINE_TYPE (StTheme, st_theme, G_TYPE_OBJECT)
 #define strqcmp(str,lit,lit_len) \
  (strlen (str) != (lit_len) || memcmp (str, lit, lit_len))

+static gboolean
+file_equal0 (GFile *file1,
+             GFile *file2)
+{
+  if (file1 == file2)
+    return TRUE;
+
+  if ((file1 == NULL) || (file2 == NULL))
+    return FALSE;
+
+  return g_file_equal (file1, file2);
+}
+
 static void
 st_theme_init (StTheme *theme)
 {
-  theme->stylesheets_by_filename = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                          (GDestroyNotify)g_free, (GDestroyNotify)cr_stylesheet_unref);
-  theme->filenames_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
+  theme->stylesheets_by_file = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
+                                                      (GDestroyNotify)g_object_unref, (GDestroyNotify)cr_stylesheet_unref);
+  theme->files_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
 }

 static void
@ -124,10 +137,10 @@ st_theme_class_init (StThemeClass *klass)
   */
  g_object_class_install_property (object_class,
                                   PROP_APPLICATION_STYLESHEET,
-                                   g_param_spec_string ("application-stylesheet",
+                                   g_param_spec_object ("application-stylesheet",
                                                        "Application Stylesheet",
                                                        "Stylesheet with application-specific styling",
-                                                        NULL,
+                                                        G_TYPE_FILE,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));

  /**
@ -138,10 +151,10 @@ st_theme_class_init (StThemeClass *klass)
   */
  g_object_class_install_property (object_class,
                                   PROP_THEME_STYLESHEET,
-                                   g_param_spec_string ("theme-stylesheet",
+                                   g_param_spec_object ("theme-stylesheet",
                                                        "Theme Stylesheet",
                                                        "Stylesheet with theme-specific styling",
-                                                        NULL,
+                                                        G_TYPE_FILE,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));

  /**
@ -152,10 +165,10 @@ st_theme_class_init (StThemeClass *klass)
   */
  g_object_class_install_property (object_class,
                                   PROP_DEFAULT_STYLESHEET,
-                                   g_param_spec_string ("default-stylesheet",
+                                   g_param_spec_object ("default-stylesheet",
                                                        "Default Stylesheet",
                                                        "Stylesheet with global default styling",
-                                                        NULL,
+                                                        G_TYPE_FILE,
                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));

  signals[STYLESHEETS_CHANGED] =
@ -168,23 +181,32 @@ st_theme_class_init (StThemeClass *klass)
 }

 static CRStyleSheet *
-parse_stylesheet (const char  *filename,
-                  GError     **error)
+parse_stylesheet (GFile   *file,
+                  GError **error)
 {
  enum CRStatus status;
  CRStyleSheet *stylesheet;
+  char *contents;
+  gsize length;

-  if (filename == NULL)
+  if (file == NULL)
    return NULL;

-  status = cr_om_parser_simply_parse_file ((const guchar *) filename,
-                                           CR_UTF_8,
-                                           &stylesheet);
+  if (!g_file_load_contents (file, NULL, &contents, &length, NULL, error))
+    return NULL;
+
+  status = cr_om_parser_simply_parse_buf ((const guchar *) contents,
+                                          length,
+                                          CR_UTF_8,
+                                          &stylesheet);
+  g_free (contents);

  if (status != CR_OK)
    {
+      char *uri = g_file_get_uri (file);
      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Error parsing stylesheet '%s'; errcode:%d", filename, status);
+                   "Error parsing stylesheet '%s'; errcode:%d", uri, status);
+      g_free (uri);
      return NULL;
    }

@ -203,12 +225,12 @@ _st_theme_parse_declaration_list (const char *str)

 /* Just g_warning for now until we have something nicer to do */
 static CRStyleSheet *
-parse_stylesheet_nofail (const char *filename)
+parse_stylesheet_nofail (GFile *file)
 {
  GError *error = NULL;
  CRStyleSheet *result;

-  result = parse_stylesheet (filename, &error);
+  result = parse_stylesheet (file, &error);
  if (error)
    {
      g_warning ("%s", error->message);
@ -219,35 +241,33 @@ parse_stylesheet_nofail (const char *filename)

 static void
 insert_stylesheet (StTheme      *theme,
-                   const char   *filename,
+                   GFile        *file,
                   CRStyleSheet *stylesheet)
 {
-  char *filename_copy;
-
  if (stylesheet == NULL)
    return;

-  filename_copy = g_strdup(filename);
+  g_object_ref (file);
  cr_stylesheet_ref (stylesheet);

-  g_hash_table_insert (theme->stylesheets_by_filename, filename_copy, stylesheet);
-  g_hash_table_insert (theme->filenames_by_stylesheet, stylesheet, filename_copy);
+  g_hash_table_insert (theme->stylesheets_by_file, file, stylesheet);
+  g_hash_table_insert (theme->files_by_stylesheet, stylesheet, file);
 }

 gboolean
 st_theme_load_stylesheet (StTheme    *theme,
-                          const char *path,
+                          GFile      *file,
                          GError    **error)
 {
  CRStyleSheet *stylesheet;

-  stylesheet = parse_stylesheet (path, error);
+  stylesheet = parse_stylesheet (file, error);
  if (!stylesheet)
    return FALSE;

  stylesheet->app_data = GUINT_TO_POINTER (TRUE);

-  insert_stylesheet (theme, path, stylesheet);
+  insert_stylesheet (theme, file, stylesheet);
  cr_stylesheet_ref (stylesheet);
  theme->custom_stylesheets = g_slist_prepend (theme->custom_stylesheets, stylesheet);
  g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
@ -257,11 +277,11 @@ st_theme_load_stylesheet (StTheme    *theme,

 void
 st_theme_unload_stylesheet (StTheme    *theme,
-                            const char *path)
+                            GFile      *file)
 {
  CRStyleSheet *stylesheet;

-  stylesheet = g_hash_table_lookup (theme->stylesheets_by_filename, path);
+  stylesheet = g_hash_table_lookup (theme->stylesheets_by_file, file);
  if (!stylesheet)
    return;

@ -269,8 +289,8 @@ st_theme_unload_stylesheet (StTheme    *theme,
    return;

  theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
-  g_hash_table_remove (theme->stylesheets_by_filename, path);
-  g_hash_table_remove (theme->filenames_by_stylesheet, stylesheet);
+  g_hash_table_remove (theme->stylesheets_by_file, file);
+  g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
  cr_stylesheet_unref (stylesheet);
  g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
 }
@ -279,7 +299,7 @@ st_theme_unload_stylesheet (StTheme    *theme,
 * st_theme_get_custom_stylesheets:
 * @theme: an #StTheme
 *
- * Returns: (transfer full) (element-type utf8): the list of stylesheet filenames
+ * Returns: (transfer full) (element-type GFile): the list of stylesheet files
 *          that were loaded with st_theme_load_stylesheet()
 */
 GSList*
@ -291,9 +311,9 @@ st_theme_get_custom_stylesheets (StTheme *theme)
  for (iter = theme->custom_stylesheets; iter; iter = iter->next)
    {
      CRStyleSheet *stylesheet = iter->data;
-      gchar *filename = g_hash_table_lookup (theme->filenames_by_stylesheet, stylesheet);
+      GFile *file = g_hash_table_lookup (theme->files_by_stylesheet, stylesheet);

-      result = g_slist_prepend (result, g_strdup (filename));
+      result = g_slist_prepend (result, g_object_ref (file));
    }

  return result;
@ -334,12 +354,12 @@ st_theme_finalize (GObject * object)
  g_slist_free (theme->custom_stylesheets);
  theme->custom_stylesheets = NULL;

-  g_hash_table_destroy (theme->stylesheets_by_filename);
-  g_hash_table_destroy (theme->filenames_by_stylesheet);
+  g_hash_table_destroy (theme->stylesheets_by_file);
+  g_hash_table_destroy (theme->files_by_stylesheet);

-  g_free (theme->application_stylesheet);
-  g_free (theme->theme_stylesheet);
-  g_free (theme->default_stylesheet);
+  g_clear_object (&theme->application_stylesheet);
+  g_clear_object (&theme->theme_stylesheet);
+  g_clear_object (&theme->default_stylesheet);

  if (theme->cascade)
    {
@ -362,36 +382,39 @@ st_theme_set_property (GObject      *object,
    {
    case PROP_APPLICATION_STYLESHEET:
      {
-        const char *path = g_value_get_string (value);
+        GFile *file = g_value_get_object (value);

-        if (path != theme->application_stylesheet)
+        if (!file_equal0 (file, theme->application_stylesheet))
          {
-            g_free (theme->application_stylesheet);
-            theme->application_stylesheet = g_strdup (path);
+            g_clear_object (&theme->application_stylesheet);
+            if (file != NULL)
+              theme->application_stylesheet = g_object_ref (file);
          }

        break;
      }
    case PROP_THEME_STYLESHEET:
      {
-        const char *path = g_value_get_string (value);
+        GFile *file = g_value_get_object (value);

-        if (path != theme->theme_stylesheet)
+        if (!file_equal0 (file, theme->theme_stylesheet))
          {
-            g_free (theme->theme_stylesheet);
-            theme->theme_stylesheet = g_strdup (path);
+            g_clear_object (&theme->theme_stylesheet);
+            if (file != NULL)
+              theme->theme_stylesheet = g_object_ref (file);
          }

        break;
      }
    case PROP_DEFAULT_STYLESHEET:
      {
-        const char *path = g_value_get_string (value);
+        GFile *file = g_value_get_object (value);

-        if (path != theme->default_stylesheet)
+        if (!file_equal0 (file, theme->default_stylesheet))
          {
-            g_free (theme->default_stylesheet);
-            theme->default_stylesheet = g_strdup (path);
+            g_clear_object (&theme->default_stylesheet);
+            if (file != NULL)
+              theme->default_stylesheet = g_object_ref (file);
          }

        break;
@ -413,13 +436,13 @@ st_theme_get_property (GObject    *object,
  switch (prop_id)
    {
    case PROP_APPLICATION_STYLESHEET:
-      g_value_set_string (value, theme->application_stylesheet);
+      g_value_set_object (value, theme->application_stylesheet);
      break;
    case PROP_THEME_STYLESHEET:
-      g_value_set_string (value, theme->theme_stylesheet);
+      g_value_set_object (value, theme->theme_stylesheet);
      break;
    case PROP_DEFAULT_STYLESHEET:
-      g_value_set_string (value, theme->default_stylesheet);
+      g_value_set_object (value, theme->default_stylesheet);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -439,9 +462,9 @@ st_theme_get_property (GObject    *object,
 * Return value: the newly created theme object
 **/
 StTheme *
-st_theme_new (const char       *application_stylesheet,
-              const char       *theme_stylesheet,
-              const char       *default_stylesheet)
+st_theme_new (GFile       *application_stylesheet,
+              GFile       *theme_stylesheet,
+              GFile       *default_stylesheet)
 {
  StTheme *theme = g_object_new (ST_TYPE_THEME,
                                    "application-stylesheet", application_stylesheet,
@ -852,26 +875,19 @@ add_matched_properties (StTheme      *a_this,

            if (import_rule->sheet == NULL)
              {
-                char *filename = NULL;
+                GFile *file = NULL;

                if (import_rule->url->stryng && import_rule->url->stryng->str)
                  {
-                    GFile *file;
-
                    file = _st_theme_resolve_url (a_this,
                                                  a_nodesheet,
                                                  import_rule->url->stryng->str);
-                    filename = g_file_get_path (file);
-
-                    g_object_unref (file);
+                    import_rule->sheet = parse_stylesheet (file, NULL);
                  }

-                if (filename)
-                  import_rule->sheet = parse_stylesheet (filename, NULL);
-
                if (import_rule->sheet)
                  {
-                    insert_stylesheet (a_this, filename, import_rule->sheet);
+                    insert_stylesheet (a_this, file, import_rule->sheet);
                    /* refcount of stylesheets starts off at zero, so we don't need to unref! */
                  }
                else
@ -882,8 +898,8 @@ add_matched_properties (StTheme      *a_this,
                    import_rule->sheet = (CRStyleSheet *) - 1;
                  }

-                if (filename)
-                  g_free (filename);
+                if (file)
+                  g_object_unref (file);
              }

            if (import_rule->sheet != (CRStyleSheet *) - 1)
@ -1008,8 +1024,8 @@ _st_theme_get_matched_properties (StTheme        *theme,
  return props;
 }

-/* Resolve an url from an url() reference in a stylesheet into an absolute
- * local filename, if possible. The resolution here is distinctly lame and
+/* Resolve an url from an url() reference in a stylesheet into a GFile,
+ * if possible. The resolution here is distinctly lame and
 * will fail on many examples.
 */
 GFile *
@ -1018,7 +1034,7 @@ _st_theme_resolve_url (StTheme      *theme,
                       const char   *url)
 {
  char *scheme;
-  GFile *stylesheet, *resource;
+  GFile *resource;

  if ((scheme = g_uri_parse_scheme (url)))
    {
@ -1027,21 +1043,18 @@ _st_theme_resolve_url (StTheme      *theme,
    }
  else if (base_stylesheet != NULL)
    {
-      const char *base_filename = NULL;
-      char *dirname;
+      GFile *base_file = NULL, *parent;

-      base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet);
+      base_file = g_hash_table_lookup (theme->files_by_stylesheet, base_stylesheet);

      /* This is an internal function, if we get here with
         a bad @base_stylesheet we have a problem. */
-      g_assert (base_filename);
+      g_assert (base_file);

-      dirname = g_path_get_dirname (base_filename);
-      stylesheet = g_file_new_for_path (dirname);
-      resource = g_file_resolve_relative_path (stylesheet, url);
+      parent = g_file_get_parent (base_file);
+      resource = g_file_resolve_relative_path (parent, url);

-      g_object_unref (stylesheet);
-      g_free (dirname);
+      g_object_unref (parent);
    }
  else
    {
--- a/src/st/st-theme.h
+++ b/src/st/st-theme.h
@ -47,12 +47,12 @@ typedef struct _StThemeClass StThemeClass;

 GType  st_theme_get_type (void) G_GNUC_CONST;

-StTheme *st_theme_new (const char *application_stylesheet,
-                       const char *theme_stylesheet,
-                       const char *default_stylesheet);
+StTheme *st_theme_new (GFile *application_stylesheet,
+                       GFile *theme_stylesheet,
+                       GFile *default_stylesheet);

-gboolean  st_theme_load_stylesheet        (StTheme *theme, const char *path, GError **error);
-void      st_theme_unload_stylesheet      (StTheme *theme, const char *path);
+gboolean  st_theme_load_stylesheet        (StTheme *theme, GFile *file, GError **error);
+void      st_theme_unload_stylesheet      (StTheme *theme, GFile *file);
 GSList   *st_theme_get_custom_stylesheets (StTheme *theme);

 G_END_DECLS
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@ -40,6 +40,7 @@
 #include "st-texture-cache.h"
 #include "st-theme-context.h"
 #include "st-theme-node-transition.h"
+#include "st-theme-node-private.h"

 #include "st-widget-accessible.h"

@ -277,26 +278,26 @@ current_paint_state (StWidget *widget)

 static void
 st_widget_texture_cache_changed (StTextureCache *cache,
-                                 const char     *uri,
+                                 GFile          *file,
                                 gpointer        user_data)
 {
  StWidget *actor = ST_WIDGET (user_data);
  StThemeNode *node = actor->priv->theme_node;
-  char *path;
  gboolean changed = FALSE;
+  GFile *theme_file;

  if (node == NULL)
    return;

-  path = g_filename_from_uri (uri, NULL, NULL);
-
-  if (g_strcmp0 (st_theme_node_get_background_image (node), path) == 0)
+  theme_file = st_theme_node_get_background_image (node);
+  if ((theme_file != NULL) && g_file_equal (theme_file, file))
    {
      st_theme_node_invalidate_background_image (node);
      changed = TRUE;
    }

-  if (g_strcmp0 (st_border_image_get_filename (st_theme_node_get_border_image (node)), path) == 0)
+  theme_file = st_border_image_get_file (st_theme_node_get_border_image (node));
+  if ((theme_file != NULL) && g_file_equal (theme_file, file))
    {
      st_theme_node_invalidate_border_image (node);
      changed = TRUE;
@ -317,8 +318,6 @@ st_widget_texture_cache_changed (StTextureCache *cache,
      if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
        clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
    }
-
-  g_free (path);
 }

 static void
@ -1542,6 +1541,8 @@ st_widget_recompute_style (StWidget    *widget,
      return;
    }

+  _st_theme_node_apply_margins (new_theme_node, CLUTTER_ACTOR (widget));
+
  if (!old_theme_node ||
      !st_theme_node_geometry_equal (old_theme_node, new_theme_node))
    clutter_actor_queue_relayout ((ClutterActor *) widget);
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@ -34,6 +34,9 @@ static StThemeNode *group2;
 static StThemeNode *text3;
 static StThemeNode *text4;
 static StThemeNode *group3;
+static StThemeNode *group4;
+static StThemeNode *group5;
+static StThemeNode *group6;
 static StThemeNode *cairo_texture;
 static gboolean fail;

@ -173,17 +176,21 @@ assert_background_image (StThemeNode *node,
 			 const char  *node_description,
 			 const char  *expected)
 {
-  const char *value = st_theme_node_get_background_image (node);
-  if (expected == NULL)
-    expected = "(null)";
-  if (value == NULL)
-    value = "(null)";
+  GFile *value = st_theme_node_get_background_image (node);
+  GFile *expected_file;

-  if (strcmp (expected, value) != 0)
+  if (expected != NULL && value != NULL)
    {
-      g_print ("%s: %s.background-image: expected: %s, got: %s\n",
-	       test, node_description, expected, value);
-      fail = TRUE;
+      expected_file = g_file_new_for_path (expected);
+
+      if (!g_file_equal (expected_file, value))
+        {
+          char *uri = g_file_get_uri (expected_file);
+          g_print ("%s: %s.background-image: expected: %s, got: %s\n",
+                   test, node_description, expected, uri);
+          fail = TRUE;
+          g_free (uri);
+        }
    }
 }

@ -229,6 +236,19 @@ test_lengths (void)
  /* 1in == 72pt == 96px, at 96dpi */
  assert_length ("group1", "padding-left", 96.,
 		 st_theme_node_get_padding (group1, ST_SIDE_LEFT));
+
+  /* 12pt == 16px at 96dpi */
+  assert_length ("group1", "margin-top", 16.,
+		 st_theme_node_get_margin (group1, ST_SIDE_TOP));
+  /* 12px == 12px */
+  assert_length ("group1", "margin-right", 12.,
+		 st_theme_node_get_margin (group1, ST_SIDE_RIGHT));
+  /* 2em == 32px (with a 12pt font) */
+  assert_length ("group1", "margin-bottom", 32.,
+		 st_theme_node_get_margin (group1, ST_SIDE_BOTTOM));
+  /* 1in == 72pt == 96px, at 96dpi */
+  assert_length ("group1", "margin-left", 96.,
+		 st_theme_node_get_margin (group1, ST_SIDE_LEFT));
 }

 static void
@ -278,6 +298,54 @@ test_padding (void)
 		 st_theme_node_get_padding (group2, ST_SIDE_LEFT));
 }

+static void
+test_margin (void)
+{
+  test = "margin";
+  /* Test that a 4-sided margin property assigns the right margin to
+   * all sides */
+  assert_length ("group2", "margin-top", 1.,
+		 st_theme_node_get_margin (group2, ST_SIDE_TOP));
+  assert_length ("group2", "margin-right", 2.,
+		 st_theme_node_get_margin (group2, ST_SIDE_RIGHT));
+  assert_length ("group2", "margin-bottom", 3.,
+		 st_theme_node_get_margin (group2, ST_SIDE_BOTTOM));
+  assert_length ("group2", "margin-left", 4.,
+		 st_theme_node_get_margin (group2, ST_SIDE_LEFT));
+
+  /* Test that a 3-sided margin property assigns the right margin to
+   * all sides */
+  assert_length ("group4", "margin-top", 1.,
+     st_theme_node_get_margin (group4, ST_SIDE_TOP));
+  assert_length ("group4", "margin-right", 2.,
+     st_theme_node_get_margin (group4, ST_SIDE_RIGHT));
+  assert_length ("group4", "margin-bottom", 3.,
+     st_theme_node_get_margin (group4, ST_SIDE_BOTTOM));
+  assert_length ("group4", "margin-left", 2.,
+     st_theme_node_get_margin (group4, ST_SIDE_LEFT));
+
+  /* Test that a 2-sided margin property assigns the right margin to
+   * all sides */
+  assert_length ("group5", "margin-top", 1.,
+     st_theme_node_get_margin (group5, ST_SIDE_TOP));
+  assert_length ("group5", "margin-right", 2.,
+     st_theme_node_get_margin (group5, ST_SIDE_RIGHT));
+  assert_length ("group5", "margin-bottom", 1.,
+     st_theme_node_get_margin (group5, ST_SIDE_BOTTOM));
+  assert_length ("group5", "margin-left", 2.,
+     st_theme_node_get_margin (group5, ST_SIDE_LEFT));
+
+  /* Test that all sides have a margin of 0 when not specified */
+  assert_length ("group6", "margin-top", 0.,
+     st_theme_node_get_margin (group6, ST_SIDE_TOP));
+  assert_length ("group6", "margin-right", 0.,
+     st_theme_node_get_margin (group6, ST_SIDE_RIGHT));
+  assert_length ("group6", "margin-bottom", 0.,
+     st_theme_node_get_margin (group6, ST_SIDE_BOTTOM));
+  assert_length ("group6", "margin-left", 0.,
+     st_theme_node_get_margin (group6, ST_SIDE_LEFT));
+}
+
 static void
 test_border (void)
 {
@ -426,14 +494,16 @@ main (int argc, char **argv)
  StTheme *theme;
  StThemeContext *context;
  PangoFontDescription *font_desc;
+  GFile *file;

  gtk_init (&argc, &argv);

  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
    return 1;

-  theme = st_theme_new ("st/test-theme.css",
-                        NULL, NULL);
+  file = g_file_new_for_path ("st/test-theme.css");
+  theme = st_theme_new (file, NULL, NULL);
+  g_object_unref (file);

  stage = clutter_stage_new ();
  context = st_theme_context_get_for_stage (CLUTTER_STAGE (stage));
@ -452,6 +522,12 @@ main (int argc, char **argv)
                              CLUTTER_TYPE_TEXT, "text2", NULL, NULL, NULL);
  group2 = st_theme_node_new (context, root, NULL,
                              CLUTTER_TYPE_GROUP, "group2", NULL, NULL, NULL);
+  group4 = st_theme_node_new (context, root, NULL,
+                              CLUTTER_TYPE_GROUP, "group4", NULL, NULL, NULL);
+  group5 = st_theme_node_new (context, root, NULL,
+                              CLUTTER_TYPE_GROUP, "group5", NULL, NULL, NULL);
+  group6 = st_theme_node_new (context, root, NULL,
+                              CLUTTER_TYPE_GROUP, "group6", NULL, NULL, NULL);
  text3 = st_theme_node_new  (context, group2, NULL,
                              CLUTTER_TYPE_TEXT, "text3", NULL, NULL,
                              "color: #0000ff; padding-bottom: 12px;");
@ -468,6 +544,7 @@ main (int argc, char **argv)
  test_type_inheritance ();
  test_adjacent_selector ();
  test_padding ();
+  test_margin ();
  test_border ();
  test_background ();
  test_font ();
@ -478,6 +555,9 @@ main (int argc, char **argv)
  g_object_unref (group1);
  g_object_unref (group2);
  g_object_unref (group3);
+  g_object_unref (group4);
+  g_object_unref (group5);
+  g_object_unref (group6);
  g_object_unref (text1);
  g_object_unref (text2);
  g_object_unref (text3);
--- a/Show More
+++ b/Show More