ui/shellDBus.js: move ShowOSD to org.gnome.Shell.OSD

ui/shellDBus.js: move key grabber to org.gnome.Shell.KeyGrabber
acquire 5 more dbus names
2015-04-02 23:43:38 +03:00 · 2015-04-02 23:43:38 +03:00 · 2015-04-02 23:43:38 +03:00
61 changed files with 6464 additions and 6065 deletions
--- a/64
+++ b/64
@@ -1,67 +1,3 @@
-3.17.2
-======
-* Remove StTable widget [Florian; #703833]
-* Increase visibility of expanders in alt-tab popup [Jakub; #745058]
-* Ensure suspend inhibitors are released when VT switched away [Rui; #749228]
-* Use iio-sensor-proxy directly for orientation lock [Bastien; #749671]
-* Misc. bug fixes [Florian, Lan, Carlos; #749279, #749383, #749529, #749490,
-  #749742]
-
-Contributors:
-  Carlos Garnacho, Ting-Wei Lan, Rui Matos, Florian Müllner, Bastien Nocera,
-  Jakub Steiner
-
-Translations:
-  Yosef Or Boczko [he], sun [zh_CN], Felipe Braga [pt_BR],
-  Victor Ibragimov [tg], Gábor Kelemen [hu], Cédric Valmary [oc],
-  Dušan Kazik [sk], Kjartan Maraas [nb], Bruno Ramalhete [pt],
-  Matej Urbančič [sl], Daniel Mustieles [es]
-
-3.17.1
-======
-* Add Display Settings entry to background menu [Meet; #697346]
-* Add window menu option to move to different monitor [Isaac; #633994]
-* Improve switch style in default/highContrast themes [Jakub; #746294, #747912]
-* Make event highlight in calendar more prominent [Jakub; #747715]
-* Fix keyboard focus when focusing a notification banner [Florian; #747205]
-* Move notification banners below the dateMenu [Meet, Florian; #745910]
-* Misc. bug fixes [Mario, Rui; #748338, #748541]
-
-Contributors:
-  Isaac Ge, Rui Matos, Florian Müllner, Meet Parikh, Mario Sanchez Prada,
-  Jakub Steiner, Jasper St. Pierre
-
-Translations:
-  Sveinn í Felli [is], Marek Černocký [cs], laurent Soleil [oc]
-
-3.16.1
-======
-* gdm: Move long session chooser menus to the side [Florian; #734352]
-* Work around background corruption with NVIDIA driver [Rui; #739178]
-* Don't allow move-to-workspace for always-sticky windows [Florian; #746782]
-* Allow switching workspaces with PgUp/PgDown in overview [Devyani; #742581]
-* Bump time PAM messages are displayed [Sarvjeet; #720885]
-* Fix "stutter" when moving window past the last workspace [Shivam; #712778]
-* Fix blurred text on login screen [Clément; #746912]
-* keyboard: Restore whole MRU list after password mode [Rui; #746605]
-* Pass event timestamps when activating remote actions [Owen; #747323]
-* Fix hung login screen when password is typed too quickly [Shivam; #737586]
-* Make on-screen keyboard work for shell chrome on wayland [Rui; #747274]
-* Implement reexec_self() for FreeBSD [Ting-Wei; #747788]
-* Allow to dismiss resident notifications [Florian; #746860]
-* Temporarily reveal legacy tray when icons are added [Florian; #746025]
-* Make concealed tray smaller to minimize overlap with apps [Florian; #746787]
-* Misc. bug fixes [Florian, Rui, Giovanni; #746323, #746579, #746902, #746364,
-  #746509, #747636]
-
-Contributors:
-  Sarvjeet, Giovanni Campagna, Adel Gadllah, Clément Guérin, Devyani Kota,
-  Ting-Wei Lan, Rui Matos, Shivam Mishra, Florian Müllner, Owen W. Taylor
-
-Translations:
-  Khaled Hosny [ar], Dušan Kazik [sk], Yuri Myasoedov [ru], Stas Solovey [ru],
-  Hannie Dumoleyn [nl], Rūdolfs Mazurs [lv]
-
 3.16.0
 ======
 * Revert erroneous login dialog changes [Ray; #740142]
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.17.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.16.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -76,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
 CLUTTER_MIN_VERSION=1.21.5
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.39.0
-MUTTER_MIN_VERSION=3.17.2
+MUTTER_MIN_VERSION=3.16.0
 GTK_MIN_VERSION=3.15.0
 GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -32,10 +32,8 @@
    <file>summary-counter.svg</file>
    <file>toggle-off-us.svg</file>
    <file>toggle-off-intl.svg</file>
-    <file>toggle-off-hc.svg</file>
    <file>toggle-on-us.svg</file>
    <file>toggle-on-intl.svg</file>
-    <file>toggle-on-hc.svg</file>
    <file>ws-switch-arrow-up.png</file>
    <file>ws-switch-arrow-down.png</file>
  </gresource>
--- a/data/theme/calendar-today.svg
+++ b/data/theme/calendar-today.svg
@@ -10,11 +10,11 @@
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
+   width="29"
+   height="29"
   id="svg10621"
   version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.2 r9819"
   sodipodi:docname="calendar-today.svg">
  <defs
     id="defs10623">
@@ -118,6 +118,17 @@
       fx="51"
       fy="30"
       r="42" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient34508-1-3"
+       id="radialGradient3113"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
+       cx="51"
+       cy="30"
+       fx="51"
+       fy="30"
+       r="42" />
  </defs>
  <sodipodi:namedview
     id="base"
@@ -126,23 +137,22 @@
     borderopacity="1.0"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-23.537329"
-     inkscape:cy="-31.442864"
+     inkscape:zoom="15.839192"
+     inkscape:cx="20.652108"
+     inkscape:cy="11.839084"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
-     inkscape:window-width="2133"
-     inkscape:window-height="1241"
-     inkscape:window-x="238"
-     inkscape:window-y="88"
-     inkscape:window-maximized="0"
-     borderlayer="true"
-     inkscape:showpageshadow="false">
+     inkscape:window-width="1280"
+     inkscape:window-height="741"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     borderlayer="true">
    <inkscape:grid
       type="xygrid"
       id="grid3109"
@@ -159,7 +169,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
@@ -167,12 +177,28 @@
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
-     transform="translate(-469.08263,-537.99307)">
-    <circle
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.23756906;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="path7305"
-       cx="481.57138"
-       cy="559.4649"
-       r="1.5" />
+     transform="translate(-469.08263,-532.99307)">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.4625;color:#000000;fill:url(#radialGradient3113);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path34506-3"
+       sodipodi:cx="51"
+       sodipodi:cy="30"
+       sodipodi:rx="42"
+       sodipodi:ry="16"
+       d="M 9,29.999999 A 42,16 0 0 1 93,30 l -42,0 z"
+       sodipodi:start="3.1415927"
+       sodipodi:end="6.2831853"
+       transform="matrix(0.43692393,0,0,1.3783114,461.29951,517.6437)"
+       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect2996"
+       width="31"
+       height="3"
+       x="468.08264"
+       y="558.99304" />
  </g>
 </svg>
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -488,9 +488,10 @@ StScrollBar {

 .switcher-arrow {
  border-color: transparent;
-  color: rgba(255, 255, 255, 0.8); }
-  .switcher-arrow:highlighted {
-    color: #fff; }
+  color: black; }
+
+.switcher-arrow:highlighted {
+  color: #fff; }

 .input-source-switcher-symbol {
  font-size: 34pt;
@@ -709,9 +710,8 @@ StScrollBar {
  border: 1px solid rgba(0, 0, 0, 0.5); }

 .calendar-day-with-events {
-  color: white;
-  font-weight: bold;
-  background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg"); }
+  color: #f2f2f2;
+  font-weight: bold; }

 .calendar-other-month-day {
  color: rgba(255, 255, 255, 0.15);
@@ -1696,11 +1696,3 @@ StScrollBar {

 stage {
  -st-icon-style: symbolic; }
-
-.toggle-switch {
-  width: 48px; }
-
-.toggle-switch-us, .toggle-switch-intl {
-  background-image: url("resource:///org/gnome/shell/theme/toggle-off-hc.svg"); }
-  .toggle-switch-us:checked, .toggle-switch-intl:checked {
-    background-image: url("resource:///org/gnome/shell/theme/toggle-on-hc.svg"); }
--- a/data/theme/gnome-shell-high-contrast.scss
+++ b/data/theme/gnome-shell-high-contrast.scss
@@ -6,9 +6,3 @@
 stage {
  -st-icon-style: symbolic;
 }
-
-.toggle-switch { width: 48px; }
-.toggle-switch-us, .toggle-switch-intl {
-  background-image: url("resource:///org/gnome/shell/theme/toggle-off-hc.svg");
-  &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-hc.svg"); }
-}
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -488,9 +488,10 @@ StScrollBar {

 .switcher-arrow {
  border-color: transparent;
-  color: rgba(238, 238, 236, 0.8); }
-  .switcher-arrow:highlighted {
-    color: #eeeeec; }
+  color: #1c1f1f; }
+
+.switcher-arrow:highlighted {
+  color: #eeeeec; }

 .input-source-switcher-symbol {
  font-size: 34pt;
@@ -709,9 +710,8 @@ StScrollBar {
  border: 1px solid rgba(28, 31, 31, 0.5); }

 .calendar-day-with-events {
-  color: white;
-  font-weight: bold;
-  background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg"); }
+  color: #e2e2df;
+  font-weight: bold; }

 .calendar-other-month-day {
  color: rgba(238, 238, 236, 0.15);
--- a/data/theme/toggle-off-hc.svg
+++ b/data/theme/toggle-off-hc.svg
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-off-hc.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-6.1820581"
-     inkscape:cy="-16.463788"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1364"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         transform="matrix(1.5323214,0,0,1.2413968,-324.76058,489.69039)"
-         id="toggle-off"
-         inkscape:label="#g8477">
-        <circle
-           cy="1033.993"
-           cx="571.95966"
-           id="path8444"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           r="7" />
-        <rect
-           ry="2.0108337"
-           rx="1.9562569"
-           y="1031.9885"
-           x="565.0083"
-           height="4.0216675"
-           width="34.850178"
-           id="rect8461"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-      <g
-         transform="matrix(1.5323214,0,0,1.2413968,-324.85635,491.16456)"
-         id="toggle-on"
-         inkscape:label="#g8481">
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect8475"
-           width="34.850178"
-           height="4.0216675"
-           x="565.0083"
-           y="1070.9279"
-           rx="1.9562569"
-           ry="2.0108337" />
-        <circle
-           transform="scale(-1,1)"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="circle8463"
-           cx="-591.0213"
-           cy="1072.9402"
-           r="9" />
-      </g>
-    </g>
-  </g>
-</svg>
--- a/data/theme/toggle-on-hc.svg
+++ b/data/theme/toggle-on-hc.svg
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="22"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="toggle-on-hc.svg">
-  <defs
-     id="defs2859">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect77541-4"
-       is_visible="true" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-222.95215"
-     inkscape:cy="3.9378433"
-     inkscape:document-units="px"
-     inkscape:current-layer="g37994"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1364"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12954"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-781.36218)">
-    <g
-       transform="matrix(0.6526046,0,0,0.80554422,99.592644,-636.32172)"
-       id="g37994">
-      <g
-         transform="matrix(1.5323214,0,0,1.2413968,-324.85635,441.50868)"
-         id="toggle-on"
-         inkscape:label="#g8481">
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="rect8475"
-           width="34.850178"
-           height="4.0216675"
-           x="565.0083"
-           y="1070.9279"
-           rx="1.9562569"
-           ry="2.0108337" />
-        <circle
-           transform="scale(-1,1)"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           id="circle8463"
-           cx="-591.0213"
-           cy="1072.9402"
-           r="9" />
-      </g>
-    </g>
-  </g>
-</svg>
--- a/data/theme/toggle-on-intl.svg
+++ b/data/theme/toggle-on-intl.svg
@@ -14,7 +14,7 @@
   height="22"
   id="svg2857"
   version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
   sodipodi:docname="toggle-on-intl.svg">
  <defs
     id="defs2859">
@@ -52,7 +52,7 @@
      <stop
         id="stop77465"
         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
+         style="stop-color:#204a87;stop-opacity:1" />
    </linearGradient>
    <linearGradient
       inkscape:collect="always"
@@ -88,14 +88,14 @@
     borderopacity="1.0"
     inkscape:pageopacity="1"
     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="37.410841"
-     inkscape:cy="16.009314"
+     inkscape:zoom="32"
+     inkscape:cx="17.255148"
+     inkscape:cy="8.9252639"
     inkscape:document-units="px"
     inkscape:current-layer="g37994"
-     showgrid="false"
+     showgrid="true"
     inkscape:window-width="2560"
-     inkscape:window-height="1376"
+     inkscape:window-height="1375"
     inkscape:window-x="0"
     inkscape:window-y="27"
     inkscape:window-maximized="1"
--- a/data/theme/toggle-on-us.svg
+++ b/data/theme/toggle-on-us.svg
@@ -14,7 +14,7 @@
   height="22"
   id="svg2857"
   version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
   sodipodi:docname="toggle-on-us.svg">
  <defs
     id="defs2859">
@@ -32,6 +32,28 @@
       inkscape:vp_y="0 : 1000 : 0"
       inkscape:vp_x="0 : 0.5 : 1"
       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient77461"
+       id="linearGradient77551"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-841.64667,-483)"
+       x1="1164.7644"
+       y1="962.93695"
+       x2="1164.7644"
+       y2="970.51404" />
+    <linearGradient
+       id="linearGradient77461"
+       inkscape:collect="always">
+      <stop
+         id="stop77463"
+         offset="0"
+         style="stop-color:#182f4c;stop-opacity:1" />
+      <stop
+         id="stop77465"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient76469-7-7-4"
@@ -58,38 +80,6 @@
       effect="spiro"
       id="path-effect77541-4"
       is_visible="true" />
-    <linearGradient
-       id="linearGradient77461-1"
-       inkscape:collect="always">
-      <stop
-         id="stop77463-1"
-         offset="0"
-         style="stop-color:#182f4c;stop-opacity:1" />
-      <stop
-         id="stop77465-4"
-         offset="1"
-         style="stop-color:#205b9a;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient77551-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8527367,0,0,0.80554422,-969.41608,-778.00299)"
-       x1="1164.7644"
-       y1="962.93695"
-       x2="1164.7644"
-       y2="970.51404" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient77461-1"
-       id="linearGradient11198"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3066667,0,0,1,-1066.3709,794.25325)"
-       x1="1322.5831"
-       y1="-312.51855"
-       x2="1322.5831"
-       y2="-306.53461" />
  </defs>
  <sodipodi:namedview
     id="base"
@@ -99,13 +89,13 @@
     inkscape:pageopacity="1"
     inkscape:pageshadow="2"
     inkscape:zoom="1"
-     inkscape:cx="-26.798898"
-     inkscape:cy="5.3753009"
+     inkscape:cx="33.380898"
+     inkscape:cy="6.9658271"
     inkscape:document-units="px"
     inkscape:current-layer="g37994"
     showgrid="false"
     inkscape:window-width="2560"
-     inkscape:window-height="1376"
+     inkscape:window-height="1375"
     inkscape:window-x="0"
     inkscape:window-y="27"
     inkscape:window-maximized="1"
@@ -162,7 +152,7 @@
           height="25"
           width="98"
           id="rect38000"
-           style="color:#000000;fill:url(#linearGradient11198);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+           style="color:#000000;fill:url(#linearGradient77551);fill-opacity:1;fill-rule:nonzero;stroke:#182f4c;stroke-width:1.37920964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
      </g>
      <g
         transform="translate(2.0625,-2)"
--- a/docs/reference/st/st-docs.sgml.in
+++ b/docs/reference/st/st-docs.sgml.in
@@ -35,6 +35,7 @@
      <xi:include href="xml/st-bin.xml"/>
      <xi:include href="xml/st-box-layout.xml"/>
      <xi:include href="xml/st-scroll-view.xml"/>
+      <xi:include href="xml/st-table.xml"/>
    </chapter>

    <chapter id="styling">
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -194,15 +194,17 @@ const AuthPrompt = new Lang.Class({
    },

    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
+        if (this._preemptiveAnswer) {
+            if (this._queryingService)
+                this._userVerifier.answerQuery(this._queryingService, this._preemptiveAnswer);
+            this._preemptiveAnswer = null;
+            return;
+        }
+
        if (this._queryingService)
            this.clear();

        this._queryingService = serviceName;
-        if (this._preemptiveAnswer) {
-            this._userVerifier.answerQuery(this._queryingService, this._preemptiveAnswer);
-            this._preemptiveAnswer = null;
-            return;
-        }
        this.setPasswordChar(passwordChar);
        this.setQuestion(question);

--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -134,7 +134,7 @@ const LoginManagerSystemd = new Lang.Class({
            if (error)
                asyncCallback(false);
            else
-                asyncCallback(result[0] != 'no' && result[0] != 'na');
+                asyncCallback(result[0] != 'no');
        });
    },

--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@@ -16,10 +16,9 @@ const BackgroundMenu = new Lang.Class({
    _init: function(layoutManager) {
        this.parent(layoutManager.dummyCursor, 0, St.Side.TOP);

-        this.addSettingsAction(_("Change Background…"), 'gnome-background-panel.desktop');
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.addSettingsAction(_("Display Settings"), 'gnome-display-panel.desktop');
        this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.addSettingsAction(_("Change Background…"), 'gnome-background-panel.desktop');

        this.actor.add_style_class_name('background-menu');

--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1252,6 +1252,10 @@ const NotificationMessage = new Lang.Class({
        this.setUseBodyMarkup(n.bannerBodyMarkup);
    },

+    canClose: function() {
+        return !this.notification.resident;
+    },
+
    _onClicked: function() {
        this.notification.activate();
    },
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -158,6 +158,14 @@ const TelepathyClient = new Lang.Class({
        this._chatSources[channel.get_object_path()] = source;
        source.connect('destroy', Lang.bind(this,
                       function() {
+                           if (this._tpClient.is_handling_channel(channel)) {
+                               // The chat box has been destroyed so it can't
+                               // handle the channel any more.
+                               channel.close_async(function(src, result) {
+                                   channel.close_finish(result);
+                               });
+                           }
+
                           delete this._chatSources[channel.get_object_path()];
                       }));
    },
@@ -266,6 +274,13 @@ const ChatSource = new Lang.Class({
        this._channel = channel;
        this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed));

+        this._notification = new ChatNotification(this);
+        this._notification.connect('activated', Lang.bind(this, this.open));
+        this._notification.connect('updated', Lang.bind(this,
+            function() {
+                if (this._banner && this._banner.expanded)
+                    this._ackMessages();
+            }));
        this._notifyTimeoutId = 0;

        this._presence = contact.get_presence_type();
@@ -280,28 +295,11 @@ const ChatSource = new Lang.Class({

        // Add ourselves as a source.
        Main.messageTray.add(this);
+        this.pushNotification(this._notification);

        this._getLogMessages();
    },

-    _ensureNotification: function() {
-        if (this._notification)
-            return;
-
-        this._notification = new ChatNotification(this);
-        this._notification.connect('activated', Lang.bind(this, this.open));
-        this._notification.connect('updated', Lang.bind(this,
-            function() {
-                if (this._banner && this._banner.expanded)
-                    this._ackMessages();
-            }));
-        this._notification.connect('destroy', Lang.bind(this,
-            function() {
-                this._notification = null;
-            }));
-        this.pushNotification(this._notification);
-    },
-
    _createPolicy: function() {
        return new MessageTray.NotificationApplicationPolicy('empathy');
    },
@@ -328,8 +326,7 @@ const ChatSource = new Lang.Class({
            return;

        this.setTitle(newAlias);
-        if (this._notification)
-            this._notification.appendAliasChange(oldAlias, newAlias);
+        this._notification.appendAliasChange(oldAlias, newAlias);
    },

    getIcon: function() {
@@ -372,10 +369,9 @@ const ChatSource = new Lang.Class({

    _updateAvatarIcon: function() {
        this.iconUpdated();
-        if (this._notifiction)
-            this._notification.update(this._notification.title,
-                                      this._notification.bannerBodyText,
-                                      { gicon: this.getIcon() });
+        this._notification.update(this._notification.title,
+                                  this._notification.bannerBodyText,
+                                  { gicon: this.getIcon() });
    },

    open: function() {
@@ -416,7 +412,6 @@ const ChatSource = new Lang.Class({
        let [success, events] = logManager.get_filtered_events_finish(result);

        let logMessages = events.map(makeMessageFromTplEvent);
-        this._ensureNotification();

        let pendingTpMessages = this._channel.get_pending_messages();
        let pendingMessages = [];
@@ -466,18 +461,6 @@ const ChatSource = new Lang.Class({
    },

    destroy: function(reason) {
-        if (this._client.is_handling_channel(this._channel)) {
-            // The chat box has been destroyed so it can't
-            // handle the channel any more.
-            this._channel.close_async(function(channel, result) {
-                channel.close_finish(result);
-            });
-        }
-
-        // Keep source alive while the channel is open
-        if (reason != MessageTray.NotificationDestroyedReason.SOURCE_CLOSED)
-            return;
-
        if (this._destroyed)
            return;

@@ -491,6 +474,9 @@ const ChatSource = new Lang.Class({
        this._contact.disconnect(this._notifyAvatarId);
        this._contact.disconnect(this._presenceChangedId);

+        if (this._timestampTimeoutId)
+            Mainloop.source_remove(this._timestampTimeoutId);
+
        this.parent(reason);
    },

@@ -515,7 +501,6 @@ const ChatSource = new Lang.Class({
        if (message.get_message_type() == Tp.ChannelTextMessageType.DELIVERY_REPORT)
            return;

-        this._ensureNotification();
        this._pendingMessages.push(message);
        this.countUpdated();

@@ -543,7 +528,6 @@ const ChatSource = new Lang.Class({
    // This is called for both messages we send from
    // our client and other clients as well.
    _messageSent: function(channel, message, flags, token) {
-        this._ensureNotification();
        message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
        this._notification.appendMessage(message);
    },
@@ -581,10 +565,9 @@ const ChatSource = new Lang.Class({
    },

    _presenceChanged: function (contact, presence, status, message) {
-        if (this._notification)
-            this._notification.update(this._notification.title,
-                                      this._notification.bannerBodyText,
-                                      { secondaryGIcon: this.getSecondaryIcon() });
+        this._notification.update(this._notification.title,
+                                  this._notification.bannerBodyText,
+                                  { secondaryGIcon: this.getSecondaryIcon() });
    },

    _pendingRemoved: function(channel, message) {
@@ -621,13 +604,6 @@ const ChatNotification = new Lang.Class({
        this._timestampTimeoutId = 0;
    },

-    destroy: function(reason) {
-        if (this._timestampTimeoutId)
-            Mainloop.source_remove(this._timestampTimeoutId);
-        this._timestampTimeoutId = 0;
-        this.parent(reason);
-    },
-
    /**
     * appendMessage:
     * @message: An object with the properties:
@@ -710,7 +686,6 @@ const ChatNotification = new Lang.Class({
        // Reset the old message timeout
        if (this._timestampTimeoutId)
            Mainloop.source_remove(this._timestampTimeoutId);
-        this._timestampTimeoutId = 0;

        let message = { realMessage: props.group != 'meta',
                        showTimestamp: false };
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -357,6 +357,8 @@ const DateMenuButton = new Lang.Class({
                this._date.setDate(now);
                this._messageList.setDate(now);
            }
+            // Block notification banners while the menu is open
+            Main.messageTray.bannerBlocked = isOpen;
        }));

        // Fill up the first column
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -81,6 +81,7 @@ function init() {

    // Miscellaneous monkeypatching
    _patchContainerClass(St.BoxLayout);
+    _patchContainerClass(St.Table);

    _patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
                                             column_spacing: 'spacing-columns' });
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -184,10 +184,6 @@ const Keyboard = new Lang.Class({
        this._daemonProxy = null;
        this._lastDeviceId = null;

-        if (Meta.is_wayland_compositor() &&
-            Caribou.DisplayAdapter.set_default)
-            Caribou.DisplayAdapter.set_default(new ShellWaylandAdapter());
-
        Meta.get_backend().connect('last-device-changed', Lang.bind(this,
            function (backend, deviceId) {
                let manager = Clutter.DeviceManager.get_default();
@@ -729,24 +725,3 @@ const KeyboardSource = new Lang.Class({
        this._keyboard.show(Main.layoutManager.bottomIndex);
    }
 });
-
-const ShellWaylandAdapter = new Lang.Class({
-    Name: 'ShellWaylandAdapter',
-    Extends: Caribou.XAdapter,
-
-    vfunc_keyval_press: function(keyval) {
-        let focus = global.stage.get_key_focus();
-        if (focus instanceof Clutter.Text)
-            Shell.util_text_insert_keyval(focus, keyval);
-        else
-            this.parent(keyval);
-    },
-
-    vfunc_keyval_release: function(keyval) {
-        let focus = global.stage.get_key_focus();
-        if (focus instanceof Clutter.Text)
-            return;             // do nothing
-        else
-            this.parent(keyval);
-    },
-});
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -837,7 +837,6 @@ const LayoutManager = new Lang.Class({
        // need to connect to 'destroy' too.

        this._trackedActors.push(actorData);
-        this._updateActorVisibility(actorData);
        this._queueUpdateRegions();
    },

@@ -856,23 +855,25 @@ const LayoutManager = new Lang.Class({
        this._queueUpdateRegions();
    },

-    _updateActorVisibility: function(actorData) {
-        if (!actorData.trackFullscreen)
-            return;
-
-        let monitor = this.findMonitorForActor(actorData.actor);
-        actorData.actor.visible = !(global.window_group.visible &&
-                                    monitor &&
-                                    monitor.inFullscreen);
-    },
-
    _updateVisibility: function() {
        let windowsVisible = Main.sessionMode.hasWindows && !this._inOverview;

        global.window_group.visible = windowsVisible;
        global.top_window_group.visible = windowsVisible;

-        this._trackedActors.forEach(Lang.bind(this, this._updateActorVisibility));
+        for (let i = 0; i < this._trackedActors.length; i++) {
+            let actorData = this._trackedActors[i], visible;
+            if (!actorData.trackFullscreen)
+                continue;
+
+            if (!windowsVisible)
+                visible = true;
+            else if (this.findMonitorForActor(actorData.actor).inFullscreen)
+                visible = false;
+            else
+                visible = true;
+            actorData.actor.visible = visible;
+        }
    },

    getWorkAreaForMonitor: function(monitorIndex) {
@@ -1315,11 +1316,8 @@ const PressureBarrier = new Lang.Class({
    },

    _onBarrierLeft: function(barrier, event) {
-        barrier._isHit = false;
-        if (this._barriers.every(function(b) { return !b._isHit; })) {
-            this._reset();
-            this._isTriggered = false;
-        }
+        this._reset();
+        this._isTriggered = false;
    },

    _trigger: function() {
@@ -1329,8 +1327,6 @@ const PressureBarrier = new Lang.Class({
    },

    _onBarrierHit: function(barrier, event) {
-        barrier._isHit = true;
-
        // If we've triggered the barrier, wait until the pointer has the
        // left the barrier hitbox until we trigger it again.
        if (this._isTriggered)
--- a/js/ui/legacyTray.js
+++ b/js/ui/legacyTray.js
@@ -1,5 +1,4 @@
 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
@@ -29,9 +28,8 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
 };

 // Offset of the original position from the bottom-right corner
-const CONCEALED_WIDTH = 3;
+const CONCEALED_VISIBLE_FRACTION = 0.2;
 const REVEAL_ANIMATION_TIME = 0.2;
-const TEMP_REVEAL_TIME = 2;

 const BARRIER_THRESHOLD = 70;
 const BARRIER_TIMEOUT = 1000;
@@ -176,15 +174,7 @@ const LegacyTray = new Lang.Class({
            }));

        this._iconBox.add_actor(button);
-
-        if (!this._concealHandle.visible) {
-            this._concealHandle.show();
-            GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, TEMP_REVEAL_TIME,
-                Lang.bind(this, function() {
-                    this._concealHandle.hide();
-                    return GLib.SOURCE_REMOVE;
-                }));
-        }
+        this._sync();
    },

    _onTrayIconRemoved: function(tm, icon) {
@@ -254,10 +244,9 @@ const LegacyTray = new Lang.Class({
            let [, boxWidth] = this._box.get_preferred_width(-1);
            let [, handleWidth] = this._revealHandle.get_preferred_width(-1);

-            if (this._revealHandle.hover)
-                targetSlide = handleWidth / boxWidth;
-            else
-                targetSlide = CONCEALED_WIDTH / boxWidth;
+            targetSlide = handleWidth / boxWidth;
+            if (!this._revealHandle.hover)
+                targetSlide *= CONCEALED_VISIBLE_FRACTION;
        }

        if (this.actor.visible) {
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -258,8 +258,6 @@ const NotificationApplicationPolicy = new Lang.Class({

    _changed: function(settings, key) {
        this.emit('policy-changed', key);
-        if (key == 'enable')
-            this.emit('enable-changed');
    },

    _canonicalizeId: function(id) {
@@ -510,7 +508,6 @@ const NotificationBanner = new Lang.Class({
    _init: function(notification) {
        this.parent(notification);

-        this.actor.can_focus = false;
        this.actor.add_style_class_name('notification-banner');

        this._buttonBox = null;
@@ -756,6 +753,10 @@ const Source = new Lang.Class({
        return this.count > 1;
    },

+    get isClearable() {
+        return !this.isChat && !this.resident;
+    },
+
    countUpdated: function() {
        this.emit('count-updated');
    },
@@ -928,6 +929,8 @@ const MessageTray = new Lang.Class({
        this._notificationTimeoutId = 0;
        this._notificationRemoved = false;

+        this.clearableCount = 0;
+
        Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false });
        Main.layoutManager.trackChrome(this._bannerBin, { affectsInputRegion: true });

@@ -978,14 +981,6 @@ const MessageTray = new Lang.Class({
        Shell.util_set_hidden_from_pick(this.actor, false);
    },

-    get bannerAlignment() {
-        return this._bannerBin.get_x_align();
-    },
-
-    set bannerAlignment(align) {
-        this._bannerBin.set_x_align(align);
-    },
-
    _onNotificationKeyRelease: function(actor, event) {
        if (event.get_key_symbol() == Clutter.KEY_Escape && event.get_state() == 0) {
            this._expireNotification();
@@ -1036,6 +1031,9 @@ const MessageTray = new Lang.Class({
            destroyId: 0,
        };

+        if (source.isClearable)
+            this.clearableCount++;
+
        this._sources.set(source, obj);

        obj.notifyId = source.connect('notify', Lang.bind(this, this._onNotify));
@@ -1048,6 +1046,9 @@ const MessageTray = new Lang.Class({
        let obj = this._sources.get(source);
        this._sources.delete(source);

+        if (source.isClearable)
+            this.clearableCount--;
+
        source.disconnect(obj.notifyId);
        source.disconnect(obj.destroyId);

--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -933,14 +933,6 @@ const Panel = new Lang.Class({
        this._updateBox(panel.center, this._centerBox);
        this._updateBox(panel.right, this._rightBox);

-        if (panel.left.indexOf('dateMenu') != -1)
-            Main.messageTray.bannerAlignment = Clutter.ActorAlign.START;
-        else if (panel.right.indexOf('dateMenu') != -1)
-            Main.messageTray.bannerAlignment = Clutter.ActorAlign.END;
-        // Default to center if there is no dateMenu
-        else
-            Main.messageTray.bannerAlignment = Clutter.ActorAlign.CENTER;
-
        if (this._sessionStyle)
            this._removeStyleClassName(this._sessionStyle);

@@ -1003,7 +995,6 @@ const Panel = new Lang.Class({
        if (parent)
            parent.remove_actor(container);

-
        box.insert_child_at_index(container, position);
        if (indicator.menu)
            this.menuManager.addMenu(indicator.menu);
@@ -1013,8 +1004,6 @@ const Panel = new Lang.Class({
            emitter.disconnect(destroyId);
            container.destroy();
        }));
-        indicator.connect('menu-set', Lang.bind(this, this._onMenuSet));
-        this._onMenuSet(indicator);
    },

    addToStatusArea: function(role, indicator, position, box) {
@@ -1046,24 +1035,5 @@ const Panel = new Lang.Class({
        this.actor.remove_style_class_name(className);
        this._rightCorner.actor.remove_style_class_name(className);
        this._leftCorner.actor.remove_style_class_name(className);
-    },
-
-    _onMenuSet: function(indicator) {
-        if (!indicator.menu || indicator.menu._openChangedId > 0)
-            return;
-
-        indicator.menu._openChangedId = indicator.menu.connect('open-state-changed',
-            Lang.bind(this, function(menu, isOpen) {
-                let boxAlignment;
-                if (this._leftBox.contains(indicator.container))
-                    boxAlignment = Clutter.ActorAlign.START;
-                else if (this._centerBox.contains(indicator.container))
-                    boxAlignment = Clutter.ActorAlign.CENTER;
-                else if (this._rightBox.contains(indicator.container))
-                    boxAlignment = Clutter.ActorAlign.END;
-
-                if (boxAlignment == Main.messageTray.bannerAlignment)
-                    Main.messageTray.bannerBlocked = isOpen;
-            }));
    }
 });
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -128,7 +128,6 @@ const Button = new Lang.Class({
            Main.uiGroup.add_actor(this.menu.actor);
            this.menu.actor.hide();
        }
-        this.emit('menu-set');
    },

    _onEvent: function(actor, event) {
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -507,22 +507,21 @@ const ScreenShield = new Lang.Class({
                                                      this._liftShield(true, 0);
                                              }));

+        this._inhibitor = null;
+        this._aboutToSuspend = false;
        this._loginManager = LoginManager.getLoginManager();
        this._loginManager.connect('prepare-for-sleep',
                                   Lang.bind(this, this._prepareForSleep));
+        this._inhibitSuspend();

-        this._loginSession = null;
        this._loginManager.getCurrentSessionProxy(Lang.bind(this,
            function(sessionProxy) {
                this._loginSession = sessionProxy;
                this._loginSession.connectSignal('Lock', Lang.bind(this, function() { this.lock(false); }));
                this._loginSession.connectSignal('Unlock', Lang.bind(this, function() { this.deactivate(false); }));
-                this._loginSession.connect('g-properties-changed', Lang.bind(this, this._syncInhibitor));
-                this._syncInhibitor();
            }));

        this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
-        this._settings.connect('changed::' + LOCK_ENABLED_KEY, Lang.bind(this, this._syncInhibitor));

        this._isModal = false;
        this._hasLockScreen = false;
@@ -548,18 +547,6 @@ const ScreenShield = new Lang.Class({

        this.idleMonitor = Meta.IdleMonitor.get_core();
        this._cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
-
-        this._syncInhibitor();
-    },
-
-    _setActive: function(active) {
-        let prevIsActive = this._isActive;
-        this._isActive = active;
-
-        if (prevIsActive != this._isActive)
-            this.emit('active-changed');
-
-        this._syncInhibitor();
    },

    _createBackground: function(monitorIndex) {
@@ -677,28 +664,31 @@ const ScreenShield = new Lang.Class({
        return Clutter.EVENT_STOP;
    },

-    _syncInhibitor: function() {
-        let inhibit = (this._loginSession && this._loginSession.Active &&
-                       !this._isActive && this._settings.get_boolean(LOCK_ENABLED_KEY));
-        if (inhibit) {
-            this._loginManager.inhibit(_("GNOME needs to lock the screen"),
-                                       Lang.bind(this, function(inhibitor) {
-                                           if (this._inhibitor)
-                                               this._inhibitor.close(null);
-                                           this._inhibitor = inhibitor;
-                                       }));
-        } else {
-            if (this._inhibitor)
-                this._inhibitor.close(null);
-            this._inhibitor = null;
-        }
+    _inhibitSuspend: function() {
+        this._loginManager.inhibit(_("GNOME needs to lock the screen"),
+                                   Lang.bind(this, function(inhibitor) {
+                                       this._inhibitor = inhibitor;
+                                   }));
+    },
+
+    _uninhibitSuspend: function() {
+        if (this._inhibitor)
+            this._inhibitor.close(null);
+        this._inhibitor = null;
    },

    _prepareForSleep: function(loginManager, aboutToSuspend) {
+        this._aboutToSuspend = aboutToSuspend;
+
        if (aboutToSuspend) {
-            if (this._settings.get_boolean(LOCK_ENABLED_KEY))
-                this.lock(true);
+            if (!this._settings.get_boolean(LOCK_ENABLED_KEY)) {
+                this._uninhibitSuspend();
+                return;
+            }
+            this.lock(true);
        } else {
+            this._inhibitSuspend();
+
            this._wakeUpScreen();
        }
    },
@@ -1093,7 +1083,15 @@ const ScreenShield = new Lang.Class({
    },

    _completeLockScreenShown: function() {
-        this._setActive(true);
+        let prevIsActive = this._isActive;
+        this._isActive = true;
+
+        if (prevIsActive != this._isActive)
+            this.emit('active-changed');
+
+        if (this._aboutToSuspend)
+            this._uninhibitSuspend();
+
        this.emit('lock-screen-shown');
    },

@@ -1187,7 +1185,8 @@ const ScreenShield = new Lang.Class({
            // gnome-settings-daemon will stop blanking the screen

            this._activationTime = 0;
-            this._setActive(false);
+            this._isActive = false;
+            this.emit('active-changed');
            return;
        }

@@ -1230,8 +1229,9 @@ const ScreenShield = new Lang.Class({
        }

        this._activationTime = 0;
-        this._setActive(false);
+        this._isActive = false;
        this._isLocked = false;
+        this.emit('active-changed');
        this.emit('locked-changed');
        global.set_runtime_state(LOCKED_STATE_STR, null);
    },
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -22,9 +22,6 @@ const GnomeShellIface = '<node> \
    <arg type="s" direction="out" name="result" /> \
 </method> \
 <method name="FocusSearch"/> \
-<method name="ShowOSD"> \
-    <arg type="a{sv}" direction="in" name="params"/> \
-</method> \
 <method name="ShowMonitorLabels"> \
    <arg type="a{uv}" direction="in" name="params" /> \
 </method> \
@@ -33,6 +30,14 @@ const GnomeShellIface = '<node> \
    <arg type="s" direction="in" name="id"/> \
 </method> \
 <method name="ShowApplications" /> \
+<property name="Mode" type="s" access="read" /> \
+<property name="OverviewActive" type="b" access="readwrite" /> \
+<property name="ShellVersion" type="s" access="read" /> \
+</interface> \
+</node>';
+
+const GnomeShellKeyGrabberIface = '<node> \
+<interface name="org.gnome.Shell.KeyGrabber"> \
 <method name="GrabAccelerator"> \
    <arg type="s" direction="in" name="accelerator"/> \
    <arg type="u" direction="in" name="flags"/> \
@@ -50,9 +55,14 @@ const GnomeShellIface = '<node> \
    <arg name="action" type="u" /> \
    <arg name="parameters" type="a{sv}" /> \
 </signal> \
-<property name="Mode" type="s" access="read" /> \
-<property name="OverviewActive" type="b" access="readwrite" /> \
-<property name="ShellVersion" type="s" access="read" /> \
+</interface> \
+</node>';
+
+const GnomeShellOSDIface = '<node> \
+<interface name="org.gnome.Shell.OSD"> \
+<method name="ShowOSD"> \
+    <arg type="a{sv}" direction="in" name="params"/> \
+</method> \
 </interface> \
 </node>';

@@ -83,6 +93,12 @@ const GnomeShell = new Lang.Class({
        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellIface, this);
        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');

+        this._dbusKeyGrabberImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellKeyGrabberIface, this);
+        this._dbusKeyGrabberImpl.export(Gio.DBus.session, '/org/gnome/Shell/KeyGrabber');
+
+        this._dbusOSDImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellOSDIface, this);
+        this._dbusOSDImpl.export(Gio.DBus.session, '/org/gnome/Shell/OSD');
+
        this._extensionsService = new GnomeShellExtensions();
        this._screenshotService = new Screenshot.ScreenshotService();

@@ -197,13 +213,13 @@ const GnomeShell = new Lang.Class({
        if (!destination)
            return;

-        let connection = this._dbusImpl.get_connection();
-        let info = this._dbusImpl.get_info();
+        let connection = this._dbusKeyGrabberImpl.get_connection();
+        let info = this._dbusKeyGrabberImpl.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(),
+                               this._dbusKeyGrabberImpl.get_object_path(),
                               info ? info.name : null,
                               'AcceleratorActivated',
                               GLib.Variant.new('(ua{sv})', [action, params]));
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -24,17 +24,6 @@ const DISABLE_LOG_OUT_KEY = 'disable-log-out';
 const DISABLE_RESTART_KEY = 'disable-restart-buttons';
 const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';

-const SENSOR_BUS_NAME = 'net.hadess.SensorProxy';
-const SENSOR_OBJECT_PATH = '/net/hadess/SensorProxy';
-
-const SensorProxyInterface = '<node> \
-<interface name="net.hadess.SensorProxy"> \
-  <property name="HasAccelerometer" type="b" access="read"/> \
-</interface> \
-</node>';
-
-const SensorProxy = Gio.DBusProxy.makeProxyWrapper(SensorProxyInterface);
-
 const AltSwitcher = new Lang.Class({
    Name: 'AltSwitcher',

@@ -155,32 +144,23 @@ const Indicator = new Lang.Class({

        this._orientationSettings.connect('changed::orientation-lock',
                                          Lang.bind(this, this._updateOrientationLock));
-        Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
-                                   Gio.BusNameWatcherFlags.NONE,
-                                   Lang.bind(this, this._sensorProxyAppeared),
-                                   Lang.bind(this, function() {
-                                       this._sensorProxy = null;
-                                       this._updateOrientationLock();
-                                   }));
+        this._orientationExists = false;
+        Gio.DBus.session.watch_name('org.gnome.SettingsDaemon.Orientation',
+                                    Gio.BusNameWatcherFlags.NONE,
+                                    Lang.bind(this, function() {
+                                        this._orientationExists = true;
+                                        this._updateOrientationLock();
+                                    }),
+                                    Lang.bind(this, function() {
+                                        this._orientationExists = false;
+                                        this._updateOrientationLock();
+                                    }));
        this._updateOrientationLock();

        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
        this._sessionUpdated();
    },

-    _sensorProxyAppeared: function() {
-        this._sensorProxy = new SensorProxy(Gio.DBus.system, SENSOR_BUS_NAME, SENSOR_OBJECT_PATH,
-            Lang.bind(this, function(proxy, error) {
-                if (error) {
-                    log(error.message);
-                    return;
-                }
-                this._sensorProxy.connect('g-properties-changed',
-                                          Lang.bind(this, this._updateOrientationLock));
-                this._updateOrientationLock();
-            }));
-    },
-
    _updateActionsVisibility: function() {
        let visible = (this._settingsAction.visible ||
                       this._orientationLockAction.visible ||
@@ -257,10 +237,7 @@ const Indicator = new Lang.Class({
    },

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

        let locked = this._orientationSettings.get_boolean('orientation-lock');
        let icon = this._orientationLockAction.child;
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -480,42 +480,50 @@ const TilePreview = new Lang.Class({

 const WorkspaceSwitchAction = new Lang.Class({
    Name: 'WorkspaceSwitchAction',
-    Extends: Clutter.SwipeAction,
+    Extends: Clutter.GestureAction,

    _init : function() {
-        const MOTION_THRESHOLD = 50;
-
        this.parent();
        this.set_n_touch_points(4);
-        this.set_threshold_trigger_distance(MOTION_THRESHOLD, MOTION_THRESHOLD);

        global.display.connect('grab-op-begin', Lang.bind(this, function() {
            this.cancel();
        }));
    },

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

-    vfunc_swept : function(actor, direction) {
-        let dir;
+    vfunc_gesture_end : function(action, actor) {
+        const MOTION_THRESHOLD = 50;

-        if (direction & Clutter.SwipeDirection.UP)
-            dir = Meta.MotionDirection.DOWN;
-        else if (direction & Clutter.SwipeDirection.DOWN)
-            dir = Meta.MotionDirection.UP;
-        else if (direction & Clutter.SwipeDirection.LEFT)
-            dir = Meta.MotionDirection.RIGHT;
-        else if (direction & Clutter.SwipeDirection.RIGHT)
-            dir = Meta.MotionDirection.LEFT;
+        // Just check one touchpoint here
+        let [startX, startY] = this.get_press_coords(0);
+        let [x, y] = this.get_motion_coords(0);
+        let offsetX = x - startX;
+        let offsetY = y - startY;
+        let direction;

-        this.emit('activated', dir);
+        if (Math.abs(offsetX) < MOTION_THRESHOLD &&
+            Math.abs(offsetY) < MOTION_THRESHOLD)
+            return;
+
+        if (Math.abs(offsetY) > Math.abs(offsetX)) {
+            if (offsetY > 0)
+                direction = Meta.MotionDirection.UP;
+            else
+                direction = Meta.MotionDirection.DOWN;
+        } else {
+            if (offsetX > 0)
+                direction = Meta.MotionDirection.LEFT;
+            else
+                direction = Meta.MotionDirection.RIGHT;
+        }
+
+        this.emit('activated', direction);
    }
 });
 Signals.addSignalMethods(WorkspaceSwitchAction.prototype);
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@@ -115,39 +115,6 @@ const WindowMenu = new Lang.Class({
            }
        }

-        let screen = global.screen;
-        let nMonitors = screen.get_n_monitors();
-        if (nMonitors > 1) {
-          this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-          let monitorIndex = window.get_monitor();
-
-          let upMonitorIndex = screen.get_monitor_neighbor_index(monitorIndex, Meta.ScreenDirection.UP);
-          if (upMonitorIndex != -1) {
-            this.addAction(_("Move to Monitor Up"), Lang.bind(this, function(event) {
-              window.move_to_monitor(upMonitorIndex);
-            }));
-          }
-          let downMonitorIndex = screen.get_monitor_neighbor_index(monitorIndex, Meta.ScreenDirection.DOWN);
-          if (downMonitorIndex != -1) {
-            this.addAction(_("Move to Monitor Down"), Lang.bind(this, function(event) {
-              window.move_to_monitor(downMonitorIndex);
-            }));
-          }
-          let leftMonitorIndex = screen.get_monitor_neighbor_index(monitorIndex, Meta.ScreenDirection.LEFT);
-          if (leftMonitorIndex != -1) {
-            this.addAction(_("Move to Monitor Left"), Lang.bind(this, function(event) {
-              window.move_to_monitor(leftMonitorIndex);
-            }));
-          }
-          let rightMonitorIndex = screen.get_monitor_neighbor_index(monitorIndex, Meta.ScreenDirection.RIGHT);
-          if (rightMonitorIndex != -1) {
-            this.addAction(_("Move to Monitor Right"), Lang.bind(this, function(event) {
-              window.move_to_monitor(rightMonitorIndex);
-            }));
-          }
-        }
-
        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

        item = this.addAction(_("Close"), Lang.bind(this, function(event) {
@@ -200,10 +167,6 @@ const WindowMenuManager = new Lang.Class({
        menu.connect('activate', function() {
            window.check_alive(global.get_current_time());
        });
-        let destroyId = window.connect('unmanaged',
-            function() {
-                menu.close();
-            });

        this._sourceActor.set_size(rect.width, rect.height);
        this._sourceActor.set_position(rect.x, rect.y);
@@ -217,7 +180,6 @@ const WindowMenuManager = new Lang.Class({

            this._sourceActor.hide();
            menu.destroy();
-            window.disconnect(destroyId);
        }));
    }
 });
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -50,7 +50,6 @@ nb
 ne
 nl
 nn
-oc
 or
 pa
 pl
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-04-25 08:00+0000\n"
-"PO-Revision-Date: 2015-04-25 11:59+0200\n"
+"POT-Creation-Date: 2015-03-13 20:44+0000\n"
+"PO-Revision-Date: 2015-03-14 00:03+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -297,13 +297,13 @@ msgstr "Se změnou zaměření v režimu myši čekat na zastavení pohybu ukaza
 msgid "Network Login"
 msgstr "Přihlášení do sítě"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "Nastala chyba při načítání dialogového okna předvoleb pro rozšíření %s:"

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "Rozšíření GNOME Shell"

@@ -314,39 +314,39 @@ msgstr "Rozšíření GNOME Shell"
 msgid "Cancel"
 msgstr "Zrušit"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "Následující"

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

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "Přihlásit se"

-#: ../js/gdm/loginDialog.js:281
+#: ../js/gdm/loginDialog.js:280
 msgid "Choose Session"
 msgstr "Vybrat sezení"

-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:421
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"

-#: ../js/gdm/loginDialog.js:840
+#: ../js/gdm/loginDialog.js:830
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(např. uživatel nebo %s)"

-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Uživatelské jméno: "

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1170
 msgid "Login Window"
 msgstr "Přihlašovací okno"

@@ -439,31 +439,31 @@ msgstr "%e. %B %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Přesměrováno na ověření přes web"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "Zde se objeví často používané aplikace"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Časté"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Všechny"

-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1850
 msgid "New Window"
 msgstr "Nové okno"

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"

-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1884
 msgid "Add to Favorites"
 msgstr "Přidat mezi oblíbené"

-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1894
 msgid "Show Details"
 msgstr "Zobrazit podrobnosti"

@@ -477,19 +477,15 @@ msgstr "%s byl přidán mezi oblíbené."
 msgid "%s has been removed from your favorites."
 msgstr "%s byl odstraněn z oblíbených."

-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "Změnit pozadí…"
-
-#: ../js/ui/backgroundMenu.js:21
-msgid "Display Settings"
-msgstr "Nastavení displeje"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Nastavení"

+#: ../js/ui/backgroundMenu.js:21
+msgid "Change Background…"
+msgstr "Změnit pozadí…"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
 #: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
@@ -542,53 +538,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "So"

-#: ../js/ui/calendar.js:564
+#: ../js/ui/calendar.js:563
 msgid "Previous month"
 msgstr "Předchozí měsíc"

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:573
 msgid "Next month"
 msgstr "Následující měsíc"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "Týden %V"

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

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "Vymazat část"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "Události"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1524
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"

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

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1613
 msgid "Notifications"
 msgstr "Upozornění"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "Žádná upozornění"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "Žádné události"

@@ -724,7 +720,7 @@ msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:775
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"
@@ -733,11 +729,11 @@ msgstr "%s je teď znám jako %s"
 msgid "Windows"
 msgstr "Okna"

-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Zobrazit aplikace"

-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Oblíbené"

@@ -913,16 +909,17 @@ msgstr "Instalovat"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Stáhnout a nainstalovat „%s“ z extensions.gnome.org?"

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "Klávesnice"

 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:59
+#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Skrýt pořadač"

-#: ../js/ui/legacyTray.js:107
+#: ../js/ui/legacyTray.js:91
 msgid "Status Icons"
 msgstr "Stavové ikony"

@@ -978,7 +975,7 @@ msgstr "Zobrazit zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"

-#: ../js/ui/messageTray.js:1504
+#: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "Informace o systému"

@@ -1020,7 +1017,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Zadejte příkaz:"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Zavřít"

@@ -1050,7 +1047,7 @@ msgstr[0] "%d nové upozornění"
 msgstr[1] "%d nová upozornění"
 msgstr[2] "%d nových upozornění"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Uzamknout"

@@ -1066,11 +1063,11 @@ msgstr "Nelze uzamknout obrazovku"
 msgid "Lock was blocked by an application"
 msgstr "Zamknutí bylo zablokováno některou z aplikací"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Hledá se…"

-#: ../js/ui/search.js:619
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "Žádné výsledky."

@@ -1134,11 +1131,11 @@ msgstr "Vícenásobné stisky kláves"
 msgid "Mouse Keys"
 msgstr "Myš klávesnicí"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Vysoký kontrast"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Styl velkého textu"

@@ -1173,7 +1170,7 @@ msgstr "Nepřipojeno"
 msgid "Brightness"
 msgstr "Jas"

-#: ../js/ui/status/keyboard.js:736
+#: ../js/ui/status/keyboard.js:603
 msgid "Show Keyboard Layout"
 msgstr "Zobrazit rozložení klávesnice"

@@ -1384,23 +1381,23 @@ msgstr "Režim „letadlo“"
 msgid "On"
 msgstr "Zapnuto"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "Přepnout uživatele"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "Odhlásit se"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "Zámek otočení"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Uspat do paměti"

-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "Vypnout"

@@ -1462,7 +1459,7 @@ msgstr[2] "Nastavení se obnoví na původní za %d sekund"

 #. 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d × %d"
@@ -1507,22 +1504,6 @@ msgstr "Přesunout o plochu výš"
 msgid "Move to Workspace Down"
 msgstr "Přesunout o plochu níž"

-#: ../js/ui/windowMenu.js:127
-msgid "Move to Monitor Up"
-msgstr "Přesunout o monitor výš"
-
-#: ../js/ui/windowMenu.js:133
-msgid "Move to Monitor Down"
-msgstr "Přesunout o monitor níž"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Přesunout o monitor doleva"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Přesunout o monitor doprava"
-
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Kalendář Evolution"
@@ -1567,12 +1548,12 @@ msgstr "Použít pro přihlašovací obrazovku zadaný režim, např. „gdm“.
 msgid "List possible modes"
 msgstr "Vypsat možné režimy"

-#: ../src/shell-app.c:239
+#: ../src/shell-app.c:247
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznámé"

-#: ../src/shell-app.c:480
+#: ../src/shell-app.c:488
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Nelze spustit „%s“"
--- a/po/es.po
+++ b/po/es.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: 2015-05-26 08:10+0000\n"
-"PO-Revision-Date: 2015-05-26 19:09+0200\n"
+"POT-Creation-Date: 2015-03-16 08:38+0000\n"
+"PO-Revision-Date: 2015-03-16 17:44+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"
@@ -311,12 +311,12 @@ msgstr ""
 msgid "Network Login"
 msgstr "Inicio de sesión de la red"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Hubo un error al lanzar el diálogo de preferencias para %s:"

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "Extensiones de GNOME Shell"

@@ -327,39 +327,39 @@ msgstr "Extensiones de GNOME Shell"
 msgid "Cancel"
 msgstr "Cancelar"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "Siguiente"

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

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"

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

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

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

-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nombre de usuario:"

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

@@ -452,31 +452,31 @@ msgstr "%d de %B de %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Redirección para autenticación web"

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

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Frecuentes"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Todas"

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

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"

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

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

@@ -490,20 +490,15 @@ 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
-msgid "Change Background…"
-msgstr "Cambiar el fondo…"
-
-#: ../js/ui/backgroundMenu.js:21
-#| msgid "Privacy Settings"
-msgid "Display Settings"
-msgstr "Configuración de pantalla"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Configuración"

+#: ../js/ui/backgroundMenu.js:21
+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:53
 msgctxt "calendar-no-work"
@@ -556,53 +551,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "S"

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

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

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "Semana %V"

 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #. */
-#: ../js/ui/calendar.js:1187
+#: ../js/ui/calendar.js:1182
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Todo el día"

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "Limpiar la sección"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "Eventos"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1524
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

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

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1613
 msgid "Notifications"
 msgstr "Notificaciones"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "No hay notificaciones"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "No hay eventos"

@@ -738,7 +733,7 @@ msgstr "Inténtelo de nuevo,"

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:775
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
@@ -747,11 +742,11 @@ msgstr "Ahora %s se llama %s"
 msgid "Windows"
 msgstr "Ventanas"

-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Mostrar aplicaciones"

-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Tablero"

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

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "Teclado"

 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:64
+#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Ocultar bandeja"

-#: ../js/ui/legacyTray.js:107
+#: ../js/ui/legacyTray.js:104
 msgid "Status Icons"
 msgstr "Iconos de estado"

@@ -983,7 +979,7 @@ msgstr "Ver fuente"
 msgid "Web Page"
 msgstr "Página web"

-#: ../js/ui/messageTray.js:1506
+#: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "Información del sistema"

@@ -1025,7 +1021,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Introducir un comando"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Cerrar"

@@ -1053,27 +1049,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d notificación nueva"
 msgstr[1] "%d notificaciones nuevas"

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

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

-#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "No se pudo bloquear"

-#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Una aplicación impidió el bloqueo"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Buscando…"

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

@@ -1137,11 +1133,11 @@ msgstr "Rechazo de teclas"
 msgid "Mouse Keys"
 msgstr "Teclas del ratón"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Contraste alto"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Texto grande"

@@ -1175,7 +1171,7 @@ msgstr "No conectado"
 msgid "Brightness"
 msgstr "Brillo"

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

@@ -1386,23 +1382,23 @@ msgstr "Modo avión"
 msgid "On"
 msgstr "Encender"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "Cambiar de usuario"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "Cerrar la sesión"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "Bloqueo de orientación"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Suspender"

-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "Apagar"

@@ -1463,7 +1459,7 @@ 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1508,24 +1504,6 @@ msgstr "Subir a un área de trabajo"
 msgid "Move to Workspace Down"
 msgstr "Bajar a un área de trabajo"

-#: ../js/ui/windowMenu.js:127
-#| msgid "Move to Workspace Up"
-msgid "Move to Monitor Up"
-msgstr "Mover a la pantalla de arriba"
-
-#: ../js/ui/windowMenu.js:133
-#| msgid "Move to Workspace Down"
-msgid "Move to Monitor Down"
-msgstr "Mover a la pantalla de abajo"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Mover a la pantalla de la izquierda"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Mover a la pantalla de la derecha"
-
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Calendario de Evolution"
--- 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: 2015-05-01 11:35+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-17 11:10+0200\n"
 "PO-Revision-Date: 2015-03-17 11:11+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
@@ -296,12 +296,12 @@ msgstr "Delay focus changes in mouse mode until the pointer stops moving"
 #: ../data/org.gnome.Shell.PortalHelper.desktop.in.h:1
 msgid "Network Login"
 msgstr "Network Login"
-
+
 #: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "אירעה שגיאה בעת טעינת דו־שיח ההעדפות עבור %s:"
-
+
 #: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "הרחבות GNOME Shell"
@@ -312,34 +312,34 @@ msgstr "הרחבות GNOME Shell"
 #: ../js/ui/status/network.js:916
 msgid "Cancel"
 msgstr "ביטול"
-
+
 #: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "הבא"
-
+
 #: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "שחרור"
-
+
 #: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "כניסה"
-
+
 #: ../js/gdm/loginDialog.js:280
 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:420
 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:829
 #, javascript-format
 msgid "(e.g., user or %s)"
@@ -347,12 +347,12 @@ msgstr "(משתמש או %s לדוגמה)"

 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
-#. (and don't even care of which one)
+#. (and don't even care of which one)
 #: ../js/gdm/loginDialog.js:834 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "שם משתמש:"
-
+
 #: ../js/gdm/loginDialog.js:1169
 msgid "Login Window"
 msgstr "חלון כניסה"
@@ -460,31 +460,31 @@ msgstr "%d ב%B %Y, %l∶%M %p"
 #: ../js/portalHelper/main.js:85
 msgid "Web Authentication Redirect"
 msgstr "אימות ניתוב הרשת"
-
+
 #: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "יישומים בשימוש תדיר יופיעו כאן"
-
+
 #: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "תדיר"
-
+
 #: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "הכול"
-
+
 #: ../js/ui/appDisplay.js:1850
 msgid "New Window"
 msgstr "חלון חדש"
-
+
 #: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "הסרה מהמועדפים"
-
+
 #: ../js/ui/appDisplay.js:1884
 msgid "Add to Favorites"
 msgstr "הוספה למועדפים"
-
+
 #: ../js/ui/appDisplay.js:1894
 msgid "Show Details"
 msgstr "הצגת פרטים"
@@ -498,19 +498,15 @@ msgstr "‏%s נוסף למועדפים שלך."
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "‏%s הוסר מהמועדפים שלך."
-
-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "החלפת הרקע…"
-
-#: ../js/ui/backgroundMenu.js:21
-msgid "Display Settings"
-msgstr "הצגת הגדרות"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
+
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
 #: ../js/ui/status/system.js:337
 msgid "Settings"
 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:53
@@ -563,53 +559,53 @@ msgctxt "grid saturday"
 msgctxt "grid saturday"
 msgid "S"
 msgstr "ש"
-
+
 #: ../js/ui/calendar.js:563
 msgid "Previous month"
 msgstr "חודש קודם"
-
+
 #: ../js/ui/calendar.js:573
 msgid "Next month"
 msgstr "חודש הבא"
-
+
 #: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "שבוע %V"

 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
-#.
+#.
 #: ../js/ui/calendar.js:1182
 msgctxt "event list time"
 msgid "All Day"
 msgstr "יום שלם"
-
+
 #: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "ניקוי מקטע"
-
+
 #: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "אירועים"
-
+
 #: ../js/ui/calendar.js:1524
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, ה־%e ב%B"
-
+
 #: ../js/ui/calendar.js:1528
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, ה־%e ב%B, %Y"
-
+
 #: ../js/ui/calendar.js:1613
 msgid "Notifications"
 msgstr "התרעות"
-
+
 #: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "אין התרעות"
-
+
 #: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "אין אירועים"
@@ -745,7 +741,7 @@ msgstr "פעולה זו לא הצליחה, נא לנסות שוב. עמך הסל
 msgstr "פעולה זו לא הצליחה, נא לנסות שוב. עמך הסליחה."

 #. Translators: this is the other person changing their old IM name to their new
-#. IM name.
+#. IM name.
 #: ../js/ui/components/telepathyClient.js:768
 #, javascript-format
 msgid "%s is now known as %s"
@@ -754,13 +750,13 @@ msgstr "השם של %s הוחלף ל־%s"
 #: ../js/ui/ctrlAltTab.js:29 ../js/ui/viewSelector.js:155
 msgid "Windows"
 msgstr "חלונות"
-
+
 #: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "הצגת יישומים"

 #. Translators: this is the name of the dock/favorites area on
-#. the left of the overview
+#. the left of the overview
 #: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "חלונית"
@@ -922,16 +918,16 @@ msgstr "התקנה"
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "הורדה והתקנה של „%s” מ־extensions.gnome.org?"
-
+
 #: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "מקלדת"

-#. translators: 'Hide' is a verb
+#. translators: 'Hide' is a verb
 #: ../js/ui/legacyTray.js:64
 msgid "Hide tray"
 msgstr "הסתרת המגש"
-
+
 #: ../js/ui/legacyTray.js:104
 msgid "Status Icons"
 msgstr "סמלי מצב"
@@ -987,7 +983,7 @@ msgstr "צפייה במקור"
 #: ../js/ui/lookingGlass.js:758
 msgid "Web Page"
 msgstr "דף אינטרנט"
-
+
 #: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "פרטי המערכת"
@@ -1034,7 +1030,7 @@ msgstr "toggle-switch-intl"
 #: ../js/ui/runDialog.js:70
 msgid "Enter a Command"
 msgstr "נא להזין פקודה"
-
+
 #: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "סגירה"
@@ -1064,7 +1060,7 @@ msgid_plural "%d new notifications"
 msgid_plural "%d new notifications"
 msgstr[0] "התרעה חדשה אחת"
 msgstr[1] "%d התרעות חדשות"
-
+
 #: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "נעילה"
@@ -1087,11 +1083,11 @@ msgstr "לא ניתן לנעול"
 #: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "הנעילה נחסמה ע״י היישום"
-
+
 #: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "בחיפוש…"
-
+
 #: ../js/ui/search.js:618
 msgid "No results."
 msgstr "אין תוצאות."
@@ -1155,11 +1151,11 @@ msgstr "מקשים קופצים"
 #: ../js/ui/status/accessibility.js:84
 msgid "Mouse Keys"
 msgstr "מקשי עכבר"
-
+
 #: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "ניגודיות גבוהה"
-
+
 #: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "טקסט גדול"
@@ -1196,7 +1192,7 @@ msgstr "לא מחובר"
 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
 msgstr "בהירות"
-
+
 #: ../js/ui/status/keyboard.js:603
 msgid "Show Keyboard Layout"
 msgstr "הצגת פריסת המקלדת"
@@ -1414,23 +1410,23 @@ msgstr "מצב טיסה"
 #: ../js/ui/status/rfkill.js:90
 msgid "On"
 msgstr "פועל"
-
+
 #: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "החלפת משתמש"
-
+
 #: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "יציאה"
-
+
 #: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "נעילת כיוון"
-
+
 #: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "השהיה"
-
+
 #: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "כיבוי"
@@ -1492,7 +1488,7 @@ msgstr[1] "שינויי הגדרות ישוחזרו בעוד %d שניות"
 msgstr[1] "שינויי הגדרות ישוחזרו בעוד %d שניות"

 #. Translators: This represents the size of a window. The first number is
-#. * the width of the window and the second is the height.
+#. * the width of the window and the second is the height.
 #: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
@@ -1537,22 +1533,6 @@ msgstr "הזזה למרחב העבודה שמלמעלה"
 #: ../js/ui/windowMenu.js:111
 msgid "Move to Workspace Down"
 msgstr "הזזה למרחב העבודה שמלמטה"
-
-#: ../js/ui/windowMenu.js:127
-msgid "Move to Monitor Up"
-msgstr "הזה לצג שמלמעלה"
-
-#: ../js/ui/windowMenu.js:133
-msgid "Move to Monitor Down"
-msgstr "הזזה לצג שמלמטה"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "הזזה לצג שמשמאל"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "הזזה לצג שמימין"

 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@
 # Copyright 2009. Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-shell package.
 #
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2009, 2010, 2011, 2012, 2013, 2014.
 # Lukács Bence <lukacs.bence1 at gmail dot com>, 2012.
 # Balázs Úr <urbalazs at gmail dot com>, 2012, 2014, 2015.
 # Balázs Meskó <meskobalazs at gmail dot com>, 2014.
@@ -11,16 +11,16 @@ 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: 2015-05-09 08:03+0000\n"
-"PO-Revision-Date: 2015-05-09 14:33+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"POT-Creation-Date: 2015-03-14 08:44+0000\n"
+"PO-Revision-Date: 2015-03-14 20:54+0100\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\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: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.2\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -303,12 +303,12 @@ msgstr ""
 msgid "Network Login"
 msgstr "Hálózati bejelentkezés"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Hiba történt a(z) %s beállításablakának betöltésekor:"

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "GNOME Shell kiterjesztések"

@@ -319,39 +319,39 @@ msgstr "GNOME Shell kiterjesztések"
 msgid "Cancel"
 msgstr "Mégse"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "Következő"

-#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Feloldás"

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "Bejelentkezés"

-#: ../js/gdm/loginDialog.js:281
+#: ../js/gdm/loginDialog.js:280
 msgid "Choose Session"
 msgstr "Válasszon munkamenetet"

-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:421
 msgid "Not listed?"
 msgstr "Nincs a listán?"

-#: ../js/gdm/loginDialog.js:840
+#: ../js/gdm/loginDialog.js:830
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(például: felhasználó vagy %s)"

-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Felhasználónév: "

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1170
 msgid "Login Window"
 msgstr "Bejelentkezési ablak"

@@ -444,31 +444,31 @@ msgstr "%Y. %B %d., %l.%M  %p"
 msgid "Web Authentication Redirect"
 msgstr "Web hitelesítés átirányítás"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "Itt jelennek meg a gyakran használt alkalmazások"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Gyakori"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Összes"

-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1850
 msgid "New Window"
 msgstr "Új ablak"

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Eltávolítás a Kedvencek közül"

-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1884
 msgid "Add to Favorites"
 msgstr "Hozzáadás a Kedvencekhez"

-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1894
 msgid "Show Details"
 msgstr "Részletek megjelenítése"

@@ -482,19 +482,15 @@ msgstr "%s felvéve a Kedvencek közé."
 msgid "%s has been removed from your favorites."
 msgstr "%s eltávolítva a Kedvencek közül"

-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "Háttér megváltoztatása…"
-
-#: ../js/ui/backgroundMenu.js:21
-msgid "Display Settings"
-msgstr "Kijelző beállításai"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Beállítások"

+#: ../js/ui/backgroundMenu.js:21
+msgid "Change Background…"
+msgstr "Háttér megváltoztatása…"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
 #: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
@@ -547,53 +543,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "Sz"

-#: ../js/ui/calendar.js:564
+#: ../js/ui/calendar.js:563
 msgid "Previous month"
 msgstr "Előző hónap"

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:573
 msgid "Next month"
 msgstr "Következő hónap"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "%V. hét"

 #. 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:1187
+#: ../js/ui/calendar.js:1182
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Egész nap"

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "Szakasz törlése"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "Események"

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

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

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1613
 msgid "Notifications"
 msgstr "Értesítések"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "Nincsenek értesítések"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "Nincsenek események"

@@ -729,7 +725,7 @@ msgstr "A hitelesítés sikertelen. Próbálja újra."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:775
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s mostantól %s néven ismert"
@@ -738,12 +734,12 @@ msgstr "%s mostantól %s néven ismert"
 msgid "Windows"
 msgstr "Ablakok"

-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Alkalmazások megjelenítése"

 # FIXME - valami jobbat
-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Dash"

@@ -912,16 +908,17 @@ msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr ""
 "Letölti és telepíti a következőt az extensions.gnome.org webhelyről: „%s”?"

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "Billentyűzet"

 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:59
+#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Tálca elrejtése"

-#: ../js/ui/legacyTray.js:107
+#: ../js/ui/legacyTray.js:91
 msgid "Status Icons"
 msgstr "Állapotikonok"

@@ -977,7 +974,7 @@ msgstr "Forrás megtekintése"
 msgid "Web Page"
 msgstr "Weblap"

-#: ../js/ui/messageTray.js:1504
+#: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "Rendszerinformációk"

@@ -1019,7 +1016,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Adjon meg egy parancsot"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Bezárás"

@@ -1047,7 +1044,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d új értesítés"
 msgstr[1] "%d új értesítés"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Zárolás"

@@ -1063,11 +1060,11 @@ msgstr "Nem lehet zárolni"
 msgid "Lock was blocked by an application"
 msgstr "A zárolást egy alkalmazás blokkolta"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Keresés…"

-#: ../js/ui/search.js:619
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "Nincs találat."

@@ -1131,11 +1128,11 @@ msgstr "Billentyűszűrés"
 msgid "Mouse Keys"
 msgstr "Egérbillentyűk"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Nagy kontraszt"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Nagy szöveg"

@@ -1169,7 +1166,7 @@ msgstr "Nincs kapcsolat"
 msgid "Brightness"
 msgstr "Fényerő"

-#: ../js/ui/status/keyboard.js:736
+#: ../js/ui/status/keyboard.js:603
 msgid "Show Keyboard Layout"
 msgstr "Billentyűzetkiosztás megjelenítése"

@@ -1380,23 +1377,23 @@ msgstr "Repülőgép üzemmód"
 msgid "On"
 msgstr "Be"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "Felhasználóváltás"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "Kijelentkezés"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "Tájolás zárolása"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Felfüggesztés"

-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "Kikapcsolás"

@@ -1457,7 +1454,7 @@ msgstr[1] "A beállítások módosításai %d másodperc múlva visszavonásra k

 #. 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1496,27 +1493,11 @@ msgstr "Mindig a látható munkaterületen"

 #: ../js/ui/windowMenu.js:106
 msgid "Move to Workspace Up"
-msgstr "Mozgatás a felső munkaterületre"
+msgstr "Mozgatás a fentebbi munkaterületre"

 #: ../js/ui/windowMenu.js:111
 msgid "Move to Workspace Down"
-msgstr "Mozgatás az alsó munkaterületre"
-
-#: ../js/ui/windowMenu.js:127
-msgid "Move to Monitor Up"
-msgstr "Mozgatás a felső kijelzőre"
-
-#: ../js/ui/windowMenu.js:133
-msgid "Move to Monitor Down"
-msgstr "Mozgatás az alsó kijelzőre"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Mozgatás a bal oldali kijelzőre"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Mozgatás a jobb oldali kijelzőre"
+msgstr "Mozgatás az alsóbb munkaterületre"

 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
@@ -1561,12 +1542,12 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Lehetséges módok listázása"

-#: ../src/shell-app.c:239
+#: ../src/shell-app.c:247
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ismeretlen"

-#: ../src/shell-app.c:480
+#: ../src/shell-app.c:488
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "„%s” indítása meghiúsult"
--- a/po/is.po
+++ b/po/is.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,10 @@
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 3.17.x\n"
+"Project-Id-Version: gnome-shell 3.15.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-14 15:38+0200\n"
-"PO-Revision-Date: 2015-05-14 15:39+0200\n"
+"POT-Creation-Date: 2015-03-19 20:47+0100\n"
+"PO-Revision-Date: 2015-03-19 20:56+0100\n"
 "Last-Translator: Åka Sikrom <a4NOSPAMPLEASETHANKYOU@hush.com>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: Norwegian bokmål\n"
@@ -296,12 +296,12 @@ msgstr "Utsett fokusendringer i musmodus til peker slutter å bevege seg"
 msgid "Network Login"
 msgstr "Nettverkspålogging"

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

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

@@ -312,34 +312,34 @@ msgstr "Utvidelser for GNOME Shell"
 msgid "Cancel"
 msgstr "Avbryt"

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

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

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "Logg inn"

-#: ../js/gdm/loginDialog.js:281
+#: ../js/gdm/loginDialog.js:280
 msgid "Choose Session"
 msgstr "Velg økt"

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

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

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1163
 msgid "Login Window"
 msgstr "Innloggingsvindu"

@@ -460,31 +460,31 @@ msgstr "%d %B %Y, %H.%M"
 msgid "Web Authentication Redirect"
 msgstr "Omdirigering av autentisering på nett"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "Ofte brukte programmer vises her"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Ofte"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Alle"

-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1850
 msgid "New Window"
 msgstr "Nytt vindu"

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"

-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1884
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"

-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1894
 msgid "Show Details"
 msgstr "Vis detaljer"

@@ -498,19 +498,15 @@ msgstr "%s ble lagt til i favoritter."
 msgid "%s has been removed from your favorites."
 msgstr "%s ble fjernet fra favoritter."

-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "Bytt bakgrunn …"
-
-#: ../js/ui/backgroundMenu.js:21
-msgid "Display Settings"
-msgstr "Innstillinger for skjerm"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Innstillinger"

+#: ../js/ui/backgroundMenu.js:21
+msgid "Change Background…"
+msgstr "Bytt bakgrunn …"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
 #: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
@@ -578,7 +574,7 @@ msgstr "Uke %V"
 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #.
-#: ../js/ui/calendar.js:1187
+#: ../js/ui/calendar.js:1183
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Hele dagen"
@@ -747,7 +743,7 @@ msgstr "Beklager, det virket ikke. Prøv igjen."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:728
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -756,13 +752,13 @@ msgstr "%s er nå kjent som %s"
 msgid "Windows"
 msgstr "Vinduer"

-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Vis programmer"

 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Favoritter"

@@ -929,16 +925,16 @@ msgstr "Installer"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Vil du laste ned og installere «%s» fra extensions.gnome.org?"

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:724
 msgid "Keyboard"
 msgstr "Tastatur"

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

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

@@ -994,7 +990,7 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"

-#: ../js/ui/messageTray.js:1506
+#: ../js/ui/messageTray.js:1507
 msgid "System Information"
 msgstr "Systeminformasjon"

@@ -1041,7 +1037,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Skriv inn en kommando"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Lukk"

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

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

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

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

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

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Søker …"

-#: ../js/ui/search.js:619
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "Ingen resultater."

@@ -1160,11 +1156,11 @@ msgstr "Spretne taster"
 msgid "Mouse Keys"
 msgstr "Mustaster"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Høy kontrast"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Stor tekst"

@@ -1200,7 +1196,7 @@ msgstr "Ikke koblet til"
 msgid "Brightness"
 msgstr "Lysstyrke"

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

@@ -1418,23 +1414,23 @@ msgstr "Flymodus"
 msgid "On"
 msgstr "På"

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

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

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

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Hvilemodus"

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

@@ -1495,7 +1491,7 @@ msgstr[1] "Endringer i innstillingene forkastes om %d sekunder"

 #. 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1540,22 +1536,6 @@ msgstr "Gå til arbeidsområdet over"
 msgid "Move to Workspace Down"
 msgstr "Gå til arbeidsområdet under"

-#: ../js/ui/windowMenu.js:127
-msgid "Move to Monitor Up"
-msgstr "Flytt til skjermen over"
-
-#: ../js/ui/windowMenu.js:133
-msgid "Move to Monitor Down"
-msgstr "Flytt til skjermen under"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Flytt til skjermen til venstre"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Flytt til skjermen til høyre"
-
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Evolution kalender"
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/oc.po
+++ b/po/oc.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,22 +15,21 @@
 # Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
 # Georges Basile Stavracas Neto <georges.stavracas@gmail.com>, 2014.
 # Enrico Nicoletto <liverig@gmail.com>, 2013, 2014, 2015.
-# Felipe Braga <fbobraga@gmail.com>, 2015.
+#
 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: 2015-05-01 20:03+0000\n"
-"PO-Revision-Date: 2015-05-01 21:38-0200\n"
-"Last-Translator: Felipe Braga <fbobraga@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-03-13 16:16+0000\n"
+"PO-Revision-Date: 2015-03-13 14:04-0300\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\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: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.7.3\n"
 "X-Project-Style: gnome\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
@@ -61,8 +60,7 @@ msgstr "Abre o menu do aplicativo"
 msgid "GNOME Shell"
 msgstr "GNOME Shell"

-#: ../data/gnome-shell.desktop.in.in.h:2
-#: ../data/gnome-shell-wayland.desktop.in.in.h:2
+#: ../data/gnome-shell.desktop.in.in.h:2 ../data/gnome-shell-wayland.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "Gerenciamento de janelas e lançador de aplicativos"

@@ -81,17 +79,11 @@ msgstr "GNOME Shell (compositor wayland)"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
-"Habilitar ferramentas internas úteis para desenvolvedores e testadores a "
-"partir do Alt-F2"
+msgstr "Habilitar ferramentas internas úteis para desenvolvedores e testadores a partir do Alt-F2"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
-msgid ""
-"Allows access to internal debugging and monitoring tools using the Alt-F2 "
-"dialog."
-msgstr ""
-"Permite acesso a ferramentas internas de depuração e monitoramento usando o "
-"diálogo Alt-F2."
+msgid "Allows access to internal debugging and monitoring tools using the Alt-F2 dialog."
+msgstr "Permite acesso a ferramentas internas de depuração e monitoramento usando o diálogo Alt-F2."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
@@ -99,16 +91,13 @@ msgstr "UUIDs das extensões para habilitar"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
 msgid ""
-"GNOME Shell extensions have a UUID property; this key lists extensions which "
-"should be loaded. Any extension that wants to be loaded needs to be in this "
-"list. You can also manipulate this list with the EnableExtension and "
-"DisableExtension D-Bus methods on org.gnome.Shell."
+"GNOME Shell extensions have a UUID property; this key lists extensions which should be loaded. Any extension that wants "
+"to be loaded needs to be in this list. You can also manipulate this list with the EnableExtension and DisableExtension D-"
+"Bus methods on org.gnome.Shell."
 msgstr ""
-"As extensões do GNOME Shell possuem uma propriedade UUID; esta chave lista "
-"as extensões que devem ser carregadas. Qualquer extensão que quiser ser "
-"carregada precisa estar nesta lista. Você também pode manipular esta lista "
-"com os métodos do DBus EnableExtension e DisableExtensions em org.gnome."
-"Shell."
+"As extensões do GNOME Shell possuem uma propriedade UUID; esta chave lista as extensões que devem ser carregadas. "
+"Qualquer extensão que quiser ser carregada precisa estar nesta lista. Você também pode manipular esta lista com os "
+"métodos do DBus EnableExtension e DisableExtensions em org.gnome.Shell."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
@@ -116,27 +105,20 @@ msgstr "Desabilita a validação de compatibilidade da versão da extensão"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
-"GNOME Shell will only load extensions that claim to support the current "
-"running version. Enabling this option will disable this check and try to "
-"load all extensions regardless of the versions they claim to support."
+"GNOME Shell will only load extensions that claim to support the current running version. Enabling this option will "
+"disable this check and try to load all extensions regardless of the versions they claim to support."
 msgstr ""
-"O GNOME Shell somente carregará extensões que declaram possuir suporte a "
-"versão atual em execução. Ao habilitar esta opção, esta verificação será "
-"desabilitada e haverá tentativas de carregar todas as extensões independente "
-"das versões que estas declaram suportar."
+"O GNOME Shell somente carregará extensões que declaram possuir suporte a versão atual em execução. Ao habilitar esta "
+"opção, esta verificação será desabilitada e haverá tentativas de carregar todas as extensões independente das versões "
+"que estas declaram suportar."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
-msgstr ""
-"Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos"
+msgstr "Lista dos IDs de arquivo de área de trabalho para os aplicativos favoritos"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:8
-msgid ""
-"The applications corresponding to these identifiers will be displayed in the "
-"favorites area."
-msgstr ""
-"Os aplicativos correspondentes a estes identificadores serão exibidos na "
-"área de favoritos."
+msgid "The applications corresponding to these identifiers will be displayed in the favorites area."
+msgstr "Os aplicativos correspondentes a estes identificadores serão exibidos na área de favoritos."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "App Picker View"
@@ -144,8 +126,7 @@ msgstr "Visualização do seletor de aplicativos"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:10
 msgid "Index of the currently selected view in the application picker."
-msgstr ""
-"Índice da visualização atualmente selecionada no seletor de aplicativos."
+msgstr "Índice da visualização atualmente selecionada no seletor de aplicativos."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
@@ -160,32 +141,23 @@ msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Sempre mostrar o item de menu \"Encerrar sessão\" no menu de usuário."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
-msgid ""
-"This key overrides the automatic hiding of the 'Log out' menu item in single-"
-"user, single-session situations."
+msgid "This key overrides the automatic hiding of the 'Log out' menu item in single-user, single-session situations."
 msgstr ""
-"Essa chave sobrescreve a ocultação automática do item de menu \"Encerrar "
-"sessão\" quando houver somente um usuário, em situações de somente uma "
-"sessão."
+"Essa chave sobrescreve a ocultação automática do item de menu \"Encerrar sessão\" quando houver somente um usuário, em "
+"situações de somente uma sessão."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
-msgid ""
-"Whether to remember password for mounting encrypted or remote filesystems"
-msgstr ""
-"Se lembra ou não as senhas para montar sistemas de arquivos criptografados "
-"ou remotos"
+msgid "Whether to remember password for mounting encrypted or remote filesystems"
+msgstr "Se lembra ou não as senhas para montar sistemas de arquivos criptografados ou remotos"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid ""
-"The shell will request a password when an encrypted device or a remote "
-"filesystem is mounted. If the password can be saved for future use a "
-"'Remember Password' checkbox will be present. This key sets the default "
-"state of the checkbox."
+"The shell will request a password when an encrypted device or a remote filesystem is mounted. If the password can be "
+"saved for future use a 'Remember Password' checkbox will be present. This key sets the default state of the checkbox."
 msgstr ""
-"O shell irá pedir uma senha quando um dispositivo criptografado ou um "
-"sistema de arquivo remoto for montado. Caso a senha possa ser salva para uso "
-"posterior, a caixa de seleção 'Lembrar senha' estará presente. Esta chave "
-"ajusta o estado padrão da caixa de seleção."
+"O shell irá pedir uma senha quando um dispositivo criptografado ou um sistema de arquivo remoto for montado. Caso a "
+"senha possa ser salva para uso posterior, a caixa de seleção 'Lembrar senha' estará presente. Esta chave ajusta o estado "
+"padrão da caixa de seleção."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Show the week date in the calendar"
@@ -208,11 +180,8 @@ msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Atalho de teclado para abrir a visualização \"Mostrar aplicativos\""

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:22
-msgid ""
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
-msgstr ""
-"Atalho de teclado para abrir a visualização \"Mostrar aplicativos\" do "
-"panorama de atividades."
+msgid "Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgstr "Atalho de teclado para abrir a visualização \"Mostrar aplicativos\" do panorama de atividades."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Keybinding to open the overview"
@@ -228,8 +197,7 @@ msgstr "Atalho de teclado para alternar a visibilidade da lista de notificação

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the notification list."
-msgstr ""
-"Atalho de teclado para alternar a visibilidade da lista de notificação."
+msgstr "Atalho de teclado para alternar a visibilidade da lista de notificação."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
@@ -241,11 +209,8 @@ msgstr "Atalho de teclado para ativar a notificação ativa."

 # Tween pode significar uma contração de Between ou se referir a um termo "in-between" usado em animação gráfica. -- Enrico
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:29
-msgid ""
-"Keybinding that pauses and resumes all running tweens, for debugging purposes"
-msgstr ""
-"Atalho de teclado que pausa e continua todos os intermediários em execução, "
-"a fim de depuração"
+msgid "Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr "Atalho de teclado que pausa e continua todos os intermediários em execução, a fim de depuração"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Which keyboard to use"
@@ -261,12 +226,11 @@ msgstr "Limitar o alternador ao espaço de trabalho atual."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid ""
-"If true, only applications that have windows on the current workspace are "
-"shown in the switcher. Otherwise, all applications are included."
+"If true, only applications that have windows on the current workspace are shown in the switcher. Otherwise, all "
+"applications are included."
 msgstr ""
-"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem "
-"janelas no espaço de trabalho atual. Caso contrário, todos os aplicativos "
-"serão incluídos."
+"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem janelas no espaço de trabalho atual. Caso "
+"contrário, todos os aplicativos serão incluídos."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid "The application icon mode."
@@ -274,37 +238,29 @@ msgstr "O modo ícone do aplicativo."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid ""
-"Configures how the windows are shown in the switcher. Valid possibilities "
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-"only' (shows only the application icon) or 'both'."
+"Configures how the windows are shown in the switcher. Valid possibilities are 'thumbnail-only' (shows a thumbnail of the "
+"window), 'app-icon-only' (shows only the application icon) or 'both'."
 msgstr ""
-"Configura como as janelas são mostradas no alternador. As possibilidades "
-"válidas são 'thumbnail-only' (mostra uma miniatura da janela), 'app-icon-"
-"only' (mostra apenas o ícone do aplicativo) ou 'both'."
+"Configura como as janelas são mostradas no alternador. As possibilidades válidas são 'thumbnail-only' (mostra uma "
+"miniatura da janela), 'app-icon-only' (mostra apenas o ícone do aplicativo) ou 'both'."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
-msgid ""
-"If true, only windows from the current workspace are shown in the switcher. "
-"Otherwise, all windows are included."
+msgid "If true, only windows from the current workspace are shown in the switcher. Otherwise, all windows are included."
 msgstr ""
-"Se verdadeiro, o alternador mostrará somente as janelas do espaço de "
-"trabalho atual. Caso contrário, todos as janelas serão incluídas."
+"Se verdadeiro, o alternador mostrará somente as janelas do espaço de trabalho atual. Caso contrário, todos as janelas "
+"serão incluídas."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Attach modal dialog to the parent window"
 msgstr "Anexar diálogo modal à janela pai"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do "
-"GNOME."
+msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
+msgstr "Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do GNOME."

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"
+msgstr "Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"

 #: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Workspaces are managed dynamically"
@@ -322,55 +278,52 @@ msgstr "Atrasar foco altera o modo do mouse até o ponteiro parar de mover"
 msgid "Network Login"
 msgstr "Sessão de Rede"

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

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

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
-#: ../js/ui/components/polkitAgent.js:166 ../js/ui/endSessionDialog.js:452
-#: ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
+#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145 ../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:916
 msgid "Cancel"
 msgstr "Cancelar"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "Próximo"

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

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

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

-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:421
 msgid "Not listed?"
 msgstr "Não está listado?"

-#: ../js/gdm/loginDialog.js:840
+#: ../js/gdm/loginDialog.js:830
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(ex.: usuário ou %s)"

-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271 ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nome de usuário: "

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1170
 msgid "Login Window"
 msgstr "Janela de sessão"

@@ -463,31 +416,31 @@ msgstr "%d de %B de %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Redirecionamento para autenticação web"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "Aplicativos usados frequentemente vão aparecer aqui"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Frequente"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Todos"

-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1850
 msgid "New Window"
 msgstr "Nova janela"

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Remover dos favoritos"

-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1884
 msgid "Add to Favorites"
 msgstr "Adicionar aos favoritos"

-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1894
 msgid "Show Details"
 msgstr "Mostrar detalhes"

@@ -501,20 +454,14 @@ msgstr "%s foi adicionado aos seus favoritos."
 msgid "%s has been removed from your favorites."
 msgstr "%s foi removido dos seus favoritos."

-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "Alterar plano de fundo…"
-
-#: ../js/ui/backgroundMenu.js:21
-#| msgid "Privacy Settings"
-msgid "Display Settings"
-msgstr "Configurações de exibição"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650 ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Configurações"

+#: ../js/ui/backgroundMenu.js:21
+msgid "Change Background…"
+msgstr "Alterar plano de fundo…"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
 #: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
@@ -567,53 +514,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "S"

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

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:573
 msgid "Next month"
 msgstr "Próximo mês"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "Semana %V"

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

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "Limpar seção"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "Eventos"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1524
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"

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

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

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "Nenhuma notificação"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "Nenhum evento"

@@ -638,16 +585,13 @@ msgstr "Senha:"
 msgid "Type again:"
 msgstr "Digite novamente:"

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

-#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:303
+#: ../js/ui/components/networkAgent.js:233 ../js/ui/components/networkAgent.js:245 ../js/ui/components/networkAgent.js:273
+#: ../js/ui/components/networkAgent.js:293 ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Senha: "

@@ -667,23 +611,16 @@ msgstr "Senha da chave privada: "
 msgid "Service: "
 msgstr "Serviço: "

-#: ../js/ui/components/networkAgent.js:320
-#: ../js/ui/components/networkAgent.js:658
+#: ../js/ui/components/networkAgent.js:320 ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "Autenticação requisitada pela rede sem fio"

-#: ../js/ui/components/networkAgent.js:321
-#: ../js/ui/components/networkAgent.js:659
+#: ../js/ui/components/networkAgent.js:321 ../js/ui/components/networkAgent.js:659
 #, javascript-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"“%s”."
-msgstr ""
-"Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio "
-"\"%s\"."
+msgid "Passwords or encryption keys are required to access the wireless network “%s”."
+msgstr "Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio \"%s\"."

-#: ../js/ui/components/networkAgent.js:325
-#: ../js/ui/components/networkAgent.js:662
+#: ../js/ui/components/networkAgent.js:325 ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "Autenticação 802.1X cabeada"

@@ -691,18 +628,15 @@ msgstr "Autenticação 802.1X cabeada"
 msgid "Network name: "
 msgstr "Nome da rede: "

-#: ../js/ui/components/networkAgent.js:332
-#: ../js/ui/components/networkAgent.js:666
+#: ../js/ui/components/networkAgent.js:332 ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "Autenticação DSL"

-#: ../js/ui/components/networkAgent.js:339
-#: ../js/ui/components/networkAgent.js:672
+#: ../js/ui/components/networkAgent.js:339 ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "Código PIN requisitado"

-#: ../js/ui/components/networkAgent.js:340
-#: ../js/ui/components/networkAgent.js:673
+#: ../js/ui/components/networkAgent.js:340 ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"

@@ -710,14 +644,11 @@ msgstr "O código PIN é necessário para o dispositivo móvel de banda larga"
 msgid "PIN: "
 msgstr "PIN: "

-#: ../js/ui/components/networkAgent.js:348
-#: ../js/ui/components/networkAgent.js:679
+#: ../js/ui/components/networkAgent.js:348 ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Senha da rede de banda larga móvel"

-#: ../js/ui/components/networkAgent.js:349
-#: ../js/ui/components/networkAgent.js:663
-#: ../js/ui/components/networkAgent.js:667
+#: ../js/ui/components/networkAgent.js:349 ../js/ui/components/networkAgent.js:663 ../js/ui/components/networkAgent.js:667
 #: ../js/ui/components/networkAgent.js:680
 #, javascript-format
 msgid "A password is required to connect to “%s”."
@@ -749,7 +680,7 @@ msgstr "Desculpe, isto não funcionou. Por favor, tente novamente."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:775
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
@@ -758,11 +689,11 @@ msgstr "%s agora é conhecido como %s"
 msgid "Windows"
 msgstr "Janelas"

-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Mostrar aplicativos"

-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Dash"

@@ -871,14 +802,9 @@ msgstr "Reiniciar & instalar atualizações"
 #: ../js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
-msgid_plural ""
-"The system will automatically restart and install updates in %d seconds."
-msgstr[0] ""
-"O sistema irá reiniciar e instalar atualizações automaticamente em %d "
-"segundo."
-msgstr[1] ""
-"O sistema irá reiniciar e instalar atualizações automaticamente em %d "
-"segundos."
+msgid_plural "The system will automatically restart and install updates in %d seconds."
+msgstr[0] "O sistema irá reiniciar e instalar atualizações automaticamente em %d segundo."
+msgstr[1] "O sistema irá reiniciar e instalar atualizações automaticamente em %d segundos."

 #: ../js/ui/endSessionDialog.js:127
 msgctxt "button"
@@ -897,9 +823,7 @@ msgstr "Desligar após atualizações serem instaladas"

 #: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
-msgstr ""
-"Funcionando na bateria: por favor, conecte na tomada antes de instalar "
-"atualizações."
+msgstr "Funcionando na bateria: por favor, conecte na tomada antes de instalar atualizações."

 #: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
@@ -930,16 +854,16 @@ msgstr "Instalar"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Baixar e instalar \"%s\" de extensions.gnome.org?"

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "Teclado"

 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:59
 msgid "Hide tray"
 msgstr "Esconder bandeja"

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

@@ -961,8 +885,7 @@ msgstr "Ocultar erros"
 msgid "Show Errors"
 msgstr "Exibir erros"

-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71
-#: ../js/ui/status/location.js:176
+#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71 ../js/ui/status/location.js:176
 msgid "Enabled"
 msgstr "Habilitado"

@@ -970,8 +893,8 @@ msgstr "Habilitado"
 #. because it's disabled by rfkill (airplane mode) */
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179
-#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179 ../js/ui/status/network.js:592
+#: ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Desabilitado"

@@ -995,7 +918,7 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Página web"

-#: ../js/ui/messageTray.js:1504
+#: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "Informações do sistema"

@@ -1037,7 +960,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Digite um comando"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Fechar"

@@ -1065,7 +988,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d nova notificação"
 msgstr[1] "%d novas notificações"

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

@@ -1081,11 +1004,11 @@ msgstr "Não foi possível bloquear"
 msgid "Lock was blocked by an application"
 msgstr "O bloqueio foi impedido por um aplicativo"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Pesquisando…"

-#: ../js/ui/search.js:619
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "Nenhum resultado."

@@ -1149,11 +1072,11 @@ msgstr "Teclas de repercussão"
 msgid "Mouse Keys"
 msgstr "Teclas do mouse"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Alto contraste"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Texto grande"

@@ -1161,9 +1084,8 @@ msgstr "Texto grande"
 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:1282
-#: ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
+#: ../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 "Desligar"
@@ -1187,7 +1109,7 @@ msgstr "Não conectado"
 msgid "Brightness"
 msgstr "Brilho"

-#: ../js/ui/status/keyboard.js:736
+#: ../js/ui/status/keyboard.js:603
 msgid "Show Keyboard Layout"
 msgstr "Exibir disposição de teclado"

@@ -1215,8 +1137,7 @@ msgstr "Habilitar"
 msgid "<unknown>"
 msgstr "<desconhecido>"

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

@@ -1401,23 +1322,23 @@ msgstr "Modo avião"
 msgid "On"
 msgstr "On"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "Alternar usuário"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "Encerrar sessão"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "Bloqueio da orientação"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Suspender"

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

@@ -1478,7 +1399,7 @@ msgstr[1] "Alterações nas configurações serão revertidas em %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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1523,24 +1444,6 @@ msgstr "Mover para a área de trabalho acima"
 msgid "Move to Workspace Down"
 msgstr "Mover para a área de trabalho abaixo"

-#: ../js/ui/windowMenu.js:127
-#| msgid "Move to Workspace Up"
-msgid "Move to Monitor Up"
-msgstr "Mover para o monitor acima"
-
-#: ../js/ui/windowMenu.js:133
-#| msgid "Move to Workspace Down"
-msgid "Move to Monitor Down"
-msgstr "Mover para o monitor abaixo"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Mover para o monitor à esquerda"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Mover para o monitor à direita"
-
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Agenda do Evolution"
@@ -1583,12 +1486,12 @@ msgstr "Utilizar um modo específico, ex.: \"gdm\" para a tela de login"
 msgid "List possible modes"
 msgstr "Listar modos possíveis"

-#: ../src/shell-app.c:239
+#: ../src/shell-app.c:247
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconhecido"

-#: ../src/shell-app.c:480
+#: ../src/shell-app.c:488
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Erro ao lançar \"%s\""
@@ -1703,10 +1606,8 @@ msgstr "O diálogo de autenticação foi descartado pelo usuário"
 #~ msgid "This account is already connected to the server"
 #~ msgstr "Esta conta já está conectada ao servidor"

-#~ msgid ""
-#~ "Connection has been replaced by a new connection using the same resource"
-#~ msgstr ""
-#~ "A conexão foi substituída por uma nova conexão usando o mesmo recurso"
+#~ msgid "Connection has been replaced by a new connection using the same resource"
+#~ msgstr "A conexão foi substituída por uma nova conexão usando o mesmo recurso"

 #~ msgid "The account already exists on the server"
 #~ msgstr "A conta já existe no servidor"
@@ -1717,18 +1618,15 @@ msgstr "O diálogo de autenticação foi descartado pelo usuário"
 #~ msgid "Certificate has been revoked"
 #~ msgstr "O certificado foi revogado"

-#~ msgid ""
-#~ "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-#~ msgstr ""
-#~ "O certificado usa um algoritmo de cifragem inseguro ou é "
-#~ "criptograficamente fraco"
+#~ msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#~ msgstr "O certificado usa um algoritmo de cifragem inseguro ou é criptograficamente fraco"

 #~ msgid ""
-#~ "The length of the server certificate, or the depth of the server "
-#~ "certificate chain, exceed the limits imposed by the cryptography library"
+#~ "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the "
+#~ "cryptography library"
 #~ msgstr ""
-#~ "O comprimento do certificado do servidor, ou a profundidade da cadeia do "
-#~ "certificado excedeu os limites impostos pela biblioteca de criptografia"
+#~ "O comprimento do certificado do servidor, ou a profundidade da cadeia do certificado excedeu os limites impostos pela "
+#~ "biblioteca de criptografia"

 #~ msgid "Internal error"
 #~ msgstr "Erro interno"
@@ -1835,39 +1733,28 @@ msgstr "O diálogo de autenticação foi descartado pelo usuário"
 #~ msgstr "O nível máximo de precisão de local."

 #~ msgid ""
-#~ "Configures the maximum level of location accuracy applications are "
-#~ "allowed to see. Valid options are 'off' (disable location tracking), "
-#~ "'country', 'city', 'neighborhood', 'street', and 'exact' (typically "
-#~ "requires GPS receiver). Please keep in mind that this only controls what "
-#~ "GeoClue will allow applications to see and they can find user's location "
-#~ "on their own using network resources (albeit with street-level accuracy "
-#~ "at best)."
+#~ "Configures the maximum level of location accuracy applications are allowed to see. Valid options are 'off' (disable "
+#~ "location tracking), 'country', 'city', 'neighborhood', 'street', and 'exact' (typically requires GPS receiver). "
+#~ "Please keep in mind that this only controls what GeoClue will allow applications to see and they can find user's "
+#~ "location on their own using network resources (albeit with street-level accuracy at best)."
 #~ msgstr ""
-#~ "Configura o nível máximo de precisão de local a que os aplicativos com "
-#~ "permissão podem ver. Opções válidas são \"off\" (desabilita o "
-#~ "rastreamento de local), \"country\", \"city\", \"neighborhood\", \"street"
-#~ "\" e \"exact\" (geralmente necessita de receptor de GPS). Por gentileza, "
-#~ "tenha em mente que estes são os únicos controles que o GeoClue permitirá "
-#~ "aos aplicativos observarem e eles podem localizar o local do usuário por "
-#~ "si só, usando recursos de rede (apesar de na melhor hipótese usarem "
-#~ "precisão à nível de rua)."
+#~ "Configura o nível máximo de precisão de local a que os aplicativos com permissão podem ver. Opções válidas são \"off"
+#~ "\" (desabilita o rastreamento de local), \"country\", \"city\", \"neighborhood\", \"street\" e \"exact\" (geralmente "
+#~ "necessita de receptor de GPS). Por gentileza, tenha em mente que estes são os únicos controles que o GeoClue "
+#~ "permitirá aos aplicativos observarem e eles podem localizar o local do usuário por si só, usando recursos de rede "
+#~ "(apesar de na melhor hipótese usarem precisão à nível de rua)."

 #~ msgid "Arrangement of buttons on the titlebar"
 #~ msgstr "Organização dos botões na barra de título"

-#~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Esta chave sobrescreve a chave em org.gnome.desktop.wm.preferences ao "
-#~ "executar o Shell do GNOME."
+#~ msgid "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell."
+#~ msgstr "Esta chave sobrescreve a chave em org.gnome.desktop.wm.preferences ao executar o Shell do GNOME."

 #~ msgid "Extension"
 #~ msgstr "Extensão"

 #~ msgid "Select an extension to configure using the combobox above."
-#~ msgstr ""
-#~ "Selecione uma extensão para configurar usando a caixa de seleção abaixo."
+#~ msgstr "Selecione uma extensão para configurar usando a caixa de seleção abaixo."

 #~ msgid "calendar:MY"
 #~ msgstr "calendar:MY"
@@ -1885,12 +1772,11 @@ msgstr "O diálogo de autenticação foi descartado pelo usuário"
 #~ msgstr "Lista de categorias que devem ser exibidas como pastas"

 #~ msgid ""
-#~ "Each category name in this list will be represented as folder in the "
-#~ "application view, rather than being displayed inline in the main view."
+#~ "Each category name in this list will be represented as folder in the application view, rather than being displayed "
+#~ "inline in the main view."
 #~ msgstr ""
-#~ "Cada nome de categoria nesta lista será representado como uma pasta na "
-#~ "visão do aplicativo, ao invés de ser exibido incorporado à visão "
-#~ "principal."
+#~ "Cada nome de categoria nesta lista será representado como uma pasta na visão do aplicativo, ao invés de ser exibido "
+#~ "incorporado à visão principal."

 #~ msgctxt "event list time"
 #~ msgid "%H\\u2236%M"
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ 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: 2015-05-13 08:05+0000\n"
-"PO-Revision-Date: 2015-05-13 10:52+0100\n"
+"POT-Creation-Date: 2015-03-27 08:57+0000\n"
+"PO-Revision-Date: 2015-03-27 16:41+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-DamnedLies-Scope: partial\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.7.4\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -256,12 +256,12 @@ msgstr "Oneskoriť pohyb zamerania v režime myši, až kým sa ukazovateľ neza
 msgid "Network Login"
 msgstr "Sieťové prihlásenie"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Vyskytla sa chyba pri načítavaní dialógového okna nastavení pre %s:"

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "Rozšírenia pre Shell prostredia GNOME"

@@ -269,15 +269,15 @@ msgstr "Rozšírenia pre Shell prostredia GNOME"
 msgid "Cancel"
 msgstr "Zrušiť"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "Ďalej"

-#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:59
+#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Odomknúť"

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prihlásiť sa"
@@ -400,31 +400,31 @@ msgstr "%d. %B %Y, %l:%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Presmerovanie webového overenia totožnosti"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "Tu sa objavia často používané aplikácie"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Často používané"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Všetky"

-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1850
 msgid "New Window"
 msgstr "Nové okno"

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Odstrániť z obľúbených"

-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1884
 msgid "Add to Favorites"
 msgstr "Pridať do obľúbených"

-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1894
 msgid "Show Details"
 msgstr "Zobraziť podrobnosti"

@@ -438,18 +438,14 @@ msgstr "Program %s bol pridaný medzi obľúbené."
 msgid "%s has been removed from your favorites."
 msgstr "Program %s bol odstránený z obľúbených."

-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "Zmeniť pozadie…"
-
-#: ../js/ui/backgroundMenu.js:21
-msgid "Display Settings"
-msgstr "Nastavenia displeja"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650 ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650 ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Nastavenia"

+#: ../js/ui/backgroundMenu.js:21
+msgid "Change Background…"
+msgstr "Zmeniť pozadie…"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
 #: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
@@ -520,7 +516,7 @@ msgstr "%V. týždeň"
 #. 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:1187
+#: ../js/ui/calendar.js:1183
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celý deň"
@@ -670,7 +666,7 @@ msgstr "Prepáčte, ale nezabralo to. Skúste to, prosím, znova."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:728
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Kontakt %s odteraz vystupuje ako %s"
@@ -680,11 +676,11 @@ msgid "Windows"
 msgstr "Okná"

 # tooltip
-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Zobrazí aplikácie"

-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Dok"

@@ -850,16 +846,16 @@ msgstr "Inštalovať"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Stiahnuť a nainštalovať „%s“ z extensions.gnome.org?"

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:724
 msgid "Keyboard"
 msgstr "Klávesnica"

 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:64
 msgid "Hide tray"
 msgstr "Skryť lištu"

-#: ../js/ui/legacyTray.js:107
+#: ../js/ui/legacyTray.js:105
 msgid "Status Icons"
 msgstr "Stavová ikona"

@@ -914,7 +910,7 @@ msgstr "Zobraziť zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"

-#: ../js/ui/messageTray.js:1504
+#: ../js/ui/messageTray.js:1507
 msgid "System Information"
 msgstr "Informácie o systéme"

@@ -957,7 +953,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Zadajte príkaz"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Zavrieť"

@@ -990,7 +986,7 @@ msgstr[0] "%d nové oznámenie"
 msgstr[1] "%d nové oznámenia"
 msgstr[2] "%d nových oznámení"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Uzamknúť"

@@ -1006,11 +1002,11 @@ msgstr "Nepodarilo sa uzamknúť obrazovku"
 msgid "Lock was blocked by an application"
 msgstr "Uzamknutie bolo zablokované aplikáciou"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Hľadá sa…"

-#: ../js/ui/search.js:619
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "Žiadne výsledky."

@@ -1077,11 +1073,11 @@ msgstr "Poskakujúce klávesy"
 msgid "Mouse Keys"
 msgstr "Myš klávesmi"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Vysoký kontrast"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Veľký text"

@@ -1114,7 +1110,7 @@ msgid "Brightness"
 msgstr "Jas"

 # menu item
-#: ../js/ui/status/keyboard.js:736
+#: ../js/ui/status/keyboard.js:747
 msgid "Show Keyboard Layout"
 msgstr "Zobraziť rozloženie klávesnice"

@@ -1328,24 +1324,24 @@ msgstr "Režim v lietadle"
 msgid "On"
 msgstr "Zapnutý"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "Prepnúť používateľa"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "Odhlásiť sa"

 # action button
-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "Uzamknutie orientácie"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Uspať"

-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "Vypnúť"

@@ -1409,7 +1405,7 @@ msgstr[2] "Zmeny nastavení budú vrátené za %d sekúnd"

 #. 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1454,22 +1450,6 @@ msgstr "Presunúť do vyššieho priestoru"
 msgid "Move to Workspace Down"
 msgstr "Presunúť do nižšieho priestoru"

-#: ../js/ui/windowMenu.js:127
-msgid "Move to Monitor Up"
-msgstr "Presunúť na monitor vyššie"
-
-#: ../js/ui/windowMenu.js:133
-msgid "Move to Monitor Down"
-msgstr "Presunúť na monitor nižšie"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Presunúť na monitor vľavo"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Presunúť na monitor vpravo"
-
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Kalendár Evolution"
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,18 +9,18 @@ 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: 2015-05-10 08:30+0000\n"
-"PO-Revision-Date: 2015-05-10 20:54+0100\n"
+"POT-Creation-Date: 2015-03-15 08:36+0000\n"
+"PO-Revision-Date: 2015-03-15 09:41+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
-"Language: sl\n"
+"Language: Slovenian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.5.4\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -302,12 +302,12 @@ msgstr ""
 msgid "Network Login"
 msgstr "Omrežna prijava"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Prišlo je do napake med nalaganjem pogovornega okna z možnosti za %s:"

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "Razširitve lupine Gnome"

@@ -318,39 +318,39 @@ msgstr "Razširitve lupine Gnome"
 msgid "Cancel"
 msgstr "Prekliči"

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

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

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

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

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

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

-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Uporabniško ime: "

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

@@ -443,31 +443,31 @@ msgstr "%B %d %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Preusmeritev spletnega overjanja"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "Pogosto uporabljeni programi bodo prikazani tu"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Pogosto"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Vse"

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

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Odstrani iz priljubljenih"

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

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

@@ -481,19 +481,15 @@ msgstr "Program \"%s\" je dodan med priljubljeno."
 msgid "%s has been removed from your favorites."
 msgstr "Program \"%s\" je odstranjen iz priljubljenih."

-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "Spremeni ozadje ..."
-
-#: ../js/ui/backgroundMenu.js:21
-msgid "Display Settings"
-msgstr "Nastavitve zaslona"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "Nastavitve"

+#: ../js/ui/backgroundMenu.js:21
+msgid "Change Background…"
+msgstr "Spremeni ozadje ..."
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
 #: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
@@ -546,53 +542,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "S"

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

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

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "Teden %V"

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

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "Počisti odsek"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "Dogodki"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1524
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d. %m."

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

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1613
 msgid "Notifications"
 msgstr "Obvestila"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "Ni obvestil"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "Ni dogodkov"

@@ -728,7 +724,7 @@ msgstr "Dejanje je spodletelo. Poskusite znova."

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:775
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s je sedaj znan kot v %s"
@@ -737,11 +733,11 @@ msgstr "%s je sedaj znan kot v %s"
 msgid "Windows"
 msgstr "Okna"

-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Pokaži programe"

-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Pregledna plošča"

@@ -920,16 +916,16 @@ 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:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "Tipkovnica"

 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:64
 msgid "Hide tray"
 msgstr "Skrij sistemsko vrstico"

-#: ../js/ui/legacyTray.js:107
+#: ../js/ui/legacyTray.js:104
 msgid "Status Icons"
 msgstr "Ikone stanja"

@@ -985,7 +981,7 @@ msgstr "Poglej vir"
 msgid "Web Page"
 msgstr "Spletna stran"

-#: ../js/ui/messageTray.js:1504
+#: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "Podrobnosti sistema"

@@ -1027,7 +1023,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Vnos ukaza"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Zapri"

@@ -1059,7 +1055,7 @@ msgstr[1] "%d novo obvestilo"
 msgstr[2] "%d novi obvestili"
 msgstr[3] "%d nova obvestila"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Zakleni"

@@ -1075,11 +1071,11 @@ msgstr "Zaklep ni mogoč"
 msgid "Lock was blocked by an application"
 msgstr "Zaklep je preprečil program"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Iskanje ..."

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

@@ -1143,11 +1139,11 @@ msgstr "Odskočne tipke"
 msgid "Mouse Keys"
 msgstr "Miškine tipke"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Visok kontrast"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Veliko besedilo"

@@ -1183,7 +1179,7 @@ msgstr "Ni vzpostavljene povezave"
 msgid "Brightness"
 msgstr "Svetlost"

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

@@ -1394,23 +1390,23 @@ msgstr "Način letala"
 msgid "On"
 msgstr "Povezano"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "Preklopi uporabnika"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "Odjava"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "Zaklep položaja"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Zaustavi"

-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "Izklop"

@@ -1473,7 +1469,7 @@ msgstr[3] "Spremembe nastavitev bodo povrnjene v %d sekundah."

 #. 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1518,22 +1514,6 @@ msgstr "Premakni na zgornjo delovno površino"
 msgid "Move to Workspace Down"
 msgstr "Premakni na spodnjo delovno površino"

-#: ../js/ui/windowMenu.js:127
-msgid "Move to Monitor Up"
-msgstr "\t"
-
-#: ../js/ui/windowMenu.js:133
-msgid "Move to Monitor Down"
-msgstr "Premakni na zaslon spodaj"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Premakni na zaslon levo"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Premakni na zaslon desno"
-
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Koledar Evolution "
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Tajik Gnome\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-05-04 19:54+0000\n"
-"PO-Revision-Date: 2015-05-05 09:50+0500\n"
+"POT-Creation-Date: 2015-03-13 20:44+0000\n"
+"PO-Revision-Date: 2015-03-14 09:50+0500\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: \n"
 "Language: tg\n"
@@ -17,7 +17,7 @@ msgstr ""
 "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.7.5\n"
+"X-Generator: Poedit 1.6.5\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -305,14 +305,14 @@ msgstr ""
 msgid "Network Login"
 msgstr "Воридшавии шабакавӣ"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "Ҳангоми боркунии равзанаи гуфтугӯи хусусиятҳо барои %s хатогие ба вуҷуд "
 "омадааст:"

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "Пасвандҳои восити GNOME"

@@ -323,39 +323,39 @@ msgstr "Пасвандҳои восити GNOME"
 msgid "Cancel"
 msgstr "Бекор кардан"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "Навбатӣ"

-#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Кушодан"

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "Ворид шудан"

-#: ../js/gdm/loginDialog.js:281
+#: ../js/gdm/loginDialog.js:280
 msgid "Choose Session"
 msgstr "Интихоби ҷаласа"

-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:421
 msgid "Not listed?"
 msgstr "Вуҷуд надора?"

-#: ../js/gdm/loginDialog.js:840
+#: ../js/gdm/loginDialog.js:830
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(масалан, корбар ё %s)"

-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Номи корбар:"

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1170
 msgid "Login Window"
 msgstr "Равзанаи воридшавӣ"

@@ -448,31 +448,31 @@ msgstr "%B %d %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Бозфиристодани санҷиши ҳаққонияти веб"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:792
 msgid "Frequently used applications will appear here"
 msgstr "Барномаҳои бештар истифодашуда ин ҷо намоиш дода мешаванд"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:912
 msgid "Frequent"
 msgstr "Роиҷ"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:919
 msgid "All"
 msgstr "Ҳама"

-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1850
 msgid "New Window"
 msgstr "Равзанаи нав"

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Тоза кардан аз Баргузидаҳо"

-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1884
 msgid "Add to Favorites"
 msgstr "Илова кардан ба Баргузидаҳо"

-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1894
 msgid "Show Details"
 msgstr "Намоиш додани тафсилот"

@@ -486,19 +486,15 @@ msgstr "%s ба баргузидаҳои шумо илова шудааст."
 msgid "%s has been removed from your favorites."
 msgstr "%s аз баргузидаҳои шумо тоза шудааст."

-#: ../js/ui/backgroundMenu.js:19
-msgid "Change Background…"
-msgstr "Тағйир додани пазсамина..."
-
-#: ../js/ui/backgroundMenu.js:21
-msgid "Display Settings"
-msgstr "Танзимоти дисплей"
-
-#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:337
 msgid "Settings"
 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:53
 msgctxt "calendar-no-work"
@@ -551,53 +547,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "Ш"

-#: ../js/ui/calendar.js:564
+#: ../js/ui/calendar.js:563
 msgid "Previous month"
 msgstr "Моҳи қаблӣ"

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:573
 msgid "Next month"
 msgstr "Моҳи навбатӣ"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "Ҳафтаи %V"

 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #. */
-#: ../js/ui/calendar.js:1187
+#: ../js/ui/calendar.js:1182
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Тамоми рӯз"

-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "Пок кардани қисмат"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "Рӯйдодҳо"

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

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

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1613
 msgid "Notifications"
 msgstr "Огоҳиҳо"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "Ягон огоҳӣ нест"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "Ягон рӯйдод нест"

@@ -733,7 +729,7 @@ msgstr "Мутаассифона, ин амал иҷро нашуд. Лутфа

 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:775
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s аллакой бо номи %s номида мешавад"
@@ -742,11 +738,11 @@ msgstr "%s аллакой бо номи %s номида мешавад"
 msgid "Windows"
 msgstr "Равзанаҳо"

-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Намоиш додани барномаҳо"

-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Рах"

@@ -914,16 +910,17 @@ msgstr "Насб кардан"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "“%s”-ро аз extensions.gnome.org боргирӣ ва насб мекунед?"

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "Клавиатура"

 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
+#: ../js/ui/legacyTray.js:59
+#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Пинҳон кардани лавҳа"

-#: ../js/ui/legacyTray.js:107
+#: ../js/ui/legacyTray.js:91
 msgid "Status Icons"
 msgstr "Нишонаҳои вазъият"

@@ -979,7 +976,7 @@ msgstr "Намоиш додани манбаъ"
 msgid "Web Page"
 msgstr "Саҳифаи веб"

-#: ../js/ui/messageTray.js:1504
+#: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "Маълумоти система"

@@ -1021,7 +1018,7 @@ msgstr "toggle-switch-us"
 msgid "Enter a Command"
 msgstr "Фармонеро ворид кунед"

-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
 msgid "Close"
 msgstr "Пӯшидан"

@@ -1049,7 +1046,7 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d огоҳии нав"
 msgstr[1] "%d огоҳии нав"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "Қулф кардан"

@@ -1065,11 +1062,11 @@ msgstr "Қулф карда намешавад"
 msgid "Lock was blocked by an application"
 msgstr "Қулф аз тарави барнома баста шудааст"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Ҷустуҷӯ рафта истодааст..."

-#: ../js/ui/search.js:619
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "Ягон натиҷа нест."

@@ -1133,11 +1130,11 @@ msgstr "Тугмаҳои ҷастухез"
 msgid "Mouse Keys"
 msgstr "Тугмаҳои муш"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "Контрасти баланд"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "Матни бузург"

@@ -1171,7 +1168,7 @@ msgstr "Пайваст нашудааст"
 msgid "Brightness"
 msgstr "Дурахшонӣ"

-#: ../js/ui/status/keyboard.js:736
+#: ../js/ui/status/keyboard.js:603
 msgid "Show Keyboard Layout"
 msgstr "Намоиш додани тарҳбандии клавиатура"

@@ -1382,23 +1379,23 @@ msgstr "Ҳолати ҳавопаймо"
 msgid "On"
 msgstr "Фаъол"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "Таъвизи корбар"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "Баромад"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "Қулфи самт"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "Таваққуф"

-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "Хомӯш кардан"

@@ -1459,7 +1456,7 @@ msgstr[1] "Тағйироти танзимот баъд аз %d сония ба

 #. 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1504,22 +1501,6 @@ msgstr "Интиқол додан ба фазои кории боло"
 msgid "Move to Workspace Down"
 msgstr "Интиқол додан ба фазои кории поён"

-#: ../js/ui/windowMenu.js:127
-msgid "Move to Monitor Up"
-msgstr "Интиқол ба канори болои монитор"
-
-#: ../js/ui/windowMenu.js:133
-msgid "Move to Monitor Down"
-msgstr "Интиқол ба канори поёни монитор"
-
-#: ../js/ui/windowMenu.js:139
-msgid "Move to Monitor Left"
-msgstr "Интиқол ба канори чапи монитор"
-
-#: ../js/ui/windowMenu.js:145
-msgid "Move to Monitor Right"
-msgstr "Интиқол ба канори рости монитор"
-
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Ӣақвими Evolution"
@@ -1563,12 +1544,12 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Рӯйхати ҳолатҳои имконпазир"

-#: ../src/shell-app.c:239
+#: ../src/shell-app.c:247
 msgctxt "program"
 msgid "Unknown"
 msgstr "Номаълум"

-#: ../src/shell-app.c:480
+#: ../src/shell-app.c:488
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Оғози “%s” қатъ шудааст"
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,8 +21,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: 2015-04-25 08:00+0000\n"
-"PO-Revision-Date: 2015-04-17 19:36+0800\n"
+"POT-Creation-Date: 2015-03-03 22:33+0000\n"
+"PO-Revision-Date: 2015-03-04 17:55+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -30,7 +30,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.7.5\n"

 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -288,55 +287,55 @@ msgstr "将鼠标模式下焦点的更改推迟到指针停止移动之后"
 msgid "Network Login"
 msgstr "网络登录"

-#: ../js/extensionPrefs/main.js:122
+#: ../js/extensionPrefs/main.js:123
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "载入 %s 的首选想对话框出错："

-#: ../js/extensionPrefs/main.js:154
+#: ../js/extensionPrefs/main.js:155
 msgid "GNOME Shell Extensions"
 msgstr "配置 GNOME Shell 扩展"

-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
+#: ../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:916
 msgid "Cancel"
 msgstr "取消"

-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
 msgid "Next"
 msgstr "下一步"

-#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "解锁"

-#: ../js/gdm/authPrompt.js:213
+#: ../js/gdm/authPrompt.js:215
 msgctxt "button"
 msgid "Sign In"
 msgstr "登录"

-#: ../js/gdm/loginDialog.js:281
+#: ../js/gdm/loginDialog.js:276
 msgid "Choose Session"
 msgstr "选择会话"

-#: ../js/gdm/loginDialog.js:431
+#: ../js/gdm/loginDialog.js:417
 msgid "Not listed?"
 msgstr "未列出？"

-#: ../js/gdm/loginDialog.js:840
+#: ../js/gdm/loginDialog.js:826
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(如 user 或 %s)"

-#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/gdm/loginDialog.js:831 ../js/ui/components/networkAgent.js:269
+#: ../js/ui/components/networkAgent.js:287
 msgid "Username: "
 msgstr "用户名："

-#: ../js/gdm/loginDialog.js:1173
+#: ../js/gdm/loginDialog.js:1166
 msgid "Login Window"
 msgstr "登录窗口"

@@ -348,112 +347,50 @@ msgstr "认证出错"
 msgid "(or swipe finger)"
 msgstr "(或滑动手指)"

-#: ../js/misc/util.js:119
+#: ../js/misc/util.js:115
 msgid "Command not found"
 msgstr "命令未找到"

-#: ../js/misc/util.js:152
+#: ../js/misc/util.js:148
 msgid "Could not parse command:"
 msgstr "不能解析命令："

-#: ../js/misc/util.js:160
+#: ../js/misc/util.js:156
 #, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "运行“%s”失败："

-#. Translators: Time in 24h format */
-#: ../js/misc/util.js:191
-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/misc/util.js:197
-msgid "Yesterday, %H∶%M"
-msgstr "昨天 %H:%M"
-
-#. Translators: this is the week day name followed by a time
-#. string in 24h format. i.e. "Monday, 14:30" */
-#: ../js/misc/util.js:203
-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/misc/util.js:209
-msgid "%B %d, %H∶%M"
-msgstr "%m月%d日, %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/misc/util.js:215
-msgid "%B %d %Y, %H∶%M"
-msgstr "%Y年%m月%d日, %H:%M"
-
-#. Translators: Time in 12h format */
-#: ../js/misc/util.js:220
-msgid "%l∶%M %p"
-msgstr "%p %-l:%M"
-
-#. Translators: this is the word "Yesterday" followed by a
-#. time string in 12h format. i.e. "Yesterday, 2:30 pm" */
-#: ../js/misc/util.js:226
-msgid "Yesterday, %l∶%M %p"
-msgstr "昨天%p %-l:%M"
-
-#. Translators: this is the week day name followed by a time
-#. string in 12h format. i.e. "Monday, 2:30 pm" */
-#: ../js/misc/util.js:232
-msgid "%A, %l∶%M %p"
-msgstr "%A%p %-l:%M"
-
-#. 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/misc/util.js:238
-msgid "%B %d, %l∶%M %p"
-msgstr "%m月%d日%p %-l:%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"*/
-#: ../js/misc/util.js:244
-msgid "%B %d %Y, %l∶%M %p"
-msgstr "%Y年%m月%d日，%p %-l:%M"
-
 #. TRANSLATORS: this is the title of the wifi captive portal login
 #. * window, until we know the title of the actual login page */
 #: ../js/portalHelper/main.js:85
 msgid "Web Authentication Redirect"
 msgstr "网页认证重定向"

-#: ../js/ui/appDisplay.js:788
+#: ../js/ui/appDisplay.js:785
 msgid "Frequently used applications will appear here"
 msgstr "常用的应用程序会出现在这里"

-#: ../js/ui/appDisplay.js:908
+#: ../js/ui/appDisplay.js:905
 msgid "Frequent"
 msgstr "常用"

-#: ../js/ui/appDisplay.js:915
+#: ../js/ui/appDisplay.js:912
 msgid "All"
 msgstr "全部"

-#: ../js/ui/appDisplay.js:1844
+#: ../js/ui/appDisplay.js:1840
 msgid "New Window"
 msgstr "新窗口"

-#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1868 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"

-#: ../js/ui/appDisplay.js:1878
+#: ../js/ui/appDisplay.js:1874
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"

-#: ../js/ui/appDisplay.js:1888
+#: ../js/ui/appDisplay.js:1884
 msgid "Show Details"
 msgstr "显示细节"

@@ -467,8 +404,8 @@ msgstr "%s 已经添加到了您的收藏夹。"
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"

-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:334
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:649
+#: ../js/ui/status/system.js:337
 msgid "Settings"
 msgstr "设置"

@@ -477,104 +414,119 @@ 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:53
+#: ../js/ui/calendar.js:52
 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:81
+msgctxt "event list time"
+msgid "All Day"
+msgstr "全天"
+
+#. Translators: Shown in calendar event list, if 24h format,
+#. \u2236 is a ratio character, similar to : */
+#: ../js/ui/calendar.js:88 ../js/ui/calendar.js:1596
+msgctxt "event list time"
+msgid "%H∶%M"
+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:97
+msgctxt "event list time"
+msgid "%l∶%M %p"
+msgstr "%p %-l:%M"
+
 #. Translators: Calendar grid abbreviation for Sunday.
 #. *
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #. */
-#: ../js/ui/calendar.js:82
+#: ../js/ui/calendar.js:111
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"

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

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

 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:88
+#: ../js/ui/calendar.js:117
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "三"

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

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

 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:94
+#: ../js/ui/calendar.js:123
 msgctxt "grid saturday"
 msgid "S"
 msgstr "六"

-#: ../js/ui/calendar.js:564
+#: ../js/ui/calendar.js:590
 msgid "Previous month"
 msgstr "上个月"

-#: ../js/ui/calendar.js:574
+#: ../js/ui/calendar.js:600
 msgid "Next month"
 msgstr "下个月"

-#: ../js/ui/calendar.js:781
+#: ../js/ui/calendar.js:807
 msgid "Week %V"
 msgstr "第 %V 星期"

-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#. */
-#: ../js/ui/calendar.js:1187
-msgctxt "event list time"
-msgid "All Day"
-msgstr "全天"
-
-#: ../js/ui/calendar.js:1289
+#: ../js/ui/calendar.js:1263
 msgid "Clear section"
 msgstr "清除选中项目"

-#: ../js/ui/calendar.js:1516
+#: ../js/ui/calendar.js:1455
 msgid "Events"
 msgstr "事件"

-#: ../js/ui/calendar.js:1525
+#: ../js/ui/calendar.js:1463
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%m月%d日 %A"

-#: ../js/ui/calendar.js:1529
+#: ../js/ui/calendar.js:1467
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日 %A"

-#: ../js/ui/calendar.js:1614
+#: ../js/ui/calendar.js:1560
 msgid "Notifications"
 msgstr "提示"

-#: ../js/ui/calendar.js:1765
+#: ../js/ui/calendar.js:1700
 msgid "No Notifications"
 msgstr "无提示"

-#: ../js/ui/calendar.js:1768
+#: ../js/ui/calendar.js:1703
 msgid "No Events"
 msgstr "无事件"

@@ -599,93 +551,79 @@ msgstr "密码："
 msgid "Type again:"
 msgstr "再输一次："

-#: ../js/ui/components/networkAgent.js:140 ../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 "连接"

-#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:303
+#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:301
 msgid "Password: "
 msgstr "密码："

-#: ../js/ui/components/networkAgent.js:238
+#: ../js/ui/components/networkAgent.js:236
 msgid "Key: "
 msgstr "密钥："

-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:275
 msgid "Identity: "
 msgstr "身份："

-#: ../js/ui/components/networkAgent.js:279
+#: ../js/ui/components/networkAgent.js:277
 msgid "Private key password: "
 msgstr "私人密钥密码："

-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:289
 msgid "Service: "
 msgstr "服务："

-#: ../js/ui/components/networkAgent.js:320
-#: ../js/ui/components/networkAgent.js:658
+#: ../js/ui/components/networkAgent.js:318
 msgid "Authentication required by wireless network"
 msgstr "无线网络要求身份认证"

-#: ../js/ui/components/networkAgent.js:321
-#: ../js/ui/components/networkAgent.js:659
+#: ../js/ui/components/networkAgent.js:319
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
 msgstr "访问无线网络“%s”需要密码或密钥。"

-#: ../js/ui/components/networkAgent.js:325
-#: ../js/ui/components/networkAgent.js:662
+#: ../js/ui/components/networkAgent.js:323
 msgid "Wired 802.1X authentication"
 msgstr "有线 802.1X 认证"

-#: ../js/ui/components/networkAgent.js:327
+#: ../js/ui/components/networkAgent.js:325
 msgid "Network name: "
 msgstr "网络名称："

-#: ../js/ui/components/networkAgent.js:332
-#: ../js/ui/components/networkAgent.js:666
+#: ../js/ui/components/networkAgent.js:330
 msgid "DSL authentication"
 msgstr "DSL 认证"

-#: ../js/ui/components/networkAgent.js:339
-#: ../js/ui/components/networkAgent.js:672
+#: ../js/ui/components/networkAgent.js:337
 msgid "PIN code required"
 msgstr "需要 PIN 码"

-#: ../js/ui/components/networkAgent.js:340
-#: ../js/ui/components/networkAgent.js:673
+#: ../js/ui/components/networkAgent.js:338
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码"

-#: ../js/ui/components/networkAgent.js:341
+#: ../js/ui/components/networkAgent.js:339
 msgid "PIN: "
 msgstr "PIN："

-#: ../js/ui/components/networkAgent.js:348
-#: ../js/ui/components/networkAgent.js:679
+#: ../js/ui/components/networkAgent.js:345
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"

-#: ../js/ui/components/networkAgent.js:349
-#: ../js/ui/components/networkAgent.js:663
-#: ../js/ui/components/networkAgent.js:667
-#: ../js/ui/components/networkAgent.js:680
+#: ../js/ui/components/networkAgent.js:346
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "连接到“%s”需要密码。"

-#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
-msgid "Network Manager"
-msgstr "网络管理器"
-
 #: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
 msgstr "需要认证"
@@ -706,9 +644,71 @@ msgstr "认证"
 msgid "Sorry, that didn't work. Please try again."
 msgstr "抱歉，您的输入有误。请重试。"

+#. Translators: Time in 24h format */
+#: ../js/ui/components/telepathyClient.js:764 ../js/ui/dateMenu.js:210
+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:771
+msgid "Yesterday, %H∶%M"
+msgstr "昨天 %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:778
+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:785
+msgid "%B %d, %H∶%M"
+msgstr "%m月%d日, %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:791
+msgid "%B %d %Y, %H∶%M"
+msgstr "%Y年%m月%d日, %H:%M"
+
+#. Translators: Time in 12h format */
+#: ../js/ui/components/telepathyClient.js:797 ../js/ui/dateMenu.js:213
+msgid "%l∶%M %p"
+msgstr "%p %-l:%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:804
+msgid "Yesterday, %l∶%M %p"
+msgstr "昨天%p %-l:%M"
+
+#. 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:811
+msgid "%A, %l∶%M %p"
+msgstr "%A%p %-l:%M"
+
+#. 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:818
+msgid "%B %d, %l∶%M %p"
+msgstr "%m月%d日%p %-l:%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"*/
+#: ../js/ui/components/telepathyClient.js:824
+msgid "%B %d %Y, %l∶%M %p"
+msgstr "%Y年%m月%d日，%p %-l:%M"
+
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:757
+#: ../js/ui/components/telepathyClient.js:856
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s"
@@ -721,7 +721,7 @@ msgstr "窗口"
 msgid "Show Applications"
 msgstr "显示应用程序"

-#: ../js/ui/dash.js:449
+#: ../js/ui/dash.js:451
 msgid "Dash"
 msgstr "Dash"

@@ -878,19 +878,10 @@ msgstr "安装"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "从 extensions.gnome.org 下载并安装“%s”？"

-#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
+#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:576
 msgid "Keyboard"
 msgstr "键盘"

-#. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:66
-msgid "Hide tray"
-msgstr "隐藏托盘"
-
-#: ../js/ui/legacyTray.js:107
-msgid "Status Icons"
-msgstr "状态图标"
-
 #: ../js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "未安装扩展"
@@ -943,7 +934,7 @@ msgstr "查看源"
 msgid "Web Page"
 msgstr "网页"

-#: ../js/ui/messageTray.js:1504
+#: ../js/ui/messageTray.js:2131
 msgid "System Information"
 msgstr "系统信息"

@@ -963,21 +954,21 @@ msgstr "概览"
 msgid "Type to search…"
 msgstr "输入以搜索..."

-#: ../js/ui/panel.js:352
+#: ../js/ui/panel.js:351
 msgid "Quit"
 msgstr "退出"

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

-#: ../js/ui/panel.js:755
+#: ../js/ui/panel.js:754
 msgid "Top Bar"
 msgstr "顶栏"

-#: ../js/ui/popupMenu.js:289
+#: ../js/ui/popupMenu.js:288
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"

@@ -1011,7 +1002,7 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d 条新通知"

-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
 msgid "Lock"
 msgstr "锁定"

@@ -1027,11 +1018,11 @@ msgstr "无法锁定"
 msgid "Lock was blocked by an application"
 msgstr "一个应用程序阻止了锁定"

-#: ../js/ui/search.js:617
+#: ../js/ui/search.js:609
 msgid "Searching…"
 msgstr "正在搜索..."

-#: ../js/ui/search.js:619
+#: ../js/ui/search.js:611
 msgid "No results."
 msgstr "无结果。"

@@ -1095,11 +1086,11 @@ msgstr "筛选键"
 msgid "Mouse Keys"
 msgstr "鼠标按键"

-#: ../js/ui/status/accessibility.js:167
+#: ../js/ui/status/accessibility.js:144
 msgid "High Contrast"
 msgstr "高对比度"

-#: ../js/ui/status/accessibility.js:202
+#: ../js/ui/status/accessibility.js:193
 msgid "Large Text"
 msgstr "大号文本"

@@ -1132,7 +1123,7 @@ msgstr "无连接"
 msgid "Brightness"
 msgstr "亮度"

-#: ../js/ui/status/keyboard.js:736
+#: ../js/ui/status/keyboard.js:599
 msgid "Show Keyboard Layout"
 msgstr "显示键盘布局"

@@ -1301,6 +1292,10 @@ msgstr "VPN 设置"
 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 "启用网络连接失败"
@@ -1343,23 +1338,23 @@ msgstr "乘机模式"
 msgid "On"
 msgstr "开"

-#: ../js/ui/status/system.js:314
+#: ../js/ui/status/system.js:317
 msgid "Switch User"
 msgstr "切换用户"

-#: ../js/ui/status/system.js:319
+#: ../js/ui/status/system.js:322
 msgid "Log Out"
 msgstr "注销"

-#: ../js/ui/status/system.js:338
+#: ../js/ui/status/system.js:341
 msgid "Orientation Lock"
 msgstr "方向锁定"

-#: ../js/ui/status/system.js:346
+#: ../js/ui/status/system.js:349
 msgid "Suspend"
 msgstr "挂起"

-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:352
 msgid "Power Off"
 msgstr "关机"

@@ -1419,7 +1414,7 @@ msgstr[0] "设置更改将在 %d 后还原"

 #. 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:613
+#: ../js/ui/windowManager.js:599
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1504,12 +1499,12 @@ msgstr "使用指定模式，如 “gdm”用于登录屏幕的模式"
 msgid "List possible modes"
 msgstr "列出可用的模式"

-#: ../src/shell-app.c:239
+#: ../src/shell-app.c:247
 msgctxt "program"
 msgid "Unknown"
 msgstr "未知"

-#: ../src/shell-app.c:480
+#: ../src/shell-app.c:488
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "启动“%s”失败"
@@ -1525,11 +1520,3 @@ msgstr "密码不能为空"
 #: ../src/shell-polkit-authentication-agent.c:346
 msgid "Authentication dialog was dismissed by the user"
 msgstr "认证对话框被用户驳回"
-
-#~ msgctxt "event list time"
-#~ msgid "%H∶%M"
-#~ msgstr "%H∶%M"
-
-#~ msgctxt "event list time"
-#~ msgid "%l∶%M %p"
-#~ msgstr "%p %-l:%M"
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -64,6 +64,8 @@ st_source_h =					\
 	st/st-scroll-bar.h			\
 	st/st-scroll-view.h			\
 	st/st-shadow.h				\
+	st/st-table.h				\
+	st/st-table-child.h			\
 	st/st-texture-cache.h			\
 	st/st-theme.h				\
 	st/st-theme-context.h			\
@@ -104,6 +106,7 @@ EXTRA_DIST += 					\

 st_source_private_h =				\
 	st/st-private.h				\
+	st/st-table-private.h			\
 	st/st-theme-private.h			\
 	st/st-theme-node-private.h		\
 	st/st-theme-node-transition.h
@@ -130,6 +133,8 @@ st_source_c =					\
 	st/st-scroll-bar.c			\
 	st/st-scroll-view.c			\
 	st/st-shadow.c				\
+	st/st-table.c				\
+	st/st-table-child.c			\
 	st/st-texture-cache.c			\
 	st/st-theme.c				\
 	st/st-theme-context.c			\
--- a/src/data-to-c.pl
+++ b/src/data-to-c.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl

 # Copyright © 2011 Red Hat, Inc
 #
--- a/src/gtkactionmuxer.c
+++ b/src/gtkactionmuxer.c
@@ -24,8 +24,6 @@
 #include "gtkactionobservable.h"
 #include "gtkactionobserver.h"

-#include <clutter/clutter.h>
-
 #include <string.h>

 /**
@@ -398,26 +396,6 @@ gtk_action_muxer_query_action (GActionGroup        *action_group,
  return FALSE;
 }

-static GVariant *
-get_platform_data (void)
-{
-  gchar time[32];
-  GVariantBuilder *builder;
-  GVariant *result;
-
-  g_snprintf (time, 32, "_TIME%d", clutter_get_current_event_time ());
-
-  builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
-
-  g_variant_builder_add (builder, "{sv}", "desktop-startup-id",
-                         g_variant_new_string (time));
-
-  result = g_variant_builder_end (builder);
-  g_variant_builder_unref (builder);
-
-  return result;
-}
-
 static void
 gtk_action_muxer_activate_action (GActionGroup *action_group,
                                  const gchar  *action_name,
@@ -430,14 +408,7 @@ gtk_action_muxer_activate_action (GActionGroup *action_group,
  group = gtk_action_muxer_find_group (muxer, action_name, &unprefixed_name);

  if (group)
-    {
-      if (G_IS_REMOTE_ACTION_GROUP (group->group))
-	g_remote_action_group_activate_action_full (G_REMOTE_ACTION_GROUP (group->group),
-						    unprefixed_name, parameter,
-						    get_platform_data ());
-      else
-	g_action_group_activate_action (group->group, unprefixed_name, parameter);
-    }
+    g_action_group_activate_action (group->group, unprefixed_name, parameter);
  else if (muxer->parent)
    g_action_group_activate_action (G_ACTION_GROUP (muxer->parent), action_name, parameter);
 }
@@ -454,15 +425,7 @@ gtk_action_muxer_change_action_state (GActionGroup *action_group,
  group = gtk_action_muxer_find_group (muxer, action_name, &unprefixed_name);

  if (group)
-    {
-      if (G_IS_REMOTE_ACTION_GROUP (group->group))
-        g_remote_action_group_change_action_state_full (G_REMOTE_ACTION_GROUP (group->group),
-                                                        unprefixed_name,
-                                                        state,
-                                                        get_platform_data ());
-      else
-        g_action_group_change_action_state (group->group, unprefixed_name, state);
-    }
+    g_action_group_change_action_state (group->group, unprefixed_name, state);
  else if (muxer->parent)
    g_action_group_change_action_state (G_ACTION_GROUP (muxer->parent), action_name, state);
 }
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,12 @@

 extern GType gnome_shell_plugin_get_type (void);

+#define END_SESSION_DIALOG_DBUS_SERVICE "org.gnome.SessionManager.EndSessionDialog"
 #define SHELL_DBUS_SERVICE "org.gnome.Shell"
+#define SHELL_KEY_GRABBER_DBUS_SERVICE "org.gnome.Shell.KeyGrabber"
+#define SHELL_OSD_DBUS_SERVICE "org.gnome.Shell.OSD"
+#define SHELL_SCREENCAST_DBUS_SERVICE "org.gnome.Shell.Screencast"
+#define SHELL_SCREENSHOT_DBUS_SERVICE "org.gnome.Shell.Screenshot"
 #define MAGNIFIER_DBUS_SERVICE "org.gnome.Magnifier"

 #define OVERRIDES_SCHEMA "org.gnome.shell.overrides"
@@ -159,6 +164,11 @@ shell_dbus_init (gboolean replace)
                            MAGNIFIER_DBUS_SERVICE, FALSE,
  /* ...and the org.freedesktop.Notifications service. */
                            "org.freedesktop.Notifications", FALSE,
+                            END_SESSION_DIALOG_DBUS_SERVICE, TRUE,
+                            SHELL_KEY_GRABBER_DBUS_SERVICE, TRUE,
+                            SHELL_OSD_DBUS_SERVICE, TRUE,
+                            SHELL_SCREENCAST_DBUS_SERVICE, TRUE,
+                            SHELL_SCREENSHOT_DBUS_SERVICE, TRUE,
                            NULL);
  /* ...and the on-screen keyboard service */
  shell_dbus_acquire_name (bus,
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -39,7 +39,7 @@
 #include <malloc.h>
 #endif

-#if defined __OpenBSD__ || defined __FreeBSD__
+#ifdef __OpenBSD__
 #include <sys/sysctl.h>
 #endif

@@ -1278,30 +1278,6 @@ shell_global_reexec_self (ShellGlobal *global)
    g_ptr_array_add (arr, *args_p);
  }

-  g_ptr_array_add (arr, NULL);
-#elif defined __FreeBSD__
-  char *buf;
-  char *buf_p;
-  char *buf_end;
-  gint mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, getpid() };
-
-  if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
-    return;
-
-  buf = g_malloc0 (len);
-
-  if (sysctl (mib, G_N_ELEMENTS (mib), buf, &len, NULL, 0) == -1) {
-    g_warning ("failed to get command line args: %d", errno);
-    g_free (buf);
-    return;
-  }
-
-  buf_end = buf+len;
-  arr = g_ptr_array_new ();
-  /* The value returned by sysctl is NUL-separated */
-  for (buf_p = buf; buf_p < buf_end; buf_p = buf_p + strlen (buf_p) + 1)
-    g_ptr_array_add (arr, buf_p);
-
  g_ptr_array_add (arr, NULL);
 #else
  return;
@@ -1321,7 +1297,7 @@ shell_global_reexec_self (ShellGlobal *global)
  execvp (arr->pdata[0], (char**)arr->pdata);
  g_warning ("failed to reexec: %s", g_strerror (errno));
  g_ptr_array_free (arr, TRUE);
-#if defined __linux__ || defined __FreeBSD__
+#if defined __linux__
  g_free (buf);
 #elif defined __OpenBSD__
  g_free (args);
@@ -1464,7 +1440,7 @@ shell_global_sync_pointer (ShellGlobal *global)

  event.type = CLUTTER_MOTION;
  event.time = shell_global_get_current_time (global);
-  event.flags = CLUTTER_EVENT_FLAG_SYNTHETIC;
+  event.flags = 0;
  event.stage = global->stage;
  event.x = x;
  event.y = y;
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -391,15 +391,3 @@ shell_util_need_background_refresh (void)

  return FALSE;
 }
-
-void
-shell_util_text_insert_keyval (ClutterActor *actor,
-                               guint         keyval)
-{
-  ClutterEvent event = { 0 };
-
-  event.type = CLUTTER_KEY_PRESS;
-  event.key.keyval = keyval;
-
-  clutter_actor_event (actor, &event, FALSE);
-}
--- a/src/shell-util.h
+++ b/src/shell-util.h
@@ -47,9 +47,6 @@ void    shell_util_cursor_tracker_to_clutter (MetaCursorTracker *tracker,

 gboolean shell_util_need_background_refresh (void);

-void shell_util_text_insert_keyval (ClutterActor *actor,
-                                    guint         keyval);
-
 G_END_DECLS

 #endif /* __SHELL_UTIL_H__ */
--- a/src/st/st-table-child.c
+++ b/src/st/st-table-child.c
@@ -0,0 +1,767 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * st-table-child.h: Table child implementation
+ *
+ * Copyright 2008, 2009 Intel Corporation.
+ * Copyright 2010 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "st-private.h"
+#include "st-table-child.h"
+#include "st-table-private.h"
+#include "st-enum-types.h"
+#include <st/st-widget.h>
+#include <st/st-table.h>
+
+/*
+ * ClutterChildMeta Implementation
+ */
+
+/**
+ * SECTION:st-table-child
+ * @short_description: The child property store for #StTable
+ *
+ * The #ClutterChildMeta implementation for the #StTable container widget.
+ *
+ */
+
+enum {
+  CHILD_PROP_0,
+
+  CHILD_PROP_COL,
+  CHILD_PROP_ROW,
+  CHILD_PROP_COL_SPAN,
+  CHILD_PROP_ROW_SPAN,
+  CHILD_PROP_X_EXPAND,
+  CHILD_PROP_Y_EXPAND,
+  CHILD_PROP_X_ALIGN,
+  CHILD_PROP_Y_ALIGN,
+  CHILD_PROP_X_FILL,
+  CHILD_PROP_Y_FILL,
+  CHILD_PROP_ALLOCATE_HIDDEN,
+};
+
+G_DEFINE_TYPE (StTableChild, st_table_child, CLUTTER_TYPE_CHILD_META);
+
+static void
+table_child_set_property (GObject      *gobject,
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  StTableChild *child = ST_TABLE_CHILD (gobject);
+  StTable *table = ST_TABLE (CLUTTER_CHILD_META(gobject)->container);
+
+  switch (prop_id)
+    {
+    case CHILD_PROP_COL:
+      child->col = g_value_get_int (value);
+      _st_table_update_row_col (table, -1, child->col);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_ROW:
+      child->row = g_value_get_int (value);
+      _st_table_update_row_col (table, child->row, -1);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_COL_SPAN:
+      child->col_span = g_value_get_int (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_ROW_SPAN:
+      child->row_span = g_value_get_int (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_X_EXPAND:
+      child->x_expand = g_value_get_boolean (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_Y_EXPAND:
+      child->y_expand = g_value_get_boolean (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_X_ALIGN:
+      child->x_align = g_value_get_enum (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_Y_ALIGN:
+      child->y_align = g_value_get_enum (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_X_FILL:
+      child->x_fill = g_value_get_boolean (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_Y_FILL:
+      child->y_fill = g_value_get_boolean (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+    case CHILD_PROP_ALLOCATE_HIDDEN:
+      child->allocate_hidden = g_value_get_boolean (value);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+table_child_get_property (GObject    *gobject,
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  StTableChild *child = ST_TABLE_CHILD (gobject);
+
+  switch (prop_id)
+    {
+    case CHILD_PROP_COL:
+      g_value_set_int (value, child->col);
+      break;
+    case CHILD_PROP_ROW:
+      g_value_set_int (value, child->row);
+      break;
+    case CHILD_PROP_COL_SPAN:
+      g_value_set_int (value, child->col_span);
+      break;
+    case CHILD_PROP_ROW_SPAN:
+      g_value_set_int (value, child->row_span);
+      break;
+    case CHILD_PROP_X_EXPAND:
+      g_value_set_boolean (value, child->x_expand);
+      break;
+    case CHILD_PROP_Y_EXPAND:
+      g_value_set_boolean (value, child->y_expand);
+      break;
+    case CHILD_PROP_X_ALIGN:
+      g_value_set_enum (value, child->x_align);
+      break;
+    case CHILD_PROP_Y_ALIGN:
+      g_value_set_enum (value, child->y_align);
+      break;
+    case CHILD_PROP_X_FILL:
+      g_value_set_boolean (value, child->x_fill);
+      break;
+    case CHILD_PROP_Y_FILL:
+      g_value_set_boolean (value, child->y_fill);
+      break;
+    case CHILD_PROP_ALLOCATE_HIDDEN:
+      g_value_set_boolean (value, child->allocate_hidden);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+st_table_child_class_init (StTableChildClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GParamSpec *pspec;
+
+  gobject_class->set_property = table_child_set_property;
+  gobject_class->get_property = table_child_get_property;
+
+  pspec = g_param_spec_int ("col",
+                            "Column Number",
+                            "The column the widget resides in",
+                            0, G_MAXINT,
+                            0,
+                            ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_COL, pspec);
+
+  pspec = g_param_spec_int ("row",
+                            "Row Number",
+                            "The row the widget resides in",
+                            0, G_MAXINT,
+                            0,
+                            ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_ROW, pspec);
+
+  pspec = g_param_spec_int ("row-span",
+                            "Row Span",
+                            "The number of rows the widget should span",
+                            1, G_MAXINT,
+                            1,
+                            ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_ROW_SPAN, pspec);
+
+  pspec = g_param_spec_int ("col-span",
+                            "Column Span",
+                            "The number of columns the widget should span",
+                            1, G_MAXINT,
+                            1,
+                            ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_COL_SPAN, pspec);
+
+  pspec = g_param_spec_boolean ("x-expand",
+                                "X Expand",
+                                "Whether the child should receive priority "
+                                "when the container is allocating spare space "
+                                "on the horizontal axis",
+                                TRUE,
+                                ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_X_EXPAND, pspec);
+
+  pspec = g_param_spec_boolean ("y-expand",
+                                "Y Expand",
+                                "Whether the child should receive priority "
+                                "when the container is allocating spare space "
+                                "on the vertical axis",
+                                TRUE,
+                                ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_Y_EXPAND, pspec);
+
+  pspec = g_param_spec_enum ("x-align",
+                             "X Alignment",
+                             "X alignment of the widget within the cell",
+                             ST_TYPE_ALIGN,
+                             ST_ALIGN_MIDDLE,
+                             ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_X_ALIGN, pspec);
+
+  pspec = g_param_spec_enum ("y-align",
+                             "Y Alignment",
+                             "Y alignment of the widget within the cell",
+                             ST_TYPE_ALIGN,
+                             ST_ALIGN_MIDDLE,
+                             ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_Y_ALIGN, pspec);
+
+  pspec = g_param_spec_boolean ("x-fill",
+                                "X Fill",
+                                "Whether the child should be allocated its "
+                                "entire available space, or whether it should "
+                                "be squashed and aligned.",
+                                TRUE,
+                                ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_X_FILL, pspec);
+
+  pspec = g_param_spec_boolean ("y-fill",
+                                "Y Fill",
+                                "Whether the child should be allocated its "
+                                "entire available space, or whether it should "
+                                "be squashed and aligned.",
+                                TRUE,
+                                ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_Y_FILL, pspec);
+
+  pspec = g_param_spec_boolean ("allocate-hidden",
+                                "Allocate Hidden",
+                                "Whether the child should be allocate even "
+                                "if it is hidden",
+                                TRUE,
+                                ST_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class, CHILD_PROP_ALLOCATE_HIDDEN, pspec);
+}
+
+static void
+st_table_child_init (StTableChild *self)
+{
+  self->col_span = 1;
+  self->row_span = 1;
+
+  self->x_align = ST_ALIGN_MIDDLE;
+  self->y_align = ST_ALIGN_MIDDLE;
+
+  self->x_expand = TRUE;
+  self->y_expand = TRUE;
+
+  self->x_fill = TRUE;
+  self->y_fill = TRUE;
+
+  self->allocate_hidden = TRUE;
+}
+
+static StTableChild*
+get_child_meta (StTable      *table,
+                ClutterActor *child)
+{
+  StTableChild *meta;
+
+  meta = (StTableChild*) clutter_container_get_child_meta (CLUTTER_CONTAINER (table), child);
+
+  return meta;
+}
+
+/**
+ * st_table_child_get_col_span:
+ * @table: an #StTable
+ * @child: a #ClutterActor
+ *
+ * Get the column span of the child. Defaults to 1.
+ *
+ * Returns: the column span of the child
+ */
+gint
+st_table_child_get_col_span (StTable      *table,
+                             ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->col_span;
+}
+
+/**
+ * st_table_child_set_col_span:
+ * @table: An #StTable
+ * @child: An #ClutterActor
+ * @span: The number of columns to span
+ *
+ * Set the column span of the child.
+ *
+ */
+void
+st_table_child_set_col_span (StTable      *table,
+                             ClutterActor *child,
+                             gint          span)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+  g_return_if_fail (span > 1);
+
+  meta = get_child_meta (table, child);
+
+  meta->col_span = span;
+
+  clutter_actor_queue_relayout (child);
+}
+
+/**
+ * st_table_child_get_row_span:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Get the row span of the child. Defaults to 1.
+ *
+ * Returns: the row span of the child
+ */
+gint
+st_table_child_get_row_span (StTable      *table,
+                             ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->row_span;
+}
+
+/**
+ * st_table_child_set_row_span:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @span: the number of rows to span
+ *
+ * Set the row span of the child.
+ *
+ */
+void
+st_table_child_set_row_span (StTable      *table,
+                             ClutterActor *child,
+                             gint          span)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+  g_return_if_fail (span > 1);
+
+  meta = get_child_meta (table, child);
+
+  meta->row_span = span;
+
+  clutter_actor_queue_relayout (child);
+}
+
+/**
+ * st_table_child_get_x_fill:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Get the x-fill state of the child
+ *
+ * Returns: %TRUE if the child is set to x-fill
+ */
+gboolean
+st_table_child_get_x_fill (StTable      *table,
+                           ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->x_fill;
+}
+
+/**
+ * st_table_child_set_x_fill:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @fill: the fill state
+ *
+ * Set the fill state of the child on the x-axis. This will cause the child to
+ * be allocated the maximum available space.
+ *
+ */
+void
+st_table_child_set_x_fill (StTable      *table,
+                           ClutterActor *child,
+                           gboolean      fill)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+
+  meta = get_child_meta (table, child);
+
+  meta->x_fill = fill;
+
+  clutter_actor_queue_relayout (child);
+}
+
+
+/**
+ * st_table_child_get_y_fill:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Get the y-fill state of the child
+ *
+ * Returns: %TRUE if the child is set to y-fill
+ */
+gboolean
+st_table_child_get_y_fill (StTable      *table,
+                           ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->y_fill;
+}
+
+/**
+ * st_table_child_set_y_fill:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @fill: the fill state
+ *
+ * Set the fill state of the child on the y-axis. This will cause the child to
+ * be allocated the maximum available space.
+ *
+ */
+void
+st_table_child_set_y_fill (StTable      *table,
+                           ClutterActor *child,
+                           gboolean      fill)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+
+  meta = get_child_meta (table, child);
+
+  meta->y_fill = fill;
+
+  clutter_actor_queue_relayout (child);
+}
+
+/**
+ * st_table_child_get_x_expand:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Get the x-expand property of the child
+ *
+ * Returns: %TRUE if the child is set to x-expand
+ */
+gboolean
+st_table_child_get_x_expand (StTable      *table,
+                             ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->x_expand;
+}
+
+/**
+ * st_table_child_set_x_expand:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @expand: the new value of the x expand child property
+ *
+ * Set x-expand on the child. This causes the column which the child
+ * resides in to be allocated any extra space if the allocation of the table is
+ * larger than the preferred size.
+ *
+ */
+void
+st_table_child_set_x_expand (StTable      *table,
+                             ClutterActor *child,
+                             gboolean      expand)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+
+  meta = get_child_meta (table, child);
+
+  meta->x_expand = expand;
+
+  clutter_actor_queue_relayout (child);
+}
+
+/**
+ * st_table_child_set_y_expand:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @expand: the new value of the y-expand child property
+ *
+ * Set y-expand on the child. This causes the row which the child
+ * resides in to be allocated any extra space if the allocation of the table is
+ * larger than the preferred size.
+ *
+ */
+void
+st_table_child_set_y_expand (StTable      *table,
+                             ClutterActor *child,
+                             gboolean      expand)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+
+  meta = get_child_meta (table, child);
+
+  meta->y_expand = expand;
+
+  clutter_actor_queue_relayout (child);
+}
+
+/**
+ * st_table_child_get_y_expand:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Get the y-expand property of the child.
+ *
+ * Returns: %TRUE if the child is set to y-expand
+ */
+gboolean
+st_table_child_get_y_expand (StTable      *table,
+                             ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->y_expand;
+}
+
+/**
+ * st_table_child_get_x_align:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Get the x-align value of the child
+ *
+ * Returns: An #StAlign value
+ */
+StAlign
+st_table_child_get_x_align (StTable      *table,
+                            ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->x_align;
+
+}
+
+/**
+ * st_table_child_set_x_align:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @align: A #StAlign value
+ *
+ * Set the alignment of the child within its cell. This will only have an effect
+ * if the the x-fill property is FALSE.
+ *
+ */
+void
+st_table_child_set_x_align (StTable      *table,
+                            ClutterActor *child,
+                            StAlign       align)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+
+  meta = get_child_meta (table, child);
+
+  meta->x_align = align;
+  clutter_actor_queue_relayout (child);
+}
+
+/**
+ * st_table_child_get_y_align:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Get the y-align value of the child
+ *
+ * Returns: An #StAlign value
+ */
+StAlign
+st_table_child_get_y_align (StTable      *table,
+                            ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), 0);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
+
+  meta = get_child_meta (table, child);
+
+  return meta->y_align;
+}
+
+/**
+ * st_table_child_set_y_align:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @align: A #StAlign value
+ *
+ * Set the value of the y-align property. This will only have an effect if
+ * y-fill value is set to FALSE.
+ *
+ */
+void
+st_table_child_set_y_align (StTable      *table,
+                            ClutterActor *child,
+                            StAlign       align)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+
+  meta = get_child_meta (table, child);
+
+  meta->y_align = align;
+  clutter_actor_queue_relayout (child);
+}
+
+/**
+ * st_table_child_set_allocate_hidden:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ * @value: %TRUE if the actor should be allocated when hidden
+ *
+ * Set whether the child should be allocate even if it is hidden
+ */
+void
+st_table_child_set_allocate_hidden (StTable      *table,
+                                    ClutterActor *child,
+                                    gboolean      value)
+{
+  StTableChild *meta;
+
+  g_return_if_fail (ST_IS_TABLE (table));
+  g_return_if_fail (CLUTTER_IS_ACTOR (child));
+
+  meta = get_child_meta (table, child);
+
+  if (meta->allocate_hidden != value)
+    {
+      meta->allocate_hidden = value;
+
+      clutter_actor_queue_relayout (child);
+
+      g_object_notify (G_OBJECT (meta), "allocate-hidden");
+    }
+}
+
+/**
+ * st_table_child_get_allocate_hidden:
+ * @table: A #StTable
+ * @child: A #ClutterActor
+ *
+ * Determine if the child is allocated even if it is hidden
+ *
+ * Returns: %TRUE if the actor is allocated when hidden
+ */
+gboolean
+st_table_child_get_allocate_hidden (StTable      *table,
+                                    ClutterActor *child)
+{
+  StTableChild *meta;
+
+  g_return_val_if_fail (ST_IS_TABLE (table), TRUE);
+  g_return_val_if_fail (CLUTTER_IS_ACTOR (child), TRUE);
+
+  meta = get_child_meta (table, child);
+
+  return meta->allocate_hidden;
+}
--- a/src/st/st-table-child.h
+++ b/src/st/st-table-child.h
@@ -0,0 +1,124 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * st-table-child.h: Table child implementation
+ *
+ * Copyright 2008, 2009 Intel Corporation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
+#error "Only <st/st.h> can be included directly.h"
+#endif
+
+#ifndef __ST_TABLE_CHILD_H__
+#define __ST_TABLE_CHILD_H__
+
+#include <st/st-types.h>
+#include <st/st-widget.h>
+#include <st/st-table.h>
+#include <clutter/clutter.h>
+
+G_BEGIN_DECLS
+
+#define ST_TYPE_TABLE_CHILD          (st_table_child_get_type ())
+#define ST_TABLE_CHILD(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_TABLE_CHILD, StTableChild))
+#define ST_IS_TABLE_CHILD(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_TABLE_CHILD))
+#define ST_TABLE_CHILD_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), ST_TYPE_TABLE_CHILD, StTableChildClass))
+#define ST_IS_TABLE_CHILD_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), ST_TYPE_TABLE_CHILD))
+#define ST_TABLE_CHILD_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), ST_TYPE_TABLE_CHILD, StTableChildClass))
+
+typedef struct _StTableChild         StTableChild;
+typedef struct _StTableChildClass    StTableChildClass;
+
+/**
+ * StTableChild:
+ *
+ * The contents of the this structure are private and should only be accessed
+ * through the public API.
+ */
+struct _StTableChild
+{
+  /*< private >*/
+  ClutterChildMeta parent_instance;
+
+  gint col;
+  gint row;
+  gint col_span;
+  gint row_span;
+  StAlign x_align;
+  StAlign y_align;
+  guint allocate_hidden : 1;
+  guint x_expand : 1;
+  guint y_expand : 1;
+  guint x_fill : 1;
+  guint y_fill : 1;
+};
+
+
+struct _StTableChildClass
+{
+  ClutterChildMetaClass parent_class;
+};
+
+GType st_table_child_get_type (void) G_GNUC_CONST;
+
+gint     st_table_child_get_col_span        (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_col_span        (StTable      *table,
+                                             ClutterActor *child,
+                                             gint          span);
+gint     st_table_child_get_row_span        (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_row_span        (StTable      *table,
+                                             ClutterActor *child,
+                                             gint          span);
+gboolean st_table_child_get_x_fill          (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_x_fill          (StTable      *table,
+                                             ClutterActor *child,
+                                             gboolean      fill);
+gboolean st_table_child_get_y_fill          (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_y_fill          (StTable      *table,
+                                             ClutterActor *child,
+                                             gboolean      fill);
+gboolean st_table_child_get_x_expand        (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_x_expand        (StTable      *table,
+                                             ClutterActor *child,
+                                             gboolean      expand);
+gboolean st_table_child_get_y_expand        (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_y_expand        (StTable      *table,
+                                             ClutterActor *child,
+                                             gboolean      expand);
+StAlign  st_table_child_get_x_align         (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_x_align         (StTable      *table,
+                                             ClutterActor *child,
+                                             StAlign       align);
+StAlign  st_table_child_get_y_align         (StTable      *table,
+                                             ClutterActor *child);
+void     st_table_child_set_y_align         (StTable      *table,
+                                             ClutterActor *child,
+                                             StAlign       align);
+void     st_table_child_set_allocate_hidden (StTable      *table,
+                                             ClutterActor *child,
+                                             gboolean      value);
+gboolean st_table_child_get_allocate_hidden (StTable      *table,
+                                             ClutterActor *child);
+
+G_END_DECLS
+
+#endif /* __ST_TABLE_H__ */
--- a/src/st/st-table-private.h
+++ b/src/st/st-table-private.h
@@ -0,0 +1,34 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * st-private-private.h: Private declarations for StTable
+ *
+ * Copyright 2007 OpenedHand
+ * Copyright 2009 Intel Corporation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ST_TABLE_PRIVATE_H__
+#define __ST_TABLE_PRIVATE_H__
+
+#include "st-table.h"
+
+G_BEGIN_DECLS
+
+void _st_table_update_row_col (StTable *table,
+			       gint     row,
+			       gint     col);
+
+G_END_DECLS
+
+#endif /* __ST_TABLE_PRIVATE_H__ */
--- a/src/st/st-table.c
+++ b/src/st/st-table.c
--- a/src/st/st-table.h
+++ b/src/st/st-table.h
@@ -0,0 +1,90 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * st-table.h: Table layout widget
+ *
+ * Copyright 2008, 2009 Intel Corporation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
+#error "Only <st/st.h> can be included directly.h"
+#endif
+
+#ifndef __ST_TABLE_H__
+#define __ST_TABLE_H__
+
+#include <st/st-types.h>
+#include <st/st-widget.h>
+
+G_BEGIN_DECLS
+
+/**
+ * StTableChildOptions:
+ * @ST_KEEP_ASPECT_RATIO: whether to respect the widget's aspect ratio
+ * @ST_X_EXPAND: whether to allocate extra space on the widget's x-axis
+ * @ST_Y_EXPAND: whether to allocate extra space on the widget's y-axis
+ * @ST_X_FILL: whether to stretch the child to fill the cell horizontally
+ * @ST_Y_FILL: whether to stretch the child to fill the cell vertically
+ *
+ * Denotes the child properties an StTable child will have.
+ */
+typedef enum
+{
+  ST_KEEP_ASPECT_RATIO = 1 << 0,
+  ST_X_EXPAND          = 1 << 1,
+  ST_Y_EXPAND          = 1 << 2,
+  ST_X_FILL            = 1 << 3,
+  ST_Y_FILL            = 1 << 4
+} StTableChildOptions;
+
+#define ST_TYPE_TABLE                (st_table_get_type ())
+#define ST_TABLE(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_TABLE, StTable))
+#define ST_IS_TABLE(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_TABLE))
+#define ST_TABLE_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), ST_TYPE_TABLE, StTableClass))
+#define ST_IS_TABLE_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), ST_TYPE_TABLE))
+#define ST_TABLE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), ST_TYPE_TABLE, StTableClass))
+
+typedef struct _StTable              StTable;
+typedef struct _StTablePrivate       StTablePrivate;
+typedef struct _StTableClass         StTableClass;
+
+/**
+ * StTable:
+ *
+ * The contents of this structure is private and should only be accessed using
+ * the provided API.
+ */
+struct _StTable
+{
+  /*< private >*/
+  StWidget parent_instance;
+
+  StTablePrivate *priv;
+};
+
+struct _StTableClass
+{
+  StWidgetClass parent_class;
+};
+
+GType st_table_get_type (void) G_GNUC_CONST;
+
+StWidget* st_table_new (void);
+
+gint st_table_get_row_count    (StTable *table);
+gint st_table_get_column_count (StTable *table);
+
+G_END_DECLS
+
+#endif /* __ST_TABLE_H__ */
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,6 +18,7 @@ TEST_JS =					\
 	interactive/inline-style.js		\
 	interactive/scrolling.js		\
 	interactive/scroll-view-sizing.js	\
+	interactive/table.js			\
 	interactive/test-title.js		\
 	interactive/transitions.js		\
 	testcommon/100-200.svg			\
--- a/tests/interactive/table.js
+++ b/tests/interactive/table.js
@@ -0,0 +1,57 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+
+const UI = imports.testcommon.ui;
+
+function test() {
+    let stage = new Clutter.Stage({ width: 600, height: 600 });
+    UI.init(stage);
+
+    let vbox = new St.BoxLayout({ vertical: true,
+                                  width: stage.width,
+                                  height: stage.height,
+                                  style: 'padding: 10px; '
+                                  + 'spacing: 10px;'
+                                  + 'font: 15px sans-serif;' });
+    stage.add_actor(vbox);
+
+    function L(text, color) {
+        return new St.Label({ text: text,
+                              style: "background: " + color + ";"
+                              + "border: 1px solid rgba(0,0,0,0.5);"
+                              + "padding: 1em;" });
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////
+
+    let table = new St.Table({ style: "border: 10px solid #888888;"
+                               + "padding: 10px;"
+                               + "spacing-rows: 5px;"
+                               + "spacing-columns: 15px;" });
+    vbox.add(table, { expand: true });
+
+    table.add(L("1", "#ff0000"),
+              { row: 0, col: 0, col_span: 3 });
+    table.add(L("2", "#00ff00"),
+              { row: 1, col: 0, row_span: 2 });
+    table.add(L("3", "#0000ff"),
+              { row: 1, col: 1,
+                x_expand: 0 });
+    table.add(L("4", "#ffff00"),
+              { row: 1, col: 2,
+                y_expand: 0, y_fill: 0
+              });
+    table.add(L("5", "#ff00ff"),
+              { row: 2, col: 1, x_expand: 0 });
+    table.add(L("6", "#00ffff"),
+              { row: 2, col: 2,
+                x_expand: 0, x_fill: 0, x_align: St.Align.END,
+                y_expand: 0, y_fill: 0, y_align: St.Align.END });
+
+    ////////////////////////////////////////////////////////////////////////////////
+
+    UI.main(stage);
+}
+test();
Author	SHA1	Message	Date
Alberts Muktupāvels	138f457949	ui/shellDBus.js: move ShowOSD to org.gnome.Shell.OSD	2015-04-02 23:43:38 +03:00
Alberts Muktupāvels	7a049499f6	ui/shellDBus.js: move key grabber to org.gnome.Shell.KeyGrabber	2015-04-02 23:43:38 +03:00
Alberts Muktupāvels	4cb4157802	acquire 5 more dbus names org.gnome.Shell.KeyGrabber, org.gnome.Shell.OSD, org.gnome.Shell.Screencast, org.gnome.Shell.Screenshot, org.gnome.SessionManager.EndSessionDialog	2015-04-02 23:43:38 +03:00