spinner: use a 60fps spinner

- sync with gtk+ and provide a fluid spinner

https://bugzilla.gnome.org/show_bug.cgi?id=753064

NEWS

@@ -1,3 +1,154 @@
+3.17.4
+======
+* Fix fuzziness of app menu icon [Jakub; #747932]
+* Implement 4 finger swipe gesture for touchpads [Carlos; #752250]
+* Misc. bug fixes [Florian, Alexandre, Piotr, Ray, Mario; #751921, #659969,
+  #752438, #752675]
+
+Contributors:
+  Piotr Drąg, Alexandre Franke, Carlos Garnacho, Florian Müllner,
+  Mario Sanchez Prada, Jakub Steiner, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Benjamin Steinwender [de], Pedro Albuquerque [pt], Fabio Tomat [fur],
+  Matej Urbančič [sl], Daniel Mustieles [es], Yosef Or Boczko [he],
+  Daniel Martinez [an]
+
+3.17.3
+======
+* Handle touch events in OSK on wayland [Rui; #750287]
+* Reinstate left/right movement to window menu [Ron; #751344]
+* Allow extensions to disable "Window is ready" notification [Adel; #748846]
+* Misc. bug fixes [Watson, Michael, Ray, Rui, Florian, Cosimo; #750465,
+  #751016, #751517, #750714, #751541, #751599]
+
+Contributors:
+  Michael Biebl, Cosimo Cecchi, Adel Gadllah, Rui Matos, Florian Müllner,
+  Ray Strode, Wim Taymans, Ron Yorston, Watson Yuuma Sato
+
+Translations:
+  Sebastian Rasmussen [sv], Dimitris Spingos [el], Muhammet Kara [tr],
+  Stas Solovey [ru], Benjamin Steinwender [de], Balázs Úr [hu],
+  Victor Ibragimov [tg], Dušan Kazik [sk], Pedro Albuquerque [pt]
+
+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]
+* Improve accessibility of legacy tray [Florian; #746487]
+* Fix legacy status icons leaking into other monitors [Florian; #745824]
+
+Contributors:
+  Florian Müllner, Ray Strode
+
+Translations:
+  Daniel Martinez [an], Sebastian Rasmussen [sv], Fran Dieguez [gl],
+  Andika Triwidada [id], Jordi Mas [ca], Kjartan Maraas [nb],
+  Inaki Larranaga Murgoitio [eu], Muhammet Kara [tr], Khaled Hosny [ar],
+  Bernd Homuth [de], Jiro Matsuzawa [ja]
+
+3.15.92
+=======
+* gdm: Fix user list accessibility [Florian; #729603]
+* Handle multiline questions in mount operations [Ross; #745713]
+* Improve classic theme [Jakub; #745686, #745687]
+* Fix ordering of calendar events [Florian; #745988]
+* Pick first input source for new windows when per-window [Rui; #746037]
+* networkAgent: Show a notification for non-user-initiated password requests
+  [Giovanni; #660293]
+* Fix dismissing calendar events [Florian; #744927]
+* Add legacy tray to ctrl-alt-tab popup [Florian; #746022]
+* Manage on-screen-keyboard visibility in gnome-shell [Carlos; #745977]
+* Add pointer barriers to legacy tray [Cosimo; #746026]
+* Use fallback when app icon cannot be resolved [Cosimo; #746219]
+* Fix handling of removed smartcard at startup [Ray; #740143]
+* gdm: Don't pick a random session for the user [Jasper; #740142]
+* Make menu selection behavior consistent with GTK [Florian; #745246]
+* gdm: Fix empty user list on user switching [Ray; #719418]
+* Misc bug fixes [Florian, Giovanni, Clément, Rui; #745666, #746019, #745861,
+  #746027, #746223, #737502, #746343, #746288]
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Piotr Drąg, Adel Gadllah, Carlos Garnacho,
+  Clément Guérin, Ross Lagerwall, Rui Matos, Florian Müllner, Jakub Steiner,
+  Jasper St. Pierre, Ray Strode
+
+Translations:
+  Piotr Drąg [pl], Changwoo Ryu [ko], Milo Casagrande [it],
+  Baurzhan Muftakhidinov [kk], Мирослав Николић [sr, sr@latin], Balázs Úr [hu],
+  IWAI, Masaharu [ja], Daniel Korostil [uk], Aurimas Černius [lt],
+  Matej Urbančič [sl], Daniel Mustieles [es], Kjartan Maraas [nb],
+  Victor Ibragimov [tg], Claude Paroz [fr], Jordi Mas [ca], Bernd Homuth [de],
+  Muhammet Kara [tr], Frédéric Péters [fr], Jiri Grönroos [fi],
+  Alexander Shopov [bg], Stas Solovey [ru], Trần Ngọc Quân [vi],
+  Samir Ribic [bs], Dušan Kazik [sk], Enrico Nicoletto [pt_BR],
+  Marek Černocký [cs], A S Alam [pa], Ask Hjorth Larsen [da],
+  Tom Tryfonidis [el], Alexandre Franke [fr], Yosef Or Boczko [he],
+  Chao-Hsiung Liao [zh_TW]
+
 3.15.91
 =======
 * Don't disable all shortcuts while non-panel menus are open [Florian; #745039]

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.15.91],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.17.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -63,8 +63,8 @@ AC_ARG_ENABLE([systemd],
               [enable_systemd=$enableval],
               [enable_systemd=auto])
 AS_IF([test x$enable_systemd != xno], [
-  AC_MSG_CHECKING([for libsystemd-journal])
+  AC_MSG_CHECKING([for libsystemd])
-  PKG_CHECK_EXISTS([libsystemd-journal],
+  PKG_CHECK_EXISTS([libsystemd],
                    [have_systemd=yes
                     AC_DEFINE([HAVE_SYSTEMD], [1], [Define if we have systemd])],
                    [have_systemd=no])
@@ -76,9 +76,9 @@ 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.15.91
+MUTTER_MIN_VERSION=3.17.4
 GTK_MIN_VERSION=3.15.0
-GIO_MIN_VERSION=2.37.0
+GIO_MIN_VERSION=2.45.3
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.13.90
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
@@ -106,7 +106,7 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
             polkit-agent-1 >= $POLKIT_MIN_VERSION
             gcr-base-3 >= $GCR_MIN_VERSION"
 if test x$have_systemd = xyes; then
-  SHARED_PCS="${SHARED_PCS} libsystemd-journal"
+  SHARED_PCS="${SHARED_PCS} libsystemd"
 fi
 
 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)

data/gnome-shell-theme.gresource.xml

@@ -32,8 +32,10 @@
     <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>

data/org.gnome.shell.gschema.xml.in.in

@@ -51,6 +51,7 @@
     </key>
     <key name="looking-glass-history" type="as">
       <default>[]</default>
+      <!-- Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass -->
       <_summary>History for the looking glass dialog</_summary>
     </key>
     <key name="always-show-log-out" type="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="29"
+   width="24"
-   height="29"
+   height="24"
    id="svg10621"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="calendar-today.svg">
   <defs
      id="defs10623">
@@ -118,17 +118,6 @@
        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"
@@ -137,22 +126,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
+     inkscape:zoom="8"
-     inkscape:cx="20.652108"
+     inkscape:cx="-23.537329"
-     inkscape:cy="11.839084"
+     inkscape:cy="-31.442864"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1280"
+     inkscape:window-width="2133"
-     inkscape:window-height="741"
+     inkscape:window-height="1241"
-     inkscape:window-x="0"
+     inkscape:window-x="238"
-     inkscape:window-y="27"
+     inkscape:window-y="88"
-     inkscape:window-maximized="1"
+     inkscape:window-maximized="0"
-     borderlayer="true">
+     borderlayer="true"
+     inkscape:showpageshadow="false">
     <inkscape:grid
        type="xygrid"
        id="grid3109"
@@ -169,7 +159,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>
@@ -177,28 +167,12 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-469.08263,-532.99307)">
+     transform="translate(-469.08263,-537.99307)">
-    <path
+    <circle
-       sodipodi:type="arc"
+       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"
-       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="path7305"
-       id="path34506-3"
+       cx="481.57138"
-       sodipodi:cx="51"
+       cy="559.4649"
-       sodipodi:cy="30"
+       r="1.5" />
-       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>

data/theme/gnome-shell-high-contrast.css

@@ -37,14 +37,13 @@ stage {
   icon-shadow: 0 1px black; }
   .button:focus {
     color: #eeeeec;
-    border-color: #215d9c;
-    box-shadow: inset 0 1px #454f52;
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px #215d9c; }
   .button:insensitive {
-    color: #7f7f7f;
+    color: gray;
     border-color: rgba(0, 0, 0, 0.7);
-    background-color: rgba(62, 67, 68, 0.7);
+    background-color: rgba(62, 67, 69, 0.7);
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
@@ -52,9 +51,46 @@ stage {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-color: #222728;
+    box-shadow: inset 0 0 black;
+    text-shadow: none;
+    icon-shadow: none; }
+
+.modal-dialog-linked-button {
+  border-right-width: 1px;
+  color: #eeeeec;
+  background-color: #2e3436;
+  border-color: rgba(0, 0, 0, 0.7);
+  box-shadow: inset 0 1px #454f52;
+  text-shadow: 0 1px black;
+  icon-shadow: 0 1px black;
+  padding: 12px; }
+  .modal-dialog-linked-button:insensitive {
+    color: gray;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-color: rgba(62, 67, 69, 0.7);
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
+  .modal-dialog-linked-button:active {
+    color: white;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-color: #222728;
+    box-shadow: inset 0 0 black;
+    text-shadow: none;
+    icon-shadow: none; }
+  .modal-dialog-linked-button:focus {
+    color: #eeeeec;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px #215d9c; }
+  .modal-dialog-linked-button:first-child {
+    border-radius: 0px 0px 0px 6px; }
+  .modal-dialog-linked-button:last-child {
+    border-right-width: 0px;
+    border-radius: 0px 0px 6px 0px; }
+  .modal-dialog-linked-button:first-child:last-child {
+    border-right-width: 0px;
+    border-radius: 0px 0px 6px 6px; }
 
 /* Entries */
 StEntry {
@@ -71,8 +107,8 @@ StEntry {
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.4);
     border-color: rgba(166, 166, 166, 0.5); }
   StEntry:insensitive {
-    color: #7f7f7f;
+    color: gray;
-    border-color: #0d0d0d;
+    border-color: #0e0e0e;
     box-shadow: none; }
   StEntry StIcon.capslock-warning {
     icon-size: 16px;
@@ -95,10 +131,10 @@ StScrollBar {
     background-color: transparent; }
   StScrollBar StButton#vhandle, StScrollBar StButton#hhandle {
     border-radius: 8px;
-    background-color: #000;
+    background-color: #999999;
     margin: 3px; }
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
-      background-color: #1a1a1a; }
+      background-color: #cccccc; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
       background-color: #215d9c; }
 
@@ -106,7 +142,7 @@ StScrollBar {
 .slider {
   height: 1em;
   -slider-height: 0.3em;
-  -slider-background-color: #0d0d0d;
+  -slider-background-color: #0e0e0e;
   -slider-border-color: black;
   -slider-active-background-color: #215d9c;
   -slider-active-border-color: #184472;
@@ -160,10 +196,11 @@ StScrollBar {
   background-color: white; }
 
 .modal-dialog {
-  border-radius: 5px;
+  border-radius: 9px;
   color: #eeeeec;
   background-color: rgba(23, 25, 26, 0.95);
-  border: 3px solid rgba(238, 238, 236, 0.5);
+  border: 3px solid rgba(238, 238, 236, 0.5); }
+  .modal-dialog .modal-dialog-content-box {
     padding: 24px; }
   .modal-dialog .run-dialog-entry {
     width: 20em;
@@ -179,10 +216,6 @@ StScrollBar {
     color: #d6d6d1;
     padding-bottom: .4em; }
 
-.button-dialog-button-box {
-  spacing: 18px;
-  padding-top: 48px; }
-
 .show-processes-dialog-subject,
 .mount-question-dialog-subject,
 .end-session-dialog-subject {
@@ -393,7 +426,7 @@ StScrollBar {
       background-color: black;
       box-shadow: inset 0 1px 0px #0d0d0d;
       font-weight: bold; }
-    .popup-menu .popup-menu-item:hover, .popup-menu .popup-menu-item:focus {
+    .popup-menu .popup-menu-item.selected {
       background-color: rgba(255, 255, 255, 0.1);
       color: #fff; }
     .popup-menu .popup-menu-item:active {
@@ -401,8 +434,6 @@ StScrollBar {
       color: #ffffff; }
     .popup-menu .popup-menu-item:insensitive {
       color: rgba(255, 255, 255, 0.5); }
-  .popup-menu .active {
-    background-color: #215d9c; }
   .popup-menu .popup-inactive-menu-item {
     color: #fff; }
     .popup-menu .popup-inactive-menu-item:insensitive {
@@ -413,7 +444,7 @@ StScrollBar {
 
 .popup-menu-ornament {
   text-align: right;
-  width: 1em; }
+  width: 1.2em; }
 
 .popup-menu-boxpointer,
 .candidate-popup-boxpointer {
@@ -490,8 +521,7 @@ StScrollBar {
 
 .switcher-arrow {
   border-color: transparent;
-  color: black; }
+  color: rgba(255, 255, 255, 0.8); }
-
   .switcher-arrow:highlighted {
     color: #fff; }
 
@@ -563,7 +593,7 @@ StScrollBar {
     -panel-corner-border-color: transparent; }
     #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
       -panel-corner-border-color: #256ab1; }
-    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
+    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-corner.unlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
       -panel-corner-border-color: transparent; }
@@ -705,15 +735,16 @@ StScrollBar {
   border-left-width: 1px; }
 
 .calendar-nonwork-day {
-  color: #7f7f7f; }
+  color: gray; }
 
 .calendar-today {
   font-weight: bold;
   border: 1px solid rgba(0, 0, 0, 0.5); }
 
 .calendar-day-with-events {
-  color: #f2f2f2;
+  color: white;
-  font-weight: bold; }
+  font-weight: bold;
+  background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg"); }
 
 .calendar-other-month-day {
   color: rgba(255, 255, 255, 0.15);
@@ -818,7 +849,7 @@ StScrollBar {
 .popup-menu-icon {
   icon-size: 1.09em; }
 
-.window-close, .notification-close {
+.window-close {
   background-image: url("resource:///org/gnome/shell/theme/close-window.svg");
   background-size: 32px;
   height: 32px;
@@ -829,12 +860,6 @@ StScrollBar {
   .window-close:rtl {
     -st-background-image-shadow: 2px 2px 6px rgba(0, 0, 0, 0.5); }
 
-.notification-close {
-  -shell-close-overlap-x: 14px;
-  -shell-close-overlap-y: -12px; }
-  .notification-close:rtl {
-    -shell-close-overlap-x: -14px; }
-
 /* NETWORK DIALOGS */
 .nm-dialog {
   max-height: 500px;
@@ -842,7 +867,8 @@ StScrollBar {
   min-width: 470px; }
 
 .nm-dialog-content {
-  spacing: 20px; }
+  spacing: 20px;
+  padding: 24px; }
 
 .nm-dialog-header-hbox {
   spacing: 10px; }
@@ -1024,7 +1050,7 @@ StScrollBar {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-color: #222728;
-    box-shadow: none;
+    box-shadow: inset 0 0 black;
     text-shadow: none;
     icon-shadow: none; }
   .app-view-control:first-child {
@@ -1190,32 +1216,6 @@ StScrollBar {
     .notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
       background-color: #292f30; }
 
-.notification {
-  font-size: 11pt;
-  width: 34em;
-  margin: 5px;
-  border-radius: 6px;
-  color: #eeeeec;
-  background-color: #2e3436;
-  border: 1px solid black;
-  spacing-rows: 4px;
-  padding: 8px;
-  spacing-columns: 10px; }
-
-.notification-unexpanded {
-  min-height: 48px;
-  height: 48px; }
-
-.notification-with-image {
-  min-height: 159px; }
-
-.notification-body {
-  spacing: 5px; }
-
-.notification-actions {
-  paddinf-top: 18px;
-  spacing: 6px; }
-
 .summary-source-counter {
   font-size: 10pt;
   font-weight: bold;
@@ -1229,36 +1229,20 @@ StScrollBar {
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
   border-radius: 0.9em; }
 
-.notification-scrollview {
-  max-height: 18em;
-  -st-vfade-offset: 24px; }
-  .notification-scrollview:ltr > StScrollBar {
-    padding-left: 6px; }
-  .notification-scrollview:rtl > StScrollBar {
-    padding-right: 6px; }
-
-.notification-button {
-  height: 24px; }
-
-.notification-icon-button {
-  border-radius: 5px;
-  padding: 5px;
-  height: 24px;
-  width: 24px; }
-  .notification-icon-button > StIcon {
-    icons-size: 16px;
-    width: 16px;
-    height: 16px;
-    padding: 2px; }
-
 .secondary-icon {
   icon-size: 1.09em; }
 
+.chat-body {
+  spacing: 5px; }
+
+.chat-response {
+  margin: 5px; }
+
 .chat-log-message {
   color: #e6e6e6; }
 
-.chat-empty-line {
+.chat-new-group {
-  font-size: 4px; }
+  padding-top: 1em; }
 
 .chat-received {
   padding-left: 4px; }
@@ -1282,9 +1266,6 @@ StScrollBar {
     padding-left: 0;
     padding-right: 4px; }
 
-.chat-notification-scrollview {
-  max-height: 22em; }
-
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px; }
@@ -1388,10 +1369,9 @@ StScrollBar {
   color: white; }
   .keyboard-key:focus {
     color: #eeeeec;
-    border-color: #215d9c;
-    box-shadow: inset 0 1px #454f52;
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px #215d9c; }
   .keyboard-key:hover, .keyboard-key:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -1403,7 +1383,7 @@ StScrollBar {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-color: #222728;
-    box-shadow: none;
+    box-shadow: inset 0 0 black;
     text-shadow: none;
     icon-shadow: none; }
   .keyboard-key:grayed {
@@ -1496,13 +1476,13 @@ StScrollBar {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-color: #1c5187;
-        box-shadow: none;
+        box-shadow: inset 0 0 black;
         text-shadow: none;
         icon-shadow: none; }
       .login-dialog .modal-dialog-button:default:insensitive {
-        color: #7f7f7f;
+        color: gray;
         border-color: rgba(0, 0, 0, 0.7);
-        background-color: rgba(62, 67, 68, 0.7);
+        background-color: rgba(62, 67, 69, 0.7);
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -1749,3 +1729,11 @@ 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"); }

data/theme/gnome-shell-high-contrast.scss

@@ -6,3 +6,9 @@
 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"); }
+}

data/theme/gnome-shell.css

@@ -37,14 +37,13 @@ stage {
   icon-shadow: 0 1px black; }
   .button:focus {
     color: #eeeeec;
-    border-color: #215d9c;
-    box-shadow: inset 0 1px #454f52;
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px #215d9c; }
   .button:insensitive {
-    color: #939695;
+    color: #949796;
     border-color: rgba(0, 0, 0, 0.7);
-    background-color: rgba(66, 71, 73, 0.7);
+    background-color: rgba(66, 72, 73, 0.7);
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
@@ -52,9 +51,46 @@ stage {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-color: #222728;
+    box-shadow: inset 0 0 black;
+    text-shadow: none;
+    icon-shadow: none; }
+
+.modal-dialog-linked-button {
+  border-right-width: 1px;
+  color: #eeeeec;
+  background-color: #2e3436;
+  border-color: rgba(0, 0, 0, 0.7);
+  box-shadow: inset 0 1px #454f52;
+  text-shadow: 0 1px black;
+  icon-shadow: 0 1px black;
+  padding: 12px; }
+  .modal-dialog-linked-button:insensitive {
+    color: #949796;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-color: rgba(66, 72, 73, 0.7);
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
+  .modal-dialog-linked-button:active {
+    color: white;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-color: #222728;
+    box-shadow: inset 0 0 black;
+    text-shadow: none;
+    icon-shadow: none; }
+  .modal-dialog-linked-button:focus {
+    color: #eeeeec;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px #215d9c; }
+  .modal-dialog-linked-button:first-child {
+    border-radius: 0px 0px 0px 6px; }
+  .modal-dialog-linked-button:last-child {
+    border-right-width: 0px;
+    border-radius: 0px 0px 6px 0px; }
+  .modal-dialog-linked-button:first-child:last-child {
+    border-right-width: 0px;
+    border-radius: 0px 0px 6px 6px; }
 
 /* Entries */
 StEntry {
@@ -71,8 +107,8 @@ StEntry {
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.4);
     border-color: rgba(154, 154, 142, 0.5); }
   StEntry:insensitive {
-    color: #939695;
+    color: #949796;
-    border-color: #323636;
+    border-color: #333636;
     box-shadow: none; }
   StEntry StIcon.capslock-warning {
     icon-size: 16px;
@@ -95,10 +131,10 @@ StScrollBar {
     background-color: transparent; }
   StScrollBar StButton#vhandle, StScrollBar StButton#hhandle {
     border-radius: 8px;
-    background-color: #393f3f;
+    background-color: #a6a8a7;
     margin: 3px; }
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
-      background-color: #515a5a; }
+      background-color: #cacbc9; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
       background-color: #215d9c; }
 
@@ -106,7 +142,7 @@ StScrollBar {
 .slider {
   height: 1em;
   -slider-height: 0.3em;
-  -slider-background-color: #323636;
+  -slider-background-color: #333636;
   -slider-border-color: #1c1f1f;
   -slider-active-background-color: #215d9c;
   -slider-active-border-color: #184472;
@@ -160,10 +196,11 @@ StScrollBar {
   background-color: white; }
 
 .modal-dialog {
-  border-radius: 5px;
+  border-radius: 9px;
   color: #eeeeec;
   background-color: rgba(23, 25, 26, 0.95);
-  border: 3px solid rgba(238, 238, 236, 0.5);
+  border: 3px solid rgba(238, 238, 236, 0.5); }
+  .modal-dialog .modal-dialog-content-box {
     padding: 24px; }
   .modal-dialog .run-dialog-entry {
     width: 20em;
@@ -179,10 +216,6 @@ StScrollBar {
     color: #d6d6d1;
     padding-bottom: .4em; }
 
-.button-dialog-button-box {
-  spacing: 18px;
-  padding-top: 48px; }
-
 .show-processes-dialog-subject,
 .mount-question-dialog-subject,
 .end-session-dialog-subject {
@@ -393,7 +426,7 @@ StScrollBar {
       background-color: #343a3a;
       box-shadow: inset 0 1px 0px #282c2c;
       font-weight: bold; }
-    .popup-menu .popup-menu-item:hover, .popup-menu .popup-menu-item:focus {
+    .popup-menu .popup-menu-item.selected {
       background-color: rgba(238, 238, 236, 0.1);
       color: #eeeeec; }
     .popup-menu .popup-menu-item:active {
@@ -401,8 +434,6 @@ StScrollBar {
       color: #ffffff; }
     .popup-menu .popup-menu-item:insensitive {
       color: rgba(238, 238, 236, 0.5); }
-  .popup-menu .active {
-    background-color: #215d9c; }
   .popup-menu .popup-inactive-menu-item {
     color: #eeeeec; }
     .popup-menu .popup-inactive-menu-item:insensitive {
@@ -413,7 +444,7 @@ StScrollBar {
 
 .popup-menu-ornament {
   text-align: right;
-  width: 1em; }
+  width: 1.2em; }
 
 .popup-menu-boxpointer,
 .candidate-popup-boxpointer {
@@ -490,8 +521,7 @@ StScrollBar {
 
 .switcher-arrow {
   border-color: transparent;
-  color: #1c1f1f; }
+  color: rgba(238, 238, 236, 0.8); }
-
   .switcher-arrow:highlighted {
     color: #eeeeec; }
 
@@ -563,7 +593,7 @@ StScrollBar {
     -panel-corner-border-color: transparent; }
     #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
       -panel-corner-border-color: #256ab1; }
-    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
+    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-corner.unlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
       -panel-corner-border-color: transparent; }
@@ -705,15 +735,16 @@ StScrollBar {
   border-left-width: 1px; }
 
 .calendar-nonwork-day {
-  color: #939695; }
+  color: #949796; }
 
 .calendar-today {
   font-weight: bold;
   border: 1px solid rgba(28, 31, 31, 0.5); }
 
 .calendar-day-with-events {
-  color: #e2e2df;
+  color: white;
-  font-weight: bold; }
+  font-weight: bold;
+  background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg"); }
 
 .calendar-other-month-day {
   color: rgba(238, 238, 236, 0.15);
@@ -818,7 +849,7 @@ StScrollBar {
 .popup-menu-icon {
   icon-size: 1.09em; }
 
-.window-close, .notification-close {
+.window-close {
   background-image: url("resource:///org/gnome/shell/theme/close-window.svg");
   background-size: 32px;
   height: 32px;
@@ -829,12 +860,6 @@ StScrollBar {
   .window-close:rtl {
     -st-background-image-shadow: 2px 2px 6px rgba(0, 0, 0, 0.5); }
 
-.notification-close {
-  -shell-close-overlap-x: 14px;
-  -shell-close-overlap-y: -12px; }
-  .notification-close:rtl {
-    -shell-close-overlap-x: -14px; }
-
 /* NETWORK DIALOGS */
 .nm-dialog {
   max-height: 500px;
@@ -842,7 +867,8 @@ StScrollBar {
   min-width: 470px; }
 
 .nm-dialog-content {
-  spacing: 20px; }
+  spacing: 20px;
+  padding: 24px; }
 
 .nm-dialog-header-hbox {
   spacing: 10px; }
@@ -1024,7 +1050,7 @@ StScrollBar {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-color: #222728;
-    box-shadow: none;
+    box-shadow: inset 0 0 black;
     text-shadow: none;
     icon-shadow: none; }
   .app-view-control:first-child {
@@ -1190,32 +1216,6 @@ StScrollBar {
     .notification-banner .notification-button:hover, .notification-banner .notification-buttonfocus {
       background-color: #292f30; }
 
-.notification {
-  font-size: 11pt;
-  width: 34em;
-  margin: 5px;
-  border-radius: 6px;
-  color: #eeeeec;
-  background-color: #2e3436;
-  border: 1px solid #1c1f1f;
-  spacing-rows: 4px;
-  padding: 8px;
-  spacing-columns: 10px; }
-
-.notification-unexpanded {
-  min-height: 48px;
-  height: 48px; }
-
-.notification-with-image {
-  min-height: 159px; }
-
-.notification-body {
-  spacing: 5px; }
-
-.notification-actions {
-  paddinf-top: 18px;
-  spacing: 6px; }
-
 .summary-source-counter {
   font-size: 10pt;
   font-weight: bold;
@@ -1229,36 +1229,20 @@ StScrollBar {
   box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
   border-radius: 0.9em; }
 
-.notification-scrollview {
-  max-height: 18em;
-  -st-vfade-offset: 24px; }
-  .notification-scrollview:ltr > StScrollBar {
-    padding-left: 6px; }
-  .notification-scrollview:rtl > StScrollBar {
-    padding-right: 6px; }
-
-.notification-button {
-  height: 24px; }
-
-.notification-icon-button {
-  border-radius: 5px;
-  padding: 5px;
-  height: 24px;
-  width: 24px; }
-  .notification-icon-button > StIcon {
-    icons-size: 16px;
-    width: 16px;
-    height: 16px;
-    padding: 2px; }
-
 .secondary-icon {
   icon-size: 1.09em; }
 
+.chat-body {
+  spacing: 5px; }
+
+.chat-response {
+  margin: 5px; }
+
 .chat-log-message {
   color: #d6d6d1; }
 
-.chat-empty-line {
+.chat-new-group {
-  font-size: 4px; }
+  padding-top: 1em; }
 
 .chat-received {
   padding-left: 4px; }
@@ -1282,9 +1266,6 @@ StScrollBar {
     padding-left: 0;
     padding-right: 4px; }
 
-.chat-notification-scrollview {
-  max-height: 22em; }
-
 .hotplug-transient-box {
   spacing: 6px;
   padding: 2px 72px 2px 12px; }
@@ -1388,10 +1369,9 @@ StScrollBar {
   color: white; }
   .keyboard-key:focus {
     color: #eeeeec;
-    border-color: #215d9c;
-    box-shadow: inset 0 1px #454f52;
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    box-shadow: inset 0px 0px 0px 1px #215d9c; }
   .keyboard-key:hover, .keyboard-key:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -1403,7 +1383,7 @@ StScrollBar {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-color: #222728;
-    box-shadow: none;
+    box-shadow: inset 0 0 black;
     text-shadow: none;
     icon-shadow: none; }
   .keyboard-key:grayed {
@@ -1496,13 +1476,13 @@ StScrollBar {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-color: #1c5187;
-        box-shadow: none;
+        box-shadow: inset 0 0 black;
         text-shadow: none;
         icon-shadow: none; }
       .login-dialog .modal-dialog-button:default:insensitive {
-        color: #939695;
+        color: #949796;
         border-color: rgba(0, 0, 0, 0.7);
-        background-color: rgba(66, 71, 73, 0.7);
+        background-color: rgba(66, 72, 73, 0.7);
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }

data/theme/toggle-off-hc.svg

@@ -0,0 +1,133 @@
+<?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>

data/theme/toggle-on-hc.svg

@@ -0,0 +1,113 @@
+<?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>

data/theme/toggle-on-intl.svg

@@ -14,7 +14,7 @@
    height="22"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="toggle-on-intl.svg">
   <defs
      id="defs2859">
@@ -52,7 +52,7 @@
       <stop
          id="stop77465"
          offset="1"
-         style="stop-color:#204a87;stop-opacity:1" />
+         style="stop-color:#205b9a;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -88,14 +88,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="32"
+     inkscape:zoom="1"
-     inkscape:cx="17.255148"
+     inkscape:cx="37.410841"
-     inkscape:cy="8.9252639"
+     inkscape:cy="16.009314"
      inkscape:document-units="px"
      inkscape:current-layer="g37994"
-     showgrid="true"
+     showgrid="false"
      inkscape:window-width="2560"
-     inkscape:window-height="1375"
+     inkscape:window-height="1376"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"

data/theme/toggle-on-us.svg

@@ -14,7 +14,7 @@
    height="22"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="toggle-on-us.svg">
   <defs
      id="defs2859">
@@ -32,28 +32,6 @@
        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"
@@ -80,6 +58,38 @@
        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"
@@ -89,13 +99,13 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="33.380898"
+     inkscape:cx="-26.798898"
-     inkscape:cy="6.9658271"
+     inkscape:cy="5.3753009"
      inkscape:document-units="px"
      inkscape:current-layer="g37994"
      showgrid="false"
      inkscape:window-width="2560"
-     inkscape:window-height="1375"
+     inkscape:window-height="1376"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
@@ -152,7 +162,7 @@
            height="25"
            width="98"
            id="rect38000"
-           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" />
+           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" />
       </g>
       <g
          transform="translate(2.0625,-2)"

docs/reference/st/st-docs.sgml.in

@@ -35,7 +35,6 @@
       <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">

js/extensionPrefs/main.js

@@ -54,7 +54,6 @@ const Application = new Lang.Class({
         this._startupUuid = null;
         this._loaded = false;
         this._skipMainWindow = false;
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
     },
 
     _extensionAvailable: function(uuid) {

js/gdm/authPrompt.js

@@ -14,7 +14,7 @@ const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;
 
-const DEFAULT_BUTTON_WELL_ICON_SIZE = 24;
+const DEFAULT_BUTTON_WELL_ICON_SIZE = 16;
 const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
 const DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3;
 
@@ -194,17 +194,15 @@ 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);
 
@@ -403,7 +401,7 @@ const AuthPrompt = new Lang.Class({
     },
 
     updateSensitivity: function(sensitive) {
-        this._updateNextButtonSensitivity(sensitive);
+        this._updateNextButtonSensitivity(sensitive && this._entry.text.length > 0);
         this._entry.reactive = sensitive;
         this._entry.clutter_text.editable = sensitive;
     },
@@ -434,8 +432,9 @@ const AuthPrompt = new Lang.Class({
         let oldStatus = this.verificationStatus;
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
         this.cancelButton.reactive = true;
+        this.nextButton.label = _("Next");
 
-        if (oldStatus == AuthPromptStatus.VERIFYING)
+        if (this._userVerifier)
             this._userVerifier.cancel();
 
         this._queryingService = null;
@@ -502,7 +501,7 @@ const AuthPrompt = new Lang.Class({
     },
 
     cancel: function() {
-        if (this.verificationStatus == AuthPromptStatus.NOT_VERIFYING || this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
+        if (this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
             return;
         }
         this.reset();

js/gdm/loginDialog.js

@@ -49,6 +49,7 @@ const _FADE_ANIMATION_TIME = 0.25;
 const _SCROLL_ANIMATION_TIME = 0.5;
 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;
 const _LOGO_ICON_HEIGHT = 48;
+const _MAX_BOTTOM_MENU_ITEMS = 5;
 
 const UserListItem = new Lang.Class({
     Name: 'UserListItem',
@@ -283,7 +284,16 @@ const SessionMenuButton = new Lang.Class({
 
         this.actor = new St.Bin({ child: this._button });
 
-        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.TOP);
+        let side = St.Side.TOP;
+        let align = 0;
+        if (Gdm.get_session_ids().length > _MAX_BOTTOM_MENU_ITEMS) {
+            if (this.actor.text_direction == Clutter.TextDirection.RTL)
+                side = St.Side.RIGHT;
+            else
+                side = St.Side.LEFT;
+            align = 0.5;
+        }
+        this._menu = new PopupMenu.PopupMenu(this._button, align, side);
         Main.uiGroup.add_actor(this._menu.actor);
         this._menu.actor.hide();
 
@@ -323,15 +333,13 @@ const SessionMenuButton = new Lang.Class({
         }
     },
 
-    activeSessionChanged: function(sessionId) {
+    setActiveSession: function(sessionId) {
          if (sessionId == this._activeSessionId)
              return;
 
          this._activeSessionId = sessionId;
          this._updateOrnament();
-    },
 
-    setActiveSession: function(sessionId) {
          this.emit('session-activated', this._activeSessionId);
     },
 
@@ -356,6 +364,9 @@ const SessionMenuButton = new Lang.Class({
             this._menu.addMenuItem(item);
             this._items[id] = item;
 
+            if (!this._activeSessionId)
+                this.setActiveSession(id);
+
             item.connect('activate', Lang.bind(this, function() {
                 this.setActiveSession(id);
             }));
@@ -495,7 +506,7 @@ const LoginDialog = new Lang.Class({
         let [minWidth, minHeight, natWidth, natHeight] = this._bannerView.get_preferred_size();
         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
 
-        actorBox.x1 = centerX - natWidth / 2;
+        actorBox.x1 = Math.floor(centerX - natWidth / 2);
         actorBox.y1 = dialogBox.y1 + Main.layoutManager.panelBox.height;
         actorBox.x2 = actorBox.x1 + natWidth;
         actorBox.y2 = actorBox.y1 + natHeight;
@@ -509,7 +520,7 @@ const LoginDialog = new Lang.Class({
         let [minWidth, minHeight, natWidth, natHeight] = this._logoBin.get_preferred_size();
         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
 
-        actorBox.x1 = centerX - natWidth / 2;
+        actorBox.x1 = Math.floor(centerX - natWidth / 2);
         actorBox.y1 = dialogBox.y2 - natHeight;
         actorBox.x2 = actorBox.x1 + natWidth;
         actorBox.y2 = actorBox.y1 + natHeight;
@@ -524,8 +535,8 @@ const LoginDialog = new Lang.Class({
         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;
         let centerY = dialogBox.y1 + (dialogBox.y2 - dialogBox.y1) / 2;
 
-        actorBox.x1 = centerX - natWidth / 2;
+        actorBox.x1 = Math.floor(centerX - natWidth / 2);
-        actorBox.y1 = centerY - natHeight / 2;
+        actorBox.y1 = Math.floor(centerY - natHeight / 2);
         actorBox.x2 = actorBox.x1 + natWidth;
         actorBox.y2 = actorBox.y1 + natHeight;
 
@@ -573,14 +584,21 @@ const LoginDialog = new Lang.Class({
         // try a different layout, or if we have what extra space we
         // can hand out
         if (bannerAllocation) {
-            let leftOverYSpace = dialogHeight - bannerHeight - authPromptHeight - logoHeight;
+            let bannerSpace;
+
+            if (authPromptAllocation)
+                bannerSpace = authPromptAllocation.y1 - bannerAllocation.y1;
+            else
+                bannerSpace = 0;
+
+            let leftOverYSpace = bannerSpace - bannerHeight;
 
             if (leftOverYSpace > 0) {
                  // First figure out how much left over space is up top
                  let leftOverTopSpace = leftOverYSpace / 2;
 
                  // Then, shift the banner into the middle of that extra space
-                 let yShift = leftOverTopSpace / 2;
+                 let yShift = Math.floor(leftOverTopSpace / 2);
 
                  bannerAllocation.y1 += yShift;
                  bannerAllocation.y2 += yShift;
@@ -606,8 +624,8 @@ const LoginDialog = new Lang.Class({
                      let centerGap = wideSpacing / 8;
 
                      // place the banner along the left edge of the center margin
-                     bannerAllocation.x2 = centerX - centerGap / 2;
+                     bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);
-                     bannerAllocation.x1 = bannerAllocation.x2 - wideBannerWidth;
+                     bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);
 
                      // figure out how tall it would like to be and try to accomodate
                      // but don't let it get too close to the logo
@@ -615,11 +633,11 @@ const LoginDialog = new Lang.Class({
 
                      let maxWideHeight = dialogHeight - 3 * logoHeight;
                      wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);
-                     bannerAllocation.y1 = centerY - wideBannerHeight / 2;
+                     bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);
                      bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;
 
                      // place the auth prompt along the right edge of the center margin
-                     authPromptAllocation.x1 = centerX + centerGap / 2;
+                     authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);
                      authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;
                  } else {
                      // If we aren't going to do a wide view, then we need to limit
@@ -629,7 +647,7 @@ const LoginDialog = new Lang.Class({
                      leftOverYSpace += bannerHeight;
 
                      // Then figure out how much of that space is up top
-                     let availableTopSpace = leftOverYSpace / 2;
+                     let availableTopSpace = Math.floor(leftOverYSpace / 2);
 
                      // Then give all of that space to the banner
                      bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;
@@ -640,7 +658,7 @@ const LoginDialog = new Lang.Class({
             let leftOverYSpace = dialogHeight - userSelectionHeight - logoHeight;
 
             if (leftOverYSpace > 0) {
-                let topExpansion = leftOverYSpace / 2;
+                let topExpansion = Math.floor(leftOverYSpace / 2);
                 let bottomExpansion = topExpansion;
 
                 userSelectionAllocation.y1 -= topExpansion;
@@ -790,7 +808,7 @@ const LoginDialog = new Lang.Class({
     },
 
     _onDefaultSessionChanged: function(client, sessionId) {
-        this._sessionMenuButton.activeSessionChanged(sessionId);
+        this._sessionMenuButton.setActiveSession(sessionId);
     },
 
     _shouldShowSessionMenuButton: function() {
@@ -1086,18 +1104,11 @@ const LoginDialog = new Lang.Class({
     },
 
     _onUserListActivated: function(activatedItem) {
-        let tasks = [function() {
-                         return GdmUtil.cloneAndFadeOutActor(this._userSelectionBox);
-                     },
-                     function() {
-                         this._setUserListExpanded(false);
-                     }];
-
         this._user = activatedItem.user;
 
         this._updateCancelButton();
 
-        let batch = new Batch.ConcurrentBatch(this, [new Batch.ConsecutiveBatch(this, tasks),
+        let batch = new Batch.ConcurrentBatch(this, [GdmUtil.cloneAndFadeOutActor(this._userSelectionBox),
                                                      this._beginVerificationForItem(activatedItem)]);
         batch.run();
     },

js/gdm/util.js

@@ -35,8 +35,8 @@ const ALLOWED_FAILURES_KEY = 'allowed-failures';
 const LOGO_KEY = 'logo';
 const DISABLE_USER_LIST_KEY = 'disable-user-list';
 
-// Give user 16ms to read each character of a PAM message
+// Give user 48ms to read each character of a PAM message
-const USER_READ_TIME = 16
+const USER_READ_TIME = 48
 
 const MessageType = {
     NONE: 0,

js/misc/loginManager.js

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

js/ui/animation.js

@@ -7,7 +7,7 @@ const St = imports.gi.St;
 const Signals = imports.signals;
 const Atk = imports.gi.Atk;
 
-const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
+const ANIMATED_ICON_UPDATE_TIMEOUT = 14;
 
 const Animation = new Lang.Class({
     Name: 'Animation',

js/ui/appDisplay.js

@@ -366,8 +366,6 @@ const AllView = new Lang.Class({
     Extends: BaseAppView,
 
     _init: function() {
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this.parent({ usePagination: true }, null);
         this._scrollView = new St.ScrollView({ style_class: 'all-apps',
                                                x_expand: true,
@@ -502,6 +500,11 @@ const AllView = new Lang.Class({
 
     _loadApps: function() {
         let apps = Gio.AppInfo.get_all().filter(function(appInfo) {
+            try {
+                let id = appInfo.get_id(); // catch invalid file encodings
+            } catch(e) {
+                return false;
+            }
             return appInfo.should_show();
         }).map(function(app) {
             return app.get_id();
@@ -525,7 +528,7 @@ const AllView = new Lang.Class({
         // at least on single-monitor setups.
         // This also disables drag-to-launch on multi-monitor setups,
         // but we hope that is not used much.
-        let favoritesWritable = this._settings.is_writable('favorite-apps');
+        let favoritesWritable = global.settings.is_writable('favorite-apps');
 
         apps.forEach(Lang.bind(this, function(appId) {
             let app = appSys.lookup_app(appId);
@@ -755,6 +758,7 @@ const AllView = new Lang.Class({
         let fadeOffset = Math.min(this._grid.topPadding,
                                   this._grid.bottomPadding);
         this._scrollView.update_fade_effect(fadeOffset, 0);
+        if (fadeOffset > 0)
             this._scrollView.get_effect('fade').fade_edges = true;
 
         if (this._availWidth != availWidth || this._availHeight != availHeight || oldNPages != this._grid.nPages()) {
@@ -783,8 +787,6 @@ const FrequentView = new Lang.Class({
     _init: function() {
         this.parent(null, { fillParent: true });
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this.actor = new St.Widget({ style_class: 'frequent-apps',
                                      layout_manager: new Clutter.BinLayout(),
                                      x_expand: true, y_expand: true });
@@ -827,7 +829,7 @@ const FrequentView = new Lang.Class({
         // at least on single-monitor setups.
         // This also disables drag-to-launch on multi-monitor setups,
         // but we hope that is not used much.
-        let favoritesWritable = this._settings.is_writable('favorite-apps');
+        let favoritesWritable = global.settings.is_writable('favorite-apps');
 
         for (let i = 0; i < mostUsed.length; i++) {
             if (!mostUsed[i].get_app_info().should_show())
@@ -1064,7 +1066,7 @@ const AppSearchProvider = new Lang.Class({
 
     getInitialResultSet: function(terms, callback, cancellable) {
         let query = terms.join(' ');
-        let groups = Gio.DesktopAppInfo.search(query);
+        let groups = Shell.AppSystem.search(query);
         let usage = Shell.AppUsage.get_default();
         let results = [];
         groups.forEach(function(group) {
@@ -1293,7 +1295,10 @@ const FolderIcon = new Lang.Class({
             if (!_listsIntersect(folderCategories, appCategories))
                 return;
 
-            addAppId(appInfo.get_id());
+            try {
+                addAppId(appInfo.get_id()); // catch invalid file encodings
+            } catch(e) {
+            }
         });
 
         this.actor.visible = this.view.getAllItems().length > 0;
@@ -1804,8 +1809,6 @@ const AppIconMenu = new Lang.Class({
 
         this.actor.add_style_class_name('app-well-menu');
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         // Chain our visibility and lifecycle to that of the source
         source.actor.connect('notify::mapped', Lang.bind(this, function () {
             if (!source.actor.mapped)
@@ -1867,7 +1870,7 @@ const AppIconMenu = new Lang.Class({
                 }));
             }
 
-            let canFavorite = this._settings.is_writable('favorite-apps');
+            let canFavorite = global.settings.is_writable('favorite-apps');
 
             if (canFavorite) {
                 this._appendSeparator();

js/ui/background.js

@@ -527,6 +527,10 @@ const BackgroundSource = new Lang.Class({
         let file = null;
         let style;
 
+        // We don't watch changes to settings here,
+        // instead we rely on Background to watch those
+        // and emit 'changed' at the right time
+
         if (this._overrideImage != null) {
             file = Gio.File.new_for_path(this._overrideImage);
             style = GDesktopEnums.BackgroundStyle.ZOOM; // Hardcode

js/ui/backgroundMenu.js

@@ -16,9 +16,10 @@ const BackgroundMenu = new Lang.Class({
     _init: function(layoutManager) {
         this.parent(layoutManager.dummyCursor, 0, St.Side.TOP);
 
-        this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         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.actor.add_style_class_name('background-menu');
 

js/ui/calendar.js

@@ -122,7 +122,8 @@ const URLHighlighter = new Lang.Class({
     _init: function(text, lineWrap, allowMarkup) {
         if (!text)
             text = '';
-        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter' });
+        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter',
+                                    x_expand: true, x_align: Clutter.ActorAlign.START });
         this._linkColor = '#ccccff';
         this.actor.connect('style-changed', Lang.bind(this, function() {
             let [hasColor, color] = this.actor.get_theme_node().lookup_color('link-color', false);
@@ -1105,6 +1106,8 @@ const Message = new Lang.Class({
             this._bodyStack.layout_manager.expansion = 1;
             this._actionBin.scale_y = 1;
         }
+
+        this.emit('expanded');
     },
 
     unexpand: function(animate) {
@@ -1127,6 +1130,8 @@ const Message = new Lang.Class({
             this._actionBin.scale_y = 0;
             this.expanded = false;
         }
+
+        this.emit('unexpanded');
     },
 
     canClose: function() {
@@ -1247,10 +1252,6 @@ const NotificationMessage = new Lang.Class({
         this.setUseBodyMarkup(n.bannerBodyMarkup);
     },
 
-    canClose: function() {
-        return !this.notification.resident;
-    },
-
     _onClicked: function() {
         this.notification.activate();
     },

js/ui/components/keyring.js

@@ -9,9 +9,15 @@ const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
 const Gcr = imports.gi.Gcr;
 
+const Animation = imports.ui.animation;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const CheckBox = imports.ui.checkBox;
+const Tweener = imports.ui.tweener;
+
+const WORK_SPINNER_ICON_SIZE = 24;
+const WORK_SPINNER_ANIMATION_DELAY = 1.0;
+const WORK_SPINNER_ANIMATION_TIME = 0.3;
 
 const KeyringDialog = new Lang.Class({
     Name: 'KeyringDialog',
@@ -58,27 +64,54 @@ const KeyringDialog = new Lang.Class({
                             { y_fill:  true,
                               y_align: St.Align.START });
 
+        this._workSpinner = null;
         this._controlTable = null;
 
-
         this._cancelButton = this.addButton({ label: '',
                                               action: Lang.bind(this, this._onCancelButton),
-                                              key: Clutter.Escape },
+                                              key: Clutter.Escape });
-                                            { expand: true, x_fill: false, x_align: St.Align.START });
-        this.placeSpinner({ expand: false,
-                            x_fill: false,
-                            y_fill: false,
-                            x_align: St.Align.END,
-                            y_align: St.Align.MIDDLE });
         this._continueButton = this.addButton({ label: '',
                                                 action: Lang.bind(this, this._onContinueButton),
-                                                default: true },
+                                                default: true });
-                                              { expand: false, x_fill: false, x_align: St.Align.END });
 
         this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);
     },
 
+    _createSpinner: function() {
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
+        this._workSpinner.actor.opacity = 0;
+        this._workSpinner.actor.show();
+    },
+
+    _setWorking: function(working) {
+        if (!this._workSpinner)
+            return;
+
+        Tweener.removeTweens(this._workSpinner.actor);
+        if (working) {
+            this._workSpinner.play();
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 255,
+                               delay: WORK_SPINNER_ANIMATION_DELAY,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear'
+                             });
+        } else {
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 0,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear',
+                               onCompleteScope: this,
+                               onComplete: function() {
+                                   if (this._workSpinner)
+                                       this._workSpinner.stop();
+                               }
+                             });
+        }
+    },
+
     _buildControlTable: function() {
         let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
         let table = new St.Widget({ style_class: 'keyring-dialog-control-table',
@@ -101,15 +134,19 @@ const KeyringDialog = new Lang.Class({
             ShellEntry.addContextMenu(this._passwordEntry, { isPassword: true });
             this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onPasswordActivate));
 
+            this._createSpinner();
             if (rtl) {
-                layout.attach(this._passwordEntry, 0, row, 1, 1);
+                layout.attach(this._workSpinner.actor, 0, row, 1, 1);
-                layout.attach(label, 1, row, 1, 1);
+                layout.attach(this._passwordEntry, 1, row, 1, 1);
+                layout.attach(label, 2, row, 1, 1);
             } else {
                 layout.attach(label, 0, row, 1, 1);
                 layout.attach(this._passwordEntry, 1, row, 1, 1);
+                layout.attach(this._workSpinner.actor, 2, row, 1, 1);
             }
             row++;
         } else {
+            this._workSpinner = null;
             this._passwordEntry = null;
         }
 
@@ -178,7 +215,7 @@ const KeyringDialog = new Lang.Class({
 
         this._continueButton.can_focus = sensitive;
         this._continueButton.reactive = sensitive;
-        this.setWorking(!sensitive);
+        this._setWorking(!sensitive);
     },
 
     _ensureOpen: function() {

js/ui/components/polkitAgent.js

@@ -13,13 +13,19 @@ const Mainloop = imports.mainloop;
 const Polkit = imports.gi.Polkit;
 const PolkitAgent = imports.gi.PolkitAgent;
 
+const Animation = imports.ui.animation;
 const Components = imports.ui.components;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const UserWidget = imports.ui.userWidget;
+const Tweener = imports.ui.tweener;
 
 const DIALOG_ICON_SIZE = 48;
 
+const WORK_SPINNER_ICON_SIZE = 24;
+const WORK_SPINNER_ANIMATION_DELAY = 1.0;
+const WORK_SPINNER_ANIMATION_TIME = 0.3;
+
 const AuthenticationDialog = new Lang.Class({
     Name: 'AuthenticationDialog',
     Extends: ModalDialog.ModalDialog,
@@ -136,6 +142,7 @@ const AuthenticationDialog = new Lang.Class({
         this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
         this._passwordBox.add(this._passwordEntry,
                               { expand: true });
+        this._addSpinner();
         this.setInitialKeyFocus(this._passwordEntry);
         this._passwordBox.hide();
 
@@ -165,17 +172,10 @@ const AuthenticationDialog = new Lang.Class({
 
         this._cancelButton = this.addButton({ label: _("Cancel"),
                                               action: Lang.bind(this, this.cancel),
-                                              key: Clutter.Escape },
+                                              key: Clutter.Escape });
-                                            { expand: true, x_fill: false, x_align: St.Align.START });
-        this.placeSpinner({ expand: false,
-                            x_fill: false,
-                            y_fill: false,
-                            x_align: St.Align.END,
-                            y_align: St.Align.MIDDLE });
         this._okButton = this.addButton({ label:  _("Authenticate"),
                                           action: Lang.bind(this, this._onAuthenticateButtonPressed),
-                                          default: true },
+                                          default: true });
-                                        { expand: false, x_fill: false, x_align: St.Align.END });
 
         this._doneEmitted = false;
 
@@ -183,6 +183,39 @@ const AuthenticationDialog = new Lang.Class({
         this._cookie = cookie;
     },
 
+    _addSpinner: function() {
+        let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
+        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
+        this._workSpinner.actor.opacity = 0;
+        this._workSpinner.actor.show();
+
+        this._passwordBox.add(this._workSpinner.actor);
+    },
+
+    _setWorking: function(working) {
+        Tweener.removeTweens(this._workSpinner.actor);
+        if (working) {
+            this._workSpinner.play();
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 255,
+                               delay: WORK_SPINNER_ANIMATION_DELAY,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear'
+                             });
+        } else {
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 0,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear',
+                               onCompleteScope: this,
+                               onComplete: function() {
+                                   if (this._workSpinner)
+                                       this._workSpinner.stop();
+                               }
+                             });
+        }
+    },
+
     performAuthentication: function() {
         this.destroySession();
         this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
@@ -229,7 +262,7 @@ const AuthenticationDialog = new Lang.Class({
 
         this._okButton.can_focus = sensitive;
         this._okButton.reactive = sensitive;
-        this.setWorking(!sensitive);
+        this._setWorking(!sensitive);
     },
 
     _onEntryActivate: function() {

js/ui/components/telepathyClient.js

@@ -3,6 +3,7 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
@@ -31,6 +32,8 @@ const SCROLLBACK_HISTORY_LINES = 10;
 // See Notification._onEntryChanged
 const COMPOSING_STOP_TIMEOUT = 5;
 
+const CHAT_EXPAND_LINES = 12;
+
 const NotificationDirection = {
     SENT: 'chat-sent',
     RECEIVED: 'chat-received'
@@ -155,14 +158,6 @@ 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()];
                        }));
     },
@@ -271,15 +266,8 @@ 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.setUrgency(MessageTray.Urgency.HIGH);
         this._notifyTimeoutId = 0;
 
-        // We ack messages when the user expands the new notification or views the summary
-        // notification, in which case the notification is also expanded.
-        this._notification.connect('expanded', Lang.bind(this, this._ackMessages));
-
         this._presence = contact.get_presence_type();
 
         this._sentId = this._channel.connect('message-sent', Lang.bind(this, this._messageSent));
@@ -292,15 +280,46 @@ 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');
     },
 
+    createBanner: function() {
+        this._banner = new ChatNotificationBanner(this._notification);
+
+        // We ack messages when the user expands the new notification
+        let id = this._banner.connect('expanded', Lang.bind(this, this._ackMessages));
+        this._banner.actor.connect('destroy', Lang.bind(this,
+            function() {
+                this._banner.disconnect(id);
+                this._banner = null;
+            }));
+
+        return this._banner;
+    },
+
     _updateAlias: function() {
         let oldAlias = this.title;
         let newAlias = this._contact.get_alias();
@@ -309,6 +328,7 @@ const ChatSource = new Lang.Class({
             return;
 
         this.setTitle(newAlias);
+        if (this._notification)
             this._notification.appendAliasChange(oldAlias, newAlias);
     },
 
@@ -352,7 +372,10 @@ const ChatSource = new Lang.Class({
 
     _updateAvatarIcon: function() {
         this.iconUpdated();
-        this._notification.update(this._notification.title, null, { customContent: true });
+        if (this._notifiction)
+            this._notification.update(this._notification.title,
+                                      this._notification.bannerBodyText,
+                                      { gicon: this.getIcon() });
     },
 
     open: function() {
@@ -393,6 +416,7 @@ 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 = [];
@@ -442,6 +466,18 @@ 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;
 
@@ -455,9 +491,6 @@ 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);
     },
 
@@ -482,6 +515,7 @@ const ChatSource = new Lang.Class({
         if (message.get_message_type() == Tp.ChannelTextMessageType.DELIVERY_REPORT)
             return;
 
+        this._ensureNotification();
         this._pendingMessages.push(message);
         this.countUpdated();
 
@@ -509,6 +543,7 @@ 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);
     },
@@ -546,7 +581,10 @@ const ChatSource = new Lang.Class({
     },
 
     _presenceChanged: function (contact, presence, status, message) {
-        this._notification.update(this._notification.title, null, { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
+        if (this._notification)
+            this._notification.update(this._notification.title,
+                                      this._notification.bannerBodyText,
+                                      { secondaryGIcon: this.getSecondaryIcon() });
     },
 
     _pendingRemoved: function(channel, message) {
@@ -556,6 +594,10 @@ const ChatSource = new Lang.Class({
             this._pendingMessages.splice(idx, 1);
             this.countUpdated();
         }
+
+        if (this._pendingMessages.length == 0 &&
+            this._banner && !this._banner.expanded)
+            this._banner.hide();
     },
 
     _ackMessages: function() {
@@ -570,42 +612,20 @@ const ChatNotification = new Lang.Class({
     Extends: MessageTray.Notification,
 
     _init: function(source) {
-        this.parent(source, source.title, null, { customContent: true, secondaryGIcon: source.getSecondaryIcon() });
+        this.parent(source, source.title, null,
+                    { secondaryGIcon: source.getSecondaryIcon() });
+        this.setUrgency(MessageTray.Urgency.HIGH);
         this.setResident(true);
 
-        this._responseEntry = new St.Entry({ style_class: 'chat-response',
+        this.messages = [];
-                                             can_focus: true });
-        this._responseEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivated));
-        this._responseEntry.clutter_text.connect('text-changed', Lang.bind(this, this._onEntryChanged));
-        this.setActionArea(this._responseEntry);
-
-        this._responseEntry.clutter_text.connect('key-focus-in', Lang.bind(this, function() {
-            this.focused = true;
-        }));
-        this._responseEntry.clutter_text.connect('key-focus-out', Lang.bind(this, function() {
-            this.focused = false;
-            this.emit('unfocused');
-        }));
-
-        this._createScrollArea();
-        this._lastGroup = null;
-
-        // Keep track of the bottom position for the current adjustment and
-        // force a scroll to the bottom if things change while we were at the
-        // bottom
-        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
-        this._scrollArea.add_style_class_name('chat-notification-scrollview');
-        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            if (adjustment.value == this._oldMaxScrollValue)
-                this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollValue = Math.max(adjustment.lower, adjustment.upper - adjustment.page_size);
-        }));
-
-        this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
-
-        this._history = [];
         this._timestampTimeoutId = 0;
-        this._composingTimeoutId = 0;
+    },
+
+    destroy: function(reason) {
+        if (this._timestampTimeoutId)
+            Mainloop.source_remove(this._timestampTimeoutId);
+        this._timestampTimeoutId = 0;
+        this.parent(reason);
     },
 
     /**
@@ -631,10 +651,8 @@ const ChatNotification = new Lang.Class({
             styles.push('chat-action');
         }
 
-        if (message.direction == NotificationDirection.RECEIVED) {
+        if (message.direction == NotificationDirection.RECEIVED)
-            this.update(this.source.title, messageBody, { customContent: true,
+            this.update(this.source.title, messageBody, { bannerMarkup: true });
-                                                          bannerMarkup: true });
-        }
 
         let group = (message.direction == NotificationDirection.RECEIVED ?
                      'received' : 'sent');
@@ -647,10 +665,10 @@ const ChatNotification = new Lang.Class({
     },
 
     _filterMessages: function() {
-        if (this._history.length < 1)
+        if (this.messages.length < 1)
             return;
 
-        let lastMessageTime = this._history[0].time;
+        let lastMessageTime = this.messages[0].timestamp;
         let currentTime = (Date.now() / 1000);
 
         // Keep the scrollback from growing too long. If the most
@@ -662,12 +680,12 @@ const ChatNotification = new Lang.Class({
         let maxLength = (lastMessageTime < currentTime - SCROLLBACK_RECENT_TIME) ?
             SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
 
-        let filteredHistory = this._history.filter(function(item) { return item.realMessage });
+        let filteredHistory = this.messages.filter(function(item) { return item.realMessage });
         if (filteredHistory.length > maxLength) {
             let lastMessageToKeep = filteredHistory[maxLength];
-            let expired = this._history.splice(this._history.indexOf(lastMessageToKeep));
+            let expired = this.messages.splice(this.messages.indexOf(lastMessageToKeep));
             for (let i = 0; i < expired.length; i++)
-                expired[i].actor.destroy();
+                this.emit('message-removed', expired[i]);
         }
     },
 
@@ -680,7 +698,6 @@ const ChatNotification = new Lang.Class({
      *  styles: Style class names for the message to have.
      *  timestamp: The timestamp of the message.
      *  noTimestamp: suppress timestamp signal?
-     *  childProps: props to add the actor with.
      */
     _append: function(props) {
         let currentTime = (Date.now() / 1000);
@@ -688,44 +705,23 @@ const ChatNotification = new Lang.Class({
                                       group: null,
                                       styles: [],
                                       timestamp: currentTime,
-                                      noTimestamp: false,
+                                      noTimestamp: false });
-                                      childProps: null });
 
         // Reset the old message timeout
         if (this._timestampTimeoutId)
             Mainloop.source_remove(this._timestampTimeoutId);
+        this._timestampTimeoutId = 0;
 
-        let highlighter = new MessageTray.URLHighlighter(props.body,
+        let message = { realMessage: props.group != 'meta',
-                                                         true,  // line wrap?
+                        showTimestamp: false };
-                                                         true); // allow markup?
+        Lang.copyProperties(props, message);
+        delete message.noTimestamp;
 
-        let body = highlighter.actor;
+        this.messages.unshift(message);
-
+        this.emit('message-added', message);
-        let styles = props.styles;
-        for (let i = 0; i < styles.length; i++)
-            body.add_style_class_name(styles[i]);
-
-        let group = props.group;
-        if (group != this._lastGroup) {
-            this._lastGroup = group;
-            let emptyLine = new St.Label({ style_class: 'chat-empty-line' });
-            this.addActor(emptyLine);
-            this._history.unshift({ actor: emptyLine, time: timestamp,
-                                    realMessage: false });
-        }
-
-        let lineBox = new St.BoxLayout({ vertical: false });
-        lineBox.add(body, props.childProps);
-        this.addActor(lineBox);
-        this._lastMessageBox = lineBox;
-
-        this.updated();
-
-        let timestamp = props.timestamp;
-        this._history.unshift({ actor: lineBox, time: timestamp,
-                                realMessage: group != 'meta' });
 
         if (!props.noTimestamp) {
+            let timestamp = props.timestamp;
             if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME) {
                 this.appendTimestamp();
             } else {
@@ -744,15 +740,8 @@ const ChatNotification = new Lang.Class({
     appendTimestamp: function() {
         this._timestampTimeoutId = 0;
 
-        let lastMessageTime = this._history[0].time;
+        this.messages[0].showTimestamp = true;
-        let lastMessageDate = new Date(lastMessageTime * 1000);
+        this.emit('timestamp-changed', this.messages[0]);
-
-        let timeLabel = Util.createTimeLabel(lastMessageDate);
-        timeLabel.style_class = 'chat-meta-message';
-        timeLabel.x_expand = timeLabel.y_expand = true;
-        timeLabel.x_align = timeLabel.y_align = Clutter.ActorAlign.END;
-
-        this._lastMessageBox.add_actor(timeLabel);
 
         this._filterMessages();
 
@@ -767,13 +756,154 @@ const ChatNotification = new Lang.Class({
            IM name. */
         let message = '<i>' + _("%s is now known as %s").format(oldAlias, newAlias) + '</i>';
 
-        let label = this._append({ body: message,
+        this._append({ body: message,
                        group: 'meta',
                        styles: ['chat-meta-message'] });
 
-        this.update(newAlias, null, { customContent: true });
-
         this._filterMessages();
+    }
+});
+
+const ChatLineBox = new Lang.Class({
+    Name: 'ChatLineBox',
+    Extends: St.BoxLayout,
+
+    vfunc_get_preferred_height: function(forWidth) {
+        let [, natHeight] = this.parent(forWidth);
+        return [natHeight, natHeight];
+    }
+});
+
+const ChatNotificationBanner = new Lang.Class({
+    Name: 'ChatNotificationBanner',
+    Extends: MessageTray.NotificationBanner,
+
+    _init: function(notification) {
+        this.parent(notification);
+
+        this._responseEntry = new St.Entry({ style_class: 'chat-response',
+                                             x_expand: true,
+                                             can_focus: true });
+        this._responseEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivated));
+        this._responseEntry.clutter_text.connect('text-changed', Lang.bind(this, this._onEntryChanged));
+        this.setActionArea(this._responseEntry);
+
+        this._responseEntry.clutter_text.connect('key-focus-in', Lang.bind(this, function() {
+            this.focused = true;
+        }));
+        this._responseEntry.clutter_text.connect('key-focus-out', Lang.bind(this, function() {
+            this.focused = false;
+            this.emit('unfocused');
+        }));
+
+        this._scrollArea = new St.ScrollView({ style_class: 'chat-scrollview vfade',
+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,
+                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
+                                               visible: this.expanded });
+        this._contentArea = new St.BoxLayout({ style_class: 'chat-body',
+                                               vertical: true });
+        this._scrollArea.add_actor(this._contentArea);
+
+        this.setExpandedBody(this._scrollArea);
+        this.setExpandedLines(CHAT_EXPAND_LINES);
+
+        this._lastGroup = null;
+
+        // Keep track of the bottom position for the current adjustment and
+        // force a scroll to the bottom if things change while we were at the
+        // bottom
+        this._oldMaxScrollValue = this._scrollArea.vscroll.adjustment.value;
+        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
+            if (adjustment.value == this._oldMaxScrollValue)
+                this.scrollTo(St.Side.BOTTOM);
+            this._oldMaxScrollValue = Math.max(adjustment.lower, adjustment.upper - adjustment.page_size);
+        }));
+
+        this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
+
+        this._composingTimeoutId = 0;
+
+        this._messageActors = new Map();
+
+        this._messageAddedId = this.notification.connect('message-added',
+            Lang.bind(this, function(n, message) {
+                this._addMessage(message);
+            }));
+        this._messageRemovedId = this.notification.connect('message-removed',
+            Lang.bind(this, function(n, message) {
+                let actor = this._messageActors.get(message);
+                if (this._messageActors.delete(message))
+                    actor.destroy();
+            }));
+        this._timestampChangedId = this.notification.connect('timestamp-changed',
+            Lang.bind(this, function(n, message) {
+                this._updateTimestamp(message);
+            }));
+
+        for (let i = this.notification.messages.length - 1; i >= 0; i--)
+            this._addMessage(this.notification.messages[i]);
+    },
+
+    _onDestroy: function() {
+        this.parent();
+        this.notification.disconnect(this._messageAddedId);
+        this.notification.disconnect(this._messageRemovedId);
+        this.notification.disconnect(this._timestampChangedId);
+    },
+
+    scrollTo: function(side) {
+        let adjustment = this._scrollArea.vscroll.adjustment;
+        if (side == St.Side.TOP)
+            adjustment.value = adjustment.lower;
+        else if (side == St.Side.BOTTOM)
+            adjustment.value = adjustment.upper;
+    },
+
+    hide: function() {
+        this.emit('done-displaying');
+    },
+
+    _addMessage: function(message) {
+        let highlighter = new Calendar.URLHighlighter(message.body, true, true);
+        let body = highlighter.actor;
+
+        let styles = message.styles;
+        for (let i = 0; i < styles.length; i++)
+            body.add_style_class_name(styles[i]);
+
+        let group = message.group;
+        if (group != this._lastGroup) {
+            this._lastGroup = group;
+            body.add_style_class_name('chat-new-group');
+        }
+
+        let lineBox = new ChatLineBox();
+        lineBox.add(body);
+        this._contentArea.add_actor(lineBox);
+        this._messageActors.set(message, lineBox);
+
+        this._updateTimestamp(message);
+    },
+
+    _updateTimestamp: function(message) {
+        let actor = this._messageActors.get(message);
+        if (!actor)
+            return;
+
+        while (actor.get_n_children() > 1)
+            actor.get_child_at_index(1).destroy();
+
+        if (message.showTimestamp) {
+            let lastMessageTime = message.timestamp;
+            let lastMessageDate = new Date(lastMessageTime * 1000);
+
+            let timeLabel = Util.createTimeLabel(lastMessageDate);
+            timeLabel.style_class = 'chat-meta-message';
+            timeLabel.x_expand = timeLabel.y_expand = true;
+            timeLabel.x_align = timeLabel.y_align = Clutter.ActorAlign.END;
+
+            actor.add_actor(timeLabel);
+        }
     },
 
     _onEntryActivated: function() {
@@ -786,13 +916,13 @@ const ChatNotification = new Lang.Class({
         // Telepathy sends out the Sent signal for us.
         // see Source._messageSent
         this._responseEntry.set_text('');
-        this.source.respond(text);
+        this.notification.source.respond(text);
     },
 
     _composingStopTimeout: function() {
         this._composingTimeoutId = 0;
 
-        this.source.setChatState(Tp.ChannelChatState.PAUSED);
+        this.notification.source.setChatState(Tp.ChannelChatState.PAUSED);
 
         return GLib.SOURCE_REMOVE;
     },
@@ -812,14 +942,14 @@ const ChatNotification = new Lang.Class({
         }
 
         if (text != '') {
-            this.source.setChatState(Tp.ChannelChatState.COMPOSING);
+            this.notification.source.setChatState(Tp.ChannelChatState.COMPOSING);
 
             this._composingTimeoutId = Mainloop.timeout_add_seconds(
                 COMPOSING_STOP_TIMEOUT,
                 Lang.bind(this, this._composingStopTimeout));
             GLib.Source.set_name_by_id(this._composingTimeoutId, '[gnome-shell] this._composingStopTimeout');
         } else {
-            this.source.setChatState(Tp.ChannelChatState.ACTIVE);
+            this.notification.source.setChatState(Tp.ChannelChatState.ACTIVE);
         }
     }
 });

js/ui/dash.js

@@ -242,8 +242,6 @@ const ShowAppsIcon = new Lang.Class({
     _init: function() {
         this.parent();
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this.toggleButton = new St.Button({ style_class: 'show-apps',
                                             track_hover: true,
                                             can_focus: true,
@@ -272,7 +270,7 @@ const ShowAppsIcon = new Lang.Class({
         if (app == null)
             return false;
 
-        if (!this._settings.is_writable('favorite-apps'))
+        if (!global.settings.is_writable('favorite-apps'))
             return false;
 
         let id = app.get_id();
@@ -430,8 +428,6 @@ const Dash = new Lang.Class({
 
         this._workId = Main.initializeDeferredWork(this._box, Lang.bind(this, this._redisplay));
 
-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell' });
-
         this._appSystem = Shell.AppSystem.get_default();
 
         this._appSystem.connect('installed-changed', Lang.bind(this, function() {
@@ -864,7 +860,7 @@ const Dash = new Lang.Class({
         if (app == null || app.is_window_backed())
             return DND.DragMotionResult.NO_DROP;
 
-        if (!this._settings.is_writable('favorite-apps'))
+        if (!global.settings.is_writable('favorite-apps'))
             return DND.DragMotionResult.NO_DROP;
 
         let favorites = AppFavorites.getAppFavorites().getFavorites();
@@ -943,7 +939,7 @@ const Dash = new Lang.Class({
             return false;
         }
 
-        if (!this._settings.is_writable('favorite-apps'))
+        if (!global.settings.is_writable('favorite-apps'))
             return false;
 
         let id = app.get_id();

js/ui/dateMenu.js

@@ -357,8 +357,6 @@ 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

js/ui/environment.js

@@ -81,7 +81,6 @@ function init() {
 
     // Miscellaneous monkeypatching
     _patchContainerClass(St.BoxLayout);
-    _patchContainerClass(St.Table);
 
     _patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
                                              column_spacing: 'spacing-columns' });

js/ui/keyboard.js

@@ -24,9 +24,6 @@ const KEYBOARD_TYPE = 'keyboard-type';
 const A11Y_APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEYBOARD = 'screen-keyboard-enabled';
 
-const CURSOR_BUS_NAME = 'org.gnome.SettingsDaemon.Cursor';
-const CURSOR_OBJECT_PATH = '/org/gnome/SettingsDaemon/Cursor';
-
 const CARIBOU_BUS_NAME = 'org.gnome.Caribou.Daemon';
 const CARIBOU_OBJECT_PATH = '/org/gnome/Caribou/Daemon';
 
@@ -114,6 +111,35 @@ const Key = new Lang.Class({
                 key.release();
                 return Clutter.EVENT_PROPAGATE;
             }));
+        button.connect('touch-event', Lang.bind(this,
+            function (actor, event) {
+                let device = event.get_device();
+                let sequence = event.get_event_sequence();
+
+                // We only handle touch events here on wayland. On X11
+                // we do get emulated pointer events, which already works
+                // for single-touch cases. Besides, the X11 passive touch grab
+                // set up by Mutter will make us see first the touch events
+                // and later the pointer events, so it will look like two
+                // unrelated series of events, we want to avoid double handling
+                // in these cases.
+                if (!Meta.is_wayland_compositor())
+                    return Clutter.EVENT_PROPAGATE;
+
+                if (!this._touchPressed &&
+                    event.type() == Clutter.EventType.TOUCH_BEGIN) {
+                    device.sequence_grab(sequence, actor);
+                    this._touchPressed = true;
+                    key.press();
+                } else if (this._touchPressed &&
+                           event.type() == Clutter.EventType.TOUCH_END &&
+                           device.sequence_get_grabbed_actor(sequence) == actor) {
+                    device.sequence_ungrab(sequence);
+                    this._touchPressed = false;
+                    key.release();
+                }
+                return Clutter.EVENT_PROPAGATE;
+            }));
 
         return button;
     },
@@ -178,12 +204,13 @@ const Keyboard = new Lang.Class({
         this._keyboardSettings.connect('changed', Lang.bind(this, this._sync));
         this._a11yApplicationsSettings = new Gio.Settings({ schema_id: A11Y_APPLICATIONS_SCHEMA });
         this._a11yApplicationsSettings.connect('changed', Lang.bind(this, this._sync));
-        this._watchNameId = Gio.bus_watch_name(Gio.BusType.SESSION, CURSOR_BUS_NAME, 0,
-                                               Lang.bind(this, this._sync),
-                                               Lang.bind(this, this._sync));
         this._daemonProxy = 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();
@@ -725,3 +752,24 @@ 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);
+    },
+});

js/ui/layout.js

@@ -11,6 +11,7 @@ const St = imports.gi.St;
 
 const Background = imports.ui.background;
 const BackgroundMenu = imports.ui.backgroundMenu;
+const LoginManager = imports.misc.loginManager;
 
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
@@ -273,6 +274,18 @@ const LayoutManager = new Lang.Class({
         global.screen.connect('in-fullscreen-changed',
                               Lang.bind(this, this._updateFullscreen));
         this._monitorsChanged();
+
+        // NVIDIA drivers don't preserve FBO contents across
+        // suspend/resume, see
+        // https://bugzilla.gnome.org/show_bug.cgi?id=739178
+        if (Shell.util_need_background_refresh()) {
+            LoginManager.getLoginManager().connect('prepare-for-sleep',
+                                                   function(lm, suspending) {
+                                                       if (suspending)
+                                                           return;
+                                                       Meta.Background.refresh_all();
+                                                   });
+        }
     },
 
     // This is called by Main after everything else is constructed
@@ -824,6 +837,7 @@ const LayoutManager = new Lang.Class({
         // need to connect to 'destroy' too.
 
         this._trackedActors.push(actorData);
+        this._updateActorVisibility(actorData);
         this._queueUpdateRegions();
     },
 
@@ -842,25 +856,23 @@ 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;
 
-        for (let i = 0; i < this._trackedActors.length; i++) {
+        this._trackedActors.forEach(Lang.bind(this, this._updateActorVisibility));
-            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) {
@@ -1303,8 +1315,11 @@ 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;
+        }
     },
 
     _trigger: function() {
@@ -1314,6 +1329,8 @@ 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)

js/ui/legacyTray.js

@@ -1,4 +1,5 @@
 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;
@@ -28,8 +29,9 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
 };
 
 // Offset of the original position from the bottom-right corner
-const CONCEALED_VISIBLE_FRACTION = 0.2;
+const CONCEALED_WIDTH = 3;
 const REVEAL_ANIMATION_TIME = 0.2;
+const TEMP_REVEAL_TIME = 2;
 
 const BARRIER_THRESHOLD = 70;
 const BARRIER_TIMEOUT = 1000;
@@ -100,6 +102,7 @@ const LegacyTray = new Lang.Class({
 
         Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false });
         Main.layoutManager.trackChrome(this._slider, { affectsInputRegion: true });
+        Main.uiGroup.set_child_below_sibling(this.actor, Main.layoutManager.modalDialogGroup);
         Main.ctrlAltTabManager.addGroup(this.actor,
                                         _("Status Icons"), 'focus-legacy-systray-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.BOTTOM });
@@ -147,17 +150,41 @@ const LegacyTray = new Lang.Class({
                                                   St.ButtonMask.THREE,
                                      can_focus: true,
                                      x_fill: true, y_fill: true });
+
+        let app = Shell.WindowTracker.get_default().get_app_from_pid(icon.pid);
+        if (!app)
+            app = Shell.AppSystem.get_default().lookup_startup_wmclass(wmClass);
+        if (!app)
+            app = Shell.AppSystem.get_default().lookup_desktop_wmclass(wmClass);
+        if (app)
+            button.accessible_name = app.get_name();
+        else
+            button.accessible_name = icon.title;
+
         button.connect('clicked',
             function() {
                 icon.click(Clutter.get_current_event());
             });
+        button.connect('key-press-event',
+            function() {
+                icon.click(Clutter.get_current_event());
+                return Clutter.EVENT_PROPAGATE;
+            });
         button.connect('key-focus-in', Lang.bind(this,
             function() {
                 this._concealHandle.show();
             }));
 
         this._iconBox.add_actor(button);
-        this._sync();
+
+        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;
+                }));
+        }
     },
 
     _onTrayIconRemoved: function(tm, icon) {
@@ -188,11 +215,7 @@ const LegacyTray = new Lang.Class({
             this._horizontalBarrier.y2 == y2)
             return;
 
-        if (this._horizontalBarrier) {
+        this._unsetBarrier();
-            this._pressureBarrier.removeBarrier(this._horizontalBarrier);
-            this._horizontalBarrier.destroy();
-            this._horizontalBarrier = null;
-        }
 
         let directions = (rtl ? Meta.BarrierDirection.NEGATIVE_X : Meta.BarrierDirection.POSITIVE_X);
         this._horizontalBarrier = new Meta.Barrier({ display: global.display,
@@ -202,6 +225,15 @@ const LegacyTray = new Lang.Class({
         this._pressureBarrier.addBarrier(this._horizontalBarrier);
     },
 
+    _unsetBarrier: function() {
+        if (this._horizontalBarrier == null)
+            return;
+
+        this._pressureBarrier.removeBarrier(this._horizontalBarrier);
+        this._horizontalBarrier.destroy();
+        this._horizontalBarrier = null;
+    },
+
     _sync: function() {
         // FIXME: we no longer treat tray icons as notifications
         let allowed = Main.sessionMode.hasNotifications;
@@ -222,17 +254,20 @@ 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;
-            if (!this._revealHandle.hover)
+            else
-                targetSlide *= CONCEALED_VISIBLE_FRACTION;
+                targetSlide = CONCEALED_WIDTH / boxWidth;
         }
 
-        if (this.actor.visible)
+        if (this.actor.visible) {
             Tweener.addTween(this._slideLayout,
                              { slideX: targetSlide,
                                time: REVEAL_ANIMATION_TIME,
                                transition: 'easeOutQuad' });
-        else
+        } else {
             this._slideLayout.slideX = targetSlide;
+            this._unsetBarrier();
+        }
     }
 });

js/ui/magnifier.js

@@ -4,6 +4,7 @@ const Atspi = imports.gi.Atspi;
 const Clutter = imports.gi.Clutter;
 const GDesktopEnums = imports.gi.GDesktopEnums;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Lang = imports.lang;
@@ -22,6 +23,8 @@ const MOUSE_POLL_FREQUENCY = 50;
 const CROSSHAIRS_CLIP_SIZE = [100, 100];
 const NO_CHANGE = 0.0;
 
+const POINTER_REST_TIME = 1000; // milliseconds
+
 // Settings
 const APPLICATIONS_SCHEMA       = 'org.gnome.desktop.a11y.applications';
 const SHOW_KEY                  = 'screen-magnifier-enabled';
@@ -444,55 +447,6 @@ const Magnifier = new Lang.Class({
         this._appSettings = new Gio.Settings({ schema_id: APPLICATIONS_SCHEMA });
         this._settings = new Gio.Settings({ schema_id: MAGNIFIER_SCHEMA });
 
-        if (zoomRegion) {
-            // Mag factor is accurate to two decimal places.
-            let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
-            if (aPref != 0.0)
-                zoomRegion.setMagFactor(aPref, aPref);
-
-            aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
-            if (aPref)
-                zoomRegion.setScreenPosition(aPref);
-
-            zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
-            zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
-
-            aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setMouseTrackingMode(aPref);
-
-            aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setFocusTrackingMode(aPref);
-
-            aPref = this._settings.get_enum(CARET_TRACKING_KEY);
-            if (aPref)
-                zoomRegion.setCaretTrackingMode(aPref);
-
-            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-            if (aPref)
-                zoomRegion.setInvertLightness(aPref);
-
-            aPref = this._settings.get_double(COLOR_SATURATION_KEY);
-            if (aPref)
-                zoomRegion.setColorSaturation(aPref);
-
-            let bc = {};
-            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-            zoomRegion.setBrightness(bc);
-
-            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-            zoomRegion.setContrast(bc);
-        }
-
-        let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
-        this.addCrosshairs();
-        this.setCrosshairsVisible(showCrosshairs);
-
         this._appSettings.connect('changed::' + SHOW_KEY,
                                   Lang.bind(this, function() {
             this.setActive(this._appSettings.get_boolean(SHOW_KEY));
@@ -561,6 +515,56 @@ const Magnifier = new Lang.Class({
                                Lang.bind(this, function() {
             this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
         }));
+
+        if (zoomRegion) {
+            // Mag factor is accurate to two decimal places.
+            let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
+            if (aPref != 0.0)
+                zoomRegion.setMagFactor(aPref, aPref);
+
+            aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
+            if (aPref)
+                zoomRegion.setScreenPosition(aPref);
+
+            zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
+            zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
+
+            aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
+            if (aPref)
+                zoomRegion.setMouseTrackingMode(aPref);
+
+            aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
+            if (aPref)
+                zoomRegion.setFocusTrackingMode(aPref);
+
+            aPref = this._settings.get_enum(CARET_TRACKING_KEY);
+            if (aPref)
+                zoomRegion.setCaretTrackingMode(aPref);
+
+            aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
+            if (aPref)
+                zoomRegion.setInvertLightness(aPref);
+
+            aPref = this._settings.get_double(COLOR_SATURATION_KEY);
+            if (aPref)
+                zoomRegion.setColorSaturation(aPref);
+
+            let bc = {};
+            bc.r = this._settings.get_double(BRIGHT_RED_KEY);
+            bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
+            bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
+            zoomRegion.setBrightness(bc);
+
+            bc.r = this._settings.get_double(CONTRAST_RED_KEY);
+            bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
+            bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
+            zoomRegion.setContrast(bc);
+        }
+
+        let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
+        this.addCrosshairs();
+        this.setCrosshairsVisible(showCrosshairs);
+
         return this._appSettings.get_boolean(SHOW_KEY);
    },
 
@@ -708,6 +712,9 @@ const ZoomRegion = new Lang.Class({
         this._xCaret = 0;
         this._yCaret = 0;
 
+        this._pointerIdleMonitor = Meta.IdleMonitor.get_for_device(Meta.VIRTUAL_CORE_POINTER_ID);
+        this._scrollContentsTimerId = 0;
+
         Main.layoutManager.connect('monitors-changed',
                                    Lang.bind(this, this._monitorsChanged));
         this._focusCaretTracker.connect('caret-moved',
@@ -1067,6 +1074,26 @@ const ZoomRegion = new Lang.Class({
         return this._isMouseOverRegion();
     },
 
+    _clearScrollContentsTimer: function() {
+        if (this._scrollContentsTimerId != 0) {
+            Mainloop.source_remove(this._scrollContentsTimerId);
+            this._scrollContentsTimerId = 0;
+        }
+    },
+
+    _scrollContentsToDelayed: function(x, y) {
+        if (this._pointerIdleMonitor.get_idletime() >= POINTER_REST_TIME) {
+            this.scrollContentsTo(x, y);
+            return;
+        }
+
+        this._clearScrollContentsTimer();
+        this._scrollContentsTimerId = Mainloop.timeout_add(POINTER_REST_TIME, Lang.bind(this, function() {
+            this._scrollContentsToDelayed(x, y);
+            return GLib.SOURCE_REMOVE;
+        }));
+    },
+
     /**
      * scrollContentsTo:
      * Shift the contents of the magnified view such it is centered on the given
@@ -1075,6 +1102,8 @@ const ZoomRegion = new Lang.Class({
      * @y:      The y-coord of the point to center on.
      */
     scrollContentsTo: function(x, y) {
+        this._clearScrollContentsTimer();
+
         this._followingCursor = false;
         this._changeROI({ xCenter: x,
                           yCenter: y });
@@ -1380,7 +1409,7 @@ const ZoomRegion = new Lang.Class({
         else if (this._caretTrackingMode == GDesktopEnums.MagnifierCaretTrackingMode.CENTERED)
             [xCaret, yCaret] = this._centerFromPointCentered(xCaret, yCaret);
 
-        this.scrollContentsTo(xCaret, yCaret);
+        this._scrollContentsToDelayed(xCaret, yCaret);
     },
 
     _centerFromFocusPosition: function() {
@@ -1394,7 +1423,7 @@ const ZoomRegion = new Lang.Class({
         else if (this._focusTrackingMode == GDesktopEnums.MagnifierFocusTrackingMode.CENTERED)
             [xFocus, yFocus] = this._centerFromPointCentered(xFocus, yFocus);
 
-        this.scrollContentsTo(xFocus, yFocus);
+        this._scrollContentsToDelayed(xFocus, yFocus);
     },
 
     _centerFromPointPush: function(xPoint, yPoint) {

js/ui/messageTray.js

@@ -69,26 +69,6 @@ const Urgency = {
     CRITICAL: 3
 };
 
-function _fixMarkup(text, allowMarkup) {
-    if (allowMarkup) {
-        // Support &, ", ', < and >, escape all other
-        // occurrences of '&'.
-        let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, '&');
-
-        // Support <b>, <i>, and <u>, escape anything else
-        // so it displays as raw markup.
-        _text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;');
-
-        try {
-            Pango.parse_markup(_text, -1, '');
-            return _text;
-        } catch (e) {}
-    }
-
-    // !allowMarkup, or invalid markup
-    return GLib.markup_escape_text(text, -1);
-}
-
 const FocusGrabber = new Lang.Class({
     Name: 'FocusGrabber',
 
@@ -147,130 +127,6 @@ const FocusGrabber = new Lang.Class({
     }
 });
 
-const URLHighlighter = new Lang.Class({
-    Name: 'URLHighlighter',
-
-    _init: function(text, lineWrap, allowMarkup) {
-        if (!text)
-            text = '';
-        this.actor = new St.Label({ reactive: true, style_class: 'url-highlighter' });
-        this._linkColor = '#ccccff';
-        this.actor.connect('style-changed', Lang.bind(this, function() {
-            let [hasColor, color] = this.actor.get_theme_node().lookup_color('link-color', false);
-            if (hasColor) {
-                let linkColor = color.to_string().substr(0, 7);
-                if (linkColor != this._linkColor) {
-                    this._linkColor = linkColor;
-                    this._highlightUrls();
-                }
-            }
-        }));
-        if (lineWrap) {
-            this.actor.clutter_text.line_wrap = true;
-            this.actor.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this.actor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        }
-
-        this.setMarkup(text, allowMarkup);
-        this.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
-            // Don't try to URL highlight when invisible.
-            // The MessageTray doesn't actually hide us, so
-            // we need to check for paint opacities as well.
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return Clutter.EVENT_PROPAGATE;
-
-            // Keep Notification.actor from seeing this and taking
-            // a pointer grab, which would block our button-release-event
-            // handler, if an URL is clicked
-            return this._findUrlAtPos(event) != -1;
-        }));
-        this.actor.connect('button-release-event', Lang.bind(this, function (actor, event) {
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return Clutter.EVENT_PROPAGATE;
-
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1) {
-                let url = this._urls[urlId].url;
-                if (url.indexOf(':') == -1)
-                    url = 'http://' + url;
-
-                Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context(0, -1));
-                return Clutter.EVENT_STOP;
-            }
-            return Clutter.EVENT_PROPAGATE;
-        }));
-        this.actor.connect('motion-event', Lang.bind(this, function(actor, event) {
-            if (!actor.visible || actor.get_paint_opacity() == 0)
-                return Clutter.EVENT_PROPAGATE;
-
-            let urlId = this._findUrlAtPos(event);
-            if (urlId != -1 && !this._cursorChanged) {
-                global.screen.set_cursor(Meta.Cursor.POINTING_HAND);
-                this._cursorChanged = true;
-            } else if (urlId == -1) {
-                global.screen.set_cursor(Meta.Cursor.DEFAULT);
-                this._cursorChanged = false;
-            }
-            return Clutter.EVENT_PROPAGATE;
-        }));
-        this.actor.connect('leave-event', Lang.bind(this, function() {
-            if (!this.actor.visible || this.actor.get_paint_opacity() == 0)
-                return Clutter.EVENT_PROPAGATE;
-
-            if (this._cursorChanged) {
-                this._cursorChanged = false;
-                global.screen.set_cursor(Meta.Cursor.DEFAULT);
-            }
-            return Clutter.EVENT_PROPAGATE;
-        }));
-    },
-
-    setMarkup: function(text, allowMarkup) {
-        text = text ? _fixMarkup(text, allowMarkup) : '';
-        this._text = text;
-
-        this.actor.clutter_text.set_markup(text);
-        /* clutter_text.text contain text without markup */
-        this._urls = Util.findUrls(this.actor.clutter_text.text);
-        this._highlightUrls();
-    },
-
-    _highlightUrls: function() {
-        // text here contain markup
-        let urls = Util.findUrls(this._text);
-        let markup = '';
-        let pos = 0;
-        for (let i = 0; i < urls.length; i++) {
-            let url = urls[i];
-            let str = this._text.substr(pos, url.pos - pos);
-            markup += str + '<span foreground="' + this._linkColor + '"><u>' + url.url + '</u></span>';
-            pos = url.pos + url.url.length;
-        }
-        markup += this._text.substr(pos);
-        this.actor.clutter_text.set_markup(markup);
-    },
-
-    _findUrlAtPos: function(event) {
-        let success;
-        let [x, y] = event.get_coords();
-        [success, x, y] = this.actor.transform_stage_point(x, y);
-        let find_pos = -1;
-        for (let i = 0; i < this.actor.clutter_text.text.length; i++) {
-            let [success, px, py, line_height] = this.actor.clutter_text.position_to_coords(i);
-            if (py > y || py + line_height < y || x < px)
-                continue;
-            find_pos = i;
-        }
-        if (find_pos != -1) {
-            for (let i = 0; i < this._urls.length; i++)
-            if (find_pos >= this._urls[i].pos &&
-                this._urls[i].pos + this._urls[i].url.length > find_pos)
-                return i;
-        }
-        return -1;
-    }
-});
-
 // NotificationPolicy:
 // An object that holds all bits of configurable policy related to a notification
 // source, such as whether to play sound or honour the critical bit.
@@ -382,6 +238,8 @@ const NotificationApplicationPolicy = new Lang.Class({
 
     _changed: function(settings, key) {
         this.emit('policy-changed', key);
+        if (key == 'enable')
+            this.emit('enable-changed');
     },
 
     _canonicalizeId: function(id) {
@@ -473,10 +331,6 @@ const NotificationApplicationPolicy = new Lang.Class({
 const Notification = new Lang.Class({
     Name: 'Notification',
 
-    ICON_SIZE: 24,
-
-    IMAGE_SIZE: 125,
-
     _init: function(source, title, banner, params) {
         this.source = source;
         this.title = title;
@@ -485,63 +339,14 @@ const Notification = new Lang.Class({
         // 'transient' is a reserved keyword in JS, so we have to use an alternate variable name
         this.isTransient = false;
         this.forFeedback = false;
-        this.expanded = false;
-        this.focused = false;
         this._acknowledged = false;
-        this._destroyed = false;
-        this._customContent = false;
         this.bannerBodyText = null;
         this.bannerBodyMarkup = false;
-        this._bannerBodyAdded = false;
-        this._titleFitsInBannerMode = true;
-        this._spacing = 0;
-        this._scrollPolicy = Gtk.PolicyType.AUTOMATIC;
         this._soundName = null;
         this._soundFile = null;
         this._soundPlayed = false;
         this.actions = [];
 
-        this.actor = new St.Button({ accessible_role: Atk.Role.NOTIFICATION });
-        this.actor.add_style_class_name('notification-unexpanded');
-        this.actor._delegate = this;
-        this.actor.connect('clicked', Lang.bind(this, this.activate));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._table = new St.Table({ style_class: 'notification',
-                                     reactive: true });
-        this._table.connect('style-changed', Lang.bind(this, this._styleChanged));
-        this.actor.set_child(this._table);
-
-        // The first line should have the title, followed by the
-        // banner text, but ellipsized if they won't both fit. We can't
-        // make St.Table or St.BoxLayout do this the way we want (don't
-        // show banner at all if title needs to be ellipsized), so we
-        // use Shell.GenericContainer.
-        this._bannerBox = new Shell.GenericContainer();
-        this._bannerBox.connect('get-preferred-width', Lang.bind(this, this._bannerBoxGetPreferredWidth));
-        this._bannerBox.connect('get-preferred-height', Lang.bind(this, this._bannerBoxGetPreferredHeight));
-        this._bannerBox.connect('allocate', Lang.bind(this, this._bannerBoxAllocate));
-        this._table.add(this._bannerBox, { row: 0,
-                                           col: 1,
-                                           col_span: 2,
-                                           x_expand: false,
-                                           y_expand: false,
-                                           y_fill: false });
-
-        // This is an empty cell that overlaps with this._bannerBox cell to ensure
-        // that this._bannerBox cell expands horizontally, while not forcing the
-        // this._imageBin that is also in col: 2 to expand horizontally.
-        this._table.add(new St.Bin(), { row: 0,
-                                        col: 2,
-                                        y_expand: false,
-                                        y_fill: false });
-
-        this._titleLabel = new St.Label();
-        this._bannerBox.add_actor(this._titleLabel);
-        this._bannerUrlHighlighter = new URLHighlighter();
-        this._bannerLabel = this._bannerUrlHighlighter.actor;
-        this._bannerBox.add_actor(this._bannerLabel);
-
         // If called with only one argument we assume the caller
         // will call .update() later on. This is the case of
         // NotificationDaemon, which wants to use the same code
@@ -559,109 +364,25 @@ const Notification = new Lang.Class({
     // the title/banner. If @params.clear is %true, it will also
     // remove any additional actors/action buttons previously added.
     update: function(title, banner, params) {
-        params = Params.parse(params, { customContent: false,
+        params = Params.parse(params, { gicon: null,
-                                        gicon: null,
                                         secondaryGIcon: null,
                                         bannerMarkup: false,
                                         clear: false,
                                         soundName: null,
                                         soundFile: null });
 
-        this._customContent = params.customContent;
-
-        let oldFocus = global.stage.key_focus;
-
-        if (params.gicon || params.clear) {
-            this.gicon = params.gicon;
-            if (this._icon)
-                this._icon.destroy();
-            this._icon = null;
-        }
-
-        if (this._secondaryIcon && (params.secondaryGIcon || params.clear)) {
-            this._secondaryIcon.destroy();
-            this._secondaryIcon = null;
-        }
-
-        // We always clear the content area if we don't have custom
-        // content because it might contain the @banner that didn't
-        // fit in the banner mode.
-        if (this._scrollArea && (!this._customContent || params.clear)) {
-            if (oldFocus && this._scrollArea.contains(oldFocus))
-                this.actor.grab_key_focus();
-
-            this._scrollArea.destroy();
-            this._scrollArea = null;
-            this._contentArea = null;
-        }
-        if (this._actionArea && params.clear) {
-            if (oldFocus && this._actionArea.contains(oldFocus))
-                this.actor.grab_key_focus();
-
-            this._actionArea.destroy();
-            this._actionArea = null;
-            this._buttonBox = null;
-            this.actions = [];
-        }
-        if (!this._scrollArea && !this._actionArea)
-            this._table.remove_style_class_name('multi-line-notification');
-
-        if (this.gicon) {
-            this._icon = new St.Icon({ gicon: this.gicon,
-                                       icon_size: this.ICON_SIZE });
-        } else {
-            this._icon = this.source.createIcon(this.ICON_SIZE);
-        }
-
-        if (this._icon) {
-            this._table.add(this._icon, { row: 0,
-                                          col: 0,
-                                          x_expand: false,
-                                          y_expand: false,
-                                          y_fill: false,
-                                          y_align: St.Align.START });
-        }
-
-        if (params.secondaryGIcon) {
-            this._secondaryIcon = new St.Icon({ gicon: params.secondaryGIcon,
-                                                style_class: 'secondary-icon' });
-            this._bannerBox.add_actor(this._secondaryIcon);
-        }
-
         this.title = title;
-        title = title ? _fixMarkup(title.replace(/\n/g, ' '), false) : '';
+        this.bannerBodyText = banner;
-        this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');
-
-        let titleDirection;
-        if (Pango.find_base_dir(title, -1) == Pango.Direction.RTL)
-            titleDirection = Clutter.TextDirection.RTL;
-        else
-            titleDirection = Clutter.TextDirection.LTR;
-
-        // Let the title's text direction control the overall direction
-        // of the notification - in case where different scripts are used
-        // in the notification, this is the right thing for the icon, and
-        // arguably for action buttons as well. Labels other than the title
-        // will be allocated at the available width, so that their alignment
-        // is done correctly automatically.
-        this._table.set_text_direction(titleDirection);
-
-        // Unless the notification has custom content, we save this.bannerBodyText
-        // to add it to the content of the notification if the notification is
-        // expandable due to other elements in its content area or due to the banner
-        // not fitting fully in the single-line mode.
-        this.bannerBodyText = this._customContent ? null : banner;
         this.bannerBodyMarkup = params.bannerMarkup;
-        this._bannerBodyAdded = false;
 
-        banner = banner ? banner.replace(/\n/g, '  ') : '';
+        if (params.gicon || params.clear)
+            this.gicon = params.gicon;
 
-        this._bannerUrlHighlighter.setMarkup(banner, params.bannerMarkup);
+        if (params.secondaryGIcon || params.clear)
-        this._bannerLabel.queue_relayout();
+            this.secondaryGIcon = params.secondaryGIcon;
 
-        // Add the bannerBody now if we know for sure we'll need it
+        if (params.clear)
-        if (this.bannerBodyText && this.bannerBodyText.indexOf('\n') > -1)
+            this.actions = [];
-            this._addBannerBody();
 
         if (this._soundName != params.soundName ||
             this._soundFile != params.soundFile) {
@@ -670,168 +391,14 @@ const Notification = new Lang.Class({
             this._soundPlayed = false;
         }
 
-        this.updated();
         this.emit('updated', params.clear);
     },
 
-    setIconVisible: function(visible) {
-        this._icon.visible = visible;
-    },
-
-    enableScrolling: function(enableScrolling) {
-        this._scrollPolicy = enableScrolling ? Gtk.PolicyType.AUTOMATIC : Gtk.PolicyType.NEVER;
-        if (this._scrollArea) {
-            this._scrollArea.vscrollbar_policy = this._scrollPolicy;
-            this._scrollArea.enable_mouse_scrolling = enableScrolling;
-        }
-    },
-
-    _createScrollArea: function() {
-        this._table.add_style_class_name('multi-line-notification');
-        this._scrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
-                                               vscrollbar_policy: this._scrollPolicy,
-                                               hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                               visible: this.expanded });
-        this._table.add(this._scrollArea, { row: 1,
-                                            col: 2 });
-        this._updateLastColumnSettings();
-        this._contentArea = new St.BoxLayout({ style_class: 'notification-body',
-                                               vertical: true });
-        this._scrollArea.add_actor(this._contentArea);
-        // If we know the notification will be expandable, we need to add
-        // the banner text to the body as the first element.
-        this._addBannerBody();
-    },
-
-    // addActor:
-    // @actor: actor to add to the body of the notification
-    //
-    // Appends @actor to the notification's body
-    addActor: function(actor, style) {
-        if (!this._scrollArea) {
-            this._createScrollArea();
-        }
-
-        this._contentArea.add(actor, style ? style : {});
-        this.updated();
-    },
-
-    // addBody:
-    // @text: the text
-    // @markup: %true if @text contains pango markup
-    // @style: style to use when adding the actor containing the text
-    //
-    // Adds a multi-line label containing @text to the notification.
-    //
-    // Return value: the newly-added label
-    addBody: function(text, markup, style) {
-        let label = new URLHighlighter(text, true, markup);
-
-        this.addActor(label.actor, style);
-        return label.actor;
-    },
-
-    _addBannerBody: function() {
-        if (this.bannerBodyText && !this._bannerBodyAdded) {
-            this._bannerBodyAdded = true;
-            this.addBody(this.bannerBodyText, this.bannerBodyMarkup);
-        }
-    },
-
-    // scrollTo:
-    // @side: St.Side.TOP or St.Side.BOTTOM
-    //
-    // Scrolls the content area (if scrollable) to the indicated edge
-    scrollTo: function(side) {
-        let adjustment = this._scrollArea.vscroll.adjustment;
-        if (side == St.Side.TOP)
-            adjustment.value = adjustment.lower;
-        else if (side == St.Side.BOTTOM)
-            adjustment.value = adjustment.upper;
-    },
-
-    // setActionArea:
-    // @actor: the actor
-    // @props: (option) St.Table child properties
-    //
-    // Puts @actor into the action area of the notification, replacing
-    // the previous contents
-    setActionArea: function(actor, props) {
-        if (this._actionArea) {
-            this._actionArea.destroy();
-            this._actionArea = null;
-            if (this._buttonBox)
-                this._buttonBox = null;
-        } else {
-            this._addBannerBody();
-        }
-        this._actionArea = actor;
-        this._actionArea.visible = this.expanded;
-
-        if (!props)
-            props = {};
-        props.row = 2;
-        props.col = 2;
-
-        this._table.add_style_class_name('multi-line-notification');
-        this._table.add(this._actionArea, props);
-        this._updateLastColumnSettings();
-        this.updated();
-    },
-
-    _updateLastColumnSettings: function() {
-        if (this._scrollArea)
-            this._table.child_set(this._scrollArea, { col: 1,
-                                                      col_span: 2 });
-        if (this._actionArea)
-            this._table.child_set(this._actionArea, { col: 1,
-                                                      col_span: 2 });
-    },
-
-    addButton: function(button, callback) {
-        if (!this._buttonBox) {
-            let box = new St.BoxLayout({ style_class: 'notification-actions' });
-            this.setActionArea(box, { x_expand: false,
-                                      y_expand: false,
-                                      x_fill: false,
-                                      y_fill: false,
-                                      x_align: St.Align.END });
-            this._buttonBox = box;
-            global.focus_manager.add_group(this._buttonBox);
-        }
-
-        this._buttonBox.add(button);
-        button.connect('clicked', Lang.bind(this, function() {
-            callback();
-
-            if (!this.resident) {
-                // We don't hide a resident notification when the user invokes one of its actions,
-                // because it is common for such notifications to update themselves with new
-                // information based on the action. We'd like to display the updated information
-                // in place, rather than pop-up a new notification.
-                this.emit('done-displaying');
-                this.destroy();
-            }
-        }));
-
-        this.updated();
-        return button;
-    },
-
     // addAction:
     // @label: the label for the action's button
     // @callback: the callback for the action
-    //
-    // Adds a button with the given @label to the notification. All
-    // action buttons will appear in a single row at the bottom of
-    // the notification.
     addAction: function(label, callback) {
         this.actions.push({ label: label, callback: callback });
-        let button = new St.Button({ style_class: 'notification-button',
-                                     label: label,
-                                     can_focus: true });
-
-        return this.addButton(button, callback);
     },
 
     get acknowledged() {
@@ -861,132 +428,6 @@ const Notification = new Lang.Class({
         this.forFeedback = forFeedback;
     },
 
-    _styleChanged: function() {
-        this._spacing = this._table.get_theme_node().get_length('spacing-columns');
-    },
-
-    _bannerBoxGetPreferredWidth: function(actor, forHeight, alloc) {
-        let [titleMin, titleNat] = this._titleLabel.get_preferred_width(forHeight);
-        let [bannerMin, bannerNat] = this._bannerLabel.get_preferred_width(forHeight);
-
-        if (this._secondaryIcon) {
-            let [secondaryIconMin, secondaryIconNat] = this._secondaryIcon.get_preferred_width(forHeight);
-
-            alloc.min_size = secondaryIconMin + this._spacing + titleMin;
-            alloc.natural_size = secondaryIconNat + this._spacing + titleNat + this._spacing + bannerNat;
-        } else {
-            alloc.min_size = titleMin;
-            alloc.natural_size = titleNat + this._spacing + bannerNat;
-        }
-    },
-
-    _bannerBoxGetPreferredHeight: function(actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] =
-            this._titleLabel.get_preferred_height(forWidth);
-    },
-
-    _bannerBoxAllocate: function(actor, box, flags) {
-        let availWidth = box.x2 - box.x1;
-
-        let [titleMinW, titleNatW] = this._titleLabel.get_preferred_width(-1);
-        let [titleMinH, titleNatH] = this._titleLabel.get_preferred_height(availWidth);
-        let [bannerMinW, bannerNatW] = this._bannerLabel.get_preferred_width(availWidth);
-
-        let rtl = (this._table.text_direction == Clutter.TextDirection.RTL);
-        let x = rtl ? availWidth : 0;
-
-        if (this._secondaryIcon) {
-            let [iconMinW, iconNatW] = this._secondaryIcon.get_preferred_width(-1);
-            let [iconMinH, iconNatH] = this._secondaryIcon.get_preferred_height(availWidth);
-
-            let secondaryIconBox = new Clutter.ActorBox();
-            let secondaryIconBoxW = Math.min(iconNatW, availWidth);
-
-            // allocate secondary icon box
-            if (rtl) {
-                secondaryIconBox.x1 = x - secondaryIconBoxW;
-                secondaryIconBox.x2 = x;
-                x = x - (secondaryIconBoxW + this._spacing);
-            } else {
-                secondaryIconBox.x1 = x;
-                secondaryIconBox.x2 = x + secondaryIconBoxW;
-                x = x + secondaryIconBoxW + this._spacing;
-            }
-            secondaryIconBox.y1 = 0;
-            // Using titleNatH ensures that the secondary icon is centered vertically
-            secondaryIconBox.y2 = titleNatH;
-
-            availWidth = availWidth - (secondaryIconBoxW + this._spacing);
-            this._secondaryIcon.allocate(secondaryIconBox, flags);
-        }
-
-        let titleBox = new Clutter.ActorBox();
-        let titleBoxW = Math.min(titleNatW, availWidth);
-        if (rtl) {
-            titleBox.x1 = availWidth - titleBoxW;
-            titleBox.x2 = availWidth;
-        } else {
-            titleBox.x1 = x;
-            titleBox.x2 = titleBox.x1 + titleBoxW;
-        }
-        titleBox.y1 = 0;
-        titleBox.y2 = titleNatH;
-        this._titleLabel.allocate(titleBox, flags);
-        this._titleFitsInBannerMode = (titleNatW <= availWidth);
-
-        let bannerFits = true;
-        if (titleBoxW + this._spacing > availWidth) {
-            this._bannerLabel.opacity = 0;
-            bannerFits = false;
-        } else {
-            let bannerBox = new Clutter.ActorBox();
-
-            if (rtl) {
-                bannerBox.x1 = 0;
-                bannerBox.x2 = titleBox.x1 - this._spacing;
-
-                bannerFits = (bannerBox.x2 - bannerNatW >= 0);
-            } else {
-                bannerBox.x1 = titleBox.x2 + this._spacing;
-                bannerBox.x2 = availWidth;
-
-                bannerFits = (bannerBox.x1 + bannerNatW <= availWidth);
-            }
-            bannerBox.y1 = 0;
-            bannerBox.y2 = titleNatH;
-            this._bannerLabel.allocate(bannerBox, flags);
-
-            // Make _bannerLabel visible if the entire notification
-            // fits on one line, or if the notification is currently
-            // unexpanded and only showing one line anyway.
-            if (!this.expanded || (bannerFits && this._table.row_count == 1))
-                this._bannerLabel.opacity = 255;
-        }
-
-        // If the banner doesn't fully fit in the banner box, we possibly need to add the
-        // banner to the body. We can't do that from here though since that will force a
-        // relayout, so we add it to the main loop.
-        if (!bannerFits && this._canExpandContent())
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                           Lang.bind(this,
-                                     function() {
-                                         if (this._destroyed)
-                                             return false;
-
-                                        if (this._canExpandContent()) {
-                                            this._addBannerBody();
-                                            this._table.add_style_class_name('multi-line-notification');
-                                            this.updated();
-                                        }
-                                        return false;
-                                     }));
-    },
-
-    _canExpandContent: function() {
-        return (this.bannerBodyText && !this._bannerBodyAdded) ||
-               (!this._titleFitsInBannerMode && !this._table.has_style_class_name('multi-line-notification'));
-    },
-
     playSound: function() {
         if (this._soundPlayed)
             return;
@@ -1019,71 +460,6 @@ const Notification = new Lang.Class({
         }
     },
 
-    updated: function() {
-        if (this.expanded)
-            this.expand(false);
-    },
-
-    expand: function(animate) {
-        this.expanded = true;
-        this.actor.remove_style_class_name('notification-unexpanded');
-
-        // Show additional content that we keep hidden in banner mode
-        if (this._actionArea)
-            this._actionArea.show();
-        if (this._scrollArea)
-            this._scrollArea.show();
-
-        // The banner is never shown when the title did not fit, so this
-        // can be an if-else statement.
-        if (!this._titleFitsInBannerMode) {
-            // Remove ellipsization from the title label and make it wrap so that
-            // we show the full title when the notification is expanded.
-            this._titleLabel.clutter_text.line_wrap = true;
-            this._titleLabel.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-            this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        } else if (this._table.row_count > 1 && this._bannerLabel.opacity != 0) {
-            // We always hide the banner if the notification has additional content.
-            //
-            // We don't need to wrap the banner that doesn't fit the way we wrap the
-            // title that doesn't fit because we won't have a notification with
-            // row_count=1 that has a banner that doesn't fully fit. We'll either add
-            // that banner to the content of the notification in _bannerBoxAllocate()
-            // or the notification will have custom content.
-            if (animate)
-                Tweener.addTween(this._bannerLabel,
-                                 { opacity: 0,
-                                   time: ANIMATION_TIME,
-                                   transition: 'easeOutQuad' });
-            else
-                this._bannerLabel.opacity = 0;
-        }
-        this.emit('expanded');
-    },
-
-    collapseCompleted: function() {
-        if (this._destroyed)
-            return;
-        this.expanded = false;
-
-        // Hide additional content that we keep hidden in banner mode
-        if (this._actionArea)
-            this._actionArea.hide();
-        if (this._scrollArea)
-            this._scrollArea.hide();
-
-        // Make sure we don't line wrap the title, and ellipsize it instead.
-        this._titleLabel.clutter_text.line_wrap = false;
-        this._titleLabel.clutter_text.ellipsize = Pango.EllipsizeMode.END;
-
-        // Restore banner opacity in case the notification is shown in the
-        // banner mode again on update.
-        this._bannerLabel.opacity = 255;
-
-        // Restore height requisition
-        this.actor.add_style_class_name('notification-unexpanded');
-    },
-
     // Allow customizing the banner UI:
     // the default implementation defers the creation to
     // the source (which will create a NotificationBanner),
@@ -1095,27 +471,14 @@ const Notification = new Lang.Class({
 
     activate: function() {
         this.emit('activated');
-        // We hide all types of notifications once the user clicks on them because the common
-        // outcome of clicking should be the relevant window being brought forward and the user's
-        // attention switching to the window.
-        this.emit('done-displaying');
         if (!this.resident)
             this.destroy();
     },
 
-    _onDestroy: function() {
-        if (this._destroyed)
-            return;
-        this._destroyed = true;
-        if (!this._destroyedReason)
-            this._destroyedReason = NotificationDestroyedReason.DISMISSED;
-        this.emit('destroy', this._destroyedReason);
-    },
-
     destroy: function(reason) {
-        this._destroyedReason = reason;
+        if (!reason)
-        this.actor.destroy();
+            reason = NotificationDestroyedReason.DISMISSED;
-        this.actor._delegate = null;
+        this.emit('destroy', reason);
     }
 });
 Signals.addSignalMethods(Notification.prototype);
@@ -1127,6 +490,7 @@ 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;
@@ -1372,10 +736,6 @@ const Source = new Lang.Class({
         return this.count > 1;
     },
 
-    get isClearable() {
-        return !this.isChat && !this.resident;
-    },
-
     countUpdated: function() {
         this.emit('count-updated');
     },
@@ -1548,8 +908,6 @@ 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 });
 
@@ -1600,6 +958,14 @@ 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();
@@ -1650,9 +1016,6 @@ 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));
@@ -1665,9 +1028,6 @@ 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);
 
@@ -1939,10 +1299,6 @@ const MessageTray = new Lang.Class({
             this.idleMonitor.add_user_active_watch(Lang.bind(this, this._onIdleMonitorBecameActive));
         }
 
-        // HACK: didn't manage to get chat into a proper state in time
-        if (this._notification.source.isChat)
-            this._banner = this._notification;
-        else
         this._banner = this._notification.createBanner();
         this._bannerClickedId = this._banner.connect('done-displaying',
                                                      Lang.bind(this, this._escapeTray));
@@ -2095,9 +1451,6 @@ const MessageTray = new Lang.Class({
         this._pointerInNotification = false;
         this._notificationRemoved = false;
 
-        if (notification.resident)
-            this._bannerBin.remove_actor(this._banner.actor);
-        else
         this._banner.actor.destroy();
         this._banner = null;
         this.actor.hide();

js/ui/modalDialog.js

@@ -23,7 +23,7 @@ const Tweener = imports.ui.tweener;
 const OPEN_AND_CLOSE_TIME = 0.1;
 const FADE_OUT_DIALOG_TIME = 1.0;
 
-const WORK_SPINNER_ICON_SIZE = 24;
+const WORK_SPINNER_ICON_SIZE = 16;
 const WORK_SPINNER_ANIMATION_DELAY = 1.0;
 const WORK_SPINNER_ANIMATION_TIME = 0.3;
 

js/ui/osdMonitorLabeler.js

@@ -15,8 +15,7 @@ const OsdMonitorLabel = new Lang.Class({
     Name: 'OsdMonitorLabel',
 
     _init: function(monitor, label) {
-        this._actor = new St.Widget({ opacity: 0,
+        this._actor = new St.Widget({ x_expand: true,
-                                      x_expand: true,
                                       y_expand: true });
 
         this._monitor = monitor;
@@ -34,10 +33,6 @@ const OsdMonitorLabel = new Lang.Class({
         this._position();
 
         Meta.disable_unredirect_for_screen(global.screen);
-        Tweener.addTween(this._actor,
-                         { opacity: 255,
-                           time: FADE_TIME,
-                           transition: 'easeOutQuad' });
     },
 
     _position: function() {
@@ -52,15 +47,8 @@ const OsdMonitorLabel = new Lang.Class({
     },
 
     destroy: function() {
-        Tweener.addTween(this._actor,
-                         { opacity: 0,
-                           time: FADE_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
         this._actor.destroy();
         Meta.enable_unredirect_for_screen(global.screen);
-                           })
-                         });
     }
 });
 

js/ui/overview.js

@@ -107,13 +107,6 @@ const Overview = new Lang.Class({
 
         this._overviewCreated = true;
 
-        // The main Background actors are inside global.window_group which are
-        // hidden when displaying the overview, so we create a new
-        // one. Instances of this class share a single CoglTexture behind the
-        // scenes which allows us to show the background with different
-        // rendering options without duplicating the texture data.
-        let monitor = Main.layoutManager.primaryMonitor;
-
         let layout = new Clutter.BinLayout();
         this._stack = new Clutter.Actor({ layout_manager: layout });
         this._stack.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
@@ -128,6 +121,11 @@ const Overview = new Lang.Class({
                                             y_expand: true });
         this._overview._delegate = this;
 
+        // The main Background actors are inside global.window_group which are
+        // hidden when displaying the overview, so we create a new
+        // one. Instances of this class share a single CoglTexture behind the
+        // scenes which allows us to show the background with different
+        // rendering options without duplicating the texture data.
         this._backgroundGroup = new Meta.BackgroundGroup();
         Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
         this._bgManagers = [];

js/ui/panel.js

@@ -25,12 +25,12 @@ const RemoteMenu = imports.ui.remoteMenu;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-const PANEL_ICON_SIZE = 24;
+const PANEL_ICON_SIZE = 16;
-const APP_MENU_ICON_MARGIN = 2;
+const APP_MENU_ICON_MARGIN = 0;
 
 const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
 
-const SPINNER_ANIMATION_TIME = 0.2;
+const SPINNER_ANIMATION_TIME = 1.0;
 
 // To make sure the panel corners blend nicely with the panel,
 // we draw background and borders the same way, e.g. drawing
@@ -933,6 +933,14 @@ 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);
 
@@ -995,6 +1003,7 @@ 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);
@@ -1004,6 +1013,8 @@ 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) {
@@ -1035,5 +1046,24 @@ 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;
+            }));
     }
 });

js/ui/panelMenu.js

@@ -128,6 +128,7 @@ const Button = new Lang.Class({
             Main.uiGroup.add_actor(this.menu.actor);
             this.menu.actor.hide();
         }
+        this.emit('menu-set');
     },
 
     _onEvent: function(actor, event) {

js/ui/popupMenu.js

@@ -169,10 +169,10 @@ const PopupBaseMenuItem = new Lang.Class({
         if (activeChanged) {
             this.active = active;
             if (active) {
-                this.actor.add_style_class_name('active');
+                this.actor.add_style_class_name('selected');
                 this.actor.grab_key_focus();
             } else {
-                this.actor.remove_style_class_name('active');
+                this.actor.remove_style_class_name('selected');
                 // Remove the CSS active state if the user press the button and
                 // while holding moves to another menu item, so we don't paint all items.
                 // The correct behaviour would be to set the new item with the CSS

js/ui/remoteSearch.js

@@ -63,7 +63,7 @@ const SearchProvider2Iface = '<node> \
 var SearchProviderProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProviderIface);
 var SearchProvider2ProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProvider2Iface);
 
-function loadRemoteSearchProviders(callback) {
+function loadRemoteSearchProviders(searchSettings, callback) {
     let objectPaths = {};
     let loadedProviders = [];
 
@@ -124,7 +124,6 @@ function loadRemoteSearchProviders(callback) {
         }
     }
 
-    let searchSettings = new Gio.Settings({ schema_id: Search.SEARCH_PROVIDERS_SCHEMA });
     if (searchSettings.get_boolean('disable-external')) {
         callback([]);
         return;

js/ui/screenShield.js

@@ -507,21 +507,22 @@ 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;
@@ -547,6 +548,18 @@ 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) {
@@ -664,31 +677,28 @@ const ScreenShield = new Lang.Class({
         return Clutter.EVENT_STOP;
     },
 
-    _inhibitSuspend: function() {
+    _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 {
-
-    _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)) {
+            if (this._settings.get_boolean(LOCK_ENABLED_KEY))
-                this._uninhibitSuspend();
-                return;
-            }
                 this.lock(true);
         } else {
-            this._inhibitSuspend();
-
             this._wakeUpScreen();
         }
     },
@@ -1083,15 +1093,7 @@ const ScreenShield = new Lang.Class({
     },
 
     _completeLockScreenShown: function() {
-        let prevIsActive = this._isActive;
+        this._setActive(true);
-        this._isActive = true;
-
-        if (prevIsActive != this._isActive)
-            this.emit('active-changed');
-
-        if (this._aboutToSuspend)
-            this._uninhibitSuspend();
-
         this.emit('lock-screen-shown');
     },
 
@@ -1185,8 +1187,7 @@ const ScreenShield = new Lang.Class({
             // gnome-settings-daemon will stop blanking the screen
 
             this._activationTime = 0;
-            this._isActive = false;
+            this._setActive(false);
-            this.emit('active-changed');
             return;
         }
 
@@ -1229,9 +1230,8 @@ const ScreenShield = new Lang.Class({
         }
 
         this._activationTime = 0;
-        this._isActive = false;
+        this._setActive(false);
         this._isLocked = false;
-        this.emit('active-changed');
         this.emit('locked-changed');
         global.set_runtime_state(LOCKED_STATE_STR, null);
     },

js/ui/search.js

@@ -416,6 +416,7 @@ const SearchResults = new Lang.Class({
 
         this._searchSettings = new Gio.Settings({ schema_id: SEARCH_PROVIDERS_SCHEMA });
         this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
+        this._searchSettings.connect('changed::enabled', Lang.bind(this, this._reloadRemoteProviders));
         this._searchSettings.connect('changed::disable-external', Lang.bind(this, this._reloadRemoteProviders));
         this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
 
@@ -434,7 +435,7 @@ const SearchResults = new Lang.Class({
             this._unregisterProvider(provider);
         }));
 
-        RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, function(providers) {
+        RemoteSearch.loadRemoteSearchProviders(this._searchSettings, Lang.bind(this, function(providers) {
             providers.forEach(Lang.bind(this, this._registerProvider));
         }));
     },

js/ui/status/accessibility.js

@@ -119,23 +119,46 @@ const ATIndicator = new Lang.Class({
 
     _buildItem: function(string, schema, key) {
         let settings = new Gio.Settings({ schema_id: schema });
+        settings.connect('changed::'+key, Lang.bind(this, function() {
+            widget.setToggleState(settings.get_boolean(key));
+
+            this._queueSyncMenuVisibility();
+        }));
+
         let widget = this._buildItemExtended(string,
             settings.get_boolean(key),
             settings.is_writable(key),
             function(enabled) {
                 return settings.set_boolean(key, enabled);
             });
-        settings.connect('changed::'+key, Lang.bind(this, function() {
-            widget.setToggleState(settings.get_boolean(key));
-
-            this._queueSyncMenuVisibility();
-        }));
         return widget;
     },
 
     _buildHCItem: function() {
         let interfaceSettings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
         let wmSettings = new Gio.Settings({ schema_id: WM_SCHEMA });
+        interfaceSettings.connect('changed::' + KEY_GTK_THEME, Lang.bind(this, function() {
+            let value = interfaceSettings.get_string(KEY_GTK_THEME);
+            if (value == HIGH_CONTRAST_THEME) {
+                highContrast.setToggleState(true);
+            } else {
+                highContrast.setToggleState(false);
+                gtkTheme = value;
+            }
+
+            this._queueSyncMenuVisibility();
+        }));
+        interfaceSettings.connect('changed::' + KEY_ICON_THEME, function() {
+            let value = interfaceSettings.get_string(KEY_ICON_THEME);
+            if (value != HIGH_CONTRAST_THEME)
+                iconTheme = value;
+        });
+        wmSettings.connect('changed::' + KEY_WM_THEME, function() {
+            let value = wmSettings.get_string(KEY_WM_THEME);
+            if (value != HIGH_CONTRAST_THEME)
+                wmTheme = value;
+        });
+
         let gtkTheme = interfaceSettings.get_string(KEY_GTK_THEME);
         let iconTheme = interfaceSettings.get_string(KEY_ICON_THEME);
         let wmTheme = wmSettings.get_string(KEY_WM_THEME);
@@ -161,32 +184,18 @@ const ATIndicator = new Lang.Class({
                     wmSettings.reset(KEY_WM_THEME);
                 }
             });
-        interfaceSettings.connect('changed::' + KEY_GTK_THEME, Lang.bind(this, function() {
-            let value = interfaceSettings.get_string(KEY_GTK_THEME);
-            if (value == HIGH_CONTRAST_THEME) {
-                highContrast.setToggleState(true);
-            } else {
-                highContrast.setToggleState(false);
-                gtkTheme = value;
-            }
-
-            this._queueSyncMenuVisibility();
-        }));
-        interfaceSettings.connect('changed::' + KEY_ICON_THEME, function() {
-            let value = interfaceSettings.get_string(KEY_ICON_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                iconTheme = value;
-        });
-        wmSettings.connect('changed::' + KEY_WM_THEME, function() {
-            let value = wmSettings.get_string(KEY_WM_THEME);
-            if (value != HIGH_CONTRAST_THEME)
-                wmTheme = value;
-        });
         return highContrast;
     },
 
     _buildFontItem: function() {
         let settings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
+        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, Lang.bind(this, function() {
+            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
+            let active = (factor > 1.0);
+            widget.setToggleState(active);
+
+            this._queueSyncMenuVisibility();
+        }));
 
         let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
         let initial_setting = (factor > 1.0);
@@ -200,13 +209,6 @@ const ATIndicator = new Lang.Class({
                 else
                     settings.reset(KEY_TEXT_SCALING_FACTOR);
             });
-        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, Lang.bind(this, function() {
-            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
-            let active = (factor > 1.0);
-            widget.setToggleState(active);
-
-            this._queueSyncMenuVisibility();
-        }));
         return widget;
     }
 });

js/ui/status/keyboard.js

@@ -2,6 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
@@ -18,10 +19,6 @@ const PanelMenu = imports.ui.panelMenu;
 const SwitcherPopup = imports.ui.switcherPopup;
 const Util = imports.misc.util;
 
-const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
-const KEY_INPUT_SOURCES = 'sources';
-const KEY_KEYBOARD_OPTIONS = 'xkb-options';
-
 const INPUT_SOURCE_TYPE_XKB = 'xkb';
 const INPUT_SOURCE_TYPE_IBUS = 'ibus';
 
@@ -142,6 +139,149 @@ const InputSourceSwitcher = new Lang.Class({
     }
 });
 
+const InputSourceSettings = new Lang.Class({
+    Name: 'InputSourceSettings',
+    Abstract: true,
+
+    _emitInputSourcesChanged: function() {
+        this.emit('input-sources-changed');
+    },
+
+    _emitKeyboardOptionsChanged: function() {
+        this.emit('keyboard-options-changed');
+    },
+
+    _emitPerWindowChanged: function() {
+        this.emit('per-window-changed');
+    },
+
+    get inputSources() {
+        return [];
+    },
+
+    get keyboardOptions() {
+        return [];
+    },
+
+    get perWindow() {
+        return false;
+    }
+});
+Signals.addSignalMethods(InputSourceSettings.prototype);
+
+const InputSourceSystemSettings = new Lang.Class({
+    Name: 'InputSourceSystemSettings',
+    Extends: InputSourceSettings,
+
+    _BUS_NAME: 'org.freedesktop.locale1',
+    _BUS_PATH: '/org/freedesktop/locale1',
+    _BUS_IFACE: 'org.freedesktop.locale1',
+    _BUS_PROPS_IFACE: 'org.freedesktop.DBus.Properties',
+
+    _init: function() {
+        this._layouts = '';
+        this._variants = '';
+        this._options = '';
+
+        this._reload();
+
+        Gio.DBus.system.signal_subscribe(this._BUS_NAME,
+                                         this._BUS_PROPS_IFACE,
+                                         'PropertiesChanged',
+                                         this._BUS_PATH,
+                                         null,
+                                         Gio.DBusSignalFlags.NONE,
+                                         Lang.bind(this, this._reload));
+    },
+
+    _reload: function() {
+        Gio.DBus.system.call(this._BUS_NAME,
+                             this._BUS_PATH,
+                             this._BUS_PROPS_IFACE,
+                             'GetAll',
+                             new GLib.Variant('(s)', [this._BUS_IFACE]),
+                             null, Gio.DBusCallFlags.NONE, -1, null,
+                             Lang.bind(this, function(conn, result) {
+                                 let props;
+                                 try {
+                                     props = conn.call_finish(result).deep_unpack()[0];
+                                 } catch(e) {
+                                     log('Could not get properties from ' + this._BUS_NAME);
+                                     return;
+                                 }
+                                 let layouts = props['X11Layout'].unpack();
+                                 let variants = props['X11Variant'].unpack();
+                                 let options = props['X11Options'].unpack();
+
+                                 if (layouts != this._layouts ||
+                                     variants != this._variants) {
+                                     this._layouts = layouts;
+                                     this._variants = variants;
+                                     this._emitInputSourcesChanged();
+                                 }
+                                 if (options != this._options) {
+                                     this._options = options;
+                                     this._emitKeyboardOptionsChanged();
+                                 }
+                             }));
+    },
+
+    get inputSources() {
+        let sourcesList = [];
+        let layouts = this._layouts.split(',');
+        let variants = this._variants.split(',');
+
+        for (let i = 0; i < layouts.length && !!layouts[i]; i++) {
+            let id = layouts[i];
+            if (!!variants[i])
+                id += '+' + variants[i];
+            sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: id });
+        }
+        return sourcesList;
+    },
+
+    get keyboardOptions() {
+        return this._options.split(',');
+    }
+});
+
+const InputSourceSessionSettings = new Lang.Class({
+    Name: 'InputSourceSessionSettings',
+    Extends: InputSourceSettings,
+
+    _DESKTOP_INPUT_SOURCES_SCHEMA: 'org.gnome.desktop.input-sources',
+    _KEY_INPUT_SOURCES: 'sources',
+    _KEY_KEYBOARD_OPTIONS: 'xkb-options',
+    _KEY_PER_WINDOW: 'per-window',
+
+    _init: function() {
+        this._settings = new Gio.Settings({ schema_id: this._DESKTOP_INPUT_SOURCES_SCHEMA });
+        this._settings.connect('changed::' + this._KEY_INPUT_SOURCES, Lang.bind(this, this._emitInputSourcesChanged));
+        this._settings.connect('changed::' + this._KEY_KEYBOARD_OPTIONS, Lang.bind(this, this._emitKeyboardOptionsChanged));
+        this._settings.connect('changed::' + this._KEY_PER_WINDOW, Lang.bind(this, this._emitPerWindowChanged));
+    },
+
+    get inputSources() {
+        let sourcesList = [];
+        let sources = this._settings.get_value(this._KEY_INPUT_SOURCES);
+        let nSources = sources.n_children();
+
+        for (let i = 0; i < nSources; i++) {
+            let [type, id] = sources.get_child_value(i).deep_unpack();
+            sourcesList.push({ type: type, id: id });
+        }
+        return sourcesList;
+    },
+
+    get keyboardOptions() {
+        return this._settings.get_strv(this._KEY_KEYBOARD_OPTIONS);
+    },
+
+    get perWindow() {
+        return this._settings.get_boolean(this._KEY_PER_WINDOW);
+    }
+});
+
 const InputSourceManager = new Lang.Class({
     Name: 'InputSourceManager',
 
@@ -155,11 +295,11 @@ const InputSourceManager = new Lang.Class({
         this._ibusSources = {};
 
         this._currentSource = null;
-        this._backupSource = null;
 
         // All valid input sources currently in the gsettings
         // KEY_INPUT_SOURCES list ordered by most recently used
         this._mruSources = [];
+        this._mruSourcesBackup = null;
         this._keybindingAction =
             Main.wm.addKeybinding('switch-input-source',
                                   new Gio.Settings({ schema_id: "org.gnome.desktop.wm.keybindings" }),
@@ -172,9 +312,12 @@ const InputSourceManager = new Lang.Class({
                                   Meta.KeyBindingFlags.IS_REVERSED,
                                   Shell.ActionMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
-        this._settings = new Gio.Settings({ schema_id: DESKTOP_INPUT_SOURCES_SCHEMA });
+        if (Main.sessionMode.isGreeter)
-        this._settings.connect('changed::' + KEY_INPUT_SOURCES, Lang.bind(this, this._inputSourcesChanged));
+            this._settings = new InputSourceSystemSettings();
-        this._settings.connect('changed::' + KEY_KEYBOARD_OPTIONS, Lang.bind(this, this._keyboardOptionsChanged));
+        else
+            this._settings = new InputSourceSessionSettings();
+        this._settings.connect('input-sources-changed', Lang.bind(this, this._inputSourcesChanged));
+        this._settings.connect('keyboard-options-changed', Lang.bind(this, this._keyboardOptionsChanged));
 
         this._xkbInfo = KeyboardManager.getXkbInfo();
         this._keyboardManager = KeyboardManager.getKeyboardManager();
@@ -192,13 +335,13 @@ const InputSourceManager = new Lang.Class({
         this._focusWindowNotifyId = 0;
         this._overviewShowingId = 0;
         this._overviewHiddenId = 0;
-        this._settings.connect('changed::per-window', Lang.bind(this, this._sourcesPerWindowChanged));
+        this._settings.connect('per-window-changed', Lang.bind(this, this._sourcesPerWindowChanged));
         this._sourcesPerWindowChanged();
         this._disableIBus = false;
     },
 
     reload: function() {
-        this._keyboardManager.setKeyboardOptions(this._settings.get_strv(KEY_KEYBOARD_OPTIONS));
+        this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions);
         this._inputSourcesChanged();
     },
 
@@ -253,7 +396,7 @@ const InputSourceManager = new Lang.Class({
     },
 
     _keyboardOptionsChanged: function() {
-        this._keyboardManager.setKeyboardOptions(this._settings.get_strv(KEY_KEYBOARD_OPTIONS));
+        this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions);
         this._keyboardManager.reapply();
     },
 
@@ -294,8 +437,8 @@ const InputSourceManager = new Lang.Class({
     },
 
     _inputSourcesChanged: function() {
-        let sources = this._settings.get_value(KEY_INPUT_SOURCES);
+        let sources = this._settings.inputSources;
-        let nSources = sources.n_children();
+        let nSources = sources.length;
 
         this._inputSources = {};
         this._ibusSources = {};
@@ -304,7 +447,8 @@ const InputSourceManager = new Lang.Class({
         for (let i = 0; i < nSources; i++) {
             let displayName;
             let shortName;
-            let [type, id] = sources.get_child_value(i).deep_unpack();
+            let type = sources[i].type;
+            let id = sources[i].id;
             let exists = false;
 
             if (type == INPUT_SOURCE_TYPE_XKB) {
@@ -372,6 +516,11 @@ const InputSourceManager = new Lang.Class({
 
         this._keyboardManager.setUserLayouts(sourcesList.map(function(x) { return x.xkbId; }));
 
+        if (!this._disableIBus && this._mruSourcesBackup) {
+            this._mruSources = this._mruSourcesBackup;
+            this._mruSourcesBackup = null;
+        }
+
         let mruSources = [];
         for (let i = 0; i < this._mruSources.length; i++) {
             for (let j = 0; j < sourcesList.length; j++)
@@ -383,20 +532,8 @@ const InputSourceManager = new Lang.Class({
         }
         this._mruSources = mruSources.concat(sourcesList);
 
-        if (this._mruSources.length > 0) {
+        if (this._mruSources.length > 0)
-            if (!this._disableIBus && this._backupSource) {
-                for (let i = 0; i < this._mruSources.length; i++) {
-                    if (this._mruSources[i].type == this._backupSource.type &&
-                        this._mruSources[i].id == this._backupSource.id) {
-                        let currentSource = this._mruSources.splice(i, 1);
-                        this._mruSources = currentSource.concat(this._mruSources);
-                        break;
-                    }
-                }
-                this._backupSource = null;
-            }
             this._mruSources[0].activate();
-        }
 
         // All ibus engines are preloaded here to reduce the launching time
         // when users switch the input sources.
@@ -461,16 +598,12 @@ const InputSourceManager = new Lang.Class({
             if (this._disableIBus)
                 return;
             this._disableIBus = true;
-            this._backupSource = this._currentSource;
+            this._mruSourcesBackup = this._mruSources.slice();
         } else {
             if (!this._disableIBus)
                 return;
             this._disableIBus = false;
         }
-        // If this._mruSources is not cleared before this.reload() is called,
-        // the order is different from the original one as IM sources will
-        // be appended to XKB sources.
-        this._mruSources = [];
         this.reload();
     },
 
@@ -513,7 +646,7 @@ const InputSourceManager = new Lang.Class({
     },
 
     _sourcesPerWindowChanged: function() {
-        this._sourcesPerWindow = this._settings.get_boolean('per-window');
+        this._sourcesPerWindow = this._settings.perWindow;
 
         if (this._sourcesPerWindow && this._focusWindowNotifyId == 0) {
             this._focusWindowNotifyId = global.display.connect('notify::focus-window',

js/ui/status/network.js

@@ -877,7 +877,7 @@ const NMWirelessDialog = new Lang.Class({
                                                  y_align: Clutter.ActorAlign.CENTER });
 
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
-        this._noNetworksSpinner = new Animation.AnimatedIcon(file, 24, 24);
+        this._noNetworksSpinner = new Animation.AnimatedIcon(file, 16, 16);
         this._noNetworksBox.add_actor(this._noNetworksSpinner.actor);
         this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label',
                                                      text: _("No Networks") }));
@@ -917,10 +917,7 @@ const NMWirelessDialog = new Lang.Class({
                                                   key: Clutter.Escape });
         this._connectButton = this.addButton({ action: Lang.bind(this, this._connect),
                                                label: _("Connect"),
-                                               key: Clutter.Return },
+                                               key: Clutter.Return });
-                                             { expand: true,
-                                               x_fill: false,
-                                               x_align: St.Align.END });
     },
 
     _connect: function() {

js/ui/status/system.js

@@ -17,15 +17,24 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
-const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
-const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
 const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
 const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
 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',
 
@@ -95,10 +104,8 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent();
 
-        this._screenSaverSettings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
         this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
         this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
-        this._privacySettings = new Gio.Settings({ schema_id: PRIVACY_SCHEMA });
         this._orientationSettings = new Gio.Settings({ schema_id: 'org.gnome.settings-daemon.peripherals.touchscreen' });
 
         this._session = new GnomeSession.SessionManager();
@@ -129,6 +136,7 @@ const Indicator = new Lang.Class({
                                 Lang.bind(this, this._updateMultiUser));
         this._updateSwitchUser();
         this._updateMultiUser();
+        this._updateLockScreen();
 
         // Whether shutdown is available or not depends on both lockdown
         // settings (disable-log-out) and Polkit policy - the latter doesn't
@@ -147,15 +155,11 @@ const Indicator = new Lang.Class({
 
         this._orientationSettings.connect('changed::orientation-lock',
                                           Lang.bind(this, this._updateOrientationLock));
-        this._orientationExists = false;
+        Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
-        Gio.DBus.session.watch_name('org.gnome.SettingsDaemon.Orientation',
                                    Gio.BusNameWatcherFlags.NONE,
+                                   Lang.bind(this, this._sensorProxyAppeared),
                                    Lang.bind(this, function() {
-                                        this._orientationExists = true;
+                                       this._sensorProxy = null;
-                                        this._updateOrientationLock();
-                                    }),
-                                    Lang.bind(this, function() {
-                                        this._orientationExists = false;
                                        this._updateOrientationLock();
                                    }));
         this._updateOrientationLock();
@@ -164,6 +168,19 @@ const Indicator = new Lang.Class({
         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 ||
@@ -240,7 +257,10 @@ const Indicator = new Lang.Class({
     },
 
     _updateOrientationLock: function() {
-        this._orientationLockAction.visible = this._orientationExists;
+        if (this._sensorProxy)
+            this._orientationLockAction.visible = this._sensorProxy.HasAccelerometer;
+        else
+            this._orientationLockAction.visible = false;
 
         let locked = this._orientationSettings.get_boolean('orientation-lock');
         let icon = this._orientationLockAction.child;

js/ui/windowAttentionHandler.js

@@ -11,7 +11,8 @@ const WindowAttentionHandler = new Lang.Class({
 
     _init : function() {
         this._tracker = Shell.WindowTracker.get_default();
-        global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
+        this._windowDemandsAttentionId = global.display.connect('window-demands-attention',
+                                                                Lang.bind(this, this._onWindowDemandsAttention));
     },
 
     _getTitleAndBanner: function(app, window) {

js/ui/windowManager.js

@@ -19,8 +19,6 @@ const Tweener = imports.ui.tweener;
 const WindowMenu = imports.ui.windowMenu;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
-const MAXIMIZE_WINDOW_ANIMATION_TIME = 0.15;
-const UNMAXIMIZE_WINDOW_ANIMATION_TIME = 0.15;
 const MINIMIZE_WINDOW_ANIMATION_TIME = 0.2;
 const SHOW_WINDOW_ANIMATION_TIME = 0.15;
 const DIALOG_SHOW_WINDOW_ANIMATION_TIME = 0.1;
@@ -83,12 +81,10 @@ const DisplayChangeDialog = new Lang.Class({
         */
         this._cancelButton = this.addButton({ label: _("Revert Settings"),
                                               action: Lang.bind(this, this._onFailure),
-                                              key: Clutter.Escape },
+                                              key: Clutter.Escape });
-                                            { expand: true, x_fill: false, x_align: St.Align.START });
         this._okButton = this.addButton({ label:  _("Keep Changes"),
                                           action: Lang.bind(this, this._onSuccess),
-                                          default: true },
+                                          default: true });
-                                        { expand: false, x_fill: false, x_align: St.Align.END });
 
         this._timeoutId = Mainloop.timeout_add(ONE_SECOND, Lang.bind(this, this._tick));
         GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._tick');
@@ -197,6 +193,8 @@ const WorkspaceTracker = new Lang.Class({
         this._workspaces = [];
         this._checkWorkspacesId = 0;
 
+        this._pauseWorkspaceCheck = false;
+
         let tracker = Shell.WindowTracker.get_default();
         tracker.connect('startup-sequence-changed', Lang.bind(this, this._queueCheckWorkspaces));
 
@@ -215,11 +213,20 @@ const WorkspaceTracker = new Lang.Class({
 
     _getWorkspaceSettings: function() {
         let settings = global.get_overrides_settings();
-        if (settings.list_keys().indexOf('dynamic-workspaces') > -1)
+        if (settings &&
+            settings.settings_schema.list_keys().indexOf('dynamic-workspaces') > -1)
             return settings;
         return new Gio.Settings({ schema_id: 'org.gnome.mutter' });
     },
 
+    blockUpdates: function() {
+        this._pauseWorkspaceCheck = true;
+    },
+
+    unblockUpdates: function() {
+        this._pauseWorkspaceCheck = false;
+    },
+
     _checkWorkspaces: function() {
         let i;
         let emptyWorkspaces = [];
@@ -229,6 +236,10 @@ const WorkspaceTracker = new Lang.Class({
             return false;
         }
 
+        // Update workspaces only if Dynamic Workspace Management has not been paused by some other function
+        if (this._pauseWorkspaceCheck)
+            return true;
+
         for (i = 0; i < this._workspaces.length; i++) {
             let lastRemoved = this._workspaces[i]._lastRemovedWindow;
             if ((lastRemoved &&
@@ -464,52 +475,100 @@ const TilePreview = new Lang.Class({
     }
 });
 
+const TouchpadWorkspaceSwitchAction = new Lang.Class({
+    Name: 'TouchpadWorkspaceSwitchAction',
+
+    _init: function(actor) {
+        this._dx = 0;
+        this._dy = 0;
+        actor.connect('captured-event', Lang.bind(this, this._handleEvent));
+    },
+
+    _checkActivated: function() {
+        const MOTION_THRESHOLD = 50;
+        let allowedModes = Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW;
+        let dir;
+
+        if ((allowedModes & Main.actionMode) == 0)
+            return;
+
+        if (this._dy < -MOTION_THRESHOLD)
+            dir = Meta.MotionDirection.DOWN;
+        else if (this._dy > MOTION_THRESHOLD)
+            dir = Meta.MotionDirection.UP;
+        else if (this._dx < -MOTION_THRESHOLD)
+            dir = Meta.MotionDirection.RIGHT;
+        else if (this._dx > MOTION_THRESHOLD)
+            dir = Meta.MotionDirection.LEFT;
+        else
+            return;
+
+        this.emit('activated', dir);
+    },
+
+    _handleEvent: function(actor, event) {
+        if (event.type() != Clutter.EventType.TOUCHPAD_SWIPE)
+            return Clutter.EVENT_PROPAGATE;
+
+        if (event.get_gesture_swipe_finger_count() != 4)
+            return Clutter.EVENT_PROPAGATE;
+
+        if (event.get_gesture_phase() == Clutter.TouchpadGesturePhase.UPDATE) {
+            let [dx, dy] = event.get_gesture_motion_delta(event);
+
+            this._dx += dx;
+            this._dy += dy;
+        } else {
+            if (event.get_gesture_phase() == Clutter.TouchpadGesturePhase.END)
+                this._checkActivated();
+
+            this._dx = 0;
+            this._dy = 0;
+        }
+
+        return Clutter.EVENT_STOP;
+    }
+});
+Signals.addSignalMethods(TouchpadWorkspaceSwitchAction.prototype);
+
 const WorkspaceSwitchAction = new Lang.Class({
     Name: 'WorkspaceSwitchAction',
-    Extends: Clutter.GestureAction,
+    Extends: Clutter.SwipeAction,
 
     _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(action, actor) {
+    vfunc_gesture_prepare : function(actor) {
         let allowedModes = Shell.ActionMode.NORMAL | Shell.ActionMode.OVERVIEW;
-        return this.get_n_current_points() == this.get_n_touch_points() &&
+
-               (allowedModes & Main.actionMode);
+        if (!this.parent(actor))
+            return false;
+
+        return (allowedModes & Main.actionMode);
     },
 
-    vfunc_gesture_end : function(action, actor) {
+    vfunc_swept : function(actor, direction) {
-        const MOTION_THRESHOLD = 50;
+        let dir;
 
-        // Just check one touchpoint here
+        if (direction & Clutter.SwipeDirection.UP)
-        let [startX, startY] = this.get_press_coords(0);
+            dir = Meta.MotionDirection.DOWN;
-        let [x, y] = this.get_motion_coords(0);
+        else if (direction & Clutter.SwipeDirection.DOWN)
-        let offsetX = x - startX;
+            dir = Meta.MotionDirection.UP;
-        let offsetY = y - startY;
+        else if (direction & Clutter.SwipeDirection.LEFT)
-        let direction;
+            dir = Meta.MotionDirection.RIGHT;
+        else if (direction & Clutter.SwipeDirection.RIGHT)
+            dir = Meta.MotionDirection.LEFT;
 
-        if (Math.abs(offsetX) < MOTION_THRESHOLD &&
+        this.emit('activated', dir);
-            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);
@@ -617,8 +676,6 @@ const WindowManager = new Lang.Class({
 
         this._minimizing = [];
         this._unminimizing = [];
-        this._maximizing = [];
-        this._unmaximizing = [];
         this._mapping = [];
         this._destroying = [];
         this._movingWindow = null;
@@ -627,12 +684,12 @@ const WindowManager = new Lang.Class({
 
         this._allowedKeybindings = {};
 
+        this._isWorkspacePrepended = false;
+
         this._switchData = null;
         this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
         this._shellwm.connect('kill-window-effects', Lang.bind(this, function (shellwm, actor) {
             this._minimizeWindowDone(shellwm, actor);
-            this._maximizeWindowDone(shellwm, actor);
-            this._unmaximizeWindowDone(shellwm, actor);
             this._mapWindowDone(shellwm, actor);
             this._destroyWindowDone(shellwm, actor);
         }));
@@ -643,8 +700,7 @@ const WindowManager = new Lang.Class({
         this._shellwm.connect('show-window-menu', Lang.bind(this, this._showWindowMenu));
         this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
         this._shellwm.connect('unminimize', Lang.bind(this, this._unminimizeWindow));
-        this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
+        this._shellwm.connect('size-change', Lang.bind(this, this._sizeChangeWindow));
-        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
         this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
         this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
         this._shellwm.connect('filter-keybinding', Lang.bind(this, this._filterKeybinding));
@@ -864,15 +920,22 @@ const WindowManager = new Lang.Class({
                                                 false, -1, 1);
 
         let gesture = new WorkspaceSwitchAction();
-        gesture.connect('activated', Lang.bind(this, function(action, direction) {
+        gesture.connect('activated', Lang.bind(this, this._actionSwitchWorkspace));
-            let newWs = global.screen.get_active_workspace().get_neighbor(direction);
-            this.actionMoveWorkspace(newWs);
-        }));
         global.stage.add_action(gesture);
 
+        // This is not a normal Clutter.GestureAction, doesn't need add_action()
+        gesture = new TouchpadWorkspaceSwitchAction(global.stage);
+        gesture.connect('activated', Lang.bind(this, this._actionSwitchWorkspace));
+
         gesture = new AppSwitchAction();
         gesture.connect('activated', Lang.bind(this, this._switchApp));
         global.stage.add_action(gesture);
+
+    },
+
+    _actionSwitchWorkspace: function(action, direction) {
+            let newWs = global.screen.get_active_workspace().get_neighbor(direction);
+            this.actionMoveWorkspace(newWs);
     },
 
     _lookupIndex: function (windows, metaWindow) {
@@ -915,6 +978,8 @@ const WindowManager = new Lang.Class({
         if (!Meta.prefs_get_dynamic_workspaces())
             return;
 
+        global.screen.append_new_workspace(false, global.get_current_time());
+
         let windows = global.get_window_actors().map(function(winActor) {
             return winActor.meta_window;
         });
@@ -1152,22 +1217,8 @@ const WindowManager = new Lang.Class({
         }
     },
 
-
+    _sizeChangeWindow : function(shellwm, actor, whichChange, oldFrameRect, oldBufferRect) {
-    _maximizeWindow : function(shellwm, actor, targetX, targetY, targetWidth, targetHeight) {
+        shellwm.completed_size_change(actor);
-        shellwm.completed_maximize(actor);
-    },
-
-    _maximizeWindowDone : function(shellwm, actor) {
-    },
-
-    _maximizeWindowOverwrite : function(shellwm, actor) {
-    },
-
-    _unmaximizeWindow : function(shellwm, actor, targetX, targetY, targetWidth, targetHeight) {
-        shellwm.completed_unmaximize(actor);
-    },
-
-    _unmaximizeWindowDone : function(shellwm, actor) {
     },
 
     _hasAttachedDialogs: function(window, ignoreWindow) {
@@ -1626,14 +1677,26 @@ const WindowManager = new Lang.Class({
         let newWs;
         let direction;
 
+        if (action == 'move') {
+            // "Moving" a window to another workspace doesn't make sense when
+            // it cannot be unstuck, and is potentially confusing if a new
+            // workspaces is added at the start/end
+            if (window.is_always_on_all_workspaces() ||
+                (Meta.prefs_get_workspaces_only_on_primary() &&
+                 window.get_monitor() != Main.layoutManager.primaryIndex))
+              return;
+        }
+
         if (target == 'last') {
             direction = Meta.MotionDirection.DOWN;
             newWs = screen.get_workspace_by_index(screen.n_workspaces - 1);
         } else if (isNaN(target)) {
             // Prepend a new workspace dynamically
             if (screen.get_active_workspace_index() == 0 &&
-                action == 'move' && target == 'up')
+                action == 'move' && target == 'up' && this._isWorkspacePrepended == false) {
                 this.insertWorkspace(0);
+                this._isWorkspacePrepended = true;
+            }
 
             direction = Meta.MotionDirection[target.toUpperCase()];
             newWs = screen.get_active_workspace().get_neighbor(direction);
@@ -1658,9 +1721,12 @@ const WindowManager = new Lang.Class({
 
         if (!Main.overview.visible) {
             if (this._workspaceSwitcherPopup == null) {
+                this._workspaceTracker.blockUpdates();
                 this._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup();
                 this._workspaceSwitcherPopup.connect('destroy', Lang.bind(this, function() {
+                    this._workspaceTracker.unblockUpdates();
                     this._workspaceSwitcherPopup = null;
+                    this._isWorkspacePrepended = false;
                 }));
             }
             this._workspaceSwitcherPopup.display(direction, newWs.index());

js/ui/windowMenu.js

@@ -74,7 +74,7 @@ const WindowMenu = new Lang.Class({
                 window.make_above();
         }));
         if (window.is_above())
-            item.setOrnament(PopupMenu.Ornament.DOT);
+            item.setOrnament(PopupMenu.Ornament.CHECK);
         if (window.get_maximized() == Meta.MaximizeFlags.BOTH ||
             type == Meta.WindowType.DOCK ||
             type == Meta.WindowType.DESKTOP ||
@@ -93,7 +93,7 @@ const WindowMenu = new Lang.Class({
                     window.stick();
             }));
             if (isSticky)
-                item.setOrnament(PopupMenu.Ornament.DOT);
+                item.setOrnament(PopupMenu.Ornament.CHECK);
             if (window.is_always_on_all_workspaces())
                 item.setSensitive(false);
 
@@ -101,13 +101,22 @@ const WindowMenu = new Lang.Class({
 
             if (!isSticky) {
                 let workspace = window.get_workspace();
-                let idx = workspace.index();
+                if (workspace != workspace.get_neighbor(Meta.MotionDirection.LEFT)) {
-                if (idx > 0) {
+                     this.addAction(_("Move to Workspace Left"), Lang.bind(this, function(event) {
+                        window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.LEFT));
+                    }));
+                }
+                if (workspace != workspace.get_neighbor(Meta.MotionDirection.RIGHT)) {
+                     this.addAction(_("Move to Workspace Right"), Lang.bind(this, function(event) {
+                        window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.RIGHT));
+                    }));
+                }
+                if (workspace != workspace.get_neighbor(Meta.MotionDirection.UP)) {
                     this.addAction(_("Move to Workspace Up"), Lang.bind(this, function(event) {
                         window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.UP));
                     }));
                 }
-                if (idx < nWorkspaces) {
+                if (workspace != workspace.get_neighbor(Meta.MotionDirection.DOWN)) {
                      this.addAction(_("Move to Workspace Down"), Lang.bind(this, function(event) {
                         window.change_workspace(workspace.get_neighbor(Meta.MotionDirection.DOWN));
                     }));
@@ -115,6 +124,39 @@ 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) {
@@ -167,6 +209,10 @@ 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);
@@ -180,6 +226,7 @@ const WindowMenuManager = new Lang.Class({
 
             this._sourceActor.hide();
             menu.destroy();
+            window.disconnect(destroyId);
         }));
     }
 });

js/ui/workspacesView.js

@@ -97,8 +97,6 @@ const WorkspacesView = new Lang.Class({
         this._scrolling = false; // swipe-scrolling
         this._animatingScroll = false; // programatically updating the adjustment
 
-        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
-
         let activeWorkspaceIndex = global.screen.get_active_workspace_index();
         this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
                                                     lower: 0,
@@ -418,7 +416,7 @@ const WorkspacesDisplay = new Lang.Class({
         this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesActualGeometry));
         this.actor.connect('parent-set', Lang.bind(this, this._parentSet));
 
-        let clickAction = new Clutter.ClickAction()
+        let clickAction = new Clutter.ClickAction();
         clickAction.connect('clicked', Lang.bind(this, function(action) {
             // Only switch to the workspace when there's no application
             // windows open. The problem is that it's too easy to miss
@@ -464,6 +462,7 @@ const WorkspacesDisplay = new Lang.Class({
 
         this._notifyOpacityId = 0;
         this._scrollEventId = 0;
+        this._keyPressEventId = 0;
 
         this._fullGeometry = null;
     },
@@ -495,6 +494,9 @@ const WorkspacesDisplay = new Lang.Class({
                                   Lang.bind(this, this._onRestacked));
         if (this._scrollEventId == 0)
             this._scrollEventId = Main.overview.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+
+        if (this._keyPressEventId == 0)
+            this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
     },
 
     animateFromOverview: function(fadeOnPrimary) {
@@ -517,7 +519,10 @@ const WorkspacesDisplay = new Lang.Class({
             Main.overview.disconnect(this._scrollEventId);
             this._scrollEventId = 0;
         }
-
+        if (this._keyPressEventId > 0) {
+            global.stage.disconnect(this._keyPressEventId);
+            this._keyPressEventId = 0;
+        }
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].destroy();
         this._workspacesViews = [];
@@ -670,6 +675,25 @@ const WorkspacesDisplay = new Lang.Class({
         }
         Main.wm.actionMoveWorkspace(ws);
         return Clutter.EVENT_STOP;
+    },
+
+    _onKeyPressEvent: function(actor, event) {
+        if (!this.actor.mapped)
+            return Clutter.EVENT_PROPAGATE;
+        let activeWs = global.screen.get_active_workspace();
+        let ws;
+        switch (event.get_key_symbol()) {
+        case Clutter.KEY_Page_Up:
+            ws = activeWs.get_neighbor(Meta.MotionDirection.UP);
+            break;
+        case Clutter.KEY_Page_Down:
+            ws = activeWs.get_neighbor(Meta.MotionDirection.DOWN);
+            break;
+        default:
+            return Clutter.EVENT_PROPAGATE;
+        }
+        Main.wm.actionMoveWorkspace(ws);
+        return Clutter.EVENT_STOP;
     }
 });
 Signals.addSignalMethods(WorkspacesDisplay.prototype);

po/LINGUAS

@@ -50,6 +50,7 @@ nb
 ne
 nl
 nn
+oc
 or
 pa
 pl

po/ca.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-10 17:04-0400\n"
+"POT-Creation-Date: 2015-03-19 01:19-0400\n"
 "PO-Revision-Date: 2014-09-14 23:32+0200\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -81,7 +81,8 @@ msgstr ""
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
-msgstr "Identificadors universals únics de les extensions que s'han d'habilitar"
+msgstr ""
+"Identificadors universals únics de les extensions que s'han d'habilitar"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
 msgid ""
@@ -210,11 +211,13 @@ msgstr "Vinculació per obrir la vista general d'activitats."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to toggle the visibility of the notification list"
-msgstr "La vinculació per commutar la visibilitat de la llista de notificacions"
+msgstr ""
+"La vinculació per commutar la visibilitat de la llista de notificacions"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the notification list."
-msgstr  "La vinculació per commutar la visibilitat de la llista de notificacions."
+msgstr ""
+"La vinculació per commutar la visibilitat de la llista de notificacions."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
@@ -319,7 +322,7 @@ msgstr "S'ha produït un error en carregar el diàleg de preferències de %s:"
 msgid "GNOME Shell Extensions"
 msgstr "Extensions del GNOME Shell"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../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
@@ -361,12 +364,12 @@ msgstr "(p. ex. l'usuari o %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:287
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nom d'usuari:"
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1163
 msgid "Login Window"
 msgstr "Finestra d'entrada"
 
@@ -522,104 +525,104 @@ msgid "Change Background…"
 msgstr "Canvia el fons de l'escriptori…"
 
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:49
+#: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
 
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:78
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Tot el dia"
-
 #. 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:93
+#: ../js/ui/calendar.js:82
 msgctxt "grid sunday"
 msgid "S"
 msgstr "Dg"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:95
+#: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "Dl"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:97
+#: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "Dt"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:99
+#: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "Dc"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:101
+#: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "Dj"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:103
+#: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "Dv"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:105
+#: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "Ds"
 
-#: ../js/ui/calendar.js:572
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Mes anterior"
 
-#: ../js/ui/calendar.js:582
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Mes següent"
 
-#: ../js/ui/calendar.js:789
+#: ../js/ui/calendar.js:781
 msgid "Week %V"
 msgstr "Setmana %V"
 
-#: ../js/ui/calendar.js:1245
+#. 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:1183
+msgctxt "event list time"
+msgid "All Day"
+msgstr "Tot el dia"
+
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Neteja la secció"
 
-#: ../js/ui/calendar.js:1459
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Cites"
 
-#: ../js/ui/calendar.js:1467
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %d de %B"
 
-#: ../js/ui/calendar.js:1471
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %d de %B de %Y"
 
-#: ../js/ui/calendar.js:1563
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: ../js/ui/calendar.js:1714
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Cap notificació"
 
-#: ../js/ui/calendar.js:1717
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Cap cita"
 
@@ -644,42 +647,44 @@ msgstr "Contrasenya:"
 msgid "Type again:"
 msgstr "Torneu a escriure-la:"
 
-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../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 "Connecta"
 
 #. Cisco LEAP
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:301
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Contrasenya:"
 
 #. static WEP
-#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "Clau:"
 
-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "Identitat:"
 
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "Contrasenya de la clau privada:"
 
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "Servei:"
 
-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "La xarxa sense fil requereix autenticació"
 
-#: ../js/ui/components/networkAgent.js:319
+#: ../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 "
@@ -688,39 +693,51 @@ msgstr ""
 "Per accedir a la xarxa sense fil «%s» calen les contrasenyes o les claus "
 "d'encriptació."
 
-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "Autenticació 802.1X amb fil"
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "Nom de la xarxa: "
 
-#: ../js/ui/components/networkAgent.js:330
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "Autenticació DSL"
 
-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "Cal que introduïu el codi PIN"
 
-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Cal que introduïu el codi PIN del dispositiu de banda ampla mòbil"
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Contrasenya de la xarxa de banda ampla mòbil"
 
-#: ../js/ui/components/networkAgent.js:346
+#: ../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”."
 msgstr "Cal introduir una contrasenya per connectar-vos a «%s»."
 
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+msgid "Network Manager"
+msgstr "Gestor de connexions de xarxa"
+
 #: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
 msgstr "Cal autenticació"
@@ -743,7 +760,7 @@ msgstr "No ha funcionat. Torneu-ho a provar."
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name.
-#: ../js/ui/components/telepathyClient.js:772
+#: ../js/ui/components/telepathyClient.js:728
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "En/na %s ara es diu %s"
@@ -928,10 +945,19 @@ msgstr "Instal·la"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Voleu baixar i instal·lar «%s» d'extensions.gnome.org?"
 
-#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:576
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:724
 msgid "Keyboard"
 msgstr "Teclat"
 
+#. translators: 'Hide' is a verb
+#: ../js/ui/legacyTray.js:64
+msgid "Hide tray"
+msgstr "Oculta la Safata"
+
+#: ../js/ui/legacyTray.js:104
+msgid "Status Icons"
+msgstr "Icones d'estat"
+
 #: ../js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "No hi ha cap extensió instal·lada"
@@ -984,7 +1010,7 @@ msgstr "Mostra el codi font"
 msgid "Web Page"
 msgstr "Pàgina web"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1507
 msgid "System Information"
 msgstr "Informació de l'ordinador"
 
@@ -1082,11 +1108,11 @@ msgstr "No es pot blocar"
 msgid "Lock was blocked by an application"
 msgstr "Una aplicació està bloquejant el bloqueig"
 
-#: ../js/ui/search.js:609
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "S'està cercant…"
 
-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "No s'ha trobat cap resultat."
 
@@ -1190,7 +1216,7 @@ msgstr "No connectat"
 msgid "Brightness"
 msgstr "Brillantor"
 
-#: ../js/ui/status/keyboard.js:599
+#: ../js/ui/status/keyboard.js:747
 msgid "Show Keyboard Layout"
 msgstr "Mostra la disposició del teclat"
 
@@ -1359,10 +1385,6 @@ msgstr "Paràmetres de la VPN"
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1657
-msgid "Network Manager"
-msgstr "Gestor de connexions de xarxa"
-
 #: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Ha fallat l'activació de la connexió de xarxa"
@@ -1576,12 +1598,12 @@ msgstr "Utilitza un mode específic, p. ex. «gdm» per la pantalla d'entrada"
 msgid "List possible modes"
 msgstr "Llista els modes possibles"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "No s'ha pogut iniciar «%s»"

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-03-13 20:44+0000\n"
+"POT-Creation-Date: 2015-07-24 08:09+0000\n"
-"PO-Revision-Date: 2015-03-14 00:03+0100\n"
+"PO-Revision-Date: 2015-07-24 22:04+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -134,15 +134,16 @@ msgstr "Číslo aktuálně zvolené stránky ve výběru aplikací."
 msgid "History for command (Alt-F2) dialog"
 msgstr "Historie příkazového dialogového okna (Alt-F2)"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
+#. Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid "History for the looking glass dialog"
 msgstr "Historie dialogového okna „looking glass“ (Alt-F2)"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "V nabídce uživatele vždy zobrazovat položku „Odhlásit“."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
@@ -150,14 +151,14 @@ msgstr ""
 "Tento klíč ruší automatické skrývání položky nabídky „Odhlásit“ v situacích "
 "s jedním uživatelem a jedním sezením."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Zdali si pamatovat heslo k připojování šifrovaných či vzdálených souborových "
 "systémů"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@@ -169,76 +170,76 @@ msgstr ""
 "zaškrtávací pole „Pamatovat si heslo“. Tento klíč určuje výchozí stav této "
 "volby."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Show the week date in the calendar"
 msgstr "Zobrazovat v kalendáři čísla týdnů"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Je-li zapnuto, zobrazovat v kalendáři čísla týdnů dle ISO."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to open the application menu"
 msgstr "Klávesová zkratka otevírající nabidku aplikací"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the application menu."
 msgstr "Klávesová zkratka sloužící k otevření nabídky aplikací."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Klávesová zkratka otevírající zobrazení aplikací"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Klávesová zkratka sloužící k otevření nabídky aplikací v Přehledu činností."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to open the overview"
 msgstr "Klávesová zkratka otevírající přehled"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to open the Activities Overview."
 msgstr "Klávesová zkratka sloužící k otevření přehledu činností"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "Klávesová zkratka přepínající viditelnost seznamu upozornění"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr "Klávesová zkratka sloužící k přepnutí viditelnosti seznamu upozornění."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification"
 msgstr "Klávesová zkratka zaměřující aktivního upozornění"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to focus the active notification."
 msgstr "Klávesová zkratka sloužící k zaměření aktivního upozornění."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
 "Klávesová zkratka k pozastavení a opětovnému spuštění všech běžících animací "
 "tweens; pro účely ladění"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Která klávesnice se má používat"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "Typ klávesnice, který se má používat."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Limit switcher to current workspace."
 msgstr "Omezit přepínání jen na aktuální plochu"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
@@ -246,11 +247,11 @@ msgstr ""
 "Je-li zapnuto, objeví se v přepínači aplikací jen ty, co jsou na aktuální "
 "pracovní ploše. V opačném případě jsou zahrnuty všechny aplikace."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The application icon mode."
 msgstr "Režim ikon aplikací"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@@ -260,7 +261,7 @@ msgstr ""
 "only“ (zobrazí náhled okna), „app-icon-only“ (zobrazí pouze ikonu aplikace) "
 "a „both“ (zobrazí náhled i ikonu)."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
@@ -268,28 +269,28 @@ msgstr ""
 "Je-li zapnuto, objeví se v přepínači oken jen ty, co jsou na aktuální "
 "pracovní ploše. V opačném případě jsou zahrnuta všechna okna."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Attach modal dialog to the parent window"
 msgstr "Modální dialogová okna připojovat k rodičovskému oknu"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr "Když běží GNOME Shell, tento klíč přepíše klíč v org.gnome.mutter"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Okna upuštěná u okraje obrazovky nechat řadit jako dlaždice"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid "Workspaces are managed dynamically"
 msgstr "Pracovní plochy jsou spravovány dynamicky"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Workspaces only on primary monitor"
 msgstr "Pracovní plochy jen na hlavním monitoru"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Se změnou zaměření v režimu myši čekat na zastavení pohybu ukazatele"
 
@@ -297,13 +298,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:123
+#: ../js/extensionPrefs/main.js:122
 #, 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:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Rozšíření GNOME Shell"
 
@@ -314,39 +315,39 @@ msgstr "Rozšíření GNOME Shell"
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Následující"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Odemknout"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Přihlásit se"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Vybrat sezení"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Nejste na seznamu?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(např. uživatel nebo %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Uživatelské jméno: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Přihlašovací okno"
 
@@ -439,31 +440,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:792
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "Zde se objeví často používané aplikace"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Časté"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Všechny"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Nové okno"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Přidat mezi oblíbené"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Zobrazit podrobnosti"
 
@@ -477,15 +478,19 @@ 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 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Nastavení"
-
-#: ../js/ui/backgroundMenu.js:21
 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:357
+msgid "Settings"
+msgstr "Nastavení"
+
 #. 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"
@@ -538,53 +543,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "So"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Předchozí měsíc"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Následující měsíc"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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:1182
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celý den"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Vymazat část"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Události"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Žádná upozornění"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Žádné události"
 
@@ -720,7 +725,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:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"
@@ -729,11 +734,11 @@ msgstr "%s je teď znám jako %s"
 msgid "Windows"
 msgstr "Okna"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Zobrazit aplikace"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Oblíbené"
 
@@ -909,17 +914,16 @@ 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:714 ../js/ui/status/keyboard.js:580
+#: ../js/ui/keyboard.js:741 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Klávesnice"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:59
+#: ../js/ui/legacyTray.js:66
-#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Skrýt pořadač"
 
-#: ../js/ui/legacyTray.js:91
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Stavové ikony"
 
@@ -975,7 +979,7 @@ msgstr "Zobrazit zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Informace o systému"
 
@@ -983,7 +987,7 @@ msgstr "Informace o systému"
 msgid "Undo"
 msgstr "Zpět"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:117
 msgid "Overview"
 msgstr "Přehled"
 
@@ -991,7 +995,7 @@ msgstr "Přehled"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters. */
-#: ../js/ui/overview.js:246
+#: ../js/ui/overview.js:244
 msgid "Type to search…"
 msgstr "Vyhledávejte psaním…"
 
@@ -1017,7 +1021,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Zadejte příkaz:"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Zavřít"
 
@@ -1047,27 +1051,27 @@ 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:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Uzamknout"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME potřebuje uzamknout obrazovku"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Nelze uzamknout obrazovku"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Zamknutí bylo zablokováno některou z aplikací"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Hledá se…"
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Žádné výsledky."
 
@@ -1131,11 +1135,11 @@ msgstr "Vícenásobné stisky kláves"
 msgid "Mouse Keys"
 msgstr "Myš klávesnicí"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Vysoký kontrast"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Styl velkého textu"
 
@@ -1170,7 +1174,7 @@ msgstr "Nepřipojeno"
 msgid "Brightness"
 msgstr "Jas"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Zobrazit rozložení klávesnice"
 
@@ -1381,23 +1385,23 @@ msgstr "Režim „letadlo“"
 msgid "On"
 msgstr "Zapnuto"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Přepnout uživatele"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Odhlásit se"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Zámek otočení"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Uspat do paměti"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Vypnout"
 
@@ -1429,27 +1433,27 @@ msgstr "Aplikace"
 msgid "Search"
 msgstr "Hledat"
 
-#: ../js/ui/windowAttentionHandler.js:19
+#: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "Připraveno „%s“"
 
-#: ../js/ui/windowManager.js:65
+#: ../js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "Chcete zachovat nastavení displeje?"
 
 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #. */
-#: ../js/ui/windowManager.js:84
+#: ../js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "Obnovit původní"
 
-#: ../js/ui/windowManager.js:88
+#: ../js/ui/windowManager.js:86
 msgid "Keep Changes"
 msgstr "Zachovat"
 
-#: ../js/ui/windowManager.js:107
+#: ../js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1459,7 +1463,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:599
+#: ../js/ui/windowManager.js:660
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d × %d"
@@ -1496,14 +1500,38 @@ msgstr "Vždy nahoře"
 msgid "Always on Visible Workspace"
 msgstr "Vždy na viditelné ploše"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "Přesunout o plochu doleva"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "Přesunout o plochu doprava"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Přesunout o plochu výš"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Přesunout o plochu níž"
 
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Přesunout o monitor výš"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Přesunout o monitor níž"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Přesunout o monitor doleva"
+
+#: ../js/ui/windowMenu.js:154
+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"
@@ -1548,21 +1576,21 @@ 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:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Nelze spustit „%s“"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Hesla si neodpovídají."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "Heslo nemůže být prázdné."
 

po/de.po

@@ -21,24 +21,22 @@ 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-03-05 08:43+0000\n"
+"POT-Creation-Date: 2015-07-03 08:08+0000\n"
-"PO-Revision-Date: 2015-03-05 20:31+0100\n"
+"PO-Revision-Date: 2015-07-03 19:24+0100\n"
-"Last-Translator: Bernd Homuth <dev@hmt.im>\n"
+"Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de_DE\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: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.1\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
 msgstr "System"
 
 #: ../data/50-gnome-shell-system.xml.in.h:2
-#| msgid "%d new notification"
-#| msgid_plural "%d new notifications"
 msgid "Show the notification list"
 msgstr "Benachrichtigungsliste anzeigen"
 
@@ -103,8 +101,8 @@ msgstr ""
 "Die Erweiterungen der GNOME-Shell besitzen eine UUID-Eigenschaft. Dieser "
 "Schlüssel listet Erweiterungen auf, welche geladen werden sollen. Jede zu "
 "ladende Erweiterung muss in dieser Liste erscheinen. Sie können diese Liste "
-"auch mit den D-Bus-Methoden EnableExtension und DisableExtension in org."
+"auch mit den D-Bus-Methoden EnableExtension und DisableExtension in org.gnome."
-"gnome.Shell bearbeiten."
+"Shell bearbeiten."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
@@ -115,8 +113,8 @@ msgstr ""
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
 msgid ""
 "GNOME Shell will only load extensions that claim to support the current "
-"running version. Enabling this option will disable this check and try to "
+"running version. Enabling this option will disable this check and try to load "
-"load all extensions regardless of the versions they claim to support."
+"all extensions regardless of the versions they claim to support."
 msgstr ""
 "GNOME-Shell lädt nur Erweiterungen, die die aktuelle Version unterstützen. "
 "Durch Aktivieren dieser Option wird die interne Kompatibilitätsprüfung "
@@ -132,8 +130,8 @@ msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr ""
-"Programme, welche auf diese Bezeichner zutreffen, werden im Favoriten-"
+"Programme, welche auf diese Bezeichner zutreffen, werden im Favoriten-Bereich "
-"Bereich angezeigt."
+"angezeigt."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
 msgid "App Picker View"
@@ -164,8 +162,7 @@ msgstr ""
 "»Abmelden« in Einzelbenutzer, Einzelsitzungssituationen."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
-msgid ""
+msgid "Whether to remember password for mounting encrypted or remote filesystems"
-"Whether to remember password for mounting encrypted or remote filesystems"
 msgstr ""
 "Legt fest, ob Passwörter für eingehängte, verschlüsselte oder entfernte "
 "Dateisysteme gespeichert werden"
@@ -173,13 +170,13 @@ msgstr ""
 #: ../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 "
+"filesystem is mounted. If the password can be saved for future use a 'Remember "
-"'Remember Password' checkbox will be present. This key sets the default "
+"Password' checkbox will be present. This key sets the default state of the "
-"state of the checkbox."
+"checkbox."
 msgstr ""
 "Die Shell wird ein Passwort anfragen, sobald ein verschlüsseltes Gerät oder "
-"ein entferntes Dateisystem eingehängt wird. Falls das Passwort für die "
+"ein entferntes Dateisystem eingehängt wird. Falls das Passwort für die Zukunft "
-"Zukunft gespeichert werden kann, wird ein Ankreuzfeld »An Passwort erinnern« "
+"gespeichert werden kann, wird ein Ankreuzfeld »An Passwort erinnern« "
 "angeboten. Dieser Schlüssel stellt den Standardstatus für dieses Ankreuzfeld "
 "ein."
 
@@ -220,13 +217,11 @@ msgid "Keybinding to open the Activities Overview."
 msgstr "Tastenkombination zum Öffnen der »Aktivitäten«-Übersicht"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-#| msgid "Keybinding to toggle the visibility of the message tray"
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit der Benachrichtigungsliste"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-#| msgid "Keybinding to toggle the visibility of the message tray."
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr ""
 "Tastenkombination zum Umschalten der Sichtbarkeit der Benachrichtigungsliste."
@@ -243,8 +238,8 @@ msgstr "Tastenkombination zur Ausrichtung auf die aktiven Benachrichtigungen."
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
-"Tastenkombination, die alle laufenden Zwischenbilder anhält und fortsetzt. "
+"Tastenkombination, die alle laufenden Zwischenbilder anhält und fortsetzt. Zur "
-"Zur Fehlerdiagnose."
+"Fehlerdiagnose."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Which keyboard to use"
@@ -273,13 +268,13 @@ msgstr "Der Modus der Anwendungssymbole."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid ""
-"Configures how the windows are shown in the switcher. Valid possibilities "
+"Configures how the windows are shown in the switcher. Valid possibilities are "
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+"'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' (shows "
-"only' (shows only the application icon) or 'both'."
+"only the application icon) or 'both'."
 msgstr ""
 "Legt fest, wie Fenster im Fensterwechsler dargestellt werden. Mögliche Werte "
-"sind »thumbnail-only« (Vorschaubilder der Fenster werden angezeigt), »app-"
+"sind »thumbnail-only« (Vorschaubilder der Fenster werden angezeigt), »app-icon-"
-"icon-only« (Nur das Anwendungssymbol wird angezeigt) oder »both« (beides)."
+"only« (Nur das Anwendungssymbol wird angezeigt) oder »both« (beides)."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid ""
@@ -294,8 +289,7 @@ msgid "Attach modal dialog to the parent window"
 msgstr "Modalen Dialog an übergeordnetes Fenster binden"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:38
-msgid ""
+msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Dieser Schlüssel überschreibt den Schlüssel in org.gnome.mutter, wenn die "
 "GNOME-Shell läuft."
@@ -303,8 +297,8 @@ msgstr ""
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Größenanpassung aktivieren, wenn ein Fenster an die Bildschirmkante "
+"Größenanpassung aktivieren, wenn ein Fenster an die Bildschirmkante verschoben "
-"verschoben wird"
+"wird"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Workspaces are managed dynamically"
@@ -323,55 +317,55 @@ msgstr ""
 msgid "Network Login"
 msgstr "Netzwerkanmeldung"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Beim Laden des Einstellungsdialogs für %s ist ein Fehler aufgetreten:"
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "GNOME-Shell-Erweiterungen"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../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 "Abbrechen"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Weiter"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Entsperren"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../js/gdm/loginDialog.js:276
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Sitzung wählen"
 
-#: ../js/gdm/loginDialog.js:417
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Nicht aufgeführt?"
 
-#: ../js/gdm/loginDialog.js:826
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(z.B. Benutzer oder %s)"
 
-#: ../js/gdm/loginDialog.js:831 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:287
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Benutzername:"
 
-#: ../js/gdm/loginDialog.js:1166
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Anmeldefenster"
 
@@ -465,31 +459,31 @@ msgstr "%e. %B %Y, %H:%M"
 msgid "Web Authentication Redirect"
 msgstr "Umleitung zu einer Internet-Anmeldung"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "Häufig genutzte Anwendungen werden hier erscheinen"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Häufig"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Alle"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Neues Fenster"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Aus Favoriten entfernen"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Zu Favoriten hinzufügen"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Details anzeigen"
 
@@ -503,115 +497,118 @@ msgstr "%s wurde zu Ihren Favoriten hinzugefügt"
 msgid "%s has been removed from your favorites."
 msgstr "%s wurde aus Ihren Favoriten entfernt"
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../js/ui/backgroundMenu.js:21
 msgid "Change Background…"
 msgstr "Hintergrund ändern …"
 
+#: ../js/ui/backgroundMenu.js:21
+msgid "Display Settings"
+msgstr "Anzeigeeinstellungen"
+
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:357
+msgid "Settings"
+msgstr "Einstellungen"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
-#: ../js/ui/calendar.js:49
+#: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
 
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#. */
-#: ../js/ui/calendar.js:78
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Ganztägig"
-
 #. 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:93
+#: ../js/ui/calendar.js:82
 msgctxt "grid sunday"
 msgid "S"
 msgstr "S"
 
 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:95
+#: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:97
+#: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "D"
 
 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:99
+#: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:101
+#: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "D"
 
 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:103
+#: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "F"
 
 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:105
+#: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
 
-#: ../js/ui/calendar.js:572
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Vorheriger Monat"
 
-#: ../js/ui/calendar.js:582
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Nächster Monat"
 
-#: ../js/ui/calendar.js:789
+#: ../js/ui/calendar.js:781
 msgid "Week %V"
 msgstr "Woche %V"
 
-#: ../js/ui/calendar.js:1245
+#. 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 "Ganztägig"
+
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Abschnitt löschen"
 
-#: ../js/ui/calendar.js:1459
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Termine"
 
-#: ../js/ui/calendar.js:1467
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d. %B"
 
-#: ../js/ui/calendar.js:1471
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
-#: ../js/ui/calendar.js:1563
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../js/ui/calendar.js:1714
+#: ../js/ui/calendar.js:1765
-#| msgid "Notifications"
 msgid "No Notifications"
 msgstr "Keine Benachrichtigungen"
 
-#: ../js/ui/calendar.js:1717
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Keine Termine"
 
@@ -636,81 +633,94 @@ msgstr "Passwort:"
 msgid "Type again:"
 msgstr "Erneut eingeben:"
 
-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../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 "Verbinden"
 
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:301
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Passwort:"
 
-#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "Schlüssel:"
 
-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "Identität:"
 
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "Passwort für geheimen Schlüssel:"
 
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "Dienst:"
 
-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "Anmeldung für Funknetzwerk wird benötigt"
 
-#: ../js/ui/components/networkAgent.js:319
+#: ../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 "
+"Passwords or encryption keys are required to access the wireless network “%s”."
-"“%s”."
 msgstr ""
 "Passwörter oder Schlüssel sind erforderlich, um auf das Funknetzwerk »%s« "
 "zuzugreifen."
 
-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "Kabelgebundene 802.1X-Anmeldung"
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "Netzwerkname:"
 
-#: ../js/ui/components/networkAgent.js:330
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "DSL-Anmeldung"
 
-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "PIN-Code ist erforderlich"
 
-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Für das mobile Breitbandgerät wird ein PIN-Code benötigt."
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Passwort der mobilen Breitbandverbindung"
 
-#: ../js/ui/components/networkAgent.js:346
+#: ../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”."
 msgstr "Es wird ein Passwort benötigt, um sich mit »%s« zu verbinden."
 
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+msgid "Network Manager"
+msgstr "Netzwerk-Verwaltung"
+
 #: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
 msgstr "Anmeldung erforderlich"
@@ -733,7 +743,7 @@ msgstr "Entschuldigung, das hat nicht geklappt. Bitte versuchen Sie es erneut."
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:772
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
@@ -747,7 +757,7 @@ msgid "Show Applications"
 msgstr "Anwendungen anzeigen"
 
 # Würde ich so übernehmen, oder evtl. »Dock«.
-#: ../js/ui/dash.js:451
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Dash"
 
@@ -755,7 +765,6 @@ msgstr "Dash"
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
 #: ../js/ui/dateMenu.js:73
-#| msgid "%A %B %e, %Y"
 msgid "%B %e %Y"
 msgstr "%e. %B %Y"
 
@@ -764,7 +773,6 @@ msgstr "%e. %B %Y"
 #. * date, e.g. "Tuesday February 17 2015".
 #. */
 #: ../js/ui/dateMenu.js:80
-#| msgid "%A %B %e, %Y"
 msgid "%A %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
@@ -773,7 +781,6 @@ msgid "Add world clocks…"
 msgstr "Weltuhren hinzufügen …"
 
 #: ../js/ui/dateMenu.js:161
-#| msgid "Open Clocks"
 msgid "World Clocks"
 msgstr "Weltuhren"
 
@@ -917,10 +924,19 @@ msgstr "Installieren"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "»%s« von extensions.gnome.org herunterladen und installieren?"
 
-#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:576
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Tastatur"
 
+#. translators: 'Hide' is a verb */
+#: ../js/ui/legacyTray.js:66
+msgid "Hide tray"
+msgstr "Ablage verbergen"
+
+#: ../js/ui/legacyTray.js:107
+msgid "Status Icons"
+msgstr "Statussymbole"
+
 #: ../js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "Keine Erweiterungen installiert"
@@ -973,7 +989,7 @@ msgstr "Quelle zeigen"
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../js/ui/messageTray.js:2131
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Systeminformationen"
 
@@ -1007,7 +1023,7 @@ msgstr "Aktivitäten"
 msgid "Top Bar"
 msgstr "Oberes Panel"
 
-#: ../js/ui/popupMenu.js:288
+#: ../js/ui/popupMenu.js:289
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
@@ -1015,7 +1031,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Bitte geben Sie einen Befehl ein"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Schließen"
 
@@ -1046,27 +1062,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d neue Benachrichtigung"
 msgstr[1] "%d neue Benachrichtigungen"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Sperren"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME muss den Bildschirm sperren"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Sperrung fehlgeschlagen"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Sperrung wurde von einer Anwendung blockiert"
 
-#: ../js/ui/search.js:609
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Suche läuft …"
 
-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
@@ -1130,11 +1146,11 @@ msgstr "Tastenanschlagfunktion"
 msgid "Mouse Keys"
 msgstr "Tastaturmaus"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Hoher Kontrast"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Große Schrift"
 
@@ -1168,7 +1184,7 @@ msgstr "Nicht verbunden"
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: ../js/ui/status/keyboard.js:599
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Tastaturbelegung anzeigen"
 
@@ -1340,10 +1356,6 @@ msgstr "VPN-Einstellungen"
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1657
-msgid "Network Manager"
-msgstr "Netzwerk-Verwaltung"
-
 #: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Aktivierung der Netzwerkverbindung ist gescheitert"
@@ -1386,23 +1398,23 @@ msgstr "Flugzeugmodus"
 msgid "On"
 msgstr "An"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Benutzer wechseln"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Hoch-/Querformats-Fixierung"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "In Bereitschaft versetzen"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Ausschalten"
 
@@ -1434,7 +1446,7 @@ msgstr "Anwendungen"
 msgid "Search"
 msgstr "Suchen"
 
-#: ../js/ui/windowAttentionHandler.js:19
+#: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "»%s« ist bereit"
@@ -1459,12 +1471,11 @@ msgstr "Beibehalten"
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
 msgstr[0] "Die Änderungen der Einstellungen werden in %d Sekunde zurückgesetzt"
-msgstr[1] ""
+msgstr[1] "Die Änderungen der Einstellungen werden in %d Sekunden zurückgesetzt"
-"Die Änderungen der Einstellungen werden in %d Sekunden zurückgesetzt"
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:599
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1501,14 +1512,38 @@ msgstr "Immer im Vordergrund"
 msgid "Always on Visible Workspace"
 msgstr "Immer auf der sichtbaren Arbeitsfläche"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "Eine Arbeitsfläche nach links bewegen"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "Eine Arbeitsfläche nach rechts bewegen"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Eine Arbeitsfläche nach oben verschieben"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Eine Arbeitsfläche nach unten verschieben"
 
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Auf den Bildschirm nach oben verschieben"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Auf den Bildschirm nach unten verschieben"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Auf den Bildschirm nach links verschieben"
+
+#: ../js/ui/windowMenu.js:154
+msgid "Move to Monitor Right"
+msgstr "Auf den Bildschirm nach rechts verschieben"
+
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Evolution-Kalender"
@@ -1552,21 +1587,21 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Die möglichen Modi auflisten"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "»%s« konnte nicht gestartet werden"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "Es muss ein Passwort angegeben werden"
 
@@ -1733,8 +1768,8 @@ msgstr "Der Dialog zur Anmeldung wurde vom Benutzer geschlossen"
 #~ msgid ""
 #~ "Connection has been replaced by a new connection using the same resource"
 #~ msgstr ""
-#~ "Die Verbindung wurde durch eine neue Verbindung mit der gleichen "
+#~ "Die Verbindung wurde durch eine neue Verbindung mit der gleichen Ressource "
-#~ "Ressource ersetzt"
+#~ "ersetzt"
 
 #~ msgid "The account already exists on the server"
 #~ msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
@@ -1756,9 +1791,9 @@ msgstr "Der Dialog zur Anmeldung wurde vom Benutzer geschlossen"
 #~ "The length of the server certificate, or the depth of the server "
 #~ "certificate chain, exceed the limits imposed by the cryptography library"
 #~ msgstr ""
-#~ "Die Länge des Server-Zertifikats oder die Tiefe der Server-"
+#~ "Die Länge des Server-Zertifikats oder die Tiefe der Server-Zertifikatskette "
-#~ "Zertifikatskette überschreiten die durch die kryptografische Bibliothek "
+#~ "überschreiten die durch die kryptografische Bibliothek gegebenen "
-#~ "gegebenen Beschränkungen"
+#~ "Beschränkungen"
 
 #~ msgid "Internal error"
 #~ msgstr "Interner Fehler"
@@ -1807,29 +1842,28 @@ msgstr "Der Dialog zur Anmeldung wurde vom Benutzer geschlossen"
 #~ msgstr "Maximale Ortsauflösung"
 
 #~ msgid ""
-#~ "Configures the maximum level of location accuracy applications are "
+#~ "Configures the maximum level of location accuracy applications are allowed "
-#~ "allowed to see. Valid options are 'off' (disable location tracking), "
+#~ "to see. Valid options are 'off' (disable location tracking), 'country', "
-#~ "'country', 'city', 'neighborhood', 'street', and 'exact' (typically "
+#~ "'city', 'neighborhood', 'street', and 'exact' (typically requires GPS "
-#~ "requires GPS receiver). Please keep in mind that this only controls what "
+#~ "receiver). Please keep in mind that this only controls what GeoClue will "
-#~ "GeoClue will allow applications to see and they can find user's location "
+#~ "allow applications to see and they can find user's location on their own "
-#~ "on their own using network resources (albeit with street-level accuracy "
+#~ "using network resources (albeit with street-level accuracy at best)."
-#~ "at best)."
 #~ msgstr ""
 #~ "Legt die maximale Ortsauflösung für Anwendungen fest. Gültige Werte sind "
 #~ "»off« (Ortung deaktiviert), »country« (Land), »city« (Stadt), "
 #~ "»neighborhood« (Nachbarschaft), »street« (Straße) und »exact« (genau, "
-#~ "benötigt üblicherweise einen GPS-Empfänger). Bitte bedenken Sie, dass "
+#~ "benötigt üblicherweise einen GPS-Empfänger). Bitte bedenken Sie, dass diese "
-#~ "diese Einstellung nur festlegt, welche Informationen GeoClue an "
+#~ "Einstellung nur festlegt, welche Informationen GeoClue an Anwendungen "
-#~ "Anwendungen weitergibt. Die Anwendungen können jedoch selbst den Ort des "
+#~ "weitergibt. Die Anwendungen können jedoch selbst den Ort des Benutzers "
-#~ "Benutzers durch Analyse von Netzwerkressourcen ausfindig machen (jedoch "
+#~ "durch Analyse von Netzwerkressourcen ausfindig machen (jedoch im besten "
-#~ "im besten Fall mit Straßengenauigkeit)."
+#~ "Fall mit Straßengenauigkeit)."
 
 #~ msgid "Arrangement of buttons on the titlebar"
 #~ msgstr "Anordnung der Knöpfe auf der Titelleiste"
 
 #~ msgid ""
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running "
-#~ "running GNOME Shell."
+#~ "GNOME Shell."
 #~ msgstr ""
 #~ "Dieser Schlüssel überschreibt den Schlüssel in org.gnome.desktop.wm."
 #~ "preferences, wenn die GNOME-Shell läuft."

po/el.po

@@ -1,5 +1,5 @@
 # Kostas Papadimas <pkst@gnome.org>, 2012.
-# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013, 2014.
+# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013, 2014, 2015.
 # Vangelis Skarmoutsos <skarmoutsosv@gmail.com>, 2013.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013.
 msgid ""
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell.po.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-03-15 08:36+0000\n"
+"POT-Creation-Date: 2015-06-05 08:06+0000\n"
-"PO-Revision-Date: 2015-03-15 20:08+0200\n"
+"PO-Revision-Date: 2015-06-06 09:58+0300\n"
-"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
+"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
-"Language-Team: team@lists.gnome.gr\n"
+"Language-Team: www.gnome.gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.4\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-DamnedLies-Scope: partial\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Project-Style: gnome\n"
@@ -312,14 +312,14 @@ msgstr ""
 msgid "Network Login"
 msgstr "Σύνδεση δικτύου"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "Προέκυψε ένα σφάλμα κατά τη φόρτωση του παραθύρου διαλόγου των προτιμήσεων "
 "για %s:"
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Επεκτάσεις GNOME Shell"
 
@@ -330,39 +330,39 @@ msgstr "Επεκτάσεις GNOME Shell"
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Ξεκλείδωμα"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Σύνδεση"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Επιλογή συνεδρίας"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Δεν είστε στη λίστα;"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:840
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(π.χ, χρήστης ή %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Όνομα χρήστη: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "Παράθυρο σύνδεσης"
 
@@ -455,53 +455,58 @@ msgstr "%B %d %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Ανακατεύθυνση πιστοποίησης ιστού"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:788
 msgid "Frequently used applications will appear here"
 msgstr "Οι πιο συχνά χρησιμοποιούμενες εφαρμογές θα εμφανιστούν εδώ"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:908
 msgid "Frequent"
 msgstr "Συχνά"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:915
 msgid "All"
 msgstr "Όλα"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1844
 msgid "New Window"
 msgstr "Νέο παράθυρο"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Αφαίρεση από τα αγαπημένα"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1878
 msgid "Add to Favorites"
 msgstr "Προσθήκη στα αγαπημένα"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1888
 msgid "Show Details"
 msgstr "Εμφάνιση λεπτομερειών"
 
 #: ../js/ui/appFavorites.js:132
 #, javascript-format
 msgid "%s has been added to your favorites."
-msgstr "Tο %s προστέθηκε στα αγαπημένα σας."
+msgstr "Το %s προστέθηκε στα αγαπημένα σας."
 
 #: ../js/ui/appFavorites.js:166
 #, javascript-format
 msgid "%s has been removed from your favorites."
-msgstr "Tο %s αφαιρέθηκε από τα αγαπημένα σας."
+msgstr "Το %s αφαιρέθηκε από τα αγαπημένα σας."
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#: ../js/ui/backgroundMenu.js:21
 msgid "Change Background…"
 msgstr "Αλλαγή παρασκηνίου…"
 
+#: ../js/ui/backgroundMenu.js:21
+#| msgid "Privacy Settings"
+msgid "Display Settings"
+msgstr "Ρυθμίσεις οθόνης"
+
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:357
+msgid "Settings"
+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"
@@ -554,53 +559,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "Σα"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Προηγούμενος μήνας"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Επόμενος μήνας"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Όλη μέρα"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Εκκαθάριση περιοχής"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Συμβάντα"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Καμία ειδοποίηση"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Κανένα συμβάν"
 
@@ -736,7 +741,7 @@ msgstr "Συγνώμη, αυτό δεν λειτούργησε. Παρακαλο
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
@@ -745,11 +750,11 @@ msgstr "Ο %s είναι τώρα γνωστός ως %s"
 msgid "Windows"
 msgstr "Παράθυρα"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Εμφάνιση εφαρμογών"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Ταμπλό"
 
@@ -918,16 +923,16 @@ msgstr "Εγκατάσταση"
 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
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Πληκτρολόγιο"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:64
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Απόκρυψη περιοχής ειδοποιήσεων"
 
-#: ../js/ui/legacyTray.js:104
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Εικονίδια κατάστασης"
 
@@ -983,7 +988,7 @@ msgstr "Προβολή πηγής"
 msgid "Web Page"
 msgstr "Ιστοσελίδα"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1506
 msgid "System Information"
 msgstr "Πληροφορίες συστήματος"
 
@@ -1025,7 +1030,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Πληκτρολογήστε μια εντολή"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -1053,27 +1058,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d νέα ειδοποίηση"
 msgstr[1] "%d νέες ειδοποιήσεις"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Κλείδωμα"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "Το GNOME χρειάζεται να κλειδώσει την οθόνη"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Αδυναμία κλειδώματος"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Το κλείδωμα εμποδίσθηκε από μια εφαρμογή"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Αναζήτηση…"
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Δε βρέθηκαν αποτελέσματα."
 
@@ -1137,11 +1142,11 @@ msgstr "Πλήκτρα αναπήδησης"
 msgid "Mouse Keys"
 msgstr "Πλήκτρα ποντικιού"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Υψηλή αντίθεση"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Μεγάλο κείμενο"
 
@@ -1175,7 +1180,7 @@ msgstr "Χωρίς σύνδεση"
 msgid "Brightness"
 msgstr "Φωτεινότητα"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Εμφάνιση διάταξης πληκτρολογίου"
 
@@ -1387,23 +1392,23 @@ msgstr "Λειτουργία αεροπλάνου"
 msgid "On"
 msgstr "Ενεργοποίηση"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Αλλαγή χρήστη"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Αποσύνδεση"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Κλείδωμα προσανατολισμού"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Αναστολή"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Τερματισμός"
 
@@ -1464,7 +1469,7 @@ msgstr[1] "Οι αλλαγές ρυθμίσεων θα επανέλθουν σε
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:599
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1509,6 +1514,24 @@ msgstr "Μετακίνηση στο χώρο εργασίας πάνω"
 msgid "Move to Workspace Down"
 msgstr "Μετακίνηση στο χώρο εργασίας κάτω"
 
+#: ../js/ui/windowMenu.js:127
+#| msgid "Move to Workspace Up"
+msgid "Move to Monitor Up"
+msgstr "Μετακίνηση στην πάνω οθόνη"
+
+#: ../js/ui/windowMenu.js:133
+#| msgid "Move to Workspace Down"
+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"

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-03-16 08:38+0000\n"
+"POT-Creation-Date: 2015-07-12 20:06+0000\n"
-"PO-Revision-Date: 2015-03-16 17:44+0100\n"
+"PO-Revision-Date: 2015-07-13 \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,11 @@ msgstr ""
 msgid "Network Login"
 msgstr "Inicio de sesión de la red"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
-#, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Hubo un error al lanzar el diálogo de preferencias para %s:"
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Extensiones de GNOME Shell"
 
@@ -327,39 +326,38 @@ msgstr "Extensiones de GNOME Shell"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Elegir sesión"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "¿No está en la lista?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:847
-#, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(ej., usuario o %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nombre de usuario:"
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Ventana de inicio de sesión"
 
@@ -380,7 +378,6 @@ msgid "Could not parse command:"
 msgstr "No se pudo analizar el comando:"
 
 #: ../js/misc/util.js:160
-#, javascript-format
 msgid "Execution of “%s” failed:"
 msgstr "Falló la ejecución de «%s»:"
 
@@ -452,53 +449,55 @@ msgstr "%d de %B de %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Redirección para autenticación web"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "Las aplicaciones usadas frecuentemente aparecerán aquí"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Frecuentes"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Todas"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Ventana nueva"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Añadir a los favoritos"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
 #: ../js/ui/appFavorites.js:132
-#, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "Se ha añadido %s a sus favoritos."
 
 #: ../js/ui/appFavorites.js:166
-#, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "Se ha quitado %s de sus favoritos."
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Configuración"
-
-#: ../js/ui/backgroundMenu.js:21
 msgid "Change Background…"
 msgstr "Cambiar el fondo…"
 
+#: ../js/ui/backgroundMenu.js:21
+msgid "Display Settings"
+msgstr "Configuración de pantalla"
+
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:357
+msgid "Settings"
+msgstr "Configuración"
+
 #. 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 +550,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Mes anterior"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Siguiente mes"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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:1182
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Todo el día"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Limpiar la sección"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Eventos"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "No hay notificaciones"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "No hay eventos"
 
@@ -610,7 +609,6 @@ msgid "External drive disconnected"
 msgstr "Dispositivo externo desconectado"
 
 #: ../js/ui/components/autorunManager.js:354
-#, javascript-format
 msgid "Open with %s"
 msgstr "Abrir con %s"
 
@@ -658,10 +656,9 @@ msgstr "La red inalámbrica requiere autenticación"
 
 #: ../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 "
+"Passwords or encryption keys are required to access the wireless network “%"
-"“%s”."
+"s”."
 msgstr ""
 "Se necesitan contraseñas o claves de cifrado para acceder a la red "
 "inalámbrica «%s»."
@@ -703,7 +700,6 @@ msgstr "Contraseña de la red de banda ancha móvil"
 #: ../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”."
 msgstr "Se requiere una contraseña para conectarse a «%s»."
 
@@ -733,8 +729,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:775
+#: ../js/ui/components/telepathyClient.js:757
-#, javascript-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
 
@@ -742,11 +737,11 @@ msgstr "Ahora %s se llama %s"
 msgid "Windows"
 msgstr "Ventanas"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Mostrar aplicaciones"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Tablero"
 
@@ -774,7 +769,6 @@ msgid "World Clocks"
 msgstr "Relojes del mundo"
 
 #: ../js/ui/endSessionDialog.js:64
-#, javascript-format
 msgctxt "title"
 msgid "Log Out %s"
 msgstr "Cerrar la sesión %s"
@@ -785,14 +779,12 @@ msgid "Log Out"
 msgstr "Cerrar la sesión"
 
 #: ../js/ui/endSessionDialog.js:67
-#, javascript-format
 msgid "%s will be logged out automatically in %d second."
 msgid_plural "%s will be logged out automatically in %d seconds."
 msgstr[0] "se cerrará automáticamente la sesión de %s en %d segundo."
 msgstr[1] "se cerrará automáticamente la sesión de %s en %d segundos."
 
 #: ../js/ui/endSessionDialog.js:72
-#, javascript-format
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
 msgstr[0] "Su sesión se cerrará automáticamente en %d segundo."
@@ -814,7 +806,6 @@ msgid "Install Updates & Power Off"
 msgstr "Instalar actualizaciones y apagar"
 
 #: ../js/ui/endSessionDialog.js:87
-#, javascript-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
 msgstr[0] "El sistema se apagará automáticamente en %d segundo."
@@ -841,7 +832,6 @@ msgid "Restart"
 msgstr "Reiniciar"
 
 #: ../js/ui/endSessionDialog.js:105
-#, javascript-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
 msgstr[0] "El sistema se reiniciará automáticamente en %d segundo."
@@ -853,16 +843,15 @@ msgid "Restart & Install Updates"
 msgstr "Reiniciar e instalar actualizaciones"
 
 #: ../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] ""
-"El sistema se reiniciará automáticamente e instalará las actualizaciones en "
+"El sistema se reiniciará automáticamente e instalará las actualizaciones en %"
-"%d segundo."
+"d segundo."
 msgstr[1] ""
-"El sistema se reiniciará automáticamente e instalará las actualizaciones en "
+"El sistema se reiniciará automáticamente e instalará las actualizaciones en %"
-"%d segundos."
+"d segundos."
 
 #: ../js/ui/endSessionDialog.js:127
 msgctxt "button"
@@ -894,13 +883,11 @@ msgstr "Hay otros usuarios con la sesión iniciada"
 
 #. Translators: Remote here refers to a remote session, like a ssh login */
 #: ../js/ui/endSessionDialog.js:640
-#, javascript-format
 msgid "%s (remote)"
 msgstr "%s (remoto)"
 
 #. Translators: Console here refers to a tty like a VT console */
 #: ../js/ui/endSessionDialog.js:643
-#, javascript-format
 msgid "%s (console)"
 msgstr "%s (consola)"
 
@@ -909,21 +896,19 @@ msgid "Install"
 msgstr "Instalar"
 
 #: ../js/ui/extensionDownloader.js:204
-#, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "¿Descargar e instalar «%s» desde extensions.gnome.org?"
 
-#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:64
+#: ../js/ui/legacyTray.js:66
-#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Ocultar bandeja"
 
-#: ../js/ui/legacyTray.js:104
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Iconos de estado"
 
@@ -933,7 +918,6 @@ msgstr "No hay extensiones instaladas"
 
 #. Translators: argument is an extension UUID. */
 #: ../js/ui/lookingGlass.js:697
-#, javascript-format
 msgid "%s has not emitted any errors."
 msgstr "%s no ha generado ningún error."
 
@@ -979,7 +963,7 @@ msgstr "Ver fuente"
 msgid "Web Page"
 msgstr "Página web"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Información del sistema"
 
@@ -1021,7 +1005,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Introducir un comando"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1036,40 +1020,38 @@ msgid "%A, %B %d"
 msgstr "%A, %d de %B"
 
 #: ../js/ui/screenShield.js:144
-#, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mensaje nuevo"
 msgstr[1] "%d mensajes nuevos"
 
 #: ../js/ui/screenShield.js:146
-#, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d notificación nueva"
 msgstr[1] "%d notificaciones nuevas"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME necesita bloquear la pantalla"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "No se pudo bloquear"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Una aplicación impidió el bloqueo"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Buscando…"
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "No se encontraron resultados."
 
@@ -1133,11 +1115,11 @@ msgstr "Rechazo de teclas"
 msgid "Mouse Keys"
 msgstr "Teclas del ratón"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Contraste alto"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Texto grande"
 
@@ -1157,7 +1139,6 @@ msgid "Bluetooth Settings"
 msgstr "Configuración de Bluetooth"
 
 #: ../js/ui/status/bluetooth.js:104
-#, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
 msgstr[0] "%d dispositivo conectado"
@@ -1171,7 +1152,7 @@ msgstr "No conectado"
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Mostrar la distribución del teclado"
 
@@ -1357,12 +1338,10 @@ msgid "Estimating…"
 msgstr "Estimando…"
 
 #: ../js/ui/status/power.js:86
-#, javascript-format
 msgid "%d∶%02d Remaining (%d%%)"
 msgstr "%d∶%02d queda (%d%%)"
 
 #: ../js/ui/status/power.js:91
-#, javascript-format
 msgid "%d∶%02d Until Full (%d%%)"
 msgstr "%d∶%02d para la carga completa (%d%%)"
 
@@ -1382,23 +1361,23 @@ msgstr "Modo avión"
 msgid "On"
 msgstr "Encender"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Cambiar de usuario"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Cerrar la sesión"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Bloqueo de orientación"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Suspender"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Apagar"
 
@@ -1430,28 +1409,26 @@ msgstr "Aplicaciones"
 msgid "Search"
 msgstr "Buscar"
 
-#: ../js/ui/windowAttentionHandler.js:19
+#: ../js/ui/windowAttentionHandler.js:20
-#, javascript-format
 msgid "“%s” is ready"
 msgstr "«%s» está preparado"
 
-#: ../js/ui/windowManager.js:65
+#: ../js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "¿Quiere mantener esta configuración de la pantalla?"
 
 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #. */
-#: ../js/ui/windowManager.js:84
+#: ../js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "Revertir configuración"
 
-#: ../js/ui/windowManager.js:88
+#: ../js/ui/windowManager.js:86
 msgid "Keep Changes"
 msgstr "Mantener cambios"
 
-#: ../js/ui/windowManager.js:107
+#: ../js/ui/windowManager.js:105
-#, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
 msgstr[0] "La configuración se revertirá en %d segundo"
@@ -1459,8 +1436,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:599
+#: ../js/ui/windowManager.js:604
-#, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
@@ -1496,14 +1472,40 @@ msgstr "Siempre encima"
 msgid "Always on Visible Workspace"
 msgstr "Siempre en el área de trabajo visible"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+#| msgid "Move to Workspace Up"
+msgid "Move to Workspace Left"
+msgstr "Mover al área de trabajo de la izquierda"
+
+#: ../js/ui/windowMenu.js:110
+#| msgid "Move to Workspace Up"
+msgid "Move to Workspace Right"
+msgstr "Mover al área de trabajo de la derecha"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Subir a un área de trabajo"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Bajar a un área de trabajo"
 
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Mover a la pantalla de arriba"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Mover a la pantalla de abajo"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Mover a la pantalla de la izquierda"
+
+#: ../js/ui/windowMenu.js:154
+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"
@@ -1558,11 +1560,11 @@ msgstr "Desconocido"
 msgid "Failed to launch “%s”"
 msgstr "Falló al lanzar «%s»"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "La contraseña no puede estar vacía"
 
@@ -2631,8 +2633,8 @@ msgstr "El usuario rechazó el diálogo de autenticación"
 #~ "If true and format is either \"12-hour\" or \"24-hour\", display seconds "
 #~ "in time."
 #~ msgstr ""
-#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los "
+#~ "Si es cierta y el formato es «12-horas» o «24-horas», muestra los segundos "
-#~ "segundos en la hora."
+#~ "en la hora."
 
 #~ msgid ""
 #~ "This key specifies the format used by the panel clock when the format key "
@@ -2649,19 +2651,18 @@ msgstr "El usuario rechazó el diálogo de autenticación"
 #~ msgid ""
 #~ "This key specifies the hour format used by the panel clock. Possible "
 #~ "values are \"12-hour\", \"24-hour\", \"unix\" and \"custom\". If set to "
-#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. "
+#~ "\"unix\", the clock will display time in seconds since Epoch, i.e. 1970-"
-#~ "1970-01-01. If set to \"custom\", the clock will display time according "
+#~ "01-01. If set to \"custom\", the clock will display time according to the "
-#~ "to the format specified in the custom_format key. Note that if set to "
+#~ "format specified in the custom_format key. Note that if set to either "
-#~ "either \"unix\" or \"custom\", the show_date and show_seconds keys are "
+#~ "\"unix\" or \"custom\", the show_date and show_seconds keys are ignored."
-#~ "ignored."
 #~ msgstr ""
 #~ "Esta clave especifica el formato de la hora especificado por el reloj del "
-#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 "
+#~ "panel. Los valores posibles son «12-hour» (12 horas), «24-hour» (24 horas), "
-#~ "horas), «unix» y «custom» (personalizado).Si se establece a «unix» el "
+#~ "«unix» y «custom» (personalizado).Si se establece a «unix» el reloj mostrará "
-#~ "reloj mostrará la hora en segundos desde la época (1 de enero de 1970). "
+#~ "la hora en segundos desde la época (1 de enero de 1970). Si se establece "
-#~ "Si se establece a «custom» el reloj mostrará la hora según el formato "
+#~ "a «custom» el reloj mostrará la hora según el formato especificado en la "
-#~ "especificado en la clave «custom_format». Note que si se establece a "
+#~ "clave «custom_format». Note que si se establece a «unix» o «custom» se "
-#~ "«unix» o «custom» se ignoran las claves «show_date» y «show_seconds»."
+#~ "ignoran las claves «show_date» y «show_seconds»."
 
 #~ msgid "Clock Format"
 #~ msgstr "Formato del reloj"

po/he.po

@@ -10,8 +10,8 @@ msgid ""
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 17:01+0200\n"
+"POT-Creation-Date: 2015-07-16 13:28+0300\n"
 "PO-Revision-Date: 2015-07-16 13:28+0300\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
@@ -134,30 +134,31 @@ msgstr "Index of the currently selected view in the application picker."
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:11
 msgid "History for command (Alt-F2) dialog"
 msgstr "History for command (Alt-F2) dialog"
-
+
+#. Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid "History for the looking glass dialog"
 msgstr "History for the looking glass dialog"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Always show the 'Log out' menu item in the user menu."
-
-#: ../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."
-msgstr ""
-"This key overrides the automatic hiding of the 'Log out' menu item in single-"
-"user, single-session situations."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
-msgid ""
+msgid ""
+"This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
-msgstr ""
+msgstr ""
+"This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+msgid ""
+"Whether to remember password for mounting encrypted or remote filesystems"
+msgstr ""
+"Whether to remember password for mounting encrypted or remote filesystems"
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@@ -168,75 +169,75 @@ msgstr ""
 "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."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Show the week date in the calendar"
 msgstr "Show the week date in the calendar"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "If true, display the ISO week date in the calendar."
 msgstr "If true, display the ISO week date in the calendar."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to open the application menu"
 msgstr "Keybinding to open the application menu"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the application menu."
 msgstr "Keybinding to open the application menu."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Keybinding to open the \"Show Applications\" view"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to open the overview"
 msgstr "Keybinding to open the overview"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to open the Activities Overview."
 msgstr "Keybinding to open the Activities Overview."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "Keybinding to toggle the visibility of the notification list"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr "Keybinding to toggle the visibility of the notification list."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification"
 msgstr "Keybinding to focus the active notification"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to focus the active notification."
 msgstr "Keybinding to focus the active notification."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Which keyboard to use"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "The type of keyboard to use."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Limit switcher to current workspace."
 msgstr "Limit switcher to current workspace."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "If true, only applications that have windows on the current workspace are "
@@ -244,51 +245,51 @@ msgstr ""
 msgstr ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The application icon mode."
 msgstr "The application icon mode."
-
-#: ../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'."
-msgstr ""
-"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'."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+msgid ""
+"Configures how the windows are shown in the switcher. Valid possibilities "
+"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
+"only' (shows only the application icon) or 'both'."
+msgstr ""
+"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'."
+
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
 msgstr ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Attach modal dialog to the parent window"
 msgstr "Attach modal dialog to the parent window"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Enable edge tiling when dropping windows on screen edges"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid "Workspaces are managed dynamically"
 msgstr "Workspaces are managed dynamically"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Workspaces only on primary monitor"
 msgstr "Workspaces only on primary monitor"
-
+
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Delay focus changes in mouse mode until the pointer stops moving"
@@ -296,50 +297,50 @@ 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:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "אירעה שגיאה בעת טעינת דו־שיח ההעדפות עבור %s:"
-
+
 #: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "הרחבות GNOME Shell"
-
+
 #: ../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 "ביטול"
-
+
 #: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "הבא"
-
+
 #: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "שחרור"
-
+
 #: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "כניסה"
-
+
 #: ../js/gdm/loginDialog.js:281
 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:431
 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:847
 #, javascript-format
 msgid "(e.g., user or %s)"
@@ -347,12 +348,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:831 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "שם משתמש:"
-
+
 #: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "חלון כניסה"
@@ -460,31 +461,31 @@ msgstr "%d ב%B %Y, %l∶%M %p"
 #: ../js/portalHelper/main.js:85
 msgid "Web Authentication Redirect"
 msgstr "אימות ניתוב הרשת"
-
+
 #: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "יישומים בשימוש תדיר יופיעו כאן"
-
+
 #: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "תדיר"
-
+
 #: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "הכול"
-
+
 #: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "חלון חדש"
-
+
 #: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "הסרה מהמועדפים"
-
+
 #: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "הוספה למועדפים"
-
+
 #: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "הצגת פרטים"
@@ -498,114 +499,118 @@ msgstr "‏%s נוסף למועדפים שלך."
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "‏%s הוסר מהמועדפים שלך."
-
+
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:649
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "הגדרות"
-
 #: ../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:357
+msgid "Settings"
+msgstr "הגדרות"
 
-#. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
+#. 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"
 msgid "06"
 msgstr "65"
-
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:78
-msgctxt "event list time"
-msgid "All Day"
-msgstr "יום שלם"
 
 #. 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
 msgctxt "grid sunday"
 msgid "S"
 msgstr "א"
 
-#. Translators: Calendar grid abbreviation for Monday
+#. Translators: Calendar grid abbreviation for Monday
 #: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "ב"
 
-#. Translators: Calendar grid abbreviation for Tuesday
+#. Translators: Calendar grid abbreviation for Tuesday
 #: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "ג"
 
-#. Translators: Calendar grid abbreviation for Wednesday
+#. Translators: Calendar grid abbreviation for Wednesday
 #: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "ד"
 
-#. Translators: Calendar grid abbreviation for Thursday
+#. Translators: Calendar grid abbreviation for Thursday
 #: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "ה"
 
-#. Translators: Calendar grid abbreviation for Friday
+#. Translators: Calendar grid abbreviation for Friday
 #: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "ו"
 
-#. Translators: Calendar grid abbreviation for Saturday
+#. Translators: Calendar grid abbreviation for Saturday
 #: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "ש"
-
+
 #: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "חודש קודם"
-
+
 #: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "חודש הבא"
-
+
 #: ../js/ui/calendar.js:781
 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
 msgid "Clear section"
 msgstr "ניקוי מקטע"
-
+
 #: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "אירועים"
-
+
 #: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, ה־%e ב%B"
-
+
 #: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, ה־%e ב%B, %Y"
-
+
 #: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "התרעות"
-
+
 #: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "אין התרעות"
-
+
 #: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "אין אירועים"
@@ -630,81 +635,95 @@ msgstr "ססמה:"
 #: ../js/ui/components/keyring.js:120
 msgid "Type again:"
 msgstr "נא להקליד שוב:"
-
+
 #: ../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 "התחברות"
 
-#. Cisco LEAP
+#. Cisco LEAP
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
 #: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "ססמה:"
 
-#. static WEP
+#. static WEP
 #: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "מפתח:"
-
+
 #: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "זהות:"
-
+
 #: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "ססמת מפתח פרטי:"
-
+
 #: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "שירות:"
-
+
+#: ../js/ui/components/networkAgent.js:320
 #: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "הרשת האלחוטית דורשת אימות"
-
+
+#: ../js/ui/components/networkAgent.js:321
 #: ../js/ui/components/networkAgent.js:659
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
 msgstr "ססמאות או מפתחות הצפנה נדרשים כדי לגשת לרשת האלחוטית „%s”"
-
+
+#: ../js/ui/components/networkAgent.js:325
 #: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "אימות Wired 802.1X"
-
+
 #: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "שם הרשת:"
-
+
+#: ../js/ui/components/networkAgent.js:332
 #: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "אימות DSL"
-
+
+#: ../js/ui/components/networkAgent.js:339
 #: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "נדרש קוד PIN"
-
+
+#: ../js/ui/components/networkAgent.js:340
 #: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "נדרש קוד PIN עבור התקן החיבור האלחוטי בפס רחב"
-
+
 #: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN: "
-
+
+#: ../js/ui/components/networkAgent.js:348
 #: ../js/ui/components/networkAgent.js:679
 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
 #, 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"
@@ -727,7 +746,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:757
 #, javascript-format
 msgid "%s is now known as %s"
@@ -742,7 +761,7 @@ msgstr "הצגת יישומים"
 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:449
 msgid "Dash"
 msgstr "חלונית"
@@ -904,10 +923,19 @@ msgstr "התקנה"
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "הורדה והתקנה של „%s” מ־extensions.gnome.org?"
-
+
 #: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 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"
@@ -960,7 +988,7 @@ msgstr "צפייה במקור"
 #: ../js/ui/lookingGlass.js:758
 msgid "Web Page"
 msgstr "דף אינטרנט"
-
+
 #: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "פרטי המערכת"
@@ -980,17 +1008,17 @@ msgstr "סקירה"
 #: ../js/ui/overview.js:246
 msgid "Type to search…"
 msgstr "יש להקליד כדי לחפש…"
-
+
 #: ../js/ui/panel.js:352
 msgid "Quit"
 msgstr "יציאה"
 
 #. Translators: If there is no suitable word for "Activities"
-#. in your language, you can use the word for "Overview".
+#. in your language, you can use the word for "Overview".
 #: ../js/ui/panel.js:404
 msgid "Activities"
 msgstr "פעילויות"
-
+
 #: ../js/ui/panel.js:755
 msgid "Top Bar"
 msgstr "הסרגל העליון"
@@ -999,7 +1027,7 @@ msgstr "הסרגל העליון"
 #. (for toggle switches containing the English words
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
-#. simply result in invisible toggle switches.
+#. simply result in invisible toggle switches.
 #: ../js/ui/popupMenu.js:289
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
@@ -1007,7 +1035,7 @@ msgstr "toggle-switch-intl"
 #: ../js/ui/runDialog.js:70
 msgid "Enter a Command"
 msgstr "נא להזין פקודה"
-
+
 #: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "סגירה"
@@ -1037,11 +1065,11 @@ 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:365
 msgid "Lock"
 msgstr "נעילה"
-
+
 #: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "על GNOME לנעול את המסך"
@@ -1052,19 +1080,19 @@ msgstr "על GNOME לנעול את המסך"
 #. Just tell him to stop using this app
 #.
 #. XXX: another option is to kick the user into the gdm login
-#. screen, where we're not affected by grabs
+#. screen, where we're not affected by grabs
 #: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "לא ניתן לנעול"
-
+
 #: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "הנעילה נחסמה ע״י היישום"
-
+
 #: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "בחיפוש…"
-
+
 #: ../js/ui/search.js:619
 msgid "No results."
 msgstr "אין תוצאות."
@@ -1128,11 +1156,11 @@ msgstr "מקשים קופצים"
 #: ../js/ui/status/accessibility.js:84
 msgid "Mouse Keys"
 msgstr "מקשי עכבר"
-
+
 #: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "ניגודיות גבוהה"
-
+
 #: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "טקסט גדול"
@@ -1169,7 +1197,7 @@ msgstr "לא מחובר"
 #: ../js/ui/status/brightness.js:44
 msgid "Brightness"
 msgstr "בהירות"
-
+
 #: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "הצגת פריסת המקלדת"
@@ -1338,10 +1366,6 @@ msgstr "הגדרות VPN"
 #: ../js/ui/status/network.js:1502
 msgid "VPN"
 msgstr "VPN"
-
-#: ../js/ui/status/network.js:1657
-msgid "Network Manager"
-msgstr "מנהל הרשתות"
 
 #: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
@@ -1391,23 +1415,23 @@ msgstr "מצב טיסה"
 #: ../js/ui/status/rfkill.js:90
 msgid "On"
 msgstr "פועל"
-
+
 #: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "החלפת משתמש"
-
+
 #: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "יציאה"
-
+
 #: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "נעילת כיוון"
-
+
 #: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "השהיה"
-
+
 #: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "כיבוי"
@@ -1439,28 +1463,28 @@ msgstr "יישומים"
 #: ../js/ui/viewSelector.js:163
 msgid "Search"
 msgstr "חיפוש"
-
+
 #: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "‏„%s” מוכן"
-
+
 #: ../js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "האם ברצונך לשמור הגדרות תצוגה אלה?"
 
 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
-#.
+#.
 #: ../js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "שחזור הגדרות"
-
+
 #: ../js/ui/windowManager.js:86
 msgid "Keep Changes"
 msgstr "שמירת שינויים"
 
-# javascript-format
+# javascript-format
 #: ../js/ui/windowManager.js:105
 #, c-format
 msgid "Settings changes will revert in %d second"
@@ -1469,7 +1493,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:604
 #, javascript-format
 msgid "%d x %d"
@@ -1506,14 +1530,38 @@ msgstr "תמיד עליון"
 #: ../js/ui/windowMenu.js:89
 msgid "Always on Visible Workspace"
 msgstr "הצגה בכל מרחבי העבודה"
-
+
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "הזזה למרחב העבודה שמשמאל"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "הזזה למרחב העבודה שמימין"
+
 #: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "הזזה למרחב העבודה שמלמעלה"
-
+
 #: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "הזזה למרחב העבודה שמלמטה"
+
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "הזה לצג שמלמעלה"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "הזזה לצג שמלמטה"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "הזזה לצג שמשמאל"
+
+#: ../js/ui/windowMenu.js:154
+msgid "Move to Monitor Right"
+msgstr "הזזה לצג שמימין"
 
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
@@ -1556,21 +1604,21 @@ msgstr "שימוש במצב מסוים, לדוגמה: „gdm“ למסך הכנ
 #: ../src/main.c:391
 msgid "List possible modes"
 msgstr "הצגת המצבים האפשריים"
-
+
 #: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "לא ידוע"
-
+
 #: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "אירע כשל בטעינת „%s”"
-
+
 #: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "הססמאות אינן תואמות."
-
+
 #: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "הססמה לא יכולה להישאר ריקה"

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.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
 # 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,8 +11,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-03-14 08:44+0000\n"
+"POT-Creation-Date: 2015-06-23 08:06+0000\n"
-"PO-Revision-Date: 2015-03-14 20:54+0100\n"
+"PO-Revision-Date: 2015-06-23 13:12+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
@@ -303,12 +303,12 @@ msgstr ""
 msgid "Network Login"
 msgstr "Hálózati bejelentkezés"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
 #, 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:155
+#: ../js/extensionPrefs/main.js:154
 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:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Következő"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Feloldás"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Bejelentkezés"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Válasszon munkamenetet"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Nincs a listán?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:840
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(például: felhasználó vagy %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Felhasználónév: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1173
 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:792
+#: ../js/ui/appDisplay.js:788
 msgid "Frequently used applications will appear here"
 msgstr "Itt jelennek meg a gyakran használt alkalmazások"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:908
 msgid "Frequent"
 msgstr "Gyakori"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:915
 msgid "All"
 msgstr "Összes"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1844
 msgid "New Window"
 msgstr "Új ablak"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Eltávolítás a Kedvencek közül"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1878
 msgid "Add to Favorites"
 msgstr "Hozzáadás a Kedvencekhez"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1888
 msgid "Show Details"
 msgstr "Részletek megjelenítése"
 
@@ -482,15 +482,19 @@ 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 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../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…"
 
+#: ../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:357
+msgid "Settings"
+msgstr "Beállítások"
+
 #. 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"
@@ -543,53 +547,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "Sz"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Előző hónap"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Következő hónap"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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:1182
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Egész nap"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Szakasz törlése"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Események"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d."
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y. %B %d."
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Értesítések"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Nincsenek értesítések"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Nincsenek események"
 
@@ -725,7 +729,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:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s mostantól %s néven ismert"
@@ -734,12 +738,12 @@ msgstr "%s mostantól %s néven ismert"
 msgid "Windows"
 msgstr "Ablakok"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Alkalmazások megjelenítése"
 
 # FIXME - valami jobbat
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Dash"
 
@@ -908,17 +912,16 @@ 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:714 ../js/ui/status/keyboard.js:580
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Billentyűzet"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:59
+#: ../js/ui/legacyTray.js:66
-#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Tálca elrejtése"
 
-#: ../js/ui/legacyTray.js:91
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Állapotikonok"
 
@@ -974,7 +977,7 @@ msgstr "Forrás megtekintése"
 msgid "Web Page"
 msgstr "Weblap"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Rendszerinformációk"
 
@@ -1016,7 +1019,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Adjon meg egy parancsot"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Bezárás"
 
@@ -1044,27 +1047,27 @@ 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:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Zárolás"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "A GNOME-nak zárolnia kell a képernyőt"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Nem lehet zárolni"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "A zárolást egy alkalmazás blokkolta"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Keresés…"
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Nincs találat."
 
@@ -1128,11 +1131,11 @@ msgstr "Billentyűszűrés"
 msgid "Mouse Keys"
 msgstr "Egérbillentyűk"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Nagy kontraszt"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Nagy szöveg"
 
@@ -1166,7 +1169,7 @@ msgstr "Nincs kapcsolat"
 msgid "Brightness"
 msgstr "Fényerő"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Billentyűzetkiosztás megjelenítése"
 
@@ -1377,23 +1380,23 @@ msgstr "Repülőgép üzemmód"
 msgid "On"
 msgstr "Be"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Felhasználóváltás"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Tájolás zárolása"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Felfüggesztés"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Kikapcsolás"
 
@@ -1454,7 +1457,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:599
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1491,13 +1494,39 @@ msgstr "Mindig felül"
 msgid "Always on Visible Workspace"
 msgstr "Mindig a látható munkaterületen"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
-msgid "Move to Workspace Up"
+#| msgid "Move to Workspace Up"
-msgstr "Mozgatás a fentebbi munkaterületre"
+msgid "Move to Workspace Left"
+msgstr "Áthelyezés a bal oldali munkaterületre"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:110
+#| msgid "Move to Workspace Up"
+msgid "Move to Workspace Right"
+msgstr "Áthelyezés a jobb oldali munkaterületre"
+
+#: ../js/ui/windowMenu.js:115
+msgid "Move to Workspace Up"
+msgstr "Áthelyezés a felső munkaterületre"
+
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
-msgstr "Mozgatás az alsóbb munkaterületre"
+msgstr "Áthelyezés az alsó munkaterületre"
+
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Áthelyezés a felső kijelzőre"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Áthelyezés az alsó kijelzőre"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Áthelyezés a bal oldali kijelzőre"
+
+#: ../js/ui/windowMenu.js:154
+msgid "Move to Monitor Right"
+msgstr "Áthelyezés a jobb oldali kijelzőre"
 
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
@@ -1542,21 +1571,21 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Lehetséges módok listázása"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "„%s” indítása meghiúsult"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "A jelszó nem lehet üres"
 

po/it.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-04 20:42+0000\n"
+"POT-Creation-Date: 2015-03-16 20:36+0000\n"
-"PO-Revision-Date: 2015-03-05 08:59+0100\n"
+"PO-Revision-Date: 2015-03-17 09:07+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italiano <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-DamnedLies-Scope: partial\n"
-"X-Generator: Poedit 1.7.4\n"
+"X-Generator: Poedit 1.7.5\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -323,7 +323,7 @@ msgstr ""
 msgid "GNOME Shell Extensions"
 msgstr "Estensioni di GNOME Shell"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../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
@@ -344,25 +344,25 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Accedi"
 
-#: ../js/gdm/loginDialog.js:276
+#: ../js/gdm/loginDialog.js:280
 msgid "Choose Session"
 msgstr "Scegli sessione"
 
-#: ../js/gdm/loginDialog.js:417
+#: ../js/gdm/loginDialog.js:421
 msgid "Not listed?"
 msgstr "Non elencato?"
 
-#: ../js/gdm/loginDialog.js:826
+#: ../js/gdm/loginDialog.js:830
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(p.e. utente o %s)"
 
-#: ../js/gdm/loginDialog.js:831 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:287
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nome utente: "
 
-#: ../js/gdm/loginDialog.js:1166
+#: ../js/gdm/loginDialog.js:1170
 msgid "Login Window"
 msgstr "Finestra di accesso"
 
@@ -471,7 +471,7 @@ msgstr "Tutte"
 msgid "New Window"
 msgstr "Nuova finestra"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
 msgid "Remove from Favorites"
 msgstr "Rimuovi dai preferiti"
 
@@ -505,104 +505,104 @@ msgid "Change Background…"
 msgstr "Cambia sfondo…"
 
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
-#: ../js/ui/calendar.js:49
+#: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
 
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#. */
-#: ../js/ui/calendar.js:78
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Giornata"
-
 #. 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:93
+#: ../js/ui/calendar.js:82
 msgctxt "grid sunday"
 msgid "S"
 msgstr "D"
 
 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:95
+#: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "L"
 
 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:97
+#: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:99
+#: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:101
+#: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "G"
 
 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:103
+#: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "V"
 
 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:105
+#: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
 
-#: ../js/ui/calendar.js:572
+#: ../js/ui/calendar.js:563
 msgid "Previous month"
 msgstr "Mese precedente"
 
-#: ../js/ui/calendar.js:582
+#: ../js/ui/calendar.js:573
 msgid "Next month"
 msgstr "Mese successivo"
 
-#: ../js/ui/calendar.js:789
+#: ../js/ui/calendar.js:780
 msgid "Week %V"
 msgstr "Settimana %V"
 
-#: ../js/ui/calendar.js:1245
+#. 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 "Giornata"
+
+#: ../js/ui/calendar.js:1288
 msgid "Clear section"
 msgstr "Annulla selezione"
 
-#: ../js/ui/calendar.js:1459
+#: ../js/ui/calendar.js:1515
 msgid "Events"
 msgstr "Eventi"
 
-#: ../js/ui/calendar.js:1467
+#: ../js/ui/calendar.js:1524
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e %B"
 
-#: ../js/ui/calendar.js:1471
+#: ../js/ui/calendar.js:1528
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e %B %Y"
 
-#: ../js/ui/calendar.js:1563
+#: ../js/ui/calendar.js:1613
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ../js/ui/calendar.js:1714
+#: ../js/ui/calendar.js:1764
 msgid "No Notifications"
 msgstr "Nessuna notifica"
 
-#: ../js/ui/calendar.js:1717
+#: ../js/ui/calendar.js:1767
 msgid "No Events"
 msgstr "Nessun evento"
 
@@ -627,40 +627,42 @@ msgstr "Password:"
 msgid "Type again:"
 msgstr "Inserire di nuovo:"
 
-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../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 "Connetti"
 
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:301
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Password: "
 
-#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "Chiave: "
 
-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "Identità: "
 
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "Password chiave privata: "
 
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "Servizio: "
 
-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "Richiesta autenticazione dalla rete wireless"
 
-#: ../js/ui/components/networkAgent.js:319
+#: ../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 "
@@ -669,39 +671,51 @@ msgstr ""
 "È richiesta una password o una chiave di cifratura per accedere alla rete "
 "wireless «%s»."
 
-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "Autenticazione via cavo 802.1X"
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "Nome rete: "
 
-#: ../js/ui/components/networkAgent.js:330
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "Autenticazione DSL"
 
-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "Richiesto codice PIN"
 
-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "È necessario il codice PIN per il dispositivo mobile"
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Password rete mobile"
 
-#: ../js/ui/components/networkAgent.js:346
+#: ../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”."
 msgstr "È richiesta una password per connettersi a «%s»."
 
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+msgid "Network Manager"
+msgstr "Gestore reti"
+
 #: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
 msgstr "Richiesta autenticazione"
@@ -724,7 +738,7 @@ msgstr "Errore nell'autenticazione. Provare di nuovo."
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:772
+#: ../js/ui/components/telepathyClient.js:775
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s ha cambiato nome in %s"
@@ -733,12 +747,12 @@ msgstr "%s ha cambiato nome in %s"
 msgid "Windows"
 msgstr "Finestre"
 
-#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
+#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
 msgid "Show Applications"
 msgstr "Mostra applicazioni"
 
 # cruscotto?!?!?!?!?!?!?
-#: ../js/ui/dash.js:451
+#: ../js/ui/dash.js:453
 msgid "Dash"
 msgstr "Dash"
 
@@ -906,10 +920,19 @@ msgstr "Installa"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Scaricare e installare «%s» da extensions.gnome.org?"
 
-#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:576
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:580
 msgid "Keyboard"
 msgstr "Tastiera"
 
+#. translators: 'Hide' is a verb */
+#: ../js/ui/legacyTray.js:64
+msgid "Hide tray"
+msgstr "Nascondi cassetto"
+
+#: ../js/ui/legacyTray.js:104
+msgid "Status Icons"
+msgstr "Icone di stato"
+
 #: ../js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "Nessuna estensione installata"
@@ -964,7 +987,7 @@ msgstr "Visualizza sorgente"
 msgid "Web Page"
 msgstr "Pagina web"
 
-#: ../js/ui/messageTray.js:2131
+#: ../js/ui/messageTray.js:2133
 msgid "System Information"
 msgstr "Informazione di sistema"
 
@@ -998,7 +1021,7 @@ msgstr "Attività"
 msgid "Top Bar"
 msgstr "Barra superiore"
 
-#: ../js/ui/popupMenu.js:288
+#: ../js/ui/popupMenu.js:289
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"
 
@@ -1050,11 +1073,11 @@ msgstr "Impossibile bloccare"
 msgid "Lock was blocked by an application"
 msgstr "Il blocco è stato impedito da un'applicazione."
 
-#: ../js/ui/search.js:609
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "Ricerca…"
 
-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "Nessun risultato."
 
@@ -1157,7 +1180,7 @@ msgstr "Non collegato"
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: ../js/ui/status/keyboard.js:599
+#: ../js/ui/status/keyboard.js:603
 msgid "Show Keyboard Layout"
 msgstr "Mostra disposizione tastiera"
 
@@ -1330,10 +1353,6 @@ msgstr "Impostazioni VPN"
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1657
-msgid "Network Manager"
-msgstr "Gestore reti"
-
 #: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Attivazione della connessione di rete non riuscita"
@@ -1542,12 +1561,12 @@ msgstr "Usa una modalità specifica, p.e. \"gdm\" per la schermata di accesso"
 msgid "List possible modes"
 msgstr "Elenca le modalità possibili"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Avvio di «%s» non riuscito"

po/ja.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the gnome-shell package.
 # Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 2010.
 # Kiyotaka NISHIBORI <ml.nishibori.kiyotaka@gmail.com>, 2011.
-# Jiro Matsuzawa <jmatsuzawa@gnome.org>, 2011, 2012, 2013, 2014.
+# Jiro Matsuzawa <jmatsuzawa@gnome.org>, 2011, 2012, 2013, 2014, 2015.
 # Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2011, 2012.
 # Hideki Yamane <henrich@debian.org>, 2011.
 # Takanori MATSUURA <t.matsuu@gmail.com>, 2012.
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-06 18:02+0000\n"
+"POT-Creation-Date: 2015-03-20 20:39+0000\n"
-"PO-Revision-Date: 2015-01-19 00:27+0900\n"
+"PO-Revision-Date: 2015-03-21 10:06+0900\n"
-"Last-Translator: IWAI, Masaharu <iwaim.sub@gmail.com>\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa@gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +30,8 @@ msgid "System"
 msgstr "システム"
 
 #: ../data/50-gnome-shell-system.xml.in.h:2
-#, fuzzy
-#| msgid "%d new notification"
-#| msgid_plural "%d new notifications"
 msgid "Show the notification list"
-msgstr "%d 件の新しい通知"
+msgstr "通知リストを表示する"
 
 #: ../data/50-gnome-shell-system.xml.in.h:3
 msgid "Focus the active notification"
@@ -170,16 +167,12 @@ msgid "Keybinding to open the Activities Overview."
 msgstr "アクティビティ画面を開くキーバインドです。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-#, fuzzy
-#| msgid "Keybinding to toggle the visibility of the message tray"
 msgid "Keybinding to toggle the visibility of the notification list"
-msgstr "メッセージトレイの表示・非表示を切り替えるキーバインド"
+msgstr "通知リストの表示・非表示を切り替えるキーバインド"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-#, fuzzy
-#| msgid "Keybinding to toggle the visibility of the message tray."
 msgid "Keybinding to toggle the visibility of the notification list."
-msgstr "メッセージトレイの表示・非表示を切り替えるキーバインドです。"
+msgstr "通知リストの表示・非表示を切り替えるキーバインドです。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to focus the active notification"
@@ -258,7 +251,7 @@ msgstr "%s の設定ダイアログのロード中にエラーが発生しまし
 msgid "GNOME Shell Extensions"
 msgstr "GNOME Shell 拡張機能"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../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
@@ -292,12 +285,12 @@ msgstr "アカウントが見つかりませんか?"
 msgid "(e.g., user or %s)"
 msgstr "(たとえば、user あるいは %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:287
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "ユーザー名: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1163
 msgid "Login Window"
 msgstr "ログインウィンドウ"
 
@@ -438,108 +431,106 @@ 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:49
+#: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
 
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#. */
-#: ../js/ui/calendar.js:78
-msgctxt "event list time"
-msgid "All Day"
-msgstr "終日"
-
 #. 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:93
+#: ../js/ui/calendar.js:82
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"
 
 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:95
+#: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "月"
 
 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:97
+#: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "火"
 
 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:99
+#: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "水"
 
 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:101
+#: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "木"
 
 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:103
+#: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "金"
 
 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:105
+#: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "土"
 
-#: ../js/ui/calendar.js:572
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "先月"
 
-#: ../js/ui/calendar.js:582
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "来月"
 
-#: ../js/ui/calendar.js:789
+#: ../js/ui/calendar.js:781
 msgid "Week %V"
-msgstr ""
+msgstr "第%V週"
 
-#: ../js/ui/calendar.js:1245
+#. 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:1183
+msgctxt "event list time"
+msgid "All Day"
+msgstr "終日"
+
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
-msgstr ""
+msgstr "セクションをクリアする"
 
-#: ../js/ui/calendar.js:1459
+#: ../js/ui/calendar.js:1516
 msgid "Events"
-msgstr ""
+msgstr "イベント"
 
-#: ../js/ui/calendar.js:1467
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%B%-e日 (%a)"
 
-#: ../js/ui/calendar.js:1471
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%B%-e日 (%a)"
 
-#: ../js/ui/calendar.js:1563
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "通知"
 
-#: ../js/ui/calendar.js:1714
+#: ../js/ui/calendar.js:1765
-#, fuzzy
-#| msgid "Notifications"
 msgid "No Notifications"
-msgstr "通知"
+msgstr "通知なし"
 
-#: ../js/ui/calendar.js:1717
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
-msgstr ""
+msgstr "イベントなし"
 
 #: ../js/ui/components/automountManager.js:91
 msgid "External drive connected"
@@ -562,77 +553,91 @@ msgstr "パスワード:"
 msgid "Type again:"
 msgstr "再入力:"
 
-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../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 "接続"
 
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:301
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "キー: "
 
-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "識別子: "
 
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "プライベートキーパスワード: "
 
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "サービス: "
 
-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "無線ネットワークでは認証が要求されます"
 
-#: ../js/ui/components/networkAgent.js:319
+#: ../js/ui/components/networkAgent.js:321
+#: ../js/ui/components/networkAgent.js:659
 #, javascript-format
 msgid "Passwords or encryption keys are required to access the wireless network “%s”."
 msgstr "無線ネットワーク ”%s” にアクセスするにはパスワードか、または暗号化キーが必要です。"
 
-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "有線 802.1X の認証"
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "ネットワーク名: "
 
-#: ../js/ui/components/networkAgent.js:330
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "DSL 認証"
 
-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "PIN コードが必要です"
 
-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドデバイスには PIN コードが必要です"
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN 番号: "
 
-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドネットワークのパスワード"
 
-#: ../js/ui/components/networkAgent.js:346
+#: ../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”."
 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 "認証が要求されました"
@@ -655,7 +660,7 @@ msgstr "申し訳ありません、認証できませんでした。再試行し
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:772
+#: ../js/ui/components/telepathyClient.js:728
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s は %s になりました"
@@ -676,30 +681,24 @@ msgstr "ダッシュボード"
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #. */
 #: ../js/ui/dateMenu.js:73
-#, fuzzy
-#| msgid "%A %B %e, %Y"
 msgid "%B %e %Y"
-msgstr "%Y年%B%-e日 (%a)"
+msgstr "%Y年%-m月%-e日"
 
 #. Translators: This is the accessible name of the date button shown
 #. * below the time in the shell; it should combine the weekday and the
 #. * date, e.g. "Tuesday February 17 2015".
 #. */
 #: ../js/ui/dateMenu.js:80
-#, fuzzy
-#| msgid "%A %B %e, %Y"
 msgid "%A %B %e %Y"
-msgstr "%Y年%B%-e日 (%a)"
+msgstr "%Y年%-m月%-e日 (%a)"
 
 #: ../js/ui/dateMenu.js:160
 msgid "Add world clocks…"
-msgstr ""
+msgstr "世界時計を追加する…"
 
 #: ../js/ui/dateMenu.js:161
-#, fuzzy
-#| msgid "Open Clocks"
 msgid "World Clocks"
-msgstr "時計を開く"
+msgstr "世界時計"
 
 #: ../js/ui/endSessionDialog.js:64
 #, javascript-format
@@ -830,10 +829,19 @@ msgstr "インストール"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "extensions.gnome.org から ”%s” をダウンロードしてインストールしますか?"
 
-#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:576
+#: ../js/ui/keyboard.js:714 ../js/ui/status/keyboard.js:724
 msgid "Keyboard"
 msgstr "キーボード"
 
+#. translators: 'Hide' is a verb */
+#: ../js/ui/legacyTray.js:64
+msgid "Hide tray"
+msgstr "トレイを非表示"
+
+#: ../js/ui/legacyTray.js:104
+msgid "Status Icons"
+msgstr "ステータスアイコン"
+
 #: ../js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "機能拡張はインストールされていません"
@@ -886,7 +894,7 @@ msgstr "ソースの表示"
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1507
 msgid "System Information"
 msgstr "システム情報"
 
@@ -970,11 +978,11 @@ msgstr "ロックできません"
 msgid "Lock was blocked by an application"
 msgstr "アプリケーションによってロックがブロックされました"
 
-#: ../js/ui/search.js:609
+#: ../js/ui/search.js:616
 msgid "Searching…"
 msgstr "検索しています…"
 
-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:618
 msgid "No results."
 msgstr "一致するものがありません。"
 
@@ -1075,7 +1083,7 @@ msgstr "未接続"
 msgid "Brightness"
 msgstr "明るさ"
 
-#: ../js/ui/status/keyboard.js:599
+#: ../js/ui/status/keyboard.js:747
 msgid "Show Keyboard Layout"
 msgstr "キーボードレイアウトの表示"
 
@@ -1244,10 +1252,6 @@ 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 "ネットワーク接続を有効にできません"
@@ -1451,12 +1455,12 @@ msgstr "指定したモードを使用する (例: ログイン画面用の \"gd
 msgid "List possible modes"
 msgstr "使用可能なモードを一覧表示する"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "不明なプログラム"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "”%s”の起動に失敗しました"
@@ -1472,534 +1476,3 @@ msgstr "パスワードを空白にすることはできません。"
 #: ../src/shell-polkit-authentication-agent.c:346
 msgid "Authentication dialog was dismissed by the user"
 msgstr "認証ダイアログはユーザーに拒否されました"
-
-#~ msgid "Show the message tray"
-#~ msgstr "メッセージトレイを表示する"
-
-#~ msgctxt "event list time"
-#~ msgid "%H∶%M"
-#~ msgstr "%H∶%M"
-
-#~ msgctxt "event list time"
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
-
-#~ msgctxt "list sunday"
-#~ msgid "Su"
-#~ msgstr "日"
-
-#~ msgctxt "list monday"
-#~ msgid "M"
-#~ msgstr "月"
-
-#~ msgctxt "list tuesday"
-#~ msgid "T"
-#~ msgstr "火"
-
-#~ msgctxt "list wednesday"
-#~ msgid "W"
-#~ msgstr "水"
-
-#~ msgctxt "list thursday"
-#~ msgid "Th"
-#~ msgstr "木"
-
-#~ msgctxt "list friday"
-#~ msgid "F"
-#~ msgstr "金"
-
-#~ msgctxt "list saturday"
-#~ msgid "S"
-#~ msgstr "土"
-
-#~ msgid "Nothing Scheduled"
-#~ msgstr "予定がありません"
-
-#~ msgid "Today"
-#~ msgstr "今日"
-
-#~ msgid "Tomorrow"
-#~ msgstr "明日"
-
-#~ msgid "This week"
-#~ msgstr "今週"
-
-#~ msgid "Next week"
-#~ msgstr "来週"
-
-#~ msgid "Removable Devices"
-#~ msgstr "リムーバブルデバイス"
-
-#~ msgid "Eject"
-#~ msgstr "取り出し"
-
-#~ msgid "Invitation"
-#~ msgstr "招待"
-
-#~ msgid "Call"
-#~ msgstr "会話"
-
-#~ msgid "File Transfer"
-#~ msgstr "ファイル転送"
-
-#~ msgid "Chat"
-#~ msgstr "チャット"
-
-#~ msgid "Unmute"
-#~ msgstr "ミュート解除"
-
-#~ msgid "Mute"
-#~ msgstr "ミュート"
-
-#~ msgid "Invitation to %s"
-#~ msgstr "%s への招待"
-
-#~ msgid "%s is inviting you to join %s"
-#~ msgstr "%s さんがあなたを %s に招待しています"
-
-#~ msgid "Decline"
-#~ msgstr "拒否する"
-
-#~ msgid "Accept"
-#~ msgstr "受け入れる"
-
-#~ msgid "Video call from %s"
-#~ msgstr "%s さんからビデオでの呼び出し"
-
-#~ msgid "Call from %s"
-#~ msgstr "%s さんからの呼び出し"
-
-#~ msgid "Answer"
-#~ msgstr "応答"
-
-#~ msgid "%s is sending you %s"
-#~ msgstr "%s さんがあなたに %s を送信しようとしています"
-
-#~ msgid "%s would like permission to see when you are online"
-#~ msgstr "%s さんが、あなたがオンライン状態になったことを知る許可を欲しいと思っています"
-
-#~ msgid "Network error"
-#~ msgstr "ネットワークエラー"
-
-#~ msgid "Authentication failed"
-#~ msgstr "認証失敗"
-
-#~ msgid "Encryption error"
-#~ msgstr "暗号化のエラーです"
-
-#~ msgid "Certificate not provided"
-#~ msgstr "証明書がありません"
-
-#~ msgid "Certificate untrusted"
-#~ msgstr "信用のない証明書です"
-
-#~ msgid "Certificate expired"
-#~ msgstr "証明書の有効期限が切れています"
-
-#~ msgid "Certificate not activated"
-#~ msgstr "証明書は利用できません"
-
-#~ msgid "Certificate hostname mismatch"
-#~ msgstr "証明書のホスト名が一致しません"
-
-#~ msgid "Certificate fingerprint mismatch"
-#~ msgstr "証明書の指紋が一致しません"
-
-#~ msgid "Certificate self-signed"
-#~ msgstr "証明書自身の署名です"
-
-#~ msgid "Status is set to offline"
-#~ msgstr "状態はオフラインに設定されています"
-
-#~ msgid "Encryption is not available"
-#~ msgstr "暗号が利用できません"
-
-#~ msgid "Certificate is invalid"
-#~ msgstr "証明書が正しくありません"
-
-#~ msgid "Connection has been refused"
-#~ msgstr "接続が拒否されました"
-
-#~ msgid "Connection can't be established"
-#~ msgstr "接続を確立できませんでした"
-
-#~ msgid "Connection has been lost"
-#~ msgstr "接続が失われました"
-
-#~ msgid "This account is already connected to the server"
-#~ msgstr "このアカウントはすでにサーバーに接続済みです"
-
-#~ msgid "Connection has been replaced by a new connection using the same resource"
-#~ msgstr "接続は同じリソースを使って新しい接続で置き換わりました"
-
-#~ msgid "The account already exists on the server"
-#~ msgstr "アカウントがサーバーにすでに存在します"
-
-#~ msgid "Server is currently too busy to handle the connection"
-#~ msgstr "サーバーがビジー状態にあるため、この接続を処理できません"
-
-#~ msgid "Certificate has been revoked"
-#~ msgstr "証明書が無効化されました"
-
-#~ msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-#~ msgstr "証明書が安全でない暗号のアルゴリズムを使っているか、暗号的に弱いです"
-
-#~ msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-#~ msgstr "サーバー証明書の長さや、サーバー証明書のチェーンの深さが暗号ライブラリで規定されている長さを越えています"
-
-#~ msgid "Internal error"
-#~ msgstr "内部エラー"
-
-#~ msgid "Unable to connect to %s"
-#~ msgstr "%s に接続できません"
-
-#~ msgid "View account"
-#~ msgstr "アカウントを表示"
-
-#~ msgid "Unknown reason"
-#~ msgstr "原因不明"
-
-#~ msgid "Open Calendar"
-#~ msgstr "カレンダーを開く"
-
-#~ msgid "Date & Time Settings"
-#~ msgstr "日時の設定"
-
-#~ msgid "Open"
-#~ msgstr "開く"
-
-#~ msgid "Remove"
-#~ msgstr "削除"
-
-#~ msgid "Clear Messages"
-#~ msgstr "メッセージをクリア"
-
-#~ msgid "Notification Settings"
-#~ msgstr "通知設定"
-
-#~ msgid "Tray Menu"
-#~ msgstr "トレイメニュー"
-
-#~ msgid "No Messages"
-#~ msgstr "メッセージなし"
-
-#~ msgid "Message Tray"
-#~ msgstr "メッセージトレイ"
-
-#~ msgid "Captive Portal"
-#~ msgstr "キャプティブポータル"
-
-#~ msgid "The maximum accuracy level of location."
-#~ msgstr "場所の最大精度レベルです。"
-
-#~ msgid "Arrangement of buttons on the titlebar"
-#~ msgstr "タイトルバーのボタン配置方法"
-
-#~ msgid "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell."
-#~ msgstr "GNOME Shell 使用時は、 このキーが、org.gnome.desktop.wm.preferences の同じキーよりも優先します。"
-
-#~ msgid "Extension"
-#~ msgstr "拡張機能"
-
-#~ msgid "Select an extension to configure using the combobox above."
-#~ msgstr "設定する拡張機能を上部のコンボボックスから選択してください。"
-
-#~ msgid "calendar:MY"
-#~ msgstr "calendar:YM"
-
-#~ msgid "List of categories that should be displayed as folders"
-#~ msgstr "フォルダー形式で表示するカテゴリ名のリスト"
-
-#~ msgid "Each category name in this list will be represented as folder in the application view, rather than being displayed inline in the main view."
-#~ msgstr "このリストに指定したカテゴリは、アプリケーションビューにおいてフォルダー形式で表示されます。メインビューのカテゴリ列には表示されません。"
-
-#~ msgid "<b>%A</b>, <b>%H:%M</b>"
-#~ msgstr "<b>%A</b> <b>%H:%M</b>"
-
-#~ msgid "<b>%B</b> <b>%d</b>, <b>%H:%M</b>"
-#~ msgstr "<b>%b</b><b>%-e日</b> <b>%H:%M</b>"
-
-#~ msgid "<b>%B</b> <b>%d</b> <b>%Y</b>, <b>%H:%M</b> "
-#~ msgstr "<b>%Y年</b><b>%b</b><b>%-e日</b><b>%H:%M</b>"
-
-#~ msgid "Authorization request from %s"
-#~ msgstr "%s からアクセス許可の要求"
-
-#~ msgid "Device %s wants to pair with this computer"
-#~ msgstr "デバイス %s がこのコンピューターとのペアリングを要求しています"
-
-#~ msgid "Allow"
-#~ msgstr "許可"
-
-#~ msgid "Deny"
-#~ msgstr "拒否"
-
-#~ msgid "Device %s wants access to the service '%s'"
-#~ msgstr "デバイス '%s' が サービス '%s' へのアクセスを要求しています"
-
-#~ msgid "Always grant access"
-#~ msgstr "許可"
-
-#~ msgid "Grant this time only"
-#~ msgstr "今回のみ許可"
-
-#~ msgid "Reject"
-#~ msgstr "拒否"
-
-#~ msgid "Pairing confirmation for %s"
-#~ msgstr "%s からペアリングの確認"
-
-#~ msgid "Please confirm whether the Passkey '%06d' matches the one on the device."
-#~ msgstr "'%06d' がデバイスのパスキーと一致しているか確認してください。"
-
-#~ msgid "Matches"
-#~ msgstr "一致"
-
-#~ msgid "Does not match"
-#~ msgstr "不一致"
-
-#~ msgid "Pairing request for %s"
-#~ msgstr "%s からペアリングの要求"
-
-#~ msgid "Please enter the PIN mentioned on the device."
-#~ msgstr "デバイスの PIN コードを入力してください。"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid ""
-#~ "Sorry, no wisdom for you today:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "すまない、今日は賢言がないのだ:\n"
-#~ "%s"
-
-#~ msgid "%s the Oracle says"
-#~ msgstr "預言者 %s 曰く"
-
-#~ msgctxt "event list time"
-#~ msgid "%H\\u2236%M"
-#~ msgstr "%H\\u2236%M"
-
-#~ msgctxt "event list time"
-#~ msgid "%l\\u2236%M\\u2009%p"
-#~ msgstr "%p%l\\u2236%M"
-
-#~ msgid "Settings Menu"
-#~ msgstr "設定メニュー"
-
-#~ msgid "Internally used to store the last IM presence explicitly set by the user. The value here is from the TpConnectionPresenceType enumeration."
-#~ msgstr "ユーザーにより明示的に設定された最新の IM プレゼンスを保存するのに内部的に使用されます。ここは TpConnectionPresenceType 列挙型の値になります。"
-
-#~ msgid "Internally used to store the last session presence status for the user. The value here is from the GsmPresenceStatus enumeration."
-#~ msgstr "ユーザーの最新のセッションプレゼンスの状態を保存するのに内部的に使用されます。ここは GsmPresenceStatus 列挙型の値になります。"
-
-#~ msgid "Session"
-#~ msgstr "セッション"
-
-#~ msgid "Click Log Out to quit these applications and log out of the system."
-#~ msgstr "ログアウトをクリックすると、起動中のアプリケーションを終了しシステムからログアウトします。"
-
-#~ msgid "Logging out of the system."
-#~ msgstr "システムからログアウトします。"
-
-#~ msgid "Click Power Off to quit these applications and power off the system."
-#~ msgstr "電源オフをクリックすると、起動中のアプリケーションを終了しシステムの電源を切ります。"
-
-#~ msgid "Powering off the system."
-#~ msgstr "システムの電源を切ります。"
-
-#~ msgid "Click Restart to quit these applications and restart the system."
-#~ msgstr "再起動をクリックすると、起動中のアプリケーションを終了しシステムを再起動します。"
-
-#~ msgid "Restarting the system."
-#~ msgstr "システムを再起動します。"
-
-#~ msgid "Shutting down might cause them to lose unsaved work."
-#~ msgstr "シャットダウンすると、他のユーザーによる未保存の作業が失われる可能性があります。"
-
-#~ msgid "Screenshots"
-#~ msgstr "スクリーンショット"
-
-#~ msgid "Record a screencast"
-#~ msgstr "スクリーンキャストを撮る"
-
-#~ msgid "Keybinding to toggle the screen recorder"
-#~ msgstr "スクリーンレコーダー切り替えのキーバインド"
-
-#~ msgid "Keybinding to start/stop the builtin screen recorder."
-#~ msgstr "内蔵のスクリーンレコーダーを起動したり止めたりするキーバインドです。"
-
-#~ msgid "Framerate used for recording screencasts."
-#~ msgstr "スクリーンキャスト録画のフレームレート"
-
-#~ msgid "The framerate of the resulting screencast recordered by GNOME Shell's screencast recorder in frames-per-second."
-#~ msgstr "GNOME Shell のスクリーンキャストレコーダーで録画するスクリーンキャストの 1秒あたりのフレーム数です。"
-
-#~ msgid "The gstreamer pipeline used to encode the screencast"
-#~ msgstr "スクリーンキャストのエンコードに使用する Gstreamer パイプライン"
-
-#~ msgid "Sets the GStreamer pipeline used to encode recordings. It follows the syntax used for gst-launch. The pipeline should have an unconnected sink pad where the recorded video is recorded. It will normally have a unconnected source pad; output from that pad will be written into the output file. However the pipeline can also take care of its own output - this might be used to send the output to an icecast server via shout2send or similar. When unset or set to an empty value, the default pipeline will be used. This is currently 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux' and records to WEBM using the VP8 codec. %T is used as a placeholder for a guess at the optimal thread count on the system."
-#~ msgstr "録画したものをエンコードするための Gstreamer パイプラインを設定します。構文は gst-launch のものに準拠します。パイプラインは未接続の録画用 sink pad を持つようにしてください。パイプラインは通常未接続の source pad を持ち、ファイルへ出力データを書き込みますが、出力方法については独自に定義することもできます。shout2send プラグインやその類似プラグインを経由して icecast サーバーへ出力データを送信するときは、この方法をとります。値が設定されていないか、空の場合は、既定のパイプライン 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux' が使用され、VP8 コーデックを使用した WebM 形式で録画します。 '%T' はシステムの最適スレッド数の推量値を示すプレースホルダーです。"
-
-#~ msgid "File extension used for storing the screencast"
-#~ msgstr "ファイルに保存するスクリーンキャストのファイル拡張子"
-
-#~ msgid "The filename for recorded screencasts will be a unique filename based on the current date, and use this extension. It should be changed when recording to a different container format."
-#~ msgstr "録画したスクリーンキャストをファイルに保存する際は、日付を基にした固有の名前とこの拡張子をファイル名として使用します。異なる形式で録画するときは拡張子を変更する必要があります。"
-
-#~ msgid "Power"
-#~ msgstr "電源"
-
-#~ msgid "Restart"
-#~ msgstr "再起動"
-
-#~ msgid "Screencast from %d %t"
-#~ msgstr "Screencast from %d %t"
-
-#~ msgid "Universal Access Settings"
-#~ msgstr "ユニバーサルアクセスの設定"
-
-#~ msgid "Visibility"
-#~ msgstr "検出可能にする"
-
-#~ msgid "Send Files to Device…"
-#~ msgstr "デバイスにファイルを送る…"
-
-#~ msgid "Set Up a New Device…"
-#~ msgstr "新しいデバイスを設定…"
-
-#~ msgid "Send Files…"
-#~ msgstr "ファイルを送信…"
-
-#~ msgid "Keyboard Settings"
-#~ msgstr "キーボードの設定"
-
-#~ msgid "Mouse Settings"
-#~ msgstr "マウスの設定"
-
-#~ msgid "Sound Settings"
-#~ msgstr "サウンドの設定"
-
-#~ msgid "Region & Language Settings"
-#~ msgstr "地域と言語の設定"
-
-#~ msgid "Volume, network, battery"
-#~ msgstr "音量, ネットワーク, バッテリー"
-
-#~ msgid "Wi-Fi"
-#~ msgstr "Wi-Fi"
-
-#~ msgid "disabled"
-#~ msgstr "利用不可"
-
-#~ msgid "More…"
-#~ msgstr "その他…"
-
-#~ msgid "Wired"
-#~ msgstr "有線接続"
-
-#~ msgid "Networking is disabled"
-#~ msgstr "ネットワークを利用できません"
-
-#~ msgid "%d hour remaining"
-#~ msgid_plural "%d hours remaining"
-#~ msgstr[0] "残り %d時間"
-
-#~ msgid "%d %s %d %s remaining"
-#~ msgstr "残り %d%s %d%s"
-
-#~ msgid "hour"
-#~ msgid_plural "hours"
-#~ msgstr[0] "時間"
-
-#~ msgid "minute"
-#~ msgid_plural "minutes"
-#~ msgstr[0] "分"
-
-#~ msgid "%d minute remaining"
-#~ msgid_plural "%d minutes remaining"
-#~ msgstr[0] "残り %d分"
-
-#~ msgctxt "percent of battery remaining"
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid "AC Adapter"
-#~ msgstr "AC アダプター"
-
-#~ msgid "Laptop Battery"
-#~ msgstr "バッテリー"
-
-#~ msgid "Monitor"
-#~ msgstr "モニター"
-
-#~ msgid "Mouse"
-#~ msgstr "マウス"
-
-#~ msgid "PDA"
-#~ msgstr "PDA"
-
-#~ msgid "Cell Phone"
-#~ msgstr "携帯電話"
-
-#~ msgid "Media Player"
-#~ msgstr "メディアプレイヤー"
-
-#~ msgid "Tablet"
-#~ msgstr "タブレット端末"
-
-#~ msgid "Computer"
-#~ msgstr "コンピューター"
-
-#~ msgctxt "device"
-#~ msgid "Unknown"
-#~ msgstr "不明なデバイス"
-
-#~ msgid "Available"
-#~ msgstr "在席中"
-
-#~ msgid "Busy"
-#~ msgstr "取り込み中"
-
-#~ msgid "Invisible"
-#~ msgstr "非表示"
-
-#~ msgid "Away"
-#~ msgstr "離席中"
-
-#~ msgid "Idle"
-#~ msgstr "待機中"
-
-#~ msgid "Your chat status will be set to busy"
-#~ msgstr "取り込み中に設定されます"
-
-#~ msgid "Notifications are now disabled, including chat messages. Your online status has been adjusted to let others know that you might not see their messages."
-#~ msgstr "チャットなどの通知メッセージが表示されなくなります。オンライン状態が変更され、あなたがメッセージに目を通せない状態にあることを、他の人が知ることができます。"
-
-#~ msgid "Whether to collect stats about applications usage"
-#~ msgstr "アプリケーション使用状況の 有効/無効"
-
-#~ msgid "The shell normally monitors active applications in order to present the most used ones (e.g. in launchers). While this data will be kept private, you may want to disable this for privacy reasons. Please note that doing so won't remove already saved data."
-#~ msgstr "通常、「お気に入り」を把握するためにアプリケーションの使用状況が監視されています。この情報が外部へ送信されることはありませんが、不安を感じるならば監視を無効にすることができます。なおすでに収集された情報は消去できません。"
-
-#~ msgid "cable unplugged"
-#~ msgstr "ケーブル抜け"
-
-#~ msgid "Auto Ethernet"
-#~ msgstr "自動イーサネット接続"
-
-#~ msgid "Auto broadband"
-#~ msgstr "自動ブロードバンド接続"
-
-#~ msgid "Auto dial-up"
-#~ msgstr "自動ダイヤルアップ"
-
-#~ msgid "Auto %s"
-#~ msgstr "自動 %s"
-
-#~ msgid "Auto bluetooth"
-#~ msgstr "自動 Bluetooth 接続"
-
-#~ msgid "Auto wireless"
-#~ msgstr "自動無線接続"

po/nb.po

@@ -7,10 +7,10 @@
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 3.15.x\n"
+"Project-Id-Version: gnome-shell 3.17.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-09 19:29+0100\n"
+"POT-Creation-Date: 2015-07-30 11:36+0200\n"
-"PO-Revision-Date: 2015-03-09 19:29+0100\n"
+"PO-Revision-Date: 2015-07-30 11:36+0200\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"
@@ -131,15 +131,16 @@ msgstr "Indeks for valgt visning i programvelgeren."
 msgid "History for command (Alt-F2) dialog"
 msgstr "Historikk for kommandodialog (Alt-F2)"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:12
+#. Translators: looking glass is a debugger and inspector tool, see https://live.gnome.org/GnomeShell/LookingGlass
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
 msgid "History for the looking glass dialog"
 msgstr "Historikk for forstørrelsesglass-dialogen"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
 msgid "Always show the 'Log out' menu item in the user menu."
 msgstr "Alltid vis menyoppføringen «Logg ut» i brukermenyen."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid ""
 "This key overrides the automatic hiding of the 'Log out' menu item in single-"
 "user, single-session situations."
@@ -147,12 +148,12 @@ msgstr ""
 "Denne nøkkelen overstyrer skjuling av menyoppføringen «Logg ut» i "
 "situasjonen én bruker, én sesjon."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
 msgid ""
 "Whether to remember password for mounting encrypted or remote filesystems"
 msgstr "Om passord til eksterne eller krypterte filsystemer skal huskes."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid ""
 "The shell will request a password when an encrypted device or a remote "
 "filesystem is mounted. If the password can be saved for future use a "
@@ -164,76 +165,76 @@ msgstr ""
 "avkryssingsboks med teksten «Husk passord». Denne nøkkelen bestemmer "
 "standardverdien for avkryssingsboksen."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
 msgid "Show the week date in the calendar"
 msgstr "Vis ukedato/ukenummer i kalender"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
 msgid "If true, display the ISO week date in the calendar."
 msgstr "Viser ISO-ukedato i kalenderen hvis «true»."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
 msgid "Keybinding to open the application menu"
 msgstr "Tastaturbinding som åpner programmenyen"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
 msgid "Keybinding to open the application menu."
 msgstr "Tastaturbinding som åpner programmenyen."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
 msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Tastaturbinding som åpner visningen «Vis programmer»"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:22
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid ""
 "Keybinding to open the \"Show Applications\" view of the Activities Overview."
 msgstr ""
 "Tastaturbinding som åpner visningen «Vis programmer» i aktivitetsoversikten."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
 msgid "Keybinding to open the overview"
 msgstr "Tastaturbinding som åpner oversikten"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
 msgid "Keybinding to open the Activities Overview."
 msgstr "Tastaturbinding som åpner aktivitetsoversikten."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:25
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "Tastaturbinding som slår av/på visning av varslingsliste"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:26
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr "Tastaturbinding som slår av/på visning av varslingsliste."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:27
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
 msgid "Keybinding to focus the active notification"
 msgstr "Tastaturbinding som fokuserer aktiv varsling"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:28
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
 msgid "Keybinding to focus the active notification."
 msgstr "Tastaturbinding som fokuserer aktiv varsling."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:29
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid ""
 "Keybinding that pauses and resumes all running tweens, for debugging purposes"
 msgstr ""
 "Hurtigtast som stanser og fortsetter pågående bevegelser til "
 "feilsøkingsformål"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:30
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
 msgid "Which keyboard to use"
 msgstr "Tastatur som skal brukes"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:31
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
 msgid "The type of keyboard to use."
 msgstr "Type tastatur som skal brukes."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:32
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
 msgid "Limit switcher to current workspace."
 msgstr "Begrens programveksling til gjeldende arbeidsområde."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:33
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
@@ -242,11 +243,11 @@ msgstr ""
 "gjeldende arbeidsområder som vises i programveksleren. I motsatt fall kan du "
 "veksle mellom programmer på tvers av arbeidsområder."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:34
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
 msgid "The application icon mode."
 msgstr "Ikonmodus for programmet."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:35
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
@@ -256,7 +257,7 @@ msgstr ""
 "valgalternativer er «thumbnail-only» (viser miniatyrbilde av vinduet), «app-"
 "icon-only» (viser bare programikonet) og «both» (viser begge forannevnte)."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:36
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
@@ -265,30 +266,30 @@ msgstr ""
 "arbeidsområder som vises i programveksleren. I motsatt fall vises vinduer "
 "fra alle arbeidsområder."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:37
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
 msgid "Attach modal dialog to the parent window"
 msgstr "Fest modal dialog til opphavsvinduet"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:38
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Denne nøkkelen overstyrer nøkkelen i org.gnome.mutter når GNOME Shell kjøres."
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:39
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Del opp skjermkantene i fliser når brukeren drar og slipper vinduer på dem"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:40
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
 msgid "Workspaces are managed dynamically"
 msgstr "Arbeidsområder håndteres dynamisk"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:41
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
 msgid "Workspaces only on primary monitor"
 msgstr "Arbeidsområder vises kun på hovedskjerm"
 
-#: ../data/org.gnome.shell.gschema.xml.in.in.h:42
+#: ../data/org.gnome.shell.gschema.xml.in.in.h:43
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "Utsett fokusendringer i musmodus til peker slutter å bevege seg"
 
@@ -296,50 +297,51 @@ msgstr "Utsett fokusendringer i musmodus til peker slutter å bevege seg"
 msgid "Network Login"
 msgstr "Nettverkspålogging"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Det oppsto en feil ved lasting av brukervalgdialog for %s:"
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Utvidelser for GNOME Shell"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../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 "Avbryt"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:435
 msgid "Next"
 msgstr "Neste"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Lås opp"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Logg inn"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 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:421
+#: ../js/gdm/loginDialog.js:431
 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:830
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(f.eks. bruker eller %s)"
@@ -347,12 +349,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:835 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:287
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Brukernavn: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Innloggingsvindu"
 
@@ -460,31 +462,31 @@ msgstr "%d %B %Y, %H.%M"
 msgid "Web Authentication Redirect"
 msgstr "Omdirigering av autentisering på nett"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "Ofte brukte programmer vises her"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Ofte"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Alle"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Nytt vindu"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Legg til i favoritter"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Vis detaljer"
 
@@ -498,114 +500,118 @@ 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 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: ../js/ui/backgroundMenu.js:21
 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:357
+msgid "Settings"
+msgstr "Innstillinger"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: ../js/ui/calendar.js:49
+#: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
 
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: ../js/ui/calendar.js:78
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Hele dagen"
-
 #. 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:93
+#: ../js/ui/calendar.js:82
 msgctxt "grid sunday"
 msgid "S"
 msgstr "S"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:95
+#: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "M"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:97
+#: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "T"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:99
+#: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "O"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:101
+#: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "T"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:103
+#: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "F"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:105
+#: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "L"
 
-#: ../js/ui/calendar.js:572
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Forrige måned"
 
-#: ../js/ui/calendar.js:582
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Neste måned"
 
-#: ../js/ui/calendar.js:789
+#: ../js/ui/calendar.js:781
 msgid "Week %V"
 msgstr "Uke %V"
 
-#: ../js/ui/calendar.js:1245
+#. 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 "Hele dagen"
+
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Tøm seksjon"
 
-#: ../js/ui/calendar.js:1459
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../js/ui/calendar.js:1467
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A %B %d"
 
-#: ../js/ui/calendar.js:1471
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A %B %d, %Y"
 
-#: ../js/ui/calendar.js:1563
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Varslinger"
 
-#: ../js/ui/calendar.js:1714
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Ingen varslinger"
 
-#: ../js/ui/calendar.js:1717
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Ingen hendelser"
 
@@ -630,42 +636,44 @@ msgstr "Passord:"
 msgid "Type again:"
 msgstr "Skriv på nytt:"
 
-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../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 "Koble til"
 
 #. Cisco LEAP
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:301
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Passord: "
 
 #. static WEP
-#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "Nøkkel: "
 
-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "Identitet: "
 
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "Passord for privat nøkkel: "
 
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "Tjeneste: "
 
-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "Autentisering kreves av trådløst nettverk"
 
-#: ../js/ui/components/networkAgent.js:319
+#: ../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 "
@@ -674,39 +682,51 @@ msgstr ""
 "Passord eller krypteringsnøkler kreves for å koble til trådløst nettverk "
 "«%s»."
 
-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "802.1X autentisering for trådbundet nettverk"
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "Navn på nettverk: "
 
-#: ../js/ui/components/networkAgent.js:330
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "DSL-autentisering"
 
-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "PIN-kode kreves"
 
-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode kreves for mobil bredbåndsenhet"
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Nettverkspassord for mobilt bredbånd"
 
-#: ../js/ui/components/networkAgent.js:346
+#: ../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”."
 msgstr "Du må oppgi et passord for å koble til «%s»."
 
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+msgid "Network Manager"
+msgstr "Nettverkshåndtering"
+
 #: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
@@ -729,7 +749,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:772
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -738,13 +758,13 @@ msgstr "%s er nå kjent som %s"
 msgid "Windows"
 msgstr "Vinduer"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 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:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Favoritter"
 
@@ -911,10 +931,19 @@ 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:706 ../js/ui/status/keyboard.js:576
+#: ../js/ui/keyboard.js:741 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Tastatur"
 
+#. translators: 'Hide' is a verb
+#: ../js/ui/legacyTray.js:66
+msgid "Hide tray"
+msgstr "Skjul statusområde"
+
+#: ../js/ui/legacyTray.js:107
+msgid "Status Icons"
+msgstr "Statusikoner"
+
 #: ../js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "Ingen utvidelser installert"
@@ -967,7 +996,7 @@ msgstr "Vis kildekode"
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Systeminformasjon"
 
@@ -975,7 +1004,7 @@ msgstr "Systeminformasjon"
 msgid "Undo"
 msgstr "Angre"
 
-#: ../js/ui/overview.js:124
+#: ../js/ui/overview.js:117
 msgid "Overview"
 msgstr "Oversikt"
 
@@ -983,7 +1012,7 @@ msgstr "Oversikt"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/overview.js:246
+#: ../js/ui/overview.js:244
 msgid "Type to search…"
 msgstr "Skriv for å søke …"
 
@@ -1014,7 +1043,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Skriv inn en kommando"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Lukk"
 
@@ -1042,11 +1071,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:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Lås"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME må låse skjermen"
 
@@ -1057,19 +1086,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:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Klarte ikke å låse"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Låsing ble stoppet av et program"
 
-#: ../js/ui/search.js:609
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Søker …"
 
-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Ingen resultater."
 
@@ -1133,11 +1162,11 @@ msgstr "Spretne taster"
 msgid "Mouse Keys"
 msgstr "Mustaster"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Høy kontrast"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Stor tekst"
 
@@ -1173,7 +1202,7 @@ msgstr "Ikke koblet til"
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../js/ui/status/keyboard.js:599
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Vis tastaturutforming"
 
@@ -1342,10 +1371,6 @@ msgstr "Innstillinger for VPN"
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1657
-msgid "Network Manager"
-msgstr "Nettverkshåndtering"
-
 #: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Aktivering av nettverkstilkobling mislyktes"
@@ -1395,23 +1420,23 @@ msgstr "Flymodus"
 msgid "On"
 msgstr "På"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Bytt bruker"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Lås for orientering"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Hvilemodus"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Slå av"
 
@@ -1443,27 +1468,27 @@ msgstr "Programmer"
 msgid "Search"
 msgstr "Søk"
 
-#: ../js/ui/windowAttentionHandler.js:19
+#: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "«%s» er klar"
 
-#: ../js/ui/windowManager.js:65
+#: ../js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "Vil du beholde disse skjerminnstillingene?"
 
 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #.
-#: ../js/ui/windowManager.js:84
+#: ../js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "Forkast innstillinger"
 
-#: ../js/ui/windowManager.js:88
+#: ../js/ui/windowManager.js:86
 msgid "Keep Changes"
 msgstr "Behold endringer"
 
-#: ../js/ui/windowManager.js:107
+#: ../js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1472,7 +1497,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:599
+#: ../js/ui/windowManager.js:660
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1509,14 +1534,38 @@ msgstr "Alltid øverst"
 msgid "Always on Visible Workspace"
 msgstr "Alltid på synlig arbeidsområde"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "Gå til arbeidsområdet til venstre"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "Gå til arbeidsområdet til høyre"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Gå til arbeidsområdet over"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Gå til arbeidsområdet under"
 
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Flytt til skjermen over"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Flytt til skjermen under"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Flytt til skjermen til venstre"
+
+#: ../js/ui/windowMenu.js:154
+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"
@@ -1559,21 +1608,21 @@ msgstr "Bruk spesifikt modus, f.eks «gdm» for innloggingsskjerm"
 msgid "List possible modes"
 msgstr "Vis mulige modi"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Klarte ikke å starte «%s»"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Passordene er ikke like."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "Passordet kan ikke være tomt"
 

po/pt_BR.po

@@ -15,21 +15,22 @@
 # 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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"POT-Creation-Date: 2015-03-13 16:16+0000\n"
+"shell&keywords=I18N+L10N&component=general\n"
-"PO-Revision-Date: 2015-03-13 14:04-0300\n"
+"POT-Creation-Date: 2015-05-01 20:03+0000\n"
-"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+"PO-Revision-Date: 2015-05-01 21:38-0200\n"
+"Last-Translator: Felipe Braga <fbobraga@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: Poedit 1.7.3\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
@@ -60,7 +61,8 @@ 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"
 
@@ -79,11 +81,17 @@ 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."
+msgid ""
-msgstr "Permite acesso a ferramentas internas de depuração e monitoramento usando o diálogo Alt-F2."
+"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"
@@ -91,13 +99,16 @@ 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 "
+"GNOME Shell extensions have a UUID property; this key lists extensions which "
-"to be loaded needs to be in this list. You can also manipulate this list with the EnableExtension and DisableExtension D-"
+"should be loaded. Any extension that wants to be loaded needs to be in this "
-"Bus methods on org.gnome.Shell."
+"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. "
+"As extensões do GNOME Shell possuem uma propriedade UUID; esta chave lista "
-"Qualquer extensão que quiser ser carregada precisa estar nesta lista. Você também pode manipular esta lista com os "
+"as extensões que devem ser carregadas. Qualquer extensão que quiser ser "
-"métodos do DBus EnableExtension e DisableExtensions em org.gnome.Shell."
+"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"
@@ -105,20 +116,27 @@ 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 "
+"GNOME Shell will only load extensions that claim to support the current "
-"disable this check and try to load all extensions regardless of the versions they claim to support."
+"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 "
+"O GNOME Shell somente carregará extensões que declaram possuir suporte a "
-"opção, esta verificação será desabilitada e haverá tentativas de carregar todas as extensões independente das versões "
+"versão atual em execução. Ao habilitar esta opção, esta verificação será "
-"que estas declaram suportar."
+"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."
+msgid ""
-msgstr "Os aplicativos correspondentes a estes identificadores serão exibidos na área de favoritos."
+"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"
@@ -126,7 +144,8 @@ 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"
@@ -141,23 +160,32 @@ 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 "
+"Essa chave sobrescreve a ocultação automática do item de menu \"Encerrar "
-"situações de somente uma sessão."
+"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"
+msgid ""
-msgstr "Se lembra ou não as senhas para montar sistemas de arquivos criptografados ou remotos"
+"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 "
+"The shell will request a password when an encrypted device or a remote "
-"saved for future use a 'Remember Password' checkbox will be present. This key sets the default state of the checkbox."
+"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 "
+"O shell irá pedir uma senha quando um dispositivo criptografado ou um "
-"senha possa ser salva para uso posterior, a caixa de seleção 'Lembrar senha' estará presente. Esta chave ajusta o estado "
+"sistema de arquivo remoto for montado. Caso a senha possa ser salva para uso "
-"padrão da caixa de seleção."
+"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"
@@ -180,8 +208,11 @@ 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."
+msgid ""
-msgstr "Atalho de teclado para abrir a visualização \"Mostrar aplicativos\" do panorama de atividades."
+"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"
@@ -197,7 +228,8 @@ 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"
@@ -209,8 +241,11 @@ 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"
+msgid ""
-msgstr "Atalho de teclado que pausa e continua todos os intermediários em execução, a fim de depuração"
+"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"
@@ -226,11 +261,12 @@ 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 "
+"If true, only applications that have windows on the current workspace are "
-"applications are included."
+"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 "
+"Se verdadeiro, o alternador mostrará somente os aplicativos que possuem "
-"contrário, todos os aplicativos serão incluídos."
+"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."
@@ -238,29 +274,37 @@ 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 "
+"Configures how the windows are shown in the switcher. Valid possibilities "
-"window), 'app-icon-only' (shows only the application icon) or 'both'."
+"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 "
+"Configura como as janelas são mostradas no alternador. As possibilidades "
-"miniatura da janela), 'app-icon-only' (mostra apenas o ícone do aplicativo) ou 'both'."
+"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 "
+"Se verdadeiro, o alternador mostrará somente as janelas do espaço de "
-"serão incluídas."
+"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."
+msgid ""
-msgstr "Esta chave sobrescreve a chave em org.gnome.mutter ao executar o Shell do GNOME."
+"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"
@@ -278,52 +322,55 @@ 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:123
+#: ../js/extensionPrefs/main.js:122
 #, 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:155
+#: ../js/extensionPrefs/main.js:154
 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/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
-#: ../js/ui/endSessionDialog.js:452 ../js/ui/extensionDownloader.js:195 ../js/ui/shellMountOperation.js:399
+#: ../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:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Próximo"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:59
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
+#: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Entrar"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Escolher sessão"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Não está listado?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:840
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(ex.: usuário ou %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271 ../js/ui/components/networkAgent.js:289
+#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Nome de usuário: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "Janela de sessão"
 
@@ -416,31 +463,31 @@ msgstr "%d de %B de %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Redirecionamento para autenticação web"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:788
 msgid "Frequently used applications will appear here"
 msgstr "Aplicativos usados frequentemente vão aparecer aqui"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:908
 msgid "Frequent"
 msgstr "Frequente"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:915
 msgid "All"
 msgstr "Todos"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1844
 msgid "New Window"
 msgstr "Nova janela"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Remover dos favoritos"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1878
 msgid "Add to Favorites"
 msgstr "Adicionar aos favoritos"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1888
 msgid "Show Details"
 msgstr "Mostrar detalhes"
 
@@ -454,14 +501,20 @@ 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 ../js/ui/panel.js:650 ../js/ui/status/system.js:337
+#: ../js/ui/backgroundMenu.js:19
-msgid "Settings"
-msgstr "Configurações"
-
-#: ../js/ui/backgroundMenu.js:21
 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
+msgid "Settings"
+msgstr "Configurações"
+
 #. 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"
@@ -514,53 +567,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Mês anterior"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Próximo mês"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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:1182
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Dia todo"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Limpar seção"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Eventos"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d de %B"
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Nenhuma notificação"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Nenhum evento"
 
@@ -585,13 +638,16 @@ 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/components/networkAgent.js:140 ../js/ui/status/network.js:277
-#: ../js/ui/status/network.js:919
+#: ../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:233
-#: ../js/ui/components/networkAgent.js:293 ../js/ui/components/networkAgent.js:303
+#: ../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: "
 
@@ -611,16 +667,23 @@ 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”."
+msgid ""
-msgstr "Senhas ou chaves criptografadas são necessárias para acessar a rede sem fio \"%s\"."
+"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"
 
@@ -628,15 +691,18 @@ 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"
 
@@ -644,11 +710,14 @@ 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”."
@@ -680,7 +749,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:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
@@ -689,11 +758,11 @@ msgstr "%s agora é conhecido como %s"
 msgid "Windows"
 msgstr "Janelas"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Mostrar aplicativos"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Dash"
 
@@ -802,9 +871,14 @@ 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."
+msgid_plural ""
-msgstr[0] "O sistema irá reiniciar e instalar atualizações automaticamente em %d segundo."
+"The system will automatically restart and install updates in %d seconds."
-msgstr[1] "O sistema irá reiniciar e instalar atualizações automaticamente em %d segundos."
+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"
@@ -823,7 +897,9 @@ 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."
@@ -854,16 +930,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:706 ../js/ui/status/keyboard.js:580
+#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:59
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Esconder bandeja"
 
-#: ../js/ui/legacyTray.js:91
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Ícones de status"
 
@@ -885,7 +961,8 @@ 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"
 
@@ -893,8 +970,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
+#: ../js/ui/lookingGlass.js:719 ../js/ui/status/location.js:179
-#: ../src/gvc/gvc-mixer-control.c:1830
+#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Desabilitado"
 
@@ -918,7 +995,7 @@ msgstr "Ver fonte"
 msgid "Web Page"
 msgstr "Página web"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1504
 msgid "System Information"
 msgstr "Informações do sistema"
 
@@ -960,7 +1037,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Digite um comando"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
 msgid "Close"
 msgstr "Fechar"
 
@@ -988,7 +1065,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:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "Bloquear"
 
@@ -1004,11 +1081,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:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Pesquisando…"
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Nenhum resultado."
 
@@ -1072,11 +1149,11 @@ msgstr "Teclas de repercussão"
 msgid "Mouse Keys"
 msgstr "Teclas do mouse"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Alto contraste"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Texto grande"
 
@@ -1084,8 +1161,9 @@ 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/bluetooth.js:51 ../js/ui/status/network.js:178
-#: ../js/ui/status/network.js:1282 ../js/ui/status/network.js:1393 ../js/ui/status/rfkill.js:91
+#: ../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"
@@ -1109,7 +1187,7 @@ msgstr "Não conectado"
 msgid "Brightness"
 msgstr "Brilho"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Exibir disposição de teclado"
 
@@ -1137,7 +1215,8 @@ 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"
 
@@ -1322,23 +1401,23 @@ msgstr "Modo avião"
 msgid "On"
 msgstr "On"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "Alternar usuário"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:319
 msgid "Log Out"
 msgstr "Encerrar sessão"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:338
 msgid "Orientation Lock"
 msgstr "Bloqueio da orientação"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:346
 msgid "Suspend"
 msgstr "Suspender"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:349
 msgid "Power Off"
 msgstr "Desligar"
 
@@ -1399,7 +1478,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:599
+#: ../js/ui/windowManager.js:613
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1444,6 +1523,24 @@ 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"
@@ -1486,12 +1583,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:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Erro ao lançar \"%s\""
@@ -1606,8 +1703,10 @@ 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"
+#~ msgid ""
-#~ msgstr "A conexão foi substituída por uma nova conexão usando o mesmo recurso"
+#~ "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"
@@ -1618,15 +1717,18 @@ 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"
+#~ msgid ""
-#~ msgstr "O certificado usa um algoritmo de cifragem inseguro ou é criptograficamente fraco"
+#~ "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 "
+#~ "The length of the server certificate, or the depth of the server "
-#~ "cryptography library"
+#~ "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 "
+#~ "O comprimento do certificado do servidor, ou a profundidade da cadeia do "
-#~ "biblioteca de criptografia"
+#~ "certificado excedeu os limites impostos pela biblioteca de criptografia"
 
 #~ msgid "Internal error"
 #~ msgstr "Erro interno"
@@ -1733,28 +1835,39 @@ 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 "
+#~ "Configures the maximum level of location accuracy applications are "
-#~ "location tracking), 'country', 'city', 'neighborhood', 'street', and 'exact' (typically requires GPS receiver). "
+#~ "allowed to see. Valid options are 'off' (disable location tracking), "
-#~ "Please keep in mind that this only controls what GeoClue will allow applications to see and they can find user's "
+#~ "'country', 'city', 'neighborhood', 'street', and 'exact' (typically "
-#~ "location on their own using network resources (albeit with street-level accuracy at best)."
+#~ "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"
+#~ "Configura o nível máximo de precisão de local a que os aplicativos com "
-#~ "\" (desabilita o rastreamento de local), \"country\", \"city\", \"neighborhood\", \"street\" e \"exact\" (geralmente "
+#~ "permissão podem ver. Opções válidas são \"off\" (desabilita o "
-#~ "necessita de receptor de GPS). Por gentileza, tenha em mente que estes são os únicos controles que o GeoClue "
+#~ "rastreamento de local), \"country\", \"city\", \"neighborhood\", \"street"
-#~ "permitirá aos aplicativos observarem e eles podem localizar o local do usuário por si só, usando recursos de rede "
+#~ "\" e \"exact\" (geralmente necessita de receptor de GPS). Por gentileza, "
-#~ "(apesar de na melhor hipótese usarem precisão à nível de rua)."
+#~ "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."
+#~ msgid ""
-#~ msgstr "Esta chave sobrescreve a chave em org.gnome.desktop.wm.preferences ao executar o Shell do GNOME."
+#~ "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"
@@ -1772,11 +1885,12 @@ 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 "
+#~ "Each category name in this list will be represented as folder in the "
-#~ "inline in the main view."
+#~ "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 "
+#~ "Cada nome de categoria nesta lista será representado como uma pasta na "
-#~ "incorporado à visão principal."
+#~ "visão do aplicativo, ao invés de ser exibido incorporado à visão "
+#~ "principal."
 
 #~ msgctxt "event list time"
 #~ msgid "%H\\u2236%M"

po/ru.po

@@ -19,8 +19,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-03-16 17:46+0000\n"
+"POT-Creation-Date: 2015-06-23 20:01+0000\n"
-"PO-Revision-Date: 2015-03-16 22:16+0300\n"
+"PO-Revision-Date: 2015-06-24 00:28+0300\n"
 "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -310,12 +310,12 @@ msgstr "Задержка изменения фокуса в режиме мыш
 msgid "Network Login"
 msgstr "Сетевая авторизация"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Возникла ошибка загрузки диалогового окна параметров для %s:"
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Расширения GNOME Shell"
 
@@ -326,39 +326,39 @@ msgstr "Расширения GNOME Shell"
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Далее"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Разблокировать"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Войти"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Выбрать сеанс"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Нет в списке?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:840
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(например, пользователь или %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Имя пользователя: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "Окно входа в систему"
 
@@ -456,31 +456,31 @@ msgstr "%d %b. %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Перенаправление для проверки подлинности"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:788
 msgid "Frequently used applications will appear here"
 msgstr "Здесь появляются часто используемые приложения"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:908
 msgid "Frequent"
 msgstr "Популярные"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:915
 msgid "All"
 msgstr "Все"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1844
 msgid "New Window"
 msgstr "Новое окно"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Удалить из избранного"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1878
 msgid "Add to Favorites"
 msgstr "Добавить в избранное"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1888
 msgid "Show Details"
 msgstr "Показать подробности"
 
@@ -494,15 +494,19 @@ msgstr "Приложение %s добавлено в избранное."
 msgid "%s has been removed from your favorites."
 msgstr "Приложение %s удалено из избранного."
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Параметры"
-
-#: ../js/ui/backgroundMenu.js:21
 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:357
+msgid "Settings"
+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"
@@ -555,55 +559,55 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "Сб"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Предыдущий месяц"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Следующий месяц"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Весь день"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Очистить секцию"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "События"
 
 # fix для даты в календаре и на экране блокировки, за разъяснением обращаться к Stas Solovey <whats_up@tut.by>
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %b."
 
 # fix для даты в календаре и на экране блокировки
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %b. %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Уведомлений нет"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Событий нет"
 
@@ -738,7 +742,7 @@ msgstr "Не удалось подтвердить подлинность. По
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Контакт %s теперь известен как %s"
@@ -747,11 +751,11 @@ msgstr "Контакт %s теперь известен как %s"
 msgid "Windows"
 msgstr "Окна"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Показать приложения"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Панель приложений"
 
@@ -927,16 +931,16 @@ msgstr "Установить"
 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
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:64
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Скрыть лоток"
 
-#: ../js/ui/legacyTray.js:104
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Значки состояния"
 
@@ -992,7 +996,7 @@ msgstr "Показать код"
 msgid "Web Page"
 msgstr "Веб-страница"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Системная информация"
 
@@ -1034,7 +1038,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Введите команду"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Закрыть"
 
@@ -1065,27 +1069,27 @@ msgstr[0] "%d новое уведомление"
 msgstr[1] "%d новых уведомления"
 msgstr[2] "%d новых уведомлений"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME необходимо заблокировать экран"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Не удалось заблокировать"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Блокировке помешало приложение"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Поиск…"
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Ничего не найдено."
 
@@ -1149,11 +1153,11 @@ msgstr "Отскакивающие клавиши"
 msgid "Mouse Keys"
 msgstr "Клавиши мыши"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Высокая контрастность"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Крупный текст"
 
@@ -1188,7 +1192,7 @@ msgstr "Не подключено"
 msgid "Brightness"
 msgstr "Яркость"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Показать раскладку клавиатуры"
 
@@ -1373,19 +1377,21 @@ msgstr "Полностью заряжена"
 msgid "Estimating…"
 msgstr "Выполняется подсчёт…"
 
+# нужно в две строки, иначе не влезает в выпадающую панель
 #: ../js/ui/status/power.js:86
 #, javascript-format
 msgid "%d∶%02d Remaining (%d%%)"
 msgstr ""
-"Разряжается (%d%%)\n"
+"Осталось %02d ч. %d мин.\n"
-"Осталось — %d∶%02d"
+"Разряжается (%d%%)"
 
+# нужно в две строки, иначе не влезает в выпадающую панель
 #: ../js/ui/status/power.js:91
 #, javascript-format
 msgid "%d∶%02d Until Full (%d%%)"
 msgstr ""
-"Заряжается (%d%%)\n"
+"До полной %02d ч. %d мин.\n"
-"До полной — %d∶%02d"
+"Заряжается (%d%%)"
 
 # Источник Бесперебойного Питания
 #: ../js/ui/status/power.js:119
@@ -1404,23 +1410,23 @@ msgstr "Режим авиаперелёта"
 msgid "On"
 msgstr "Включено"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Сменить пользователя"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Завершить сеанс"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Заблокировать положение"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Ждущий режим"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Выключить"
 
@@ -1482,7 +1488,7 @@ msgstr[2] "Изменения параметров будут отменены
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:599
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1519,14 +1525,40 @@ msgstr "Всегда сверху"
 msgid "Always on Visible Workspace"
 msgstr "Всегда на видимом рабочем месте"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+#| msgid "Move to Workspace Up"
+msgid "Move to Workspace Left"
+msgstr "Переместить на рабочее влево"
+
+#: ../js/ui/windowMenu.js:110
+#| msgid "Move to Workspace Up"
+msgid "Move to Workspace Right"
+msgstr "Переместить на рабочее место вправо"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Переместить на рабочее место вверх"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Переместить на рабочее место вниз"
 
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Переместить на экран вверх"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Переместить на экран вниз"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Переместить на экран влево"
+
+#: ../js/ui/windowMenu.js:154
+msgid "Move to Monitor Right"
+msgstr "Переместить на экран вправо"
+
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Календарь Evolution"
@@ -1582,154 +1614,14 @@ msgstr "Неизвестное приложение"
 msgid "Failed to launch “%s”"
 msgstr "Не удалось запустить «%s»"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 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 "%l∶%M %p"
-
-#~ msgid "Invitation"
-#~ msgstr "Приглашение"
-
-#~ msgid "Call"
-#~ msgstr "Вызов"
-
-#~ msgid "File Transfer"
-#~ msgstr "Передача файлов"
-
-#~ msgid "Chat"
-#~ msgstr "Чат"
-
-#~ msgid "Invitation to %s"
-#~ msgstr "Приглашение в %s"
-
-#~ msgid "%s is inviting you to join %s"
-#~ msgstr "%s приглашает вас присоединиться к %s"
-
-#~ msgid "Decline"
-#~ msgstr "Отказаться"
-
-#~ msgid "Accept"
-#~ msgstr "Принять"
-
-#~ msgid "Video call from %s"
-#~ msgstr "Видеозвонок от %s"
-
-#~ msgid "Call from %s"
-#~ msgstr "Вас вызывает %s"
-
-#~ msgid "Answer"
-#~ msgstr "Ответить"
-
-#~ msgid "%s is sending you %s"
-#~ msgstr "%s отправляет вам %s"
-
-#~ msgid "%s would like permission to see when you are online"
-#~ msgstr "%s хочет видеть, когда вы доступны в сети"
-
-#~ msgid "Network error"
-#~ msgstr "Ошибка сети"
-
-#~ msgid "Authentication failed"
-#~ msgstr "Ошибка аутентификации"
-
-#~ msgid "Encryption error"
-#~ msgstr "Ошибка шифрования"
-
-#~ msgid "Certificate not provided"
-#~ msgstr "Сертификат не предоставляется"
-
-#~ msgid "Certificate untrusted"
-#~ msgstr "Недоверенный сертификат"
-
-#~ msgid "Certificate expired"
-#~ msgstr "Срок действия сертификата истёк"
-
-#~ msgid "Certificate not activated"
-#~ msgstr "Сертификат не активирован"
-
-#~ msgid "Certificate hostname mismatch"
-#~ msgstr "Имя узла сертификата не совпадает"
-
-#~ msgid "Certificate fingerprint mismatch"
-#~ msgstr "Отпечаток сертификата не совпадает"
-
-#~ msgid "Certificate self-signed"
-#~ msgstr "Самоподписанный сертификат"
-
-#~ msgid "Status is set to offline"
-#~ msgstr "Установлен статус «не в сети»"
-
-#~ msgid "Encryption is not available"
-#~ msgstr "Шифрование недоступно"
-
-#~ msgid "Certificate is invalid"
-#~ msgstr "Недействительный сертификат"
-
-#~ msgid "Connection has been refused"
-#~ msgstr "В соединении отказано"
-
-#~ msgid "Connection can't be established"
-#~ msgstr "Соединение не может быть установлено"
-
-#~ msgid "Connection has been lost"
-#~ msgstr "Соединение потеряно"
-
-#~ msgid "This account is already connected to the server"
-#~ msgstr "Эта учётная запись уже подключена к серверу"
-
-#~ msgid ""
-#~ "Connection has been replaced by a new connection using the same resource"
-#~ msgstr "Соединение было заменено новым, используя тот же источник"
-
-#~ msgid "The account already exists on the server"
-#~ msgstr "Учётная запись уже существует на сервере"
-
-#~ msgid "Server is currently too busy to handle the connection"
-#~ msgstr ""
-#~ "Сервер в настоящее время сильно перегружен, чтобы обработать соединение"
-
-#~ msgid "Certificate has been revoked"
-#~ msgstr "Сертификат аннулирован"
-
-#~ msgid ""
-#~ "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-#~ msgstr ""
-#~ "Сертификат использует небезопасный алгоритм шифрования или он "
-#~ "криптографически нестоек"
-
-#~ msgid ""
-#~ "The length of the server certificate, or the depth of the server "
-#~ "certificate chain, exceed the limits imposed by the cryptography library"
-#~ msgstr ""
-#~ "Длина сертификата сервера, или глубина цепочки сертификатов сервера, "
-#~ "превышает пределы, установленные библиотекой криптографии"
-
-#~ msgid "Internal error"
-#~ msgstr "Внутренняя ошибка"
-
-#~ msgid "Unable to connect to %s"
-#~ msgstr "Не удалось подключиться к %s"
-
-#~ msgid "View account"
-#~ msgstr "Показать учётную запись"
-
-#~ msgid "Unknown reason"
-#~ msgstr "Неизвестная причина"
-
-#~ msgid "Show the message list"
-#~ msgstr "Показать список уведомлений"

po/sk.po

@@ -7,10 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=general\n"
-"shell&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-06-29 08:02+0000\n"
-"POT-Creation-Date: 2015-03-13 16:16+0000\n"
+"PO-Revision-Date: 2015-06-29 12:41+0100\n"
-"PO-Revision-Date: 2015-03-13 17:44+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -19,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: Vé 0.1.4\n"
+"X-Generator: Poedit 1.8.1\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
 msgid "System"
@@ -53,8 +52,7 @@ msgstr "Otvoriť ponuku aplikácií"
 msgid "GNOME Shell"
 msgstr "Shell prostredia GNOME"
 
-#: ../data/gnome-shell.desktop.in.in.h:2
+#: ../data/gnome-shell.desktop.in.in.h:2 ../data/gnome-shell-wayland.desktop.in.in.h:2
-#: ../data/gnome-shell-wayland.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "Správa okien a spúšťanie aplikácií"
 
@@ -72,17 +70,11 @@ msgstr "Shell prostredia GNOME (kompozitor pre wayland)"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:1
 msgid "Enable internal tools useful for developers and testers from Alt-F2"
-msgstr ""
+msgstr "Povoliť vnútorné nástroje užitočné pre vývojárov a testerov z dialógového okna Alt-F2"
-"Povoliť vnútorné nástroje užitočné pre vývojárov a testerov z dialógového "
-"okna Alt-F2"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:2
-msgid ""
+msgid "Allows access to internal debugging and monitoring tools using the Alt-F2 dialog."
-"Allows access to internal debugging and monitoring tools using the Alt-F2 "
+msgstr "Umožňuje prístup k vnútorným ladiacim a sledovacím nástrojom pomocou dialógového okna Alt-F2."
-"dialog."
-msgstr ""
-"Umožňuje prístup k vnútorným ladiacim a sledovacím nástrojom pomocou "
-"dialógového okna Alt-F2."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:3
 msgid "UUIDs of extensions to enable"
@@ -90,43 +82,28 @@ msgstr "Vlastnosť UUID rozšírení určených na povolenie"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:4
 msgid ""
-"GNOME Shell extensions have a UUID property; this key lists extensions which "
+"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 "
-"should be loaded. Any extension that wants to be loaded needs to be in this "
+"org.gnome.Shell."
-"list. You can also manipulate this list with the EnableExtension and "
-"DisableExtension D-Bus methods on org.gnome.Shell."
 msgstr ""
-"Rozšírenia pre Shell prostredia GNOME majú vlastnosť UUID; tento kľúč "
+"Rozšírenia pre Shell prostredia GNOME majú vlastnosť UUID; tento kľúč obsahuje zoznam rozšírení, ktoré by mali byť načítané. Každé rozšírenie, ktoré je potrebné načítať, musí byť v tomto zozname. Tento zoznam môžete upraviť aj ručne pomocou metód DBus "
-"obsahuje zoznam rozšírení, ktoré by mali byť načítané. Každé rozšírenie, "
+"EnableExtension a DisableExtension v org.gnome.Shell."
-"ktoré je potrebné načítať, musí byť v tomto zozname. Tento zoznam môžete "
-"upraviť aj ručne pomocou metód DBus EnableExtension a DisableExtension v org."
-"gnome.Shell."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:5
 msgid "Disables the validation of extension version compatibility"
 msgstr "Zakáže kontrolu kompatibility verzií rozšírení"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:6
-msgid ""
+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 ""
-"Shell prostredia GNOME načíta len rozšírenia, ktoré deklarujú podporu pre "
+"Shell prostredia GNOME načíta len rozšírenia, ktoré deklarujú podporu pre práve spustenú verziu prostredia. Povolením tejto voľby zakážete túto kontrolu a umožníte načítanie všetkých rozšírení bez ohľadu na to, pre ktorú verziu prostredia deklarujú podporu."
-"práve spustenú verziu prostredia. Povolením tejto voľby zakážete túto "
-"kontrolu a umožníte načítanie všetkých rozšírení bez ohľadu na to, pre ktorú "
-"verziu prostredia deklarujú podporu."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:7
 msgid "List of desktop file IDs for favorite applications"
 msgstr "Zoznam identifikátorov súborov plochy pre obľúbené aplikácie"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:8
-msgid ""
+msgid "The applications corresponding to these identifiers will be displayed in the favorites area."
-"The applications corresponding to these identifiers will be displayed in the "
+msgstr "Aplikácie zodpovedajúce týmto identifikátorom budú zobrazené medzi obľúbenými aplikáciami."
-"favorites area."
-msgstr ""
-"Aplikácie zodpovedajúce týmto identifikátorom budú zobrazené medzi "
-"obľúbenými aplikáciami."
 
 # summary
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:9
@@ -153,32 +130,18 @@ msgstr "Vždy zobraziť položku „Odhlásiť sa“ v ponuke používateľa."
 
 # description
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:14
-msgid ""
+msgid "This key overrides the automatic hiding of the 'Log out' menu item in single-user, single-session situations."
-"This key overrides the automatic hiding of the 'Log out' menu item in single-"
+msgstr "Tento kľúč preváži automatické skrývanie položky „Odhlásiť sa“ v situáciách s jedným používateľom alebo jednou reláciou."
-"user, single-session situations."
-msgstr ""
-"Tento kľúč preváži automatické skrývanie položky „Odhlásiť sa“ v situáciách "
-"s jedným používateľom alebo jednou reláciou."
 
 # summary
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:15
 msgid "Whether to remember password for mounting encrypted or remote filesystems"
-msgstr ""
+msgstr "Určiť, či bude zapamätané heslo pre pripojenie zašifrovaných alebo prenosných súborových systémov"
-"Určiť, či bude zapamätané heslo pre pripojenie zašifrovaných alebo "
-"prenosných súborových systémov"
 
 # description
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:16
-msgid ""
+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 "
+msgstr "Shell bude po pripojení zašifrovaného alebo prenosného súborového systému požadovať heslo. Ak bude možné toto heslo uložiť pre neskoršie použitie, zobrazí sa zaškrtávacie pole „Zapamätať heslo“. Tento kľúč nastaví predvolený stav zaškrtávacieho poľa."
-"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 ""
-"Shell bude po pripojení zašifrovaného alebo prenosného súborového systému "
-"požadovať heslo. Ak bude možné toto heslo uložiť pre neskoršie použitie, "
-"zobrazí sa zaškrtávacie pole „Zapamätať heslo“. Tento kľúč nastaví "
-"predvolený stav zaškrtávacieho poľa."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:17
 msgid "Show the week date in the calendar"
@@ -201,11 +164,8 @@ msgid "Keybinding to open the \"Show Applications\" view"
 msgstr "Klávesová skratka na otvorenie pohľadu „Zobraziť aplikácie“"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:22
-msgid ""
+msgid "Keybinding to open the \"Show Applications\" view of the Activities Overview."
-"Keybinding to open the \"Show Applications\" view of the Activities Overview."
+msgstr "Klávesová skratka na otvorenie pohľadu „Zobraziť aplikácie“ v prehľade aktivít."
-msgstr ""
-"Klávesová skratka na otvorenie pohľadu „Zobraziť aplikácie“ v prehľade "
-"aktivít."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:23
 msgid "Keybinding to open the overview"
@@ -233,11 +193,8 @@ msgstr "Klávesová skratka, s ktorou sa zamerá na aktívne oznámenia."
 
 # summary
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:29
-msgid ""
+msgid "Keybinding that pauses and resumes all running tweens, for debugging purposes"
-"Keybinding that pauses and resumes all running tweens, for debugging purposes"
+msgstr "Klávesová skratka, ktorá pozastaví a znovu spustí všetky animácie(tween), pre ladiace účely"
-msgstr ""
-"Klávesová skratka, ktorá pozastaví a znovu spustí všetky animácie(tween), "
-"pre ladiace účely"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:30
 msgid "Which keyboard to use"
@@ -254,35 +211,21 @@ msgstr "Obmedziť prepínač na aktuálny pracovný priestor."
 
 # desc
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:33
-msgid ""
+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 "
+msgstr "Ak je true, iba aplikácie, ktoré majú okná na aktuálnom pracovnom priestore budú zobrazené v prepínači. Inak budú zahrnuté všetky aplikácie."
-"shown in the switcher. Otherwise, all applications are included."
-msgstr ""
-"Ak je true, iba aplikácie, ktoré majú okná na aktuálnom pracovnom priestore "
-"budú zobrazené v prepínači. Inak budú zahrnuté všetky aplikácie."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:34
 msgid "The application icon mode."
 msgstr "Režim ikonizácie aplikácií."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:35
-msgid ""
+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 "
+msgstr "Konfiguruje, ako sa majú zobraziť okná v prepínači. Platné možnosti sú „thumbnail-only“ (zobrazí miniatúru okna), „app-icon-only“ (zobrazí iba ikonu aplikácie) alebo „both“ (zobrazí oboje)."
-"are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-"only' (shows only the application icon) or 'both'."
-msgstr ""
-"Konfiguruje, ako sa majú zobraziť okná v prepínači. Platné možnosti sú "
-"„thumbnail-only“ (zobrazí miniatúru okna), „app-icon-only“ (zobrazí iba "
-"ikonu aplikácie) alebo „both“ (zobrazí oboje)."
 
 # desc
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:36
-msgid ""
+msgid "If true, only windows from the current workspace are shown in the switcher. Otherwise, all windows are included."
-"If true, only windows from the current workspace are shown in the switcher. "
+msgstr "Ak je true, iba okná z aktuálneho pracovného priestoru budú zobrazené v prepínači. Inak budú zahrnuté všetky okná."
-"Otherwise, all windows are included."
-msgstr ""
-"Ak je true, iba okná z aktuálneho pracovného priestoru budú zobrazené v "
-"prepínači. Inak budú zahrnuté všetky okná."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:37
 msgid "Attach modal dialog to the parent window"
@@ -290,9 +233,7 @@ msgstr "Pripojiť modálne dialógové okno k rodičovskému oknu"
 
 #: ../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 ""
+msgstr "Tento kľúč preváži kľúč v org.gnome.mutter po spustení Shellu prostredia GNOME."
-"Tento kľúč preváži kľúč v org.gnome.mutter po spustení Shellu prostredia "
-"GNOME."
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:39
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -315,57 +256,52 @@ 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:123
+#: ../js/extensionPrefs/main.js:122
 #, 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:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Rozšírenia pre Shell prostredia GNOME"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:145
+#: ../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
-#: ../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 "Zrušiť"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Ďalej"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403 ../js/ui/unlockDialog.js:59
-#: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Odomknúť"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prihlásiť sa"
 
 # button
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Vybrať reláciu"
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=659972
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Nie ste v zozname?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(napr., používateľ alebo %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271 ../js/ui/components/networkAgent.js:289
-#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Používateľské meno: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1180
 msgid "Login Window"
 msgstr "Prihlasovacie okno"
 
@@ -464,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:792
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "Tu sa objavia často používané aplikácie"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Často používané"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Všetky"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Nové okno"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Odstrániť z obľúbených"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Pridať do obľúbených"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Zobraziť podrobnosti"
 
@@ -502,15 +438,18 @@ 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 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Nastavenia"
-
-#: ../js/ui/backgroundMenu.js:21
 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:357
+msgid "Settings"
+msgstr "Nastavenia"
+
 #. 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"
@@ -566,53 +505,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Predchádzajúci mesiac"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Nasledujúci mesiac"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 msgid "Week %V"
 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:1182
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celý deň"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Vymazať úsek"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Udalosti"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %e. %B"
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %e. %B %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Oznámenia"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Žiadne oznámenia"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Žiadne udalosti"
 
@@ -638,16 +577,11 @@ msgstr "Heslo:"
 msgid "Type again:"
 msgstr "Zadajte znovu:"
 
-#: ../js/ui/components/networkAgent.js:140 ../js/ui/status/network.js:277
+#: ../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/status/network.js:359 ../js/ui/status/network.js:919
 msgid "Connect"
 msgstr "Pripojiť"
 
-#: ../js/ui/components/networkAgent.js:233
+#: ../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:245
-#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -667,23 +601,16 @@ msgstr "Heslo k súkromnému kľúču: "
 msgid "Service: "
 msgstr "Služba: "
 
-#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:320 ../js/ui/components/networkAgent.js:658
-#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "Bezdrôtová sieť vyžaduje overenie totožnosti"
 
-#: ../js/ui/components/networkAgent.js:321
+#: ../js/ui/components/networkAgent.js:321 ../js/ui/components/networkAgent.js:659
-#: ../js/ui/components/networkAgent.js:659
 #, javascript-format
-msgid ""
+msgid "Passwords or encryption keys are required to access the wireless network “%s”."
-"Passwords or encryption keys are required to access the wireless network "
+msgstr "Na prístup do bezdrôtovej siete „%s“ sú vyžadované heslá alebo šifrovacie kľúče."
-"“%s”."
-msgstr ""
-"Na prístup do bezdrôtovej siete „%s“ sú vyžadované heslá alebo šifrovacie "
-"kľúče."
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:325 ../js/ui/components/networkAgent.js:662
-#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "Overenie totožnosti k drôtovej sieti 802.1X"
 
@@ -691,18 +618,15 @@ msgstr "Overenie totožnosti k drôtovej sieti 802.1X"
 msgid "Network name: "
 msgstr "Názov siete: "
 
-#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:332 ../js/ui/components/networkAgent.js:666
-#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "Overenie totožnosti k DSL"
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:339 ../js/ui/components/networkAgent.js:672
-#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "Požaduje sa kód PIN"
 
-#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:340 ../js/ui/components/networkAgent.js:673
-#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Pre zariadenie mobilnej širokopásmovej siete je potrebný kód PIN"
 
@@ -710,15 +634,11 @@ msgstr "Pre zariadenie mobilnej širokopásmovej siete je potrebný kód PIN"
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:348 ../js/ui/components/networkAgent.js:679
-#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Heslo k mobilnej širokopásmovej sieti"
 
-#: ../js/ui/components/networkAgent.js:349
+#: ../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:663
-#: ../js/ui/components/networkAgent.js:667
-#: ../js/ui/components/networkAgent.js:680
 #, javascript-format
 msgid "A password is required to connect to “%s”."
 msgstr "Na pripojenie k „%s“ sa požaduje heslo."
@@ -750,7 +670,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:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "Kontakt %s odteraz vystupuje ako %s"
@@ -760,11 +680,11 @@ msgid "Windows"
 msgstr "Okná"
 
 # tooltip
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Zobrazí aplikácie"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Dok"
 
@@ -806,17 +726,17 @@ msgstr "Odhlásenie"
 #, javascript-format
 msgid "%s will be logged out automatically in %d second."
 msgid_plural "%s will be logged out automatically in %d seconds."
-msgstr[0] "Používateľ %s bude automaticky odhlásený o %d sekúnd."
+msgstr[0] "Používateľ %s bude automaticky odhlásený o %d sekundu."
-msgstr[1] "Používateľ %s bude automaticky odhlásený o %d sekundu."
+msgstr[1] "Používateľ %s bude automaticky odhlásený o %d sekundy."
-msgstr[2] "Používateľ %s bude automaticky odhlásený o %d sekundy."
+msgstr[2] "Používateľ %s bude automaticky odhlásený o %d sekúnd."
 
 #: ../js/ui/endSessionDialog.js:72
 #, javascript-format
 msgid "You will be logged out automatically in %d second."
 msgid_plural "You will be logged out automatically in %d seconds."
-msgstr[0] "Budete automaticky odhlásený o %d sekúnd."
+msgstr[0] "Budete automaticky odhlásený o %d sekundu."
-msgstr[1] "Budete automaticky odhlásený o %d sekundu."
+msgstr[1] "Budete automaticky odhlásený o %d sekundy."
-msgstr[2] "Budete automaticky odhlásený o %d sekundy."
+msgstr[2] "Budete automaticky odhlásený o %d sekúnd."
 
 #: ../js/ui/endSessionDialog.js:78
 msgctxt "button"
@@ -837,9 +757,9 @@ msgstr "Inštalácia aktualizácií a vypnutie"
 #, javascript-format
 msgid "The system will power off automatically in %d second."
 msgid_plural "The system will power off automatically in %d seconds."
-msgstr[0] "Systém sa automaticky vypne o %d sekúnd."
+msgstr[0] "Systém sa automaticky vypne o %d sekundu."
-msgstr[1] "Systém sa automaticky vypne o %d sekundu."
+msgstr[1] "Systém sa automaticky vypne o %d sekundy."
-msgstr[2] "Systém sa automaticky vypne o %d sekundy."
+msgstr[2] "Systém sa automaticky vypne o %d sekúnd."
 
 #: ../js/ui/endSessionDialog.js:91
 msgctxt "checkbox"
@@ -865,9 +785,9 @@ msgstr "Reštart"
 #, javascript-format
 msgid "The system will restart automatically in %d second."
 msgid_plural "The system will restart automatically in %d seconds."
-msgstr[0] "Systém sa automaticky reštartuje o %d sekúnd."
+msgstr[0] "Systém sa automaticky reštartuje o %d sekundu."
-msgstr[1] "Systém sa automaticky reštartuje o %d sekundu."
+msgstr[1] "Systém sa automaticky reštartuje o %d sekundy."
-msgstr[2] "Systém sa automaticky reštartuje o %d sekundy."
+msgstr[2] "Systém sa automaticky reštartuje o %d sekúnd."
 
 #: ../js/ui/endSessionDialog.js:119
 msgctxt "title"
@@ -877,14 +797,10 @@ msgstr "Reštart a inštalácia aktualizácií"
 #: ../js/ui/endSessionDialog.js:121
 #, javascript-format
 msgid "The system will automatically restart and install updates in %d second."
-msgid_plural ""
+msgid_plural "The system will automatically restart and install updates in %d seconds."
-"The system will automatically restart and install updates in %d seconds."
+msgstr[0] "Systém sa automaticky reštartuje a nainštaluje aktualizácie o %d sekundu."
-msgstr[0] ""
+msgstr[1] "Systém sa automaticky reštartuje a nainštaluje aktualizácie o %d sekundy."
-"Systém sa automaticky reštartuje a nainštaluje aktualizácie o %d sekúnd."
+msgstr[2] "Systém sa automaticky reštartuje a nainštaluje aktualizácie o %d sekúnd."
-msgstr[1] ""
-"Systém sa automaticky reštartuje a nainštaluje aktualizácie o %d sekundu."
-msgstr[2] ""
-"Systém sa automaticky reštartuje a nainštaluje aktualizácie o %d sekundy."
 
 #: ../js/ui/endSessionDialog.js:127
 msgctxt "button"
@@ -903,9 +819,7 @@ msgstr "Vypnúť po inštalácii aktualizácií"
 
 #: ../js/ui/endSessionDialog.js:338
 msgid "Running on battery power: please plug in before installing updates."
-msgstr ""
+msgstr "Systém je napájaný z batérie. Pred inštaláciou aktualizácií pripojte napájací zdroj."
-"Systém je napájaný z batérie. Pred inštaláciou aktualizácií pripojte "
-"napájací zdroj."
 
 #: ../js/ui/endSessionDialog.js:355
 msgid "Some applications are busy or have unsaved work."
@@ -936,17 +850,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:706 ../js/ui/status/keyboard.js:580
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Klávesnica"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:59
+#: ../js/ui/legacyTray.js:66
-#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Skryť lištu"
 
-#: ../js/ui/legacyTray.js:91
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Stavová ikona"
 
@@ -968,8 +881,7 @@ msgstr "Skryť chyby"
 msgid "Show Errors"
 msgstr "Zobraziť chyby"
 
-#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71
+#: ../js/ui/lookingGlass.js:716 ../js/ui/status/location.js:71 ../js/ui/status/location.js:176
-#: ../js/ui/status/location.js:176
 msgid "Enabled"
 msgstr "Povolené"
 
@@ -977,8 +889,7 @@ msgstr "Povolené"
 #. 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/lookingGlass.js:719 ../js/ui/status/location.js:179 ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
-#: ../js/ui/status/network.js:592 ../src/gvc/gvc-mixer-control.c:1830
 msgid "Disabled"
 msgstr "Zakázané"
 
@@ -1003,7 +914,7 @@ msgstr "Zobraziť zdroj"
 msgid "Web Page"
 msgstr "Webová stránka"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Informácie o systéme"
 
@@ -1046,7 +957,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Zadajte príkaz"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Zavrieť"
 
@@ -1067,39 +978,39 @@ msgstr "%A, %e. %B"
 #, javascript-format
 msgid "%d new message"
 msgid_plural "%d new messages"
-msgstr[0] "%d nových správ"
+msgstr[0] "%d nová správa"
-msgstr[1] "%d nová správa"
+msgstr[1] "%d nové správy"
-msgstr[2] "%d nové správy"
+msgstr[2] "%d nových správ"
 
 #: ../js/ui/screenShield.js:146
 #, javascript-format
 msgid "%d new notification"
 msgid_plural "%d new notifications"
-msgstr[0] "%d nových oznámení"
+msgstr[0] "%d nové oznámenie"
-msgstr[1] "%d nové oznámenie"
+msgstr[1] "%d nové oznámenia"
-msgstr[2] "%d nové oznámenia"
+msgstr[2] "%d nových oznámení"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Uzamknúť"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "Prostredie GNOME vyžaduje uzamknutie obrazovky"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Nepodarilo sa uzamknúť obrazovku"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Uzamknutie bolo zablokované aplikáciou"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Hľadá sa…"
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Žiadne výsledky."
 
@@ -1166,11 +1077,11 @@ msgstr "Poskakujúce klávesy"
 msgid "Mouse Keys"
 msgstr "Myš klávesmi"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Vysoký kontrast"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Veľký text"
 
@@ -1178,10 +1089,7 @@ msgstr "Veľký text"
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:51 ../js/ui/status/network.js:178
+#: ../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
-#: ../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 "Vypnúť"
 
@@ -1193,9 +1101,9 @@ msgstr "Nastavenia Bluetooth"
 #, javascript-format
 msgid "%d Connected Device"
 msgid_plural "%d Connected Devices"
-msgstr[0] "%d pripojených zariadení"
+msgstr[0] "%d pripojené zariadenie"
-msgstr[1] "%d pripojené zariadenie"
+msgstr[1] "%d pripojené zariadenia"
-msgstr[2] "%d pripojené zariadenia"
+msgstr[2] "%d pripojených zariadení"
 
 #: ../js/ui/status/bluetooth.js:106 ../js/ui/status/network.js:1310
 msgid "Not Connected"
@@ -1206,7 +1114,7 @@ msgid "Brightness"
 msgstr "Jas"
 
 # menu item
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Zobraziť rozloženie klávesnice"
 
@@ -1236,8 +1144,7 @@ msgid "<unknown>"
 msgstr "<neznáme>"
 
 # DK: pripojenie, zariadenie
-#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308
+#: ../js/ui/status/network.js:457 ../js/ui/status/network.js:1308 ../js/ui/status/network.js:1512
-#: ../js/ui/status/network.js:1512
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -1421,24 +1328,24 @@ msgstr "Režim v lietadle"
 msgid "On"
 msgstr "Zapnutý"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Prepnúť používateľa"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Odhlásiť sa"
 
 # action button
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Uzamknutie orientácie"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Uspať"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Vypnúť"
 
@@ -1496,13 +1403,13 @@ msgstr "Uchovať zmeny"
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
-msgstr[0] "Zmeny nastavení budú vrátené za %d sekúnd"
+msgstr[0] "Zmeny nastavení budú vrátené za %d sekundu"
-msgstr[1] "Zmeny nastavení budú vrátené za %d sekundu"
+msgstr[1] "Zmeny nastavení budú vrátené za %d sekundy"
-msgstr[2] "Zmeny nastavení budú vrátené za %d sekundy"
+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:599
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1537,15 +1444,39 @@ msgstr "Vždy navrchu"
 
 #: ../js/ui/windowMenu.js:89
 msgid "Always on Visible Workspace"
-msgstr "Vždy vo viditeľnom priestore"
+msgstr "Vždy vo viditeľnom pracovnom priestore"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "Presunúť do ľavého pracovného priestoru"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "Presunúť do pravého pracovného priestoru"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
-msgstr "Presunúť do vyššieho priestoru"
+msgstr "Presunúť do vyššieho pracovného priestoru"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
-msgstr "Presunúť do nižšieho priestoru"
+msgstr "Presunúť do nižšieho pracovného priestoru"
+
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Presunúť na monitor vyššie"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Presunúť na monitor nižšie"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Presunúť na monitor vľavo"
+
+#: ../js/ui/windowMenu.js:154
+msgid "Move to Monitor Right"
+msgstr "Presunúť na monitor vpravo"
 
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
@@ -1557,9 +1488,9 @@ msgstr "Kalendár Evolution"
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
-msgstr[0] "%u výstupov"
+msgstr[0] "%u výstup"
-msgstr[1] "%u výstup"
+msgstr[1] "%u výstupy"
-msgstr[2] "%u výstupy"
+msgstr[2] "%u výstupov"
 
 #. translators:
 #. * The number of sound inputs on a particular device
@@ -1567,9 +1498,9 @@ msgstr[2] "%u výstupy"
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
-msgstr[0] "%u vstupov"
+msgstr[0] "%u vstup"
-msgstr[1] "%u vstup"
+msgstr[1] "%u vstupy"
-msgstr[2] "%u vstupy"
+msgstr[2] "%u vstupov"
 
 #: ../src/gvc/gvc-mixer-control.c:2373
 msgid "System Sounds"
@@ -1591,21 +1522,21 @@ msgstr "Použitie zvláštneho režimu, napr. „gdm“  pre prihlasovaciu obraz
 msgid "List possible modes"
 msgstr "Zoznam možných režimov"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Zlyhalo spustenie „%s“"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "Heslo nemôže byť prázdne"
 
@@ -1712,8 +1643,7 @@ msgstr "Dialógové okno overenia totožnosti bolo zatvorené používateľom"
 #~ msgid "This account is already connected to the server"
 #~ msgstr "Tento účet je už pripojený k serveru"
 
-#~ msgid ""
+#~ msgid "Connection has been replaced by a new connection using the same resource"
-#~ "Connection has been replaced by a new connection using the same resource"
 #~ msgstr "Pripojenie bolo nahradené novým, ktoré používa rovnaký zdroj"
 
 #~ msgid "The account already exists on the server"
@@ -1725,18 +1655,11 @@ msgstr "Dialógové okno overenia totožnosti bolo zatvorené používateľom"
 #~ msgid "Certificate has been revoked"
 #~ msgstr "Certifikát bol zrušený"
 
-#~ msgid ""
+#~ msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-#~ "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#~ msgstr "Šifrovací algoritmus používaný certifikátom nie je bezpečný alebo je kryptograficky slabý"
-#~ msgstr ""
-#~ "Šifrovací algoritmus používaný certifikátom nie je bezpečný alebo je "
-#~ "kryptograficky slabý"
 
-#~ msgid ""
+#~ 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 "
+#~ msgstr "Dĺžka certifikátu servera, alebo hĺbka reťazca certifikátu servera presahuje limit stanovený kryptografickou knižnicou."
-#~ "certificate chain, exceed the limits imposed by the cryptography library"
-#~ msgstr ""
-#~ "Dĺžka certifikátu servera, alebo hĺbka reťazca certifikátu servera "
-#~ "presahuje limit stanovený kryptografickou knižnicou."
 
 #~ msgid "Internal error"
 #~ msgstr "Vnútorná chyba"
@@ -1846,31 +1769,17 @@ msgstr "Dialógové okno overenia totožnosti bolo zatvorené používateľom"
 #~ msgstr "Maximálna úroveň presnosti určenia polohy."
 
 #~ msgid ""
-#~ "Configures the maximum level of location accuracy applications are "
+#~ "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 "
-#~ "allowed to see. Valid options are 'off' (disable location tracking), "
+#~ "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)."
-#~ "'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 ""
-#~ "Konfiguruje maximálnu úroveň presnosti určenia polohy, ktorú aplikácie "
+#~ "Konfiguruje maximálnu úroveň presnosti určenia polohy, ktorú aplikácie môžu získať. Povolené sú voľby 'off' (zakáže sledovanie polohy), 'country' (krajina), 'city' (mesto), 'neighborhood' (okolie), 'street' (ulica), 'exact' (presne, pri čom je "
-#~ "môžu získať. Povolené sú voľby 'off' (zakáže sledovanie polohy), "
+#~ "štandardne požadované použitie prijímača GPS). Uvedomte si, že toto nastavenie ovplyvňuje povolenia GeoClue a aplikácie môžu tiež získať údaje o polohe použitím sieťových prostriedkov (aj keď prinajlepšom s presnosťou na ulicu)."
-#~ "'country' (krajina), 'city' (mesto), 'neighborhood' (okolie), "
-#~ "'street' (ulica), 'exact' (presne, pri čom je štandardne požadované "
-#~ "použitie prijímača GPS). Uvedomte si, že toto nastavenie ovplyvňuje "
-#~ "povolenia GeoClue a aplikácie môžu tiež získať údaje o polohe použitím "
-#~ "sieťových prostriedkov (aj keď prinajlepšom s presnosťou na ulicu)."
 
 #~ msgid "Arrangement of buttons on the titlebar"
 #~ msgstr "Usporiadanie tlačidiel na titulku okna"
 
-#~ msgid ""
+#~ msgid "This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell."
-#~ "This key overrides the key in org.gnome.desktop.wm.preferences when "
+#~ msgstr "Tento kľúč preváži kľúč v org.gnome.desktop.wm.preferences po spustení Shellu prostredia GNOME."
-#~ "running GNOME Shell."
-#~ msgstr ""
-#~ "Tento kľúč preváži kľúč v org.gnome.desktop.wm.preferences po spustení "
-#~ "Shellu prostredia GNOME."
 
 #~ msgid "Extension"
 #~ msgstr "Rozšírenie"

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-03-15 08:36+0000\n"
+"POT-Creation-Date: 2015-07-08 08:07+0000\n"
-"PO-Revision-Date: 2015-03-15 09:41+0100\n"
+"PO-Revision-Date: 2015-07-08 15:46+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
-"Language: Slovenian\n"
+"Language: sl\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.5.4\n"
+"X-Generator: Poedit 1.7.5\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:123
+#: ../js/extensionPrefs/main.js:122
 #, 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:155
+#: ../js/extensionPrefs/main.js:154
 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:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Naslednji"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Odkleni"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Prijava"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Izbor seje"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Ali je ni na seznamu?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:847
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(na primer, uporabnika ali %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:852 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Uporabniško ime: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1180
 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:792
+#: ../js/ui/appDisplay.js:789
 msgid "Frequently used applications will appear here"
 msgstr "Pogosto uporabljeni programi bodo prikazani tu"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:909
 msgid "Frequent"
 msgstr "Pogosto"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:916
 msgid "All"
 msgstr "Vse"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1845
 msgid "New Window"
 msgstr "Novo okno"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1873 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Odstrani iz priljubljenih"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1879
 msgid "Add to Favorites"
 msgstr "Dodaj med priljubljene"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1889
 msgid "Show Details"
 msgstr "Pokaži besedilo"
 
@@ -481,15 +481,19 @@ 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 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Nastavitve"
-
-#: ../js/ui/backgroundMenu.js:21
 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:357
+msgid "Settings"
+msgstr "Nastavitve"
+
 #. 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 +546,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "S"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Predhodni mesec"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Naslednji mesec"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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:1182
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Celodnevno"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Počisti odsek"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Dogodki"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d. %m."
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Obvestila"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Ni obvestil"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Ni dogodkov"
 
@@ -724,7 +728,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:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s je sedaj znan kot v %s"
@@ -733,11 +737,11 @@ msgstr "%s je sedaj znan kot v %s"
 msgid "Windows"
 msgstr "Okna"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Pokaži programe"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Pregledna plošča"
 
@@ -916,16 +920,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:714 ../js/ui/status/keyboard.js:580
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:64
+#: ../js/ui/legacyTray.js:66
 msgid "Hide tray"
 msgstr "Skrij sistemsko vrstico"
 
-#: ../js/ui/legacyTray.js:104
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Ikone stanja"
 
@@ -981,7 +985,7 @@ msgstr "Poglej vir"
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Podrobnosti sistema"
 
@@ -1023,7 +1027,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Vnos ukaza"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Zapri"
 
@@ -1055,27 +1059,27 @@ 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:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Zakleni"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "Zakleniti je treba zaslon"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Zaklep ni mogoč"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Zaklep je preprečil program"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Iskanje ..."
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Ni najdenih zadetkov."
 
@@ -1139,11 +1143,11 @@ msgstr "Odskočne tipke"
 msgid "Mouse Keys"
 msgstr "Miškine tipke"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Visok kontrast"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Veliko besedilo"
 
@@ -1179,7 +1183,7 @@ msgstr "Ni vzpostavljene povezave"
 msgid "Brightness"
 msgstr "Svetlost"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Pokaži razporeditev tipkovnice"
 
@@ -1390,23 +1394,23 @@ msgstr "Način letala"
 msgid "On"
 msgstr "Povezano"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Preklopi uporabnika"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Odjava"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Zaklep položaja"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Zaustavi"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Izklop"
 
@@ -1438,27 +1442,27 @@ msgstr "Programi"
 msgid "Search"
 msgstr "Poišči"
 
-#: ../js/ui/windowAttentionHandler.js:19
+#: ../js/ui/windowAttentionHandler.js:20
 #, javascript-format
 msgid "“%s” is ready"
 msgstr "“%s” storitev je pripravljena"
 
-#: ../js/ui/windowManager.js:65
+#: ../js/ui/windowManager.js:63
 msgid "Do you want to keep these display settings?"
 msgstr "Ali želite ohraniti te nastavitve zaslona?"
 
 #. Translators: this and the following message should be limited in lenght,
 #. to avoid ellipsizing the labels.
 #. */
-#: ../js/ui/windowManager.js:84
+#: ../js/ui/windowManager.js:82
 msgid "Revert Settings"
 msgstr "Povrni nastavitve"
 
-#: ../js/ui/windowManager.js:88
+#: ../js/ui/windowManager.js:86
 msgid "Keep Changes"
 msgstr "Sledi spremembam"
 
-#: ../js/ui/windowManager.js:107
+#: ../js/ui/windowManager.js:105
 #, javascript-format
 msgid "Settings changes will revert in %d second"
 msgid_plural "Settings changes will revert in %d seconds"
@@ -1469,7 +1473,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:599
+#: ../js/ui/windowManager.js:604
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1506,14 +1510,38 @@ msgstr "Vedno na vrhu"
 msgid "Always on Visible Workspace"
 msgstr "Vedno na dejavni delovni površini"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "Premakni na delovno površino na levi"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "Premakni na delovno površino na desni"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Premakni na zgornjo delovno površino"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Premakni na spodnjo delovno površino"
 
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "\t"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Premakni na zaslon spodaj"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Premakni na zaslon levo"
+
+#: ../js/ui/windowMenu.js:154
+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 "
@@ -1570,11 +1598,11 @@ msgstr "Neznano"
 msgid "Failed to launch “%s”"
 msgstr "Zaganjanje “%s” je spodletelo"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Gesli se ne skladata."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "Geslo ne more biti prazno"
 

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-03-13 20:44+0000\n"
+"POT-Creation-Date: 2015-06-24 20:04+0000\n"
-"PO-Revision-Date: 2015-03-14 09:50+0500\n"
+"PO-Revision-Date: 2015-06-25 10:20+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.6.5\n"
+"X-Generator: Poedit 1.7.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:123
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr ""
 "Ҳангоми боркунии равзанаи гуфтугӯи хусусиятҳо барои %s хатогие ба вуҷуд "
 "омадааст:"
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "Пасвандҳои восити GNOME"
 
@@ -323,39 +323,39 @@ msgstr "Пасвандҳои восити GNOME"
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Навбатӣ"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Кушодан"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Ворид шудан"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Интихоби ҷаласа"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Вуҷуд надора?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:840
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(масалан, корбар ё %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:271
+#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
 #: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Номи корбар:"
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "Равзанаи воридшавӣ"
 
@@ -448,31 +448,31 @@ msgstr "%B %d %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Бозфиристодани санҷиши ҳаққонияти веб"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:788
 msgid "Frequently used applications will appear here"
 msgstr "Барномаҳои бештар истифодашуда ин ҷо намоиш дода мешаванд"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:908
 msgid "Frequent"
 msgstr "Роиҷ"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:915
 msgid "All"
 msgstr "Ҳама"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1844
 msgid "New Window"
 msgstr "Равзанаи нав"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Тоза кардан аз Баргузидаҳо"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1878
 msgid "Add to Favorites"
 msgstr "Илова кардан ба Баргузидаҳо"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1888
 msgid "Show Details"
 msgstr "Намоиш додани тафсилот"
 
@@ -486,15 +486,19 @@ msgstr "%s ба баргузидаҳои шумо илова шудааст."
 msgid "%s has been removed from your favorites."
 msgstr "%s аз баргузидаҳои шумо тоза шудааст."
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Танзимот"
-
-#: ../js/ui/backgroundMenu.js:21
 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:357
+msgid "Settings"
+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"
@@ -547,53 +551,53 @@ msgctxt "grid saturday"
 msgid "S"
 msgstr "Ш"
 
-#: ../js/ui/calendar.js:563
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Моҳи қаблӣ"
 
-#: ../js/ui/calendar.js:573
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Моҳи навбатӣ"
 
-#: ../js/ui/calendar.js:780
+#: ../js/ui/calendar.js:781
 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
+#: ../js/ui/calendar.js:1187
 msgctxt "event list time"
 msgid "All Day"
 msgstr "Тамоми рӯз"
 
-#: ../js/ui/calendar.js:1288
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Пок кардани қисмат"
 
-#: ../js/ui/calendar.js:1515
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Рӯйдодҳо"
 
-#: ../js/ui/calendar.js:1524
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %B %d"
 
-#: ../js/ui/calendar.js:1528
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: ../js/ui/calendar.js:1613
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "Огоҳиҳо"
 
-#: ../js/ui/calendar.js:1764
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Ягон огоҳӣ нест"
 
-#: ../js/ui/calendar.js:1767
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Ягон рӯйдод нест"
 
@@ -729,7 +733,7 @@ msgstr "Мутаассифона, ин амал иҷро нашуд. Лутфа
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:775
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s аллакой бо номи %s номида мешавад"
@@ -738,11 +742,11 @@ msgstr "%s аллакой бо номи %s номида мешавад"
 msgid "Windows"
 msgstr "Равзанаҳо"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Намоиш додани барномаҳо"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Рах"
 
@@ -910,17 +914,16 @@ msgstr "Насб кардан"
 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
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. translators: 'Hide' is a verb */
-#: ../js/ui/legacyTray.js:59
+#: ../js/ui/legacyTray.js:66
-#| msgid "Hide Text"
 msgid "Hide tray"
 msgstr "Пинҳон кардани лавҳа"
 
-#: ../js/ui/legacyTray.js:91
+#: ../js/ui/legacyTray.js:107
 msgid "Status Icons"
 msgstr "Нишонаҳои вазъият"
 
@@ -976,7 +979,7 @@ msgstr "Намоиш додани манбаъ"
 msgid "Web Page"
 msgstr "Саҳифаи веб"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1486
 msgid "System Information"
 msgstr "Маълумоти система"
 
@@ -1018,7 +1021,7 @@ msgstr "toggle-switch-us"
 msgid "Enter a Command"
 msgstr "Фармонеро ворид кунед"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:162
 msgid "Close"
 msgstr "Пӯшидан"
 
@@ -1046,27 +1049,27 @@ msgid_plural "%d new notifications"
 msgstr[0] "%d огоҳии нав"
 msgstr[1] "%d огоҳии нав"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Қулф кардан"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME бояд экранро қулф кунад"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Қулф карда намешавад"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Қулф аз тарави барнома баста шудааст"
 
-#: ../js/ui/search.js:616
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Ҷустуҷӯ рафта истодааст..."
 
-#: ../js/ui/search.js:618
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Ягон натиҷа нест."
 
@@ -1130,11 +1133,11 @@ msgstr "Тугмаҳои ҷастухез"
 msgid "Mouse Keys"
 msgstr "Тугмаҳои муш"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Контрасти баланд"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Матни бузург"
 
@@ -1168,7 +1171,7 @@ msgstr "Пайваст нашудааст"
 msgid "Brightness"
 msgstr "Дурахшонӣ"
 
-#: ../js/ui/status/keyboard.js:603
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Намоиш додани тарҳбандии клавиатура"
 
@@ -1379,23 +1382,23 @@ msgstr "Ҳолати ҳавопаймо"
 msgid "On"
 msgstr "Фаъол"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Таъвизи корбар"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Баромад"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Қулфи самт"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Таваққуф"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Хомӯш кардан"
 
@@ -1456,7 +1459,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:599
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1493,14 +1496,38 @@ msgstr "Ҳамеша дар боло"
 msgid "Always on Visible Workspace"
 msgstr "Ҳамеша дар фазои кории намоён"
 
-#: ../js/ui/windowMenu.js:106
+#: ../js/ui/windowMenu.js:105
+msgid "Move to Workspace Left"
+msgstr "Интиқол додан ба фазои кории чап"
+
+#: ../js/ui/windowMenu.js:110
+msgid "Move to Workspace Right"
+msgstr "Интиқол додан ба фазои кории рост"
+
+#: ../js/ui/windowMenu.js:115
 msgid "Move to Workspace Up"
 msgstr "Интиқол додан ба фазои кории боло"
 
-#: ../js/ui/windowMenu.js:111
+#: ../js/ui/windowMenu.js:120
 msgid "Move to Workspace Down"
 msgstr "Интиқол додан ба фазои кории поён"
 
+#: ../js/ui/windowMenu.js:136
+msgid "Move to Monitor Up"
+msgstr "Интиқол ба канори болои монитор"
+
+#: ../js/ui/windowMenu.js:142
+msgid "Move to Monitor Down"
+msgstr "Интиқол ба канори поёни монитор"
+
+#: ../js/ui/windowMenu.js:148
+msgid "Move to Monitor Left"
+msgstr "Интиқол ба канори чапи монитор"
+
+#: ../js/ui/windowMenu.js:154
+msgid "Move to Monitor Right"
+msgstr "Интиқол ба канори рости монитор"
+
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Ӣақвими Evolution"
@@ -1544,21 +1571,21 @@ msgstr ""
 msgid "List possible modes"
 msgstr "Рӯйхати ҳолатҳои имконпазир"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Оғози “%s” қатъ шудааст"
 
-#: ../src/shell-keyring-prompt.c:714
+#: ../src/shell-keyring-prompt.c:742
 msgid "Passwords do not match."
 msgstr "Паролҳо мувофиқат намекунанд."
 
-#: ../src/shell-keyring-prompt.c:722
+#: ../src/shell-keyring-prompt.c:750
 msgid "Password cannot be blank"
 msgstr "Парол бояд холӣ набошад"
 
@@ -1787,7 +1814,7 @@ msgstr "Равзанаи гуфтугӯи санҷиши ҳакконият бо
 #~ "маҳдудиятҳое, ки бо китобхонаи рамзгузорӣ таъин шудаанд, дарозтар мебошад"
 
 #~ msgid "Internal error"
-#~ msgstr "Хатогии дохилӣ"
+#~ msgstr "Хатои дохилӣ"
 
 #~ msgid "Unable to connect to %s"
 #~ msgstr "Пайвастшавӣ ба %s имконнопазир аст"

po/tr.po

@@ -14,16 +14,16 @@ msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-10 20:43+0000\n"
+"POT-Creation-Date: 2015-06-09 08:06+0000\n"
-"PO-Revision-Date: 2015-03-11 00:54+0200\n"
+"PO-Revision-Date: 2015-06-09 20:10+0300\n"
 "Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
-"Language-Team: Turkish <gnome-turk@gnome.org>\n"
+"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/50-gnome-shell-system.xml.in.h:1
@@ -31,8 +31,6 @@ msgid "System"
 msgstr "Sistem"
 
 #: ../data/50-gnome-shell-system.xml.in.h:2
-#| msgid "%d new notification"
-#| msgid_plural "%d new notifications"
 msgid "Show the notification list"
 msgstr "Bildirim listesini göster"
 
@@ -211,12 +209,10 @@ msgid "Keybinding to open the Activities Overview."
 msgstr "Etkinlikler Genel Görünümünü açmak için klavye kısayolu"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:25
-#| msgid "Keybinding to toggle the visibility of the message tray"
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr "Bildirim listesinin görünürlüğünü değiştirmek için klavye kısayolu"
 
 #: ../data/org.gnome.shell.gschema.xml.in.in.h:26
-#| msgid "Keybinding to toggle the visibility of the message tray."
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr "Bildirim listesinin görünürlüğünü değiştirmek için klavye kısayolu."
 
@@ -312,55 +308,55 @@ msgstr ""
 msgid "Network Login"
 msgstr "Ağ Girişi"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "%s için tercihler iletişim penceresi yüklenirken hata oluştu:"
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "GNOME Kabuğu Uzantıları"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../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 "İptal"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "Kilit Aç"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "Giriş"
 
-#: ../js/gdm/loginDialog.js:280
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "Oturum Seçin"
 
-#: ../js/gdm/loginDialog.js:421
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "Listede yok mu?"
 
-#: ../js/gdm/loginDialog.js:830
+#: ../js/gdm/loginDialog.js:840
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(örneğin, kullanıcı veya %s)"
 
-#: ../js/gdm/loginDialog.js:835 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:287
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "Kullanıcı Adı: "
 
-#: ../js/gdm/loginDialog.js:1170
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "Oturum Açma Penceresi"
 
@@ -453,31 +449,31 @@ msgstr "%d %B %Y, %l∶%M %p"
 msgid "Web Authentication Redirect"
 msgstr "Web Kimlik Doğrulama Yönlendirmesi"
 
-#: ../js/ui/appDisplay.js:792
+#: ../js/ui/appDisplay.js:788
 msgid "Frequently used applications will appear here"
 msgstr "Sık kullanılan uygulamalar burada yer alacak"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:908
 msgid "Frequent"
 msgstr "Sık sık"
 
-#: ../js/ui/appDisplay.js:919
+#: ../js/ui/appDisplay.js:915
 msgid "All"
 msgstr "Hepsi"
 
-#: ../js/ui/appDisplay.js:1850
+#: ../js/ui/appDisplay.js:1844
 msgid "New Window"
 msgstr "Yeni Pencere"
 
-#: ../js/ui/appDisplay.js:1878 ../js/ui/dash.js:291
+#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "Sık Kullanılanlardan Çıkar"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1878
 msgid "Add to Favorites"
 msgstr "Sık Kullanılanlara Ekle"
 
-#: ../js/ui/appDisplay.js:1894
+#: ../js/ui/appDisplay.js:1888
 msgid "Show Details"
 msgstr "Ayrıntıları Göster"
 
@@ -491,115 +487,119 @@ msgstr "%s sık kullanılanlarınıza eklendi."
 msgid "%s has been removed from your favorites."
 msgstr "%s sık kullanılanlarınızdan çıkarıldı."
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
+#: ../js/ui/backgroundMenu.js:19
-#: ../js/ui/status/system.js:337
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: ../js/ui/backgroundMenu.js:21
 msgid "Change Background…"
 msgstr "Arkaplanı Değiştir…"
 
+#: ../js/ui/backgroundMenu.js:21
+#| msgid "Privacy Settings"
+msgid "Display Settings"
+msgstr "Görüntü Ayarları"
+
+#: ../js/ui/backgroundMenu.js:22 ../js/ui/panel.js:650
+#: ../js/ui/status/system.js:357
+msgid "Settings"
+msgstr "Ayarlar"
+
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
-#: ../js/ui/calendar.js:49
+#: ../js/ui/calendar.js:53
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
 
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#. */
-#: ../js/ui/calendar.js:78
-msgctxt "event list time"
-msgid "All Day"
-msgstr "Tüm Gün"
-
 #. 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:93
+#: ../js/ui/calendar.js:82
 msgctxt "grid sunday"
 msgid "S"
 msgstr "P"
 
 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:95
+#: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "P"
 
 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:97
+#: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "S"
 
 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:99
+#: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "Ç"
 
 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:101
+#: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "P"
 
 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:103
+#: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "C"
 
 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:105
+#: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "C"
 
-#: ../js/ui/calendar.js:572
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "Önceki ay"
 
-#: ../js/ui/calendar.js:582
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "Gelecek ay"
 
-#: ../js/ui/calendar.js:789
+#: ../js/ui/calendar.js:781
 msgid "Week %V"
 msgstr "%V. Hafta"
 
-#: ../js/ui/calendar.js:1245
+#. 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 "Tüm Gün"
+
+#: ../js/ui/calendar.js:1289
 msgid "Clear section"
 msgstr "Bölümü temizle"
 
-#: ../js/ui/calendar.js:1459
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "Olaylar"
 
-#: ../js/ui/calendar.js:1467
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%A, %d %B"
 
-#: ../js/ui/calendar.js:1471
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
-#: ../js/ui/calendar.js:1563
+#: ../js/ui/calendar.js:1614
-#| msgid "No Notifications"
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#: ../js/ui/calendar.js:1714
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "Bildirim Yok"
 
-#: ../js/ui/calendar.js:1717
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "Olay Yok"
 
@@ -624,40 +624,42 @@ msgstr "Parola:"
 msgid "Type again:"
 msgstr "Terkar yazın:"
 
-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../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 "Bağlan"
 
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:301
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "Parola: "
 
-#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "Anahtar: "
 
-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "Kimlik: "
 
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "Özel anahtar parolası: "
 
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "Hizmet: "
 
-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "Kablosuz ağ için kimlik doğrulama gerekiyor"
 
-#: ../js/ui/components/networkAgent.js:319
+#: ../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 "
@@ -666,39 +668,51 @@ msgstr ""
 "“%s” kablosuz ağına erişmek için parolalar veya şifreleme anahtarları "
 "gerekiyor."
 
-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "Kablolu 802.1X kimlik doğrulaması"
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "Ağ adı: "
 
-#: ../js/ui/components/networkAgent.js:330
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "DSL kimlik doğrulama"
 
-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "PIN kodu gerekli"
 
-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobil geniş bant aygıtı için PIN kodu gerekli"
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN: "
 
-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "Mobil geniş bant ağ parolası"
 
-#: ../js/ui/components/networkAgent.js:346
+#: ../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”."
 msgstr "“%s”e bağlanmak için parola gerekli."
 
+#: ../js/ui/components/networkAgent.js:647 ../js/ui/status/network.js:1657
+msgid "Network Manager"
+msgstr "Ağ Yöneticisi"
+
 #: ../js/ui/components/polkitAgent.js:54
 msgid "Authentication Required"
 msgstr "Kimlik Doğrulaması Gerekli"
@@ -721,7 +735,7 @@ msgstr "Üzgünüm ama işe yaramadı. Lütfen tekrar deneyin."
 
 #. Translators: this is the other person changing their old IM name to their new
 #. IM name. */
-#: ../js/ui/components/telepathyClient.js:772
+#: ../js/ui/components/telepathyClient.js:757
 #, javascript-format
 msgid "%s is now known as %s"
 msgstr "%s, şimdi %s olarak biliniyor"
@@ -730,11 +744,11 @@ msgstr "%s, şimdi %s olarak biliniyor"
 msgid "Windows"
 msgstr "Pencereler"
 
-#: ../js/ui/dash.js:252 ../js/ui/dash.js:293
+#: ../js/ui/dash.js:250 ../js/ui/dash.js:291
 msgid "Show Applications"
 msgstr "Uygulamaları Göster"
 
-#: ../js/ui/dash.js:453
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Konsol"
 
@@ -894,10 +908,19 @@ msgstr "Kur"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "extensions.gnome.org adresinden “%s” indirilip kurulsun mu?"
 
-#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:576
+#: ../js/ui/keyboard.js:747 ../js/ui/status/keyboard.js:713
 msgid "Keyboard"
 msgstr "Klavye"
 
+#. translators: 'Hide' is a verb */
+#: ../js/ui/legacyTray.js:66
+msgid "Hide tray"
+msgstr "Tepsiyi gizle"
+
+#: ../js/ui/legacyTray.js:107
+msgid "Status Icons"
+msgstr "Durum Simgeleri"
+
 #: ../js/ui/lookingGlass.js:643
 msgid "No extensions installed"
 msgstr "Herhangi bir uzantı kurulu değil"
@@ -950,7 +973,7 @@ msgstr "Kaynağı Görüntüle"
 msgid "Web Page"
 msgstr "Web Sayfası"
 
-#: ../js/ui/messageTray.js:2133
+#: ../js/ui/messageTray.js:1506
 msgid "System Information"
 msgstr "Sistem Bilgisi"
 
@@ -992,7 +1015,7 @@ msgstr "toggle-switch-intl"
 msgid "Enter a Command"
 msgstr "Komut Girin"
 
-#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:120
+#: ../js/ui/runDialog.js:110 ../js/ui/windowMenu.js:153
 msgid "Close"
 msgstr "Kapat"
 
@@ -1018,27 +1041,27 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d yeni bildirim"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:365
 msgid "Lock"
 msgstr "Kilitle"
 
-#: ../js/ui/screenShield.js:668
+#: ../js/ui/screenShield.js:684
 msgid "GNOME needs to lock the screen"
 msgstr "GNOME'un ekranı kilitlemesi gerekiyor"
 
-#: ../js/ui/screenShield.js:795 ../js/ui/screenShield.js:1271
+#: ../js/ui/screenShield.js:805 ../js/ui/screenShield.js:1271
 msgid "Unable to lock"
 msgstr "Kilitlenemedi"
 
-#: ../js/ui/screenShield.js:796 ../js/ui/screenShield.js:1272
+#: ../js/ui/screenShield.js:806 ../js/ui/screenShield.js:1272
 msgid "Lock was blocked by an application"
 msgstr "Kilitleme bir uygulama tarafından engellendi"
 
-#: ../js/ui/search.js:609
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "Aranıyor…"
 
-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "Sonuç yok."
 
@@ -1102,11 +1125,11 @@ msgstr "Zıplayan Tuşlar"
 msgid "Mouse Keys"
 msgstr "Fare Tuşları"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "Yüksek Karşıtlık"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "Büyük Yazı"
 
@@ -1139,7 +1162,7 @@ msgstr "Bağlı Değil"
 msgid "Brightness"
 msgstr "Parlaklık"
 
-#: ../js/ui/status/keyboard.js:599
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "Klavye Düzenini Göster"
 
@@ -1308,10 +1331,6 @@ msgstr "VPN Ayarları"
 msgid "VPN"
 msgstr "VPN"
 
-#: ../js/ui/status/network.js:1657
-msgid "Network Manager"
-msgstr "Ağ Yöneticisi"
-
 #: ../js/ui/status/network.js:1697
 msgid "Activation of network connection failed"
 msgstr "Ağ bağlantısının etkinleştirilmesi başarısız oldu"
@@ -1354,23 +1373,23 @@ msgstr "Uçak Kipi"
 msgid "On"
 msgstr "Açık"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:337
 msgid "Switch User"
 msgstr "Kullanıcı Değiştir"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:342
 msgid "Log Out"
 msgstr "Oturumu Kapat"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:361
 msgid "Orientation Lock"
 msgstr "Yönelim Kilidi"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:369
 msgid "Suspend"
 msgstr "Beklet"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:372
 msgid "Power Off"
 msgstr "Kapat"
 
@@ -1430,7 +1449,7 @@ msgstr[0] "Ayarlardaki değişiklikler %d saniye içinde eski haline döndürül
 
 #. Translators: This represents the size of a window. The first number is
 #. * the width of the window and the second is the height. */
-#: ../js/ui/windowManager.js:599
+#: ../js/ui/windowManager.js:605
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1475,6 +1494,24 @@ msgstr "Üstteki Çalışma Alanına Taşı"
 msgid "Move to Workspace Down"
 msgstr "Alttaki Çalışma Alanına Taşı"
 
+#: ../js/ui/windowMenu.js:127
+#| msgid "Move to Workspace Up"
+msgid "Move to Monitor Up"
+msgstr "Üstteki Monitöre Taşı"
+
+#: ../js/ui/windowMenu.js:133
+#| msgid "Move to Workspace Down"
+msgid "Move to Monitor Down"
+msgstr "Alttaki Monitöre Taşı"
+
+#: ../js/ui/windowMenu.js:139
+msgid "Move to Monitor Left"
+msgstr "Soldaki Monitöre Taşı"
+
+#: ../js/ui/windowMenu.js:145
+msgid "Move to Monitor Right"
+msgstr "Sağdaki Monitöre Taşı"
+
 #: ../src/calendar-server/evolution-calendar.desktop.in.in.h:1
 msgid "Evolution Calendar"
 msgstr "Evolution Takvim"
@@ -1515,12 +1552,12 @@ msgstr "Oturum açma için -\"gdm\" gibi- özel bir kip kullan"
 msgid "List possible modes"
 msgstr "Mevcut kipleri listele"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "“%s” başlatılamadı"

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-03-03 22:33+0000\n"
+"POT-Creation-Date: 2015-04-25 08:00+0000\n"
-"PO-Revision-Date: 2015-03-04 17:55+0800\n"
+"PO-Revision-Date: 2015-04-17 19:36+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,6 +30,7 @@ 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"
@@ -287,55 +288,55 @@ msgstr "将鼠标模式下焦点的更改推迟到指针停止移动之后"
 msgid "Network Login"
 msgstr "网络登录"
 
-#: ../js/extensionPrefs/main.js:123
+#: ../js/extensionPrefs/main.js:122
 #, javascript-format
 msgid "There was an error loading the preferences dialog for %s:"
 msgstr "载入 %s 的首选想对话框出错："
 
-#: ../js/extensionPrefs/main.js:155
+#: ../js/extensionPrefs/main.js:154
 msgid "GNOME Shell Extensions"
 msgstr "配置 GNOME Shell 扩展"
 
-#: ../js/gdm/authPrompt.js:147 ../js/ui/components/networkAgent.js:143
+#: ../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 "取消"
 
-#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:217
+#: ../js/gdm/authPrompt.js:169 ../js/gdm/authPrompt.js:215
 msgid "Next"
 msgstr "下一步"
 
-#: ../js/gdm/authPrompt.js:213 ../js/ui/shellMountOperation.js:403
+#: ../js/gdm/authPrompt.js:211 ../js/ui/shellMountOperation.js:403
 #: ../js/ui/unlockDialog.js:59
 msgid "Unlock"
 msgstr "解锁"
 
-#: ../js/gdm/authPrompt.js:215
+#: ../js/gdm/authPrompt.js:213
 msgctxt "button"
 msgid "Sign In"
 msgstr "登录"
 
-#: ../js/gdm/loginDialog.js:276
+#: ../js/gdm/loginDialog.js:281
 msgid "Choose Session"
 msgstr "选择会话"
 
-#: ../js/gdm/loginDialog.js:417
+#: ../js/gdm/loginDialog.js:431
 msgid "Not listed?"
 msgstr "未列出？"
 
-#: ../js/gdm/loginDialog.js:826
+#: ../js/gdm/loginDialog.js:840
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(如 user 或 %s)"
 
-#: ../js/gdm/loginDialog.js:831 ../js/ui/components/networkAgent.js:269
+#: ../js/gdm/loginDialog.js:845 ../js/ui/components/networkAgent.js:271
-#: ../js/ui/components/networkAgent.js:287
+#: ../js/ui/components/networkAgent.js:289
 msgid "Username: "
 msgstr "用户名："
 
-#: ../js/gdm/loginDialog.js:1166
+#: ../js/gdm/loginDialog.js:1173
 msgid "Login Window"
 msgstr "登录窗口"
 
@@ -347,50 +348,112 @@ msgstr "认证出错"
 msgid "(or swipe finger)"
 msgstr "(或滑动手指)"
 
-#: ../js/misc/util.js:115
+#: ../js/misc/util.js:119
 msgid "Command not found"
 msgstr "命令未找到"
 
-#: ../js/misc/util.js:148
+#: ../js/misc/util.js:152
 msgid "Could not parse command:"
 msgstr "不能解析命令："
 
-#: ../js/misc/util.js:156
+#: ../js/misc/util.js:160
 #, 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:785
+#: ../js/ui/appDisplay.js:788
 msgid "Frequently used applications will appear here"
 msgstr "常用的应用程序会出现在这里"
 
-#: ../js/ui/appDisplay.js:905
+#: ../js/ui/appDisplay.js:908
 msgid "Frequent"
 msgstr "常用"
 
-#: ../js/ui/appDisplay.js:912
+#: ../js/ui/appDisplay.js:915
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:1840
+#: ../js/ui/appDisplay.js:1844
 msgid "New Window"
 msgstr "新窗口"
 
-#: ../js/ui/appDisplay.js:1868 ../js/ui/dash.js:289
+#: ../js/ui/appDisplay.js:1872 ../js/ui/dash.js:289
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: ../js/ui/appDisplay.js:1874
+#: ../js/ui/appDisplay.js:1878
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: ../js/ui/appDisplay.js:1884
+#: ../js/ui/appDisplay.js:1888
 msgid "Show Details"
 msgstr "显示细节"
 
@@ -404,8 +467,8 @@ msgstr "%s 已经添加到了您的收藏夹。"
 msgid "%s has been removed from your favorites."
 msgstr "%s 已经从您的收藏夹移除。"
 
-#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:649
+#: ../js/ui/backgroundMenu.js:19 ../js/ui/panel.js:650
-#: ../js/ui/status/system.js:337
+#: ../js/ui/status/system.js:334
 msgid "Settings"
 msgstr "设置"
 
@@ -414,119 +477,104 @@ 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:52
+#: ../js/ui/calendar.js:53
 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:111
+#: ../js/ui/calendar.js:82
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"
 
 #. Translators: Calendar grid abbreviation for Monday */
-#: ../js/ui/calendar.js:113
+#: ../js/ui/calendar.js:84
 msgctxt "grid monday"
 msgid "M"
 msgstr "一"
 
 #. Translators: Calendar grid abbreviation for Tuesday */
-#: ../js/ui/calendar.js:115
+#: ../js/ui/calendar.js:86
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "二"
 
 #. Translators: Calendar grid abbreviation for Wednesday */
-#: ../js/ui/calendar.js:117
+#: ../js/ui/calendar.js:88
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "三"
 
 #. Translators: Calendar grid abbreviation for Thursday */
-#: ../js/ui/calendar.js:119
+#: ../js/ui/calendar.js:90
 msgctxt "grid thursday"
 msgid "T"
 msgstr "四"
 
 #. Translators: Calendar grid abbreviation for Friday */
-#: ../js/ui/calendar.js:121
+#: ../js/ui/calendar.js:92
 msgctxt "grid friday"
 msgid "F"
 msgstr "五"
 
 #. Translators: Calendar grid abbreviation for Saturday */
-#: ../js/ui/calendar.js:123
+#: ../js/ui/calendar.js:94
 msgctxt "grid saturday"
 msgid "S"
 msgstr "六"
 
-#: ../js/ui/calendar.js:590
+#: ../js/ui/calendar.js:564
 msgid "Previous month"
 msgstr "上个月"
 
-#: ../js/ui/calendar.js:600
+#: ../js/ui/calendar.js:574
 msgid "Next month"
 msgstr "下个月"
 
-#: ../js/ui/calendar.js:807
+#: ../js/ui/calendar.js:781
 msgid "Week %V"
 msgstr "第 %V 星期"
 
-#: ../js/ui/calendar.js:1263
+#. 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
 msgid "Clear section"
 msgstr "清除选中项目"
 
-#: ../js/ui/calendar.js:1455
+#: ../js/ui/calendar.js:1516
 msgid "Events"
 msgstr "事件"
 
-#: ../js/ui/calendar.js:1463
+#: ../js/ui/calendar.js:1525
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%m月%d日 %A"
 
-#: ../js/ui/calendar.js:1467
+#: ../js/ui/calendar.js:1529
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日 %A"
 
-#: ../js/ui/calendar.js:1560
+#: ../js/ui/calendar.js:1614
 msgid "Notifications"
 msgstr "提示"
 
-#: ../js/ui/calendar.js:1700
+#: ../js/ui/calendar.js:1765
 msgid "No Notifications"
 msgstr "无提示"
 
-#: ../js/ui/calendar.js:1703
+#: ../js/ui/calendar.js:1768
 msgid "No Events"
 msgstr "无事件"
 
@@ -551,79 +599,93 @@ msgstr "密码："
 msgid "Type again:"
 msgstr "再输一次："
 
-#: ../js/ui/components/networkAgent.js:138 ../js/ui/status/network.js:277
+#: ../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 "连接"
 
-#: ../js/ui/components/networkAgent.js:231
+#: ../js/ui/components/networkAgent.js:233
-#: ../js/ui/components/networkAgent.js:243
+#: ../js/ui/components/networkAgent.js:245
-#: ../js/ui/components/networkAgent.js:271
+#: ../js/ui/components/networkAgent.js:273
-#: ../js/ui/components/networkAgent.js:291
+#: ../js/ui/components/networkAgent.js:293
-#: ../js/ui/components/networkAgent.js:301
+#: ../js/ui/components/networkAgent.js:303
 msgid "Password: "
 msgstr "密码："
 
-#: ../js/ui/components/networkAgent.js:236
+#: ../js/ui/components/networkAgent.js:238
 msgid "Key: "
 msgstr "密钥："
 
-#: ../js/ui/components/networkAgent.js:275
+#: ../js/ui/components/networkAgent.js:277
 msgid "Identity: "
 msgstr "身份："
 
-#: ../js/ui/components/networkAgent.js:277
+#: ../js/ui/components/networkAgent.js:279
 msgid "Private key password: "
 msgstr "私人密钥密码："
 
-#: ../js/ui/components/networkAgent.js:289
+#: ../js/ui/components/networkAgent.js:291
 msgid "Service: "
 msgstr "服务："
 
-#: ../js/ui/components/networkAgent.js:318
+#: ../js/ui/components/networkAgent.js:320
+#: ../js/ui/components/networkAgent.js:658
 msgid "Authentication required by wireless network"
 msgstr "无线网络要求身份认证"
 
-#: ../js/ui/components/networkAgent.js:319
+#: ../js/ui/components/networkAgent.js:321
+#: ../js/ui/components/networkAgent.js:659
 #, javascript-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
 "“%s”."
 msgstr "访问无线网络“%s”需要密码或密钥。"
 
-#: ../js/ui/components/networkAgent.js:323
+#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:662
 msgid "Wired 802.1X authentication"
 msgstr "有线 802.1X 认证"
 
-#: ../js/ui/components/networkAgent.js:325
+#: ../js/ui/components/networkAgent.js:327
 msgid "Network name: "
 msgstr "网络名称："
 
-#: ../js/ui/components/networkAgent.js:330
+#: ../js/ui/components/networkAgent.js:332
+#: ../js/ui/components/networkAgent.js:666
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
-#: ../js/ui/components/networkAgent.js:337
+#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:672
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: ../js/ui/components/networkAgent.js:338
+#: ../js/ui/components/networkAgent.js:340
+#: ../js/ui/components/networkAgent.js:673
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码"
 
-#: ../js/ui/components/networkAgent.js:339
+#: ../js/ui/components/networkAgent.js:341
 msgid "PIN: "
 msgstr "PIN："
 
-#: ../js/ui/components/networkAgent.js:345
+#: ../js/ui/components/networkAgent.js:348
+#: ../js/ui/components/networkAgent.js:679
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../js/ui/components/networkAgent.js:346
+#: ../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”."
 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 "需要认证"
@@ -644,71 +706,9 @@ 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:856
+#: ../js/ui/components/telepathyClient.js:757
 #, 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:451
+#: ../js/ui/dash.js:449
 msgid "Dash"
 msgstr "Dash"
 
@@ -878,10 +878,19 @@ msgstr "安装"
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "从 extensions.gnome.org 下载并安装“%s”？"
 
-#: ../js/ui/keyboard.js:706 ../js/ui/status/keyboard.js:576
+#: ../js/ui/keyboard.js:718 ../js/ui/status/keyboard.js:713
 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 "未安装扩展"
@@ -934,7 +943,7 @@ msgstr "查看源"
 msgid "Web Page"
 msgstr "网页"
 
-#: ../js/ui/messageTray.js:2131
+#: ../js/ui/messageTray.js:1504
 msgid "System Information"
 msgstr "系统信息"
 
@@ -954,21 +963,21 @@ msgstr "概览"
 msgid "Type to search…"
 msgstr "输入以搜索..."
 
-#: ../js/ui/panel.js:351
+#: ../js/ui/panel.js:352
 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:403
+#: ../js/ui/panel.js:404
 msgid "Activities"
 msgstr "活动"
 
-#: ../js/ui/panel.js:754
+#: ../js/ui/panel.js:755
 msgid "Top Bar"
 msgstr "顶栏"
 
-#: ../js/ui/popupMenu.js:288
+#: ../js/ui/popupMenu.js:289
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"
 
@@ -1002,7 +1011,7 @@ msgid "%d new notification"
 msgid_plural "%d new notifications"
 msgstr[0] "%d 条新通知"
 
-#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:345
+#: ../js/ui/screenShield.js:432 ../js/ui/status/system.js:342
 msgid "Lock"
 msgstr "锁定"
 
@@ -1018,11 +1027,11 @@ msgstr "无法锁定"
 msgid "Lock was blocked by an application"
 msgstr "一个应用程序阻止了锁定"
 
-#: ../js/ui/search.js:609
+#: ../js/ui/search.js:617
 msgid "Searching…"
 msgstr "正在搜索..."
 
-#: ../js/ui/search.js:611
+#: ../js/ui/search.js:619
 msgid "No results."
 msgstr "无结果。"
 
@@ -1086,11 +1095,11 @@ msgstr "筛选键"
 msgid "Mouse Keys"
 msgstr "鼠标按键"
 
-#: ../js/ui/status/accessibility.js:144
+#: ../js/ui/status/accessibility.js:167
 msgid "High Contrast"
 msgstr "高对比度"
 
-#: ../js/ui/status/accessibility.js:193
+#: ../js/ui/status/accessibility.js:202
 msgid "Large Text"
 msgstr "大号文本"
 
@@ -1123,7 +1132,7 @@ msgstr "无连接"
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../js/ui/status/keyboard.js:599
+#: ../js/ui/status/keyboard.js:736
 msgid "Show Keyboard Layout"
 msgstr "显示键盘布局"
 
@@ -1292,10 +1301,6 @@ 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 "启用网络连接失败"
@@ -1338,23 +1343,23 @@ msgstr "乘机模式"
 msgid "On"
 msgstr "开"
 
-#: ../js/ui/status/system.js:317
+#: ../js/ui/status/system.js:314
 msgid "Switch User"
 msgstr "切换用户"
 
-#: ../js/ui/status/system.js:322
+#: ../js/ui/status/system.js:319
 msgid "Log Out"
 msgstr "注销"
 
-#: ../js/ui/status/system.js:341
+#: ../js/ui/status/system.js:338
 msgid "Orientation Lock"
 msgstr "方向锁定"
 
-#: ../js/ui/status/system.js:349
+#: ../js/ui/status/system.js:346
 msgid "Suspend"
 msgstr "挂起"
 
-#: ../js/ui/status/system.js:352
+#: ../js/ui/status/system.js:349
 msgid "Power Off"
 msgstr "关机"
 
@@ -1414,7 +1419,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:599
+#: ../js/ui/windowManager.js:613
 #, javascript-format
 msgid "%d x %d"
 msgstr "%d x %d"
@@ -1499,12 +1504,12 @@ msgstr "使用指定模式，如 “gdm”用于登录屏幕的模式"
 msgid "List possible modes"
 msgstr "列出可用的模式"
 
-#: ../src/shell-app.c:247
+#: ../src/shell-app.c:239
 msgctxt "program"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/shell-app.c:488
+#: ../src/shell-app.c:480
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "启动“%s”失败"
@@ -1520,3 +1525,11 @@ 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"

src/Makefile-st.am

@@ -64,8 +64,6 @@ 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			\
@@ -106,7 +104,6 @@ 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
@@ -133,8 +130,6 @@ 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			\

src/data-to-c.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Copyright © 2011 Red Hat, Inc
 #

src/gnome-shell-plugin.c

@@ -42,18 +42,11 @@ static void gnome_shell_plugin_minimize         (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor);
 static void gnome_shell_plugin_unminimize       (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor);
-static void gnome_shell_plugin_maximize         (MetaPlugin          *plugin,
+static void gnome_shell_plugin_size_change      (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor,
-                                                 gint                 x,
+                                                 MetaSizeChange       which_change,
-                                                 gint                 y,
+                                                 MetaRectangle       *old_rect,
-                                                 gint                 width,
+                                                 MetaRectangle       *new_rect);
-                                                 gint                 height);
-static void gnome_shell_plugin_unmaximize       (MetaPlugin          *plugin,
-                                                 MetaWindowActor     *actor,
-                                                 gint                 x,
-                                                 gint                 y,
-                                                 gint                 width,
-                                                 gint                 height);
 static void gnome_shell_plugin_map              (MetaPlugin          *plugin,
                                                  MetaWindowActor     *actor);
 static void gnome_shell_plugin_destroy          (MetaPlugin          *plugin,
@@ -134,8 +127,7 @@ gnome_shell_plugin_class_init (GnomeShellPluginClass *klass)
   plugin_class->map              = gnome_shell_plugin_map;
   plugin_class->minimize         = gnome_shell_plugin_minimize;
   plugin_class->unminimize       = gnome_shell_plugin_unminimize;
-  plugin_class->maximize         = gnome_shell_plugin_maximize;
+  plugin_class->size_change      = gnome_shell_plugin_size_change;
-  plugin_class->unmaximize       = gnome_shell_plugin_unmaximize;
   plugin_class->destroy          = gnome_shell_plugin_destroy;
 
   plugin_class->switch_workspace = gnome_shell_plugin_switch_workspace;
@@ -281,27 +273,13 @@ gnome_shell_plugin_unminimize (MetaPlugin         *plugin,
 }
 
 static void
-gnome_shell_plugin_maximize (MetaPlugin         *plugin,
+gnome_shell_plugin_size_change (MetaPlugin         *plugin,
                                 MetaWindowActor    *actor,
-                             gint                x,
+                                MetaSizeChange      which_change,
-                             gint                y,
+                                MetaRectangle      *old_frame_rect,
-                             gint                width,
+                                MetaRectangle      *old_buffer_rect)
-                             gint                height)
 {
-  _shell_wm_maximize (get_shell_wm (),
+  _shell_wm_size_change (get_shell_wm (), actor, which_change, old_frame_rect, old_buffer_rect);
-                      actor, x, y, width, height);
-}
-
-static void
-gnome_shell_plugin_unmaximize (MetaPlugin         *plugin,
-                               MetaWindowActor    *actor,
-                               gint                x,
-                               gint                y,
-                               gint                width,
-                               gint                height)
-{
-  _shell_wm_unmaximize (get_shell_wm (),
-                        actor, x, y, width, height);
 }
 
 static void

src/gtkactionmuxer.c

@@ -24,6 +24,8 @@
 #include "gtkactionobservable.h"
 #include "gtkactionobserver.h"
 
+#include <clutter/clutter.h>
+
 #include <string.h>
 
 /**
@@ -396,6 +398,26 @@ 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,
@@ -408,7 +430,14 @@ 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);
+    }
   else if (muxer->parent)
     g_action_group_activate_action (G_ACTION_GROUP (muxer->parent), action_name, parameter);
 }
@@ -425,7 +454,15 @@ 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);
+    }
   else if (muxer->parent)
     g_action_group_change_action_state (G_ACTION_GROUP (muxer->parent), action_name, state);
 }

src/main.c

@@ -174,19 +174,19 @@ shell_prefs_init (void)
 {
   ShellGlobal *global = shell_global_get ();
   GSettings *settings = shell_global_get_overrides_settings (global);
-  char **keys, **k, *schema_id;
+  GSettingsSchema *schema;
+  char **keys, **k;
 
   if (!settings)
     return;
 
-  g_object_get (G_OBJECT (settings), "schema-id", &schema_id, NULL);
+  g_object_get (G_OBJECT (settings), "settings-schema", &schema, NULL);
 
-  keys = g_settings_list_keys (settings);
+  for (keys = k = g_settings_schema_list_keys (schema); *k; k++)
-  for (keys = k = g_settings_list_keys (settings); *k; k++)
+    meta_prefs_override_preference_schema (*k, g_settings_schema_get_id (schema));
-    meta_prefs_override_preference_schema (*k, schema_id);
 
   g_strfreev (keys);
-  g_free (schema_id);
+  g_settings_schema_unref (schema);
 }
 
 static void

src/shell-app-system.c

@@ -83,12 +83,18 @@ scan_startup_wm_class_to_id (ShellAppSystem *self)
   for (l = apps; l != NULL; l = l->next)
     {
       GAppInfo *info = l->data;
-      const char *startup_wm_class, *id;
+      const char *startup_wm_class, *id, *old_id;
 
       id = g_app_info_get_id (info);
       startup_wm_class = g_desktop_app_info_get_startup_wm_class (G_DESKTOP_APP_INFO (info));
 
-      if (startup_wm_class != NULL)
+      if (startup_wm_class == NULL)
+        continue;
+
+      /* In case multiple .desktop files set the same StartupWMClass, prefer
+       * the one where ID and StartupWMClass match */
+      old_id = g_hash_table_lookup (priv->startup_wm_class_to_id, startup_wm_class);
+      if (old_id == NULL || strcmp (id, startup_wm_class) == 0)
         g_hash_table_insert (priv->startup_wm_class_to_id,
                              g_strdup (startup_wm_class), g_strdup (id));
     }
@@ -377,3 +383,28 @@ shell_app_system_get_running (ShellAppSystem *self)
 
   return ret;
 }
+
+/**
+ * shell_app_system_search:
+ * @search_string: the search string to use
+ *
+ * Wrapper around g_desktop_app_info_search() that replaces results that
+ * don't validate as UTF-8 with the empty string.
+ *
+ * Returns: (array zero-terminated=1) (element-type GStrv) (transfer full): a
+ *   list of strvs.  Free each item with g_strfreev() and free the outer
+ *   list with g_free().
+ */
+char ***
+shell_app_system_search (const char *search_string)
+{
+    char ***results = g_desktop_app_info_search (search_string);
+    char ***groups, **ids;
+
+    for (groups = results; *groups; groups++)
+      for (ids = *groups; *ids; ids++)
+        if (!g_utf8_validate (*ids, -1, NULL))
+          **ids = '\0';
+
+      return results;
+}

src/shell-app-system.h

@@ -48,5 +48,6 @@ ShellApp       *shell_app_system_lookup_desktop_wmclass       (ShellAppSystem *s
                                                                const char     *wmclass);
 
 GSList         *shell_app_system_get_running               (ShellAppSystem  *self);
+char         ***shell_app_system_search                    (const char *search_string);
 
 #endif /* __SHELL_APP_SYSTEM_H__ */

src/shell-app.c

@@ -828,11 +828,14 @@ shell_app_sync_running_state (ShellApp *app)
 {
   g_return_if_fail (app->running_state != NULL);
 
+  if (app->state != SHELL_APP_STATE_STARTING)
+    {
       if (app->running_state->interesting_windows == 0)
         shell_app_state_transition (app, SHELL_APP_STATE_STOPPED);
-  else if (app->state != SHELL_APP_STATE_STARTING)
+      else
         shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
     }
+}
 
 
 static void
@@ -1000,10 +1003,16 @@ _shell_app_remove_window (ShellApp   *app,
 
   if (!meta_window_is_skip_taskbar (window))
     app->running_state->interesting_windows--;
-  shell_app_sync_running_state (app);
 
-  if (app->running_state && app->running_state->windows == NULL)
+  if (app->running_state->windows == NULL)
+    {
       g_clear_pointer (&app->running_state, unref_running_state);
+      shell_app_state_transition (app, SHELL_APP_STATE_STOPPED);
+    }
+  else
+    {
+      shell_app_sync_running_state (app);
+    }
 
   g_signal_emit (app, shell_app_signals[WINDOWS_CHANGED], 0);
 }

src/shell-embedded-window.c

@@ -59,7 +59,7 @@ shell_embedded_window_show (GtkWidget *widget)
       /* Size is 0x0 if the GtkWindow is not shown */
       clutter_actor_queue_relayout (CLUTTER_ACTOR (window->priv->actor));
 
-      if (CLUTTER_ACTOR_IS_REALIZED (window->priv->actor))
+      if (clutter_actor_is_realized (CLUTTER_ACTOR (window->priv->actor)))
         gtk_widget_map (widget);
     }
 }
@@ -166,7 +166,7 @@ _shell_embedded_window_set_actor (ShellEmbeddedWindow  *window,
   window->priv->actor = actor;
 
   if (actor &&
-      CLUTTER_ACTOR_IS_MAPPED (actor) &&
+      clutter_actor_is_mapped (CLUTTER_ACTOR (actor)) &&
       gtk_widget_get_visible (GTK_WIDGET (window)))
     gtk_widget_map (GTK_WIDGET (window));
 }

src/shell-generic-container.c

@@ -172,7 +172,7 @@ shell_generic_container_get_focus_chain (StWidget *widget)
        child != NULL;
        child = clutter_actor_get_next_sibling (child))
     {
-      if (CLUTTER_ACTOR_IS_VISIBLE (child) &&
+      if (clutter_actor_is_visible (child) &&
           !shell_generic_container_get_skip_paint (self, child))
         focus_chain = g_list_prepend (focus_chain, child);
     }
@@ -273,7 +273,7 @@ shell_generic_container_get_paint_volume (ClutterActor *self,
         {
           const ClutterPaintVolume *child_volume;
 
-          if (!CLUTTER_ACTOR_IS_VISIBLE (child))
+          if (!clutter_actor_is_visible (child))
             continue;
 
           if (shell_generic_container_get_skip_paint (SHELL_GENERIC_CONTAINER  (self), child))

src/shell-global.c

@@ -39,7 +39,7 @@
 #include <malloc.h>
 #endif
 
-#ifdef __OpenBSD__
+#if defined __OpenBSD__ || defined __FreeBSD__
 #include <sys/sysctl.h>
 #endif
 
@@ -1278,6 +1278,30 @@ 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;
@@ -1297,7 +1321,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__
+#if defined __linux__ || defined __FreeBSD__
   g_free (buf);
 #elif defined __OpenBSD__
   g_free (args);
@@ -1440,7 +1464,7 @@ shell_global_sync_pointer (ShellGlobal *global)
 
   event.type = CLUTTER_MOTION;
   event.time = shell_global_get_current_time (global);
-  event.flags = 0;
+  event.flags = CLUTTER_EVENT_FLAG_SYNTHETIC;
   event.stage = global->stage;
   event.x = x;
   event.y = y;

src/shell-gtk-embed.c

@@ -94,7 +94,7 @@ shell_gtk_embed_window_created_cb (MetaDisplay   *display,
       clutter_actor_set_opacity (window_actor, 0);
 
       /* Set an empty input shape on the window so that it can't get
-         any input. This probably isn't the ideal way to acheive this.
+         any input. This probably isn't the ideal way to achieve this.
          It would probably be better to force the window to go behind
          Mutter's guard window, but this is quite difficult to do as
          Mutter doesn't manage the stacking for override redirect
@@ -116,6 +116,21 @@ shell_gtk_embed_window_created_cb (MetaDisplay   *display,
     }
 }
 
+static void
+shell_gtk_embed_on_window_mapped (GtkWidget     *object,
+                                  ShellGtkEmbed *embed)
+{
+  MetaDisplay *display = shell_global_get_display (shell_global_get ());
+
+  /* Listen for new windows so we can detect when Mutter has
+     created a MutterWindow for this window */
+  embed->priv->window_created_handler =
+    g_signal_connect (display,
+                      "window-created",
+                      G_CALLBACK (shell_gtk_embed_window_created_cb),
+                      embed);
+}
+
 static void
 shell_gtk_embed_set_window (ShellGtkEmbed       *embed,
                             ShellEmbeddedWindow *window)
@@ -140,6 +155,10 @@ shell_gtk_embed_set_window (ShellGtkEmbed       *embed,
       g_signal_handlers_disconnect_by_func (embed->priv->window,
                                             (gpointer)shell_gtk_embed_on_window_destroy,
                                             embed);
+
+      g_signal_handlers_disconnect_by_func (embed->priv->window,
+                                            (gpointer)shell_gtk_embed_on_window_mapped,
+                                            embed);
     }
 
   embed->priv->window = window;
@@ -153,13 +172,8 @@ shell_gtk_embed_set_window (ShellGtkEmbed       *embed,
       g_signal_connect (embed->priv->window, "destroy",
                         G_CALLBACK (shell_gtk_embed_on_window_destroy), embed);
 
-      /* Listen for new windows so we can detect when Mutter has
+      g_signal_connect (embed->priv->window, "map",
-         created a MutterWindow for this window */
+                        G_CALLBACK (shell_gtk_embed_on_window_mapped), embed);
-      embed->priv->window_created_handler =
-        g_signal_connect (display,
-                          "window-created",
-                          G_CALLBACK (shell_gtk_embed_window_created_cb),
-                          embed);
     }
 
   clutter_actor_queue_relayout (CLUTTER_ACTOR (embed));

src/shell-keyring-prompt.c

@@ -111,6 +111,34 @@ shell_keyring_prompt_init (ShellKeyringPrompt *self)
 
 }
 
+static gchar *
+remove_mnemonics (const GValue *value)
+{
+  const gchar mnemonic = '_';
+  gchar *stripped_label, *temp;
+  const gchar *label;
+
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
+
+  label = g_value_get_string (value);
+  g_return_val_if_fail (label != NULL, NULL);
+
+  /* Stripped label will have the original label lenght at most */
+  stripped_label = temp = g_new (gchar, strlen(label) + 1);
+  g_assert (stripped_label != NULL);
+
+  while (*label != '\0')
+    {
+      if (*label == mnemonic)
+        label++;
+      *(temp++) = *(label++);
+    }
+  *temp = '\0';
+
+  return stripped_label;
+}
+
 static void
 shell_keyring_prompt_set_property (GObject      *obj,
                                    guint         prop_id,
@@ -145,7 +173,7 @@ shell_keyring_prompt_set_property (GObject      *obj,
     break;
   case PROP_CHOICE_LABEL:
     g_free (self->choice_label);
-    self->choice_label = g_value_dup_string (value);
+    self->choice_label = remove_mnemonics (value);
     if (!self->choice_label)
         self->choice_label = g_strdup ("");
     g_object_notify (obj, "choice-label");
@@ -165,12 +193,12 @@ shell_keyring_prompt_set_property (GObject      *obj,
     break;
   case PROP_CONTINUE_LABEL:
     g_free (self->continue_label);
-    self->continue_label = g_value_dup_string (value);
+    self->continue_label = remove_mnemonics (value);
     g_object_notify (obj, "continue-label");
     break;
   case PROP_CANCEL_LABEL:
     g_free (self->cancel_label);
-    self->cancel_label = g_value_dup_string (value);
+    self->cancel_label = remove_mnemonics (value);
     g_object_notify (obj, "cancel-label");
     break;
   case PROP_PASSWORD_ACTOR:

src/shell-recorder-src.c

@@ -11,12 +11,15 @@ struct _ShellRecorderSrc
 {
   GstPushSrc parent;
 
-  GMutex mutex_data;
+  GMutex mutex;
-  GMutex *mutex;
 
   GstCaps *caps;
-  GAsyncQueue *queue;
+  GMutex queue_lock;
-  gboolean closed;
+  GCond queue_cond;
+  GQueue *queue;
+
+  gboolean eos;
+  gboolean flushing;
   guint memory_used;
   guint memory_used_update_idle;
 };
@@ -32,9 +35,6 @@ enum {
   PROP_MEMORY_USED
 };
 
-/* Special marker value once the source is closed */
-#define RECORDER_QUEUE_END ((GstBuffer *)1)
-
 #define shell_recorder_src_parent_class parent_class
 G_DEFINE_TYPE(ShellRecorderSrc, shell_recorder_src, GST_TYPE_PUSH_SRC);
 
@@ -44,9 +44,10 @@ shell_recorder_src_init (ShellRecorderSrc      *src)
   gst_base_src_set_format (GST_BASE_SRC (src), GST_FORMAT_TIME);
   gst_base_src_set_live (GST_BASE_SRC (src), TRUE);
 
-  src->queue = g_async_queue_new ();
+  src->queue = g_queue_new ();
-  src->mutex = &src->mutex_data;
+  g_mutex_init (&src->mutex);
-  g_mutex_init (src->mutex);
+  g_mutex_init (&src->queue_lock);
+  g_cond_init (&src->queue_cond);
 }
 
 static gboolean
@@ -54,9 +55,9 @@ shell_recorder_src_memory_used_update_idle (gpointer data)
 {
   ShellRecorderSrc *src = data;
 
-  g_mutex_lock (src->mutex);
+  g_mutex_lock (&src->mutex);
   src->memory_used_update_idle = 0;
-  g_mutex_unlock (src->mutex);
+  g_mutex_unlock (&src->mutex);
 
   g_object_notify (G_OBJECT (src), "memory-used");
 
@@ -70,14 +71,14 @@ static void
 shell_recorder_src_update_memory_used (ShellRecorderSrc *src,
 				       int               delta)
 {
-  g_mutex_lock (src->mutex);
+  g_mutex_lock (&src->mutex);
   src->memory_used += delta;
   if (src->memory_used_update_idle == 0)
     {
       src->memory_used_update_idle = g_idle_add (shell_recorder_src_memory_used_update_idle, src);
       g_source_set_name_by_id (src->memory_used_update_idle, "[gnome-shell] shell_recorder_src_memory_used_update_idle");
     }
-  g_mutex_unlock (src->mutex);
+  g_mutex_unlock (&src->mutex);
 }
 
 /* _negotiate() is called when we have to decide on a format. We
@@ -93,6 +94,62 @@ shell_recorder_src_negotiate (GstBaseSrc * base_src)
   return result;
 }
 
+static gboolean
+shell_recorder_src_unlock (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = TRUE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean
+shell_recorder_src_unlock_stop (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = FALSE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean
+shell_recorder_src_start (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = FALSE;
+  src->eos = FALSE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean
+shell_recorder_src_stop (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = TRUE;
+  src->eos = FALSE;
+  g_queue_foreach (src->queue, (GFunc) gst_buffer_unref, NULL);
+  g_queue_clear (src->queue);
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
 static gboolean
 shell_recorder_src_send_event (GstElement * element, GstEvent * event)
 {
@@ -123,17 +180,29 @@ shell_recorder_src_create (GstPushSrc  *push_src,
   ShellRecorderSrc *src = SHELL_RECORDER_SRC (push_src);
   GstBuffer *buffer;
 
-  if (src->closed)
+  g_mutex_lock (&src->queue_lock);
-    return GST_FLOW_EOS;
+  while (TRUE) {
+    /* int the flushing state we just return FLUSHING */
+    if (src->flushing) {
+      g_mutex_unlock (&src->queue_lock);
+      return GST_FLOW_FLUSHING;
+    }
 
-  buffer = g_async_queue_pop (src->queue);
+    buffer = g_queue_pop_head (src->queue);
 
-  if (buffer == RECORDER_QUEUE_END)
+    /* we have a buffer, exit the loop to handle it */
-    {
+    if (buffer != NULL)
-      /* Returning UNEXPECTED here will cause a EOS message to be sent */
+      break;
-      src->closed = TRUE;
+
+    /* no buffer, check EOS */
+    if (src->eos) {
+      g_mutex_unlock (&src->queue_lock);
       return GST_FLOW_EOS;
     }
+    /* wait for something to happen and try again */
+    g_cond_wait (&src->queue_cond, &src->queue_lock);
+  }
+  g_mutex_unlock (&src->queue_lock);
 
   shell_recorder_src_update_memory_used (src,
 					 - (int)(gst_buffer_get_size(buffer) / 1024));
@@ -176,9 +245,11 @@ shell_recorder_src_finalize (GObject *object)
     g_source_remove (src->memory_used_update_idle);
 
   shell_recorder_src_set_caps (src, NULL);
-  g_async_queue_unref (src->queue);
+  g_queue_free_full (src->queue, (GDestroyNotify) gst_buffer_unref);
 
-  g_mutex_clear (src->mutex);
+  g_mutex_clear (&src->mutex);
+  g_mutex_clear (&src->queue_lock);
+  g_cond_clear (&src->queue_cond);
 
   G_OBJECT_CLASS (shell_recorder_src_parent_class)->finalize (object);
 }
@@ -216,9 +287,9 @@ shell_recorder_src_get_property (GObject         *object,
       gst_value_set_caps (value, src->caps);
       break;
     case PROP_MEMORY_USED:
-      g_mutex_lock (src->mutex);
+      g_mutex_lock (&src->mutex);
       g_value_set_uint (value, src->memory_used);
-      g_mutex_unlock (src->mutex);
+      g_mutex_unlock (&src->mutex);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -270,6 +341,10 @@ shell_recorder_src_class_init (ShellRecorderSrcClass *klass)
   element_class->send_event = shell_recorder_src_send_event;
 
   base_src_class->negotiate = shell_recorder_src_negotiate;
+  base_src_class->unlock = shell_recorder_src_unlock;
+  base_src_class->unlock_stop = shell_recorder_src_unlock_stop;
+  base_src_class->start = shell_recorder_src_start;
+  base_src_class->stop = shell_recorder_src_stop;
 
   push_src_class->create = shell_recorder_src_create;
 }
@@ -292,7 +367,10 @@ shell_recorder_src_add_buffer (ShellRecorderSrc *src,
   shell_recorder_src_update_memory_used (src,
 					 (int)(gst_buffer_get_size(buffer) / 1024));
 
-  g_async_queue_push (src->queue, gst_buffer_ref (buffer));
+  g_mutex_lock (&src->queue_lock);
+  g_queue_push_tail (src->queue, gst_buffer_ref (buffer));
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
 }
 
 /**
@@ -305,10 +383,13 @@ void
 shell_recorder_src_close (ShellRecorderSrc *src)
 {
   /* We can't send a message to the source immediately or buffers that haven't
-   * been pushed yet will be discarded. Instead stick a marker onto our own
+   * been pushed yet will be discarded. Instead mark ourselves EOS, which will
-   * queue to send an event once everything has been pushed.
+   * make us send an event once everything has been pushed.
    */
-  g_async_queue_push (src->queue, RECORDER_QUEUE_END);
+  g_mutex_lock (&src->queue_lock);
+  src->eos = TRUE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
 }
 
 static gboolean

src/shell-stack.c

@@ -155,7 +155,7 @@ shell_stack_navigate_focus (StWidget         *widget,
       if (from && clutter_actor_contains (CLUTTER_ACTOR (widget), from))
         return FALSE;
 
-      if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (widget)))
+      if (clutter_actor_is_mapped (CLUTTER_ACTOR (widget)))
         {
           clutter_actor_grab_key_focus (CLUTTER_ACTOR (widget));
           return TRUE;