Bump version to 3.8.2

To go along GNOME Shell 3.8.2
window-list: Make bottom panel taller in classic mode
2013-05-14 07:16:36 +02:00 · 2013-05-13 22:02:27 +02:00 · 2013-04-30 21:54:54 +02:00
158 changed files with 9887 additions and 28497 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,14 @@
-ABOUT-NLS
 Makefile
 Makefile.in
 Makefile.in.in
-aclocal.m4
-autom4te.cache/
-config/
 configure
 config.log
 config.status
+aclocal.m4
+autom4te.cache/
 data/*.json
-m4/
-po/*.header
-po/*.sed
-po/*.sin
-po/Makevars.template
-po/POTFILES
-po/Rules-quot
 po/gnome-shell-extensions.pot
+po/POTFILES
 po/stamp-it
 staging/
 zip-files/
@@ -25,5 +17,7 @@ zip-files/
 *.gmo
 metadata.json
 *.desktop
+*.desktop.in
+*.gschema.xml
 *.gschema.valid
 *.session
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "data/gnome-shell-sass"]
-	path = data/gnome-shell-sass
-	url = https://git.gnome.org/browse/gnome-shell-sass/
--- a/395
+++ b/395
@@ -1,396 +1,7 @@
-3.25.2
-======
-* places-menu: Make URI launching asynchronous
-* updated translations (de, fur, hr, hu, id, sl)
-
-3.25.1
-======
-* apps-menu: Mark copied launchers as trusted
-* places-menu: Make icon lookup asynchronous
-* updated translations (hr)
-
-3.24.1
-======
-* apps-menu: Allow creating desktop launchers via DND
-* updated translations (el, vi)
-
-3.24.0
-======
-* updated translations (lv, tr)
-
-3.23.92
-=======
-* update classic theme
-* updated translations (be, ko, ca, da, cs, ru, lt)
-
-3.23.91
-=======
-* updated translations (de, es, eu, fi, fr, fur, gl, hu, id, it, kk, nb, pl, pt_BR,
-  sk, sr, sr@latin, sv, uk, zh_TW)
-
-3.23.90
-=======
-* window-list: Improve styling
-* window-list: Hide workspace indicator when there's a single (static) workspace
-* new translation (be)
-
-3.23.2
-======
-* alternateTab: Don't take over 'switch-group' shortcut
-* updated translations (zh_CN)
-
-3.22.1
-======
-* window-list: Update icon on app changes
-
-3.22.0
-======
-* updated translations (en_GB)
-
-3.21.92
-=======
-* update style
-* updated translations (pl, vi)
-
-3.21.91
-=======
-* updated translations (pl)
-
-3.21.90
-=======
-* updated translations (es, gu)
-
-3.21.4
-======
-* apps-menu: Fix entries from non-standard AppDir directories
-
-3.21.3
-======
-* adjust to gnome-shell changes
-* updated translations (oc)
-
-3.21.2
-======
-* version bump, nothing to see here
-
-3.20.1
-======
-* update classic style
-* updated translations (gd, oc)
-
-3.20.0
-======
-* version bump, nothing to see here
-
-3.19.92
-=======
-* version bump, nothing to see here
-
-3.19.91
-=======
-* updated translations (oc)
-
-3.19.90
-=======
-* version bump, nothing to see here
-
-3.19.4
-======
-* screenshot-window-sizer: HiDPI support
-* Fix gnome-shell component in classic session
-* updated translations (lt)
-
-3.19.3
-======
-* native-window-placement: Don't let border overlap title
-* apps-menu: Fix handling of .desktop files in subdirectories
-* updated translations (is)
-
-3.19.2
-======
-* updated translations (gd)
-
-3.19.1
-======
-* Fix some theme issues
-
-3.18.1
-======
-* window-list: Fix accessibility of window buttons
-* apps-menu: Fix unreliable highlight
-* updated translations (ar)
-
-3.18.0
-======
-* Bump version
-
-3.17.92
-=======
-* places: Include DESKTOP when desktop icons are enabled
-* updated translations (fa)
-
-3.17.91
-=======
-* updated translations (nl, pl, zh_TW)
-
-3.17.90
-=======
-* window-list: Improve application ordering
-* workspace-indicator: Use consistent workspace numbering
-
-3.17.4
-======
-* updated translations (fur)
-
-3.17.3
-======
-* window-list: Adjust with text-scaling-factor
-* classic style updates
-* updated translations (pt, ro)
-
-3.17.2
-======
-* updated translations (oc, pt, zh_CN)
-
-3.17.1
-======
-* style updates
-* updated translations (oc)
-
-3.16.1
-======
-* window-list: Fix workspace indicators popup menu position
-* apps-menu: Fix taking over panel-main-menu shortcut
-* updated translations (et, ja, lv)
-
-3.16.0
-======
-* updated translations (ca)
-
-3.15.92
-=======
-* classic: Update theme
-* update for mutter API changes
-* updated translations (bg, bs, da, fi, pa, ru, sr, sr@latin, tg)
-
-3.15.91
-=======
-* classic: Update theme
-* systemMonitor extension was removed, as the message tray where it
-  put its indicator no longer exists
-* window-list: Adjust for gnome-shell changes
-* updated translations (gl, it, kk, ko, lt, pl, sk, uk, zh_TW)
-
-3.15.90
-=======
-* classic: Visual refresh based on new shell theme
-* window-list: Adjust for gnome-shell changes
-* updated translations (an, el, eo, eu, fr, he, is, sv, tr)
-
-3.15.4
-======
-* window-list: Improve interaction with system modal dialogs
-* updated translations (cs, de, es, eu, fur, hu, id, nb, pt_BR, ru, sl, vi)
-
-3.15.3.1
-========
-* adjust to gnome-shell change
-
-3.15.3
-======
-* classic-mode: Add high-contrast theme variant, drop .desktop file
-* places-menu: Fix error when XDG user directories are not set up
-* window-list: Add option to show on all monitors
-* updated translations (eu, hu, kk, ro, tr)
-
-3.15.2
-======
-* removable-drive, user-theme, window-list: Update for gnome-shell changes
-* apps-menu: Fix some visual glitches
-* Fix classic mode style
-* updated translations (an, cs, he, vi)
-
-3.15.1
-======
- * updated translations (es, nb)
-
-3.14.1
-======
- * alternateTab: Fix dismissing popup with Escape
- * some improvements to the window-list
-   (spacing in app buttons, no flash when closing windows with auto-grouping)
- * updated translations (lv, it, pt, bg)
-
-3.14.0
-======
- * updated translations (bn_IN, hi, kn, sr, sr@latin, uk)
-
-3.13.92
-=======
-* new extension: screenshot-window-sizer
-* window-list: Don't add sticky windows more than once
-* updated translations (da, de, fi, ko, mr, ms, ne, pa, pl, sk, sv, ta, te, tr)
-
-3.13.91
-=======
-* window-list: restore fitts'ability of workspace button
-* updated for gnome-shell changes
-* updated translations (cs, kk, fr, or, fa, ja, gu, id)
-
-3.13.90
-=======
-* updated translations (as, ca, eu, nl, zh_CN, zh_HK, zh_TW)
-
-3.13.4
-======
-* Updated for gnome-shell changes
-* updated translations (el, gl, ru)
-
-3.13.3
-======
-* Tweak preference UIs some more
-* Fix classic mode schema overrides
-* updated translations (es, he, hu, lt, nb, pt_BR, sl, tr)
-
-3.13.2
-======
-* Fix sorting of grouped buttons in window list
-* Tweak preference UIs
-* updated translations (en_GB)
-
-3.13.1
-======
-* add DesktopNames key to the classic session file
-* classic theme: remove rounded corners from tile previews
-* window-list: don't shift message tray on other monitors
-* auto-move-windows: several fixes and updates for api changes
-* launch-new-instances: updates for api changes
-* updated translations (ja, km)
-
-3.12.0
-======
-* updated translations (zh_HK, zh_TW)
-
-3.11.92
-=======
-* nothing to see here, move on
-
-3.11.91
-=======
-* updated translations (ko, fur)
-
-3.11.90
-=======
-* several fixes and improvements to the window-list
-  (can be scrolled, works correctly with the OSD
-  keyboard, filters skip-taskbar windows, does not
-  force all notifications to bold)
-* drive-menu fixed not to show shadowed mounts
-* updates for gnome-shell changes (launch-new-instance,
-  auto-move-windows, places-menu)
-* build system fixes for systems without /bin/bash
-* updated translations (or, tr, uk)
-
-3.11.5
-======
-* updates for gnome-shell changes
-* updated translations (kn)
-
-3.11.4
-======
-* classic mode now supports session saving
-* updates for gnome-shell changes
-* updated translations (ar, kn)
-
-3.11.3
-======
-* workspace-indicator is vertically aligned now
-* updated translations (ar, eo, ta, te)
-
-3.11.2
-======
-* updated translations (zh_CN)
-
-3.11.1
-======
-* ignore shadowed mounts in drive-menu extension
-* updates for gnome-shell/gjs changes
-* updated translations (el, th)
-
-3.10.1
-======
-* updated translations (af, ca, ca@valencia, de, et, eu, fa,
-  hu, lt, lv, nb, nl, pa, pt, sk, sr, sr@latin, tr)
-
-3.10.0
-======
-* updated translations (as, cs, da, es, et, fi, fr, gl,
-  he, id, it, kk, lt, lv, pa, pl, pt, pt_BR, ru, sl, tg,
-  uk, zh_HK, zh_TW)
-
-3.9.92
-======
-* more updates and fixes for gnome-shell master changes
-  and regressions (systemMonitor, window-list, apps-menu)
-* lots of updated translations (ar, as, cs, da, de, el, es,
-  eu, fi, gl, he, hu, it, ja, kk, ko, lv, nb, nl, pa, pl,
-  pt_BR, ru, sk, sr, sr@latin, ta, tg)
-
-3.9.91
-======
-* update the classic mode session and theme to work with the
-  new system menu
-* the usual round of updates and fixes for gnome-shell
-  API changes
-* updated translations (de, it, lt, nl, pl, pt_BR, sk,
-  zh_HK, zh_TW)
-
-3.9.90
-======
-* xrandr-indicator was removed, as the implementation
-  was incompatible with the new DisplayConfig mutter API
-* various extensions were updated for the 3.9.90 gnome-shell API
-* updated translations (cs, es, fur, gl, he, hu, id, ja, sl, tg,
-  zh_CN, zh_HK, zh_TW)
-
-3.9.5
+3.8.2
 =====
-* alternative-status-menu was removed entirely, as
-  it does not fit in the designs of the new unified
-  status menu
-* updated translations (as, gu, it, ru)
-
-3.9.4
-=====
-* apps-menu: fixed handling of hot corner in case
-  of screen reconfiguration
-* alternative-status-menu now correctly honors polkit
-  for hibernation
-* user-menu now loads themes from $XDG_DATA_HOME too
-* translation updates (de, id, pt_BR, vi, zh_CN, ml)
-
-3.9.3
-=====
-* classic mode mini extensions were replaced with a
-  GSettings override specified in the .json file
-* styling of classic mode improved
-* native-window-placement is back working on 3.9
-* misc bug fixes
-* traslation updates (an, cs, el, es, gl, nb, pl, sk, tg)
-
-3.9.2
-=====
-* apps-menu: appearance of the scrollbars was improved
-* window-list is a little taller in classic mode (to account
-  for the workspace switcher)
-* alternative-status-menu honors again the dconf configuration
-* translation updates (sr)
-
-3.9.1
-=====
-* updates to window-list, xrandr-indicator,
-  workspace-indicator, windowsNavigator for gnome-shell
-  changes
+* window-list: fix styling in classic mode
+* window-list: code cleanups
 * translation updates (cs, es, lt, pl, pt_BR, sl)

 3.8.1
--- a/30
+++ b/30
@@ -1,18 +1,20 @@
 GNOME Shell Extensions is a collection of extensions providing additional
 and optional functionality to GNOME Shell.
-
 Since GNOME Shell is not API stable, extensions work only against a very
 specific version of the shell, usually the same as this package (see
-"configure --version"). The extensions in this package are supported by GNOME
-and will be updated to reflect future API changes in GNOME Shell.
+"configure --version"). Also, since extensions are built from many
+individual contributors, we cannot guarantee stability or quality for any
+specific extension.
+For these reasons, distributions are advised to avoid installing or packaging
+this module by defaul.

 For more information about GNOME Shell Extensions
- https://wiki.gnome.org/Projects/GnomeShell/Extensions
+ http://live.gnome.org/GnomeShell/Extensions

 For general information about GNOME Shell
- https://wiki.gnome.org/Projects/GnomeShell
+ http://live.gnome.org/GnomeShell

-Bugs should be reported at https://bugzilla.gnome.org against the 'gnome-shell'
+Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
 product, with the 'extensions' component.

 Extensions
@@ -22,6 +24,12 @@ alternate-tab

  Lets you use classic Alt+Tab (window-based instead of app-based) in GNOME Shell.

+alternative-status-menu
+
+  For those who want a power off item visible at all the time, replaces GNOME Shell
+status menu with one featuring separate Suspend and Power Off. Adds the ability to
+hibernate as well.
+
 apps-menu

  Lets you reach an application using gnome 2.x style menu on the panel.
@@ -57,6 +65,10 @@ places-menu

  Shows a status Indicator for navigating to Places.

+systemMonitor
+
+  An message tray indicator showing CPU and memory loads.
+
 user-theme

  Loads a shell theme from ~/.themes/<name>/gnome-shell.
@@ -65,6 +77,12 @@ windowsNavigator

  Allow keyboard selection of windows and workspaces in overlay mode.

+xrandr-indicator
+
+  Replace the GTK+ based indicator from gnome-settings-daemon with
+a native one. Lets the user rotate the laptop monitor and open
+display preferences quickly.
+
 License
 =======
 GNOME Shell Extensions are distributed under the terms of the GNU General Public License,
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,23 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.

 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

+PKG_NAME="gnome-shell-extensions"
+
 test -f $srcdir/configure.ac || {
    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
    echo " top-level gnome-shell-extensions directory"
    exit 1
 }

-# Fetch submodules if needed
-if test ! -f data/gnome-shell-sass/COPYING;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-fi
-git submodule update
-
 which gnome-autogen.sh || {
    echo "You need to install gnome-common from GNOME Git (or from"
    echo "your OS vendor's package manager)."
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.25.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.8.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])

 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
@@ -12,9 +12,7 @@ GETTEXT_PACKAGE=gnome-shell-extensions
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                   [The prefix for our gettext translation domains.])
-
-AM_GNU_GETTEXT_VERSION([0.19.6])
-AM_GNU_GETTEXT([external])
+IT_PROG_INTLTOOL(0.26)

 PKG_PROG_PKG_CONFIG([0.22])

@@ -29,9 +27,9 @@ fi
 AC_SUBST([SHELL_VERSION])

 dnl keep this in alphabetic order
-CLASSIC_EXTENSIONS="apps-menu places-menu alternate-tab launch-new-instance window-list"
-DEFAULT_EXTENSIONS="$CLASSIC_EXTENSIONS drive-menu screenshot-window-sizer windowsNavigator workspace-indicator"
-ALL_EXTENSIONS="$DEFAULT_EXTENSIONS auto-move-windows example native-window-placement user-theme"
+CLASSIC_EXTENSIONS="apps-menu places-menu alternate-tab default-min-max launch-new-instance static-workspaces window-list"
+DEFAULT_EXTENSIONS="$CLASSIC_EXTENSIONS alternative-status-menu drive-menu windowsNavigator workspace-indicator"
+ALL_EXTENSIONS="$DEFAULT_EXTENSIONS auto-move-windows example native-window-placement systemMonitor user-theme xrandr-indicator"
 AC_SUBST(CLASSIC_EXTENSIONS, [$CLASSIC_EXTENSIONS])
 AC_SUBST(ALL_EXTENSIONS, [$ALL_EXTENSIONS])
 AC_ARG_ENABLE([extensions],
@@ -62,8 +60,18 @@ AM_CONDITIONAL([CLASSIC_MODE], [test x"$enable_classic_mode" != xno])
 ENABLED_EXTENSIONS=
 for e in $enable_extensions; do
 	case $e in
+		systemMonitor)
+			PKG_CHECK_MODULES(GTOP, libgtop-2.0 >= 2.28.3,
+					[ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"],
+					[AC_MSG_WARN([libgtop-2.0 not found, disabling systemMonitor])])
+			;;
+		xrandr-indicator)
+			PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= 2.91.6,
+					[ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"],
+					[AC_MSG_WARN([gnome-desktop-3.0 not found, disabling xrandr-indicator])])
+			;;
 dnl		keep this in alphabetic order
-		alternate-tab|apps-menu|auto-move-windows|drive-menu|example|launch-new-instance|native-window-placement|places-menu|screenshot-window-sizer|user-theme|window-list|windowsNavigator|workspace-indicator)
+		alternate-tab|alternative-status-menu|apps-menu|auto-move-windows|default-min-max|drive-menu|example|launch-new-instance|native-window-placement|places-menu|static-workspaces|user-theme|window-list|windowsNavigator|workspace-indicator)
 			ENABLED_EXTENSIONS="$ENABLED_EXTENSIONS $e"
 			;;
 		*)
@@ -73,24 +81,26 @@ done

 AC_SUBST(ENABLED_EXTENSIONS, [$ENABLED_EXTENSIONS])

-AC_PATH_PROG([SASS],[sass],[])
-
 dnl Please keep this sorted alphabetically
 AC_CONFIG_FILES([
  data/Makefile
  extensions/alternate-tab/Makefile
+  extensions/alternative-status-menu/Makefile
  extensions/apps-menu/Makefile
  extensions/auto-move-windows/Makefile
+  extensions/default-min-max/Makefile
  extensions/drive-menu/Makefile
  extensions/example/Makefile
  extensions/launch-new-instance/Makefile
  extensions/native-window-placement/Makefile
  extensions/places-menu/Makefile
-  extensions/screenshot-window-sizer/Makefile
+  extensions/static-workspaces/Makefile
+  extensions/systemMonitor/Makefile
  extensions/user-theme/Makefile
  extensions/window-list/Makefile
  extensions/windowsNavigator/Makefile
  extensions/workspace-indicator/Makefile
+  extensions/xrandr-indicator/Makefile
  extensions/Makefile
  Makefile
  po/Makefile.in
--- a/data/HACKING
+++ b/data/HACKING
@@ -1,6 +0,0 @@
-To generate the css files, from the project directory:
-
-sass --sourcemap=none --update .
-
-To update the gnome-shell-sass submodule to latest upstream commit:
-git submodule update --rebase
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,13 @@
 include $(top_srcdir)/include.mk

+desktopdir = $(datadir)/applications
+desktop_in_in_files = gnome-shell-classic.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
 sessiondir = $(datadir)/gnome-session/sessions
-session_in_files = gnome-classic.session.desktop.in
+session_in_in_files = gnome-classic.session.desktop.in.in
+session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
 session_DATA = $(session_in_files:.session.desktop.in=.session)

 xsessiondir = $(datadir)/xsessions
@@ -14,39 +20,20 @@ mode_DATA = $(mode_in_files:.json.in=.json)

 themedir = $(datadir)/gnome-shell/theme
 theme_DATA = 				\
-	$(srcdir)/calendar-today.svg		\
-	$(srcdir)/classic-process-working.svg		\
-	$(srcdir)/classic-toggle-off-intl.svg		\
-	$(srcdir)/classic-toggle-off-us.svg		\
-	$(srcdir)/classic-toggle-on-intl.svg		\
-	$(srcdir)/classic-toggle-on-us.svg		\
-	$(srcdir)/gnome-classic.css			\
-	$(srcdir)/gnome-classic-high-contrast.css	\
+	$(srcdir)/classic-process-working.svg	\
+	$(srcdir)/classic-toggle-off-intl.svg	\
+	$(srcdir)/classic-toggle-off-us.svg	\
+	$(srcdir)/classic-toggle-on-intl.svg	\
+	$(srcdir)/classic-toggle-on-us.svg	\
+	$(srcdir)/gnome-classic.css		\
 	$(NULL)

-theme_sources =							\
-	$(srcdir)/gnome-classic.scss				\
-	$(srcdir)/gnome-shell-sass/_colors.scss			\
-	$(srcdir)/gnome-shell-sass/_common.scss			\
-	$(srcdir)/gnome-shell-sass/_drawing.scss		\
-	$(srcdir)/gnome-shell-sass/_high-contrast-colors.scss	\
-	$(NULL)
-
-%.css: %.scss $(theme_sources)
-	@if test -n "$(SASS)"; then \
-		if $(AM_V_P); then PS4= set -x; else echo "  GEN      $@"; fi; \
-		$(SASS) --sourcemap=none --update -f -q $<; \
-	fi
-
-gsettings_SCHEMAS = org.gnome.shell.extensions.classic-overrides.gschema.xml
-
-@GSETTINGS_RULES@
-
-%.desktop:%.desktop.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-%.session: %.session.desktop.in
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+%.desktop.in:%.desktop.in.in
+	$(AM_V_GEN) sed \
+		-e "s|\@libexecdir\@|$(libexecdir)|" \
+		-e "s|\@bindir\@|$(bindir)|" \
+		-e "s|\@VERSION\@|$(VERSION)|" \
+		$< > $@

 comma:=,
 empty:=
@@ -58,15 +45,20 @@ extension_list:=$(subst $(space),$(comma),$(extensions))
 		-e "s|\@CLASSIC_EXTENSIONS\@|$(extension_list)|g" \
 		$< > $@

+%.session: %.session.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+
+@INTLTOOL_DESKTOP_RULE@
+
 EXTRA_DIST = \
-	$(session_in_files) \
+	$(desktop_in_in_files) \
+	$(session_in_in_files) \
 	$(xsession_in_files) \
 	$(mode_in_files) \
-	$(gsettings_SCHEMAS) \
 	$(theme_DATA) \
 	$(NULL)

 CLEANFILES = \
+	$(desktop_DATA) \
 	$(session_DATA) \
 	$(xsession_DATA) \
 	$(mode_DATA) \
--- a/data/calendar-today.svg
+++ b/data/calendar-today.svg
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="calendar-today.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3007"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient2997"
-       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"
-     pagecolor="#d3d3d3"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-55.349829"
-     inkscape:cy="-31.442864"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="2133"
-     inkscape:window-height="1241"
-     inkscape:window-x="238"
-     inkscape:window-y="89"
-     inkscape:window-maximized="0"
-     borderlayer="true"
-     inkscape:showpageshadow="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3109"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata10626">
-    <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(-469.08263,-537.99307)">
-    <circle
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#555753;fill-opacity:0.23756906;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="path7305"
-       cx="481.57138"
-       cy="559.4649"
-       r="1.5" />
-  </g>
-</svg>
--- a/data/classic-process-working.svg
+++ b/data/classic-process-working.svg
--- a/data/classic-toggle-off-intl.svg
+++ b/data/classic-toggle-off-intl.svg
@@ -14,10 +14,20 @@
   height="22"
   id="svg10865"
   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-off-intl.svg">
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="toggle-off-us.svg">
  <defs
     id="defs10867">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62852-6-5"
+       id="linearGradient62981-1-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85639946,0,0,0.81059641,27.810405,92.069729)"
+       x1="740"
+       y1="486.10501"
+       x2="740"
+       y2="505.3204" />
    <linearGradient
       id="linearGradient62852-6-5">
      <stop
@@ -67,6 +77,16 @@
       effect="spiro"
       id="path-effect62829-6-8-0"
       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62821-5-8-1"
+       id="linearGradient62864-0-3-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-197.64667,0)"
+       x1="702.58966"
+       y1="484.49405"
+       x2="702.58966"
+       y2="507.42715" />
    <linearGradient
       id="linearGradient62821-5-8-1">
      <stop
@@ -88,76 +108,6 @@
       id="linearGradient11647"
       xlink:href="#linearGradient62821-5-8-1"
       inkscape:collect="always" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath65663">
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
-         id="rect65665"
-         width="96.999924"
-         height="24.292892"
-         x="708.71954"
-         y="406.96973"
-         rx="3.1139846"
-         ry="1.9595497"
-         inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/content selection/content-selection.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
-       id="linearGradient65582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5250827,0,0,0.72144839,620.16092,156.4917)"
-       x1="207.17195"
-       y1="497.39584"
-       x2="207.17195"
-       y2="531.48669" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9">
-      <stop
-         style="stop-color:#f4f6f4;stop-opacity:1"
-         offset="0"
-         id="stop5380-6-1-1-9-3-6-3-6-45-6-4-4-9-9-8-9" />
-      <stop
-         style="stop-color:#d7dad7;stop-opacity:1"
-         offset="1"
-         id="stop5382-06-3-6-4-2-4-6-8-0-9-6-8-7-7-6-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient65584">
-      <stop
-         style="stop-color:#f1f1f1;stop-opacity:1"
-         offset="0"
-         id="stop65586" />
-      <stop
-         style="stop-color:#a7aba7;stop-opacity:0;"
-         offset="1"
-         id="stop65588" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
-       id="linearGradient65582-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5250827,0,0,0.72144839,-75.348673,-359.16458)"
-       x1="207.17195"
-       y1="497.39584"
-       x2="207.17195"
-       y2="531.48669" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient65584"
-       id="linearGradient65590-6"
-       x1="716.62506"
-       y1="537.23358"
-       x2="716.62506"
-       y2="535.23358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0139469,0,0,1.0139469,-705.52354,-521.99915)" />
  </defs>
  <sodipodi:namedview
     id="base"
@@ -167,8 +117,8 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1"
-     inkscape:cx="23.565368"
-     inkscape:cy="19.596892"
+     inkscape:cx="-133.20351"
+     inkscape:cy="20.84411"
     inkscape:document-units="px"
     inkscape:current-layer="g62929"
     showgrid="false"
@@ -179,8 +129,8 @@
     inkscape:bbox-paths="true"
     inkscape:snap-others="false"
     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
+     inkscape:window-height="1380"
+     inkscape:window-x="1600"
     inkscape:window-y="28"
     inkscape:window-maximized="1"
     showborder="false">
@@ -196,7 +146,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>
@@ -216,7 +166,7 @@
         transform="translate(0,30)"
         id="g62931">
        <rect
-           style="fill:#cecece;fill-opacity:1;stroke:#a7a7a7;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;solid-opacity:1;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
+           style="fill:url(#linearGradient62864-0-3-1);fill-opacity:1;stroke:#a6a8a6;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero"
           id="rect62935"
           width="63.856125"
           height="21.093594"
@@ -225,7 +175,7 @@
           rx="2"
           ry="2" />
        <rect
-           style="fill:url(#linearGradient65582);fill-opacity:1;stroke:#a7a7a7;stroke-width:0.97313344;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;color:#000000;clip-rule:nonzero;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-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           style="fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#777b7a;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
           id="rect62937"
           width="29.97398"
           height="17.022524"
@@ -235,18 +185,56 @@
           ry="1" />
        <g
           transform="translate(-38.048674,-1.9445437)"
-           id="g62939" />
+           id="g62939">
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="695"
+             height="8"
+             width="2"
+             id="rect62941"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="699"
+             height="8"
+             width="2"
+             id="rect62943"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="703"
+             height="8"
+             width="2"
+             id="rect62945"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+        </g>
        <path
           inkscape:connector-curvature="0"
-           inkscape:original-d="m 647.78241,486.57192 27.73523,0"
+           inkscape:original-d="m 647.78624,486.57192 27.94632,0"
           inkscape:path-effect="#path-effect62989-8-0"
           id="path62947"
-           d="m 647.78241,486.57192 27.73523,0"
+           d="m 647.78624,486.57192 27.94632,0"
           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
      </g>
      <g
         id="g11665"
         transform="matrix(0.78906097,0,0,0.78906097,178.78814,111.57844)" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="translate(642.41421,514.02037)"
+         d="m 55,11.875 a 4.625,4.625 0 1 1 -9.25,0 4.625,4.625 0 1 1 9.25,0 z"
+         sodipodi:ry="4.625"
+         sodipodi:rx="4.625"
+         sodipodi:cy="11.875"
+         sodipodi:cx="50.375"
+         id="path3786"
+         sodipodi:type="arc" />
      <path
         sodipodi:type="arc"
         id="path3016"
@@ -254,9 +242,9 @@
         sodipodi:cy="11.875"
         sodipodi:rx="4.625"
         sodipodi:ry="4.625"
-         d="M 55,11.875 A 4.625,4.625 0 0 1 50.375,16.5 4.625,4.625 0 0 1 45.75,11.875 4.625,4.625 0 0 1 50.375,7.25 4.625,4.625 0 0 1 55,11.875 Z"
+         d="m 55,11.875 a 4.625,4.625 0 1 1 -9.25,0 4.625,4.625 0 1 1 9.25,0 z"
         transform="translate(642.41421,512.02037)"
-         style="fill:none;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#555753;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
    </g>
  </g>
 </svg>
--- a/data/classic-toggle-off-us.svg
+++ b/data/classic-toggle-off-us.svg
@@ -14,10 +14,20 @@
   height="22"
   id="svg10865"
   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-off-us.svg">
+   inkscape:version="0.48+devel r12050"
+   sodipodi:docname="toggle-off-us.svg">
  <defs
     id="defs10867">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62852-6-5"
+       id="linearGradient62981-1-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85639946,0,0,0.81059641,27.810405,92.069729)"
+       x1="740"
+       y1="486.10501"
+       x2="740"
+       y2="505.3204" />
    <linearGradient
       id="linearGradient62852-6-5">
      <stop
@@ -67,6 +77,16 @@
       effect="spiro"
       id="path-effect62829-6-8-0"
       is_visible="true" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62821-5-8-1"
+       id="linearGradient62864-0-3-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-197.64667,0)"
+       x1="702.58966"
+       y1="484.49405"
+       x2="702.58966"
+       y2="507.42715" />
    <linearGradient
       id="linearGradient62821-5-8-1">
      <stop
@@ -88,32 +108,6 @@
       id="linearGradient11647"
       xlink:href="#linearGradient62821-5-8-1"
       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9"
-       id="linearGradient65582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5250827,0,0,0.72144839,620.16092,156.4917)"
-       x1="207.17195"
-       y1="497.39584"
-       x2="207.17195"
-       y2="531.48669" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5378-2-5-9-9-0-80-7-6-8-4-5-7-3-6-2-9">
-      <stop
-         style="stop-color:#f4f6f4;stop-opacity:1"
-         offset="0"
-         id="stop5380-6-1-1-9-3-6-3-6-45-6-4-4-9-9-8-9" />
-      <stop
-         style="stop-color:#d7dad7;stop-opacity:1"
-         offset="1"
-         id="stop5382-06-3-6-4-2-4-6-8-0-9-6-8-7-7-6-7" />
-    </linearGradient>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0-6"
-       effect="spiro" />
  </defs>
  <sodipodi:namedview
     id="base"
@@ -123,8 +117,8 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1"
-     inkscape:cx="78.222729"
-     inkscape:cy="-3.6620078"
+     inkscape:cx="50.925774"
+     inkscape:cy="11.296867"
     inkscape:document-units="px"
     inkscape:current-layer="g62929"
     showgrid="false"
@@ -135,8 +129,8 @@
     inkscape:bbox-paths="true"
     inkscape:snap-others="false"
     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
+     inkscape:window-height="1375"
+     inkscape:window-x="1600"
     inkscape:window-y="28"
     inkscape:window-maximized="1"
     showborder="false">
@@ -152,7 +146,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>
@@ -169,11 +163,10 @@
       id="g62929"
       transform="translate(-643.91421,517.29894)">
      <g
-         style="display:inline"
         transform="translate(0,30)"
         id="g62931">
        <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:#cecece;fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;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:new"
+           style="fill:url(#linearGradient62864-0-3-1);fill-opacity:1;stroke:#a6a8a6;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero"
           id="rect62935"
           width="63.856125"
           height="21.093594"
@@ -182,7 +175,7 @@
           rx="2"
           ry="2" />
        <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:url(#linearGradient65582);fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:0.97313344;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="fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#777b7a;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
           id="rect62937"
           width="29.97398"
           height="17.022524"
@@ -192,18 +185,58 @@
           ry="1" />
        <g
           transform="translate(-38.048674,-1.9445437)"
-           id="g62939" />
+           id="g62939">
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="695"
+             height="8"
+             width="2"
+             id="rect62941"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="699"
+             height="8"
+             width="2"
+             id="rect62943"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="703"
+             height="8"
+             width="2"
+             id="rect62945"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+        </g>
        <path
           inkscape:connector-curvature="0"
-           inkscape:original-d="m 647.78241,486.57192 27.73523,0"
-           inkscape:path-effect="#path-effect62989-8-0-6"
+           inkscape:original-d="m 647.78624,486.57192 27.94632,0"
+           inkscape:path-effect="#path-effect62989-8-0"
           id="path62947"
-           d="m 647.78241,486.57192 27.73523,0"
+           d="m 647.78624,486.57192 27.94632,0"
           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
      </g>
      <g
         id="g11665"
         transform="matrix(0.78906097,0,0,0.78906097,167.78814,111.57844)">
+        <text
+           xml:space="preserve"
+           style="font-size:13.14816952px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           x="644.02277"
+           y="534.94739"
+           id="text62949-7"
+           sodipodi:linespacing="125%"
+           transform="scale(1.0113976,0.98873084)"><tspan
+             sodipodi:role="line"
+             id="tspan62951-7"
+             x="644.02277"
+             y="534.94739">OFF</tspan></text>
        <text
           xml:space="preserve"
           style="font-size:12.69556618px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
--- a/data/classic-toggle-on-intl.svg
+++ b/data/classic-toggle-on-intl.svg
@@ -14,10 +14,42 @@
   height="22"
   id="svg10865"
   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-on-intl.svg">
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="toggle-on-us.svg">
  <defs
     id="defs10867">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62991-9-6"
+       id="linearGradient62979-8-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-197.64667,0)"
+       x1="702.58966"
+       y1="484.49405"
+       x2="702.58966"
+       y2="507.42715" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient62991-9-6">
+      <stop
+         style="stop-color:#589fe9;stop-opacity:1"
+         offset="0"
+         id="stop62993-6-9" />
+      <stop
+         style="stop-color:#a3cefe;stop-opacity:1"
+         offset="1"
+         id="stop62995-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62852-6-5"
+       id="linearGradient62981-1-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85639946,0,0,0.81059641,57.747905,92.132229)"
+       x1="740"
+       y1="486.10501"
+       x2="740"
+       y2="505.3204" />
    <linearGradient
       id="linearGradient62852-6-5">
      <stop
@@ -37,41 +69,6 @@
       is_visible="true"
       id="path-effect62989-8-0"
       effect="spiro" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient38513"
-       id="linearGradient38519"
-       x1="690"
-       y1="506.25049"
-       x2="690"
-       y2="480.93414"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient38513">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop38515" />
-      <stop
-         style="stop-color:#6f9ccd;stop-opacity:1"
-         offset="1"
-         id="stop38517" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient62852-6-5"
-       id="linearGradient62981-1-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85639946,0,0,0.81059641,57.747905,92.132229)"
-       x1="740"
-       y1="486.10501"
-       x2="740"
-       y2="505.3204" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect62989-8-0-8"
-       effect="spiro" />
  </defs>
  <sodipodi:namedview
     id="base"
@@ -81,8 +78,8 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1"
-     inkscape:cx="9.3225163"
-     inkscape:cy="-0.1588306"
+     inkscape:cx="14.199007"
+     inkscape:cy="11.127758"
     inkscape:document-units="px"
     inkscape:current-layer="g62929"
     showgrid="false"
@@ -93,8 +90,8 @@
     inkscape:bbox-paths="true"
     inkscape:snap-others="false"
     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
+     inkscape:window-height="1380"
+     inkscape:window-x="1600"
     inkscape:window-y="28"
     inkscape:window-maximized="1"
     showborder="false">
@@ -110,7 +107,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>
@@ -127,11 +124,10 @@
       id="g62929"
       transform="translate(-643.91421,517.29894)">
      <g
-         style="display:inline"
         transform="translate(0,30)"
         id="g62931">
        <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:url(#linearGradient38519);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;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"
+           style="fill:url(#linearGradient62979-8-1);fill-opacity:1;stroke:#1a71cc;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
           id="rect62935"
           width="63.856125"
           height="21.093594"
@@ -140,7 +136,7 @@
           rx="2"
           ry="2" />
        <rect
-           style="display:inline;fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#777b7a;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
           id="rect62937"
           width="29.97398"
           height="17.022524"
@@ -150,11 +146,39 @@
           ry="1" />
        <g
           transform="translate(-7.9861743,-1.9445437)"
-           id="g62939" />
+           id="g62939">
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="695"
+             height="8"
+             width="2"
+             id="rect62941"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="699"
+             height="8"
+             width="2"
+             id="rect62943"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="703"
+             height="8"
+             width="2"
+             id="rect62945"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+        </g>
        <path
           inkscape:connector-curvature="0"
           inkscape:original-d="m 677.59874,486.57192 27.94632,0"
-           inkscape:path-effect="#path-effect62989-8-0-8"
+           inkscape:path-effect="#path-effect62989-8-0"
           id="path62947"
           d="m 677.59874,486.57192 27.94632,0"
           style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
@@ -163,7 +187,7 @@
         inkscape:connector-curvature="0"
         id="path4444"
         d="m 661.91421,522.09451 0,7"
-         style="fill:#3465a4;stroke:#3465a4;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;fill-opacity:1;fill-rule:nonzero;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="fill:none;stroke:#1a71cc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;fill-opacity:1;fill-rule:nonzero;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
      <path
         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
         d="m 18,7.96875 0,7"
--- a/data/classic-toggle-on-us.svg
+++ b/data/classic-toggle-on-us.svg
@@ -14,10 +14,32 @@
   height="22"
   id="svg10865"
   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="classic-toggle-on-us.svg">
+   inkscape:version="0.48+devel r12050"
+   sodipodi:docname="toggle-on-us.svg">
  <defs
     id="defs10867">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient62991-9-6"
+       id="linearGradient62979-8-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3066667,0,0,1,-197.64667,0)"
+       x1="702.58966"
+       y1="484.49405"
+       x2="702.58966"
+       y2="507.42715" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient62991-9-6">
+      <stop
+         style="stop-color:#589fe9;stop-opacity:1"
+         offset="0"
+         id="stop62993-6-9" />
+      <stop
+         style="stop-color:#a3cefe;stop-opacity:1"
+         offset="1"
+         id="stop62995-1-6" />
+    </linearGradient>
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient62852-6-5"
@@ -47,53 +69,6 @@
       is_visible="true"
       id="path-effect62989-8-0"
       effect="spiro" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath65663">
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
-         id="rect65665"
-         width="96.999924"
-         height="24.292892"
-         x="708.71954"
-         y="406.96973"
-         rx="3.1139846"
-         ry="1.9595497"
-         inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/content selection/content-selection.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient38513"
-       id="linearGradient38519"
-       x1="690"
-       y1="506.25049"
-       x2="690"
-       y2="480.93414"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient38513">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop38515" />
-      <stop
-         style="stop-color:#6f9ccd;stop-opacity:1"
-         offset="1"
-         id="stop38517" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-644,-483)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient38513"
-       id="linearGradient38519-3"
-       x1="690"
-       y1="506.25049"
-       x2="690"
-       y2="480.93414"
-       gradientUnits="userSpaceOnUse" />
  </defs>
  <sodipodi:namedview
     id="base"
@@ -103,8 +78,8 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1"
-     inkscape:cx="20.775745"
-     inkscape:cy="7.0434022"
+     inkscape:cx="8.2018252"
+     inkscape:cy="8.0650495"
     inkscape:document-units="px"
     inkscape:current-layer="g62929"
     showgrid="false"
@@ -115,8 +90,8 @@
     inkscape:bbox-paths="true"
     inkscape:snap-others="false"
     inkscape:window-width="2560"
-     inkscape:window-height="1342"
-     inkscape:window-x="0"
+     inkscape:window-height="1375"
+     inkscape:window-x="1600"
     inkscape:window-y="28"
     inkscape:window-maximized="1"
     showborder="false">
@@ -152,7 +127,7 @@
         transform="translate(0,30)"
         id="g62931">
        <rect
-           style="fill:url(#linearGradient38519);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;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-rule:nonzero;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           style="fill:url(#linearGradient62979-8-1);fill-opacity:1;stroke:#1a71cc;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
           id="rect62935"
           width="63.856125"
           height="21.093594"
@@ -161,7 +136,7 @@
           rx="2"
           ry="2" />
        <rect
-           style="fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#3465a4;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           style="fill:url(#linearGradient62981-1-1);fill-opacity:1;stroke:#777b7a;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
           id="rect62937"
           width="29.97398"
           height="17.022524"
@@ -171,7 +146,35 @@
           ry="1" />
        <g
           transform="translate(-7.9861743,-1.9445437)"
-           id="g62939" />
+           id="g62939">
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="695"
+             height="8"
+             width="2"
+             id="rect62941"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="699"
+             height="8"
+             width="2"
+             id="rect62943"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+          <rect
+             ry="1"
+             rx="1"
+             y="492"
+             x="703"
+             height="8"
+             width="2"
+             id="rect62945"
+             style="fill:#e8e8e5;fill-opacity:1;stroke:none;display:inline" />
+        </g>
        <path
           inkscape:connector-curvature="0"
           inkscape:original-d="m 677.59874,486.57192 27.94632,0"
@@ -186,7 +189,7 @@
         id="text62949-7"
         y="534.96918"
         x="646.71399"
-         style="font-size:10.01104736px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#3465a4;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold;"
+         style="font-size:10.01104736px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#1a71cc;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
         xml:space="preserve"><tspan
           y="534.96918"
           x="646.71399"
--- a/data/classic.json.in
+++ b/data/classic.json.in
@@ -4,6 +4,7 @@
    "enabledExtensions": [@CLASSIC_EXTENSIONS@],
    "panel": { "left": ["activities", "appMenu"],
               "center": [],
-               "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"]
+               "right": ["a11y", "keyboard", "volume", "bluetooth",
+                         "network", "battery", "dateMenu", "userMenu"]
             }
 }
--- a/data/gnome-classic-high-contrast.css
+++ b/data/gnome-classic-high-contrast.css
@@ -1,5 +0,0 @@
-@import url("gnome-classic.css");
-
-stage {
-  -st-icon-style: symbolic;
-}
--- a/data/gnome-classic.css
+++ b/data/gnome-classic.css
--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=GNOME Classic
-Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
+_Name=GNOME Classic
+_Comment=This session logs you into GNOME Classic
+Exec=gnome-session --session gnome-classic
 TryExec=gnome-session
+Icon=
 Type=Application
-DesktopNames=GNOME-Classic;GNOME;
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -1,83 +0,0 @@
-/* Use the gnome-shell theme, but with light colors */
-$variant: 'light';
-
-@import "gnome-shell-sass/_colors"; //use gtk colors
-@import "gnome-shell-sass/_drawing";
-@import "gnome-shell-sass/_common";
-
-/* Overrides */
-
-#panel {
-  font-weight: normal;
-  background-color: $bg_color;
-  background-gradient-direction: vertical;
-  background-gradient-end: darken($bg_color,5%);
-  border-top-color: #666; /* we don't support non-uniform border-colors and
-                             use the top border color for any border, so we
-                             need to set it even if all we want is a bottom
-                             border */
-  border-bottom: 1px solid #666;
-  app-icon-bottom-clip: 0px;
-  &:overview {
-    background-color: #000;
-    background-gradient-end: #000;
-    border-top-color: #000;
-    border-bottom: 1px solid #000;
-    .panel-button { color: #fff; }
-  }
-
-  .panel-button {
-    -natural-hpadding: 8px;
-    -minimum-hpadding: 4px;
-    font-weight: normal;
-    color: $fg_color;
-    &:active, &:overview, &:focus, &:checked {
-      // Trick due to St limitations. It needs a background to draw
-      // a box-shadow
-      background-color: $selected_bg_color !important;
-      color: $selected_fg_color !important;
-      box-shadow: none;
-      & > .system-status-icon { icon-shadow: none; }
-    }
-    .app-menu-icon { width: 0; height: 0; margin: 0; } // shell's display:none; :D
-  }
-
-  .panel-corner,
-  .panel-corner:active,
-  .panel-corner:overview,
-  .panel-corner:focus {
-    -panel-corner-radius: 0;
-  }
-  &.lock-screen,
-  &.unlock-screen, 
-  &.login-screen { 
-    background-color: transparentize($_bubble_bg_color, 0.5);
-    background-gradient-start: transparentize($_bubble_bg_color, 0.5);
-    background-gradient-end: transparentize($_bubble_bg_color, 0.5);
-    border-bottom: none;
-    .panel-button { color: $osd_fg_color; }
-  }
-  .popup-menu-arrow { width: 0; height: 0;  } // shell's display: none;
-}
-
-#appMenu { 
-  padding: 0 8px 0 8px; 
-  spinner-image: url("classic-process-working.svg"); 
-}
-.tile-preview-left.on-primary,
-.tile-preview-right.on-primary,
-.tile-preview-left.tile-preview-right.on-primary {
-    /* keep in sync with -panel-corner-radius */
-    border-radius: 0;
-}
-
-@each $v in us, intl {
-  .toggle-switch-#{$v} {
-    background-image: url("classic-toggle-off-#{$v}.svg");
-    &:checked { background-image: url("classic-toggle-on-#{$v}.svg"); }
-  }
-}
-
-.calendar-day-with-events {
-  background-image: url("calendar-today.svg");
-}
--- a/data/gnome-classic.session.desktop.in
+++ b/data/gnome-classic.session.desktop.in
@@ -1,3 +0,0 @@
-[GNOME Session]
-Name=GNOME Classic
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Orientation;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XRANDR;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
--- a/data/gnome-classic.session.desktop.in.in
+++ b/data/gnome-classic.session.desktop.in.in
@@ -0,0 +1,4 @@
+[GNOME Session]
+_Name=GNOME Classic
+RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
+IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
--- a/data/gnome-shell-classic.desktop.in.in
+++ b/data/gnome-shell-classic.desktop.in.in
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+_Name=GNOME Shell Classic
+_Comment=Window management and application launching
+Exec=@bindir@/gnome-shell --mode=classic
+TryExec=@bindir@/gnome-shell
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+Categories=GNOME;GTK;Core;
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=panel;windowmanager;
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=false
--- a/data/gnome-shell-sass
+++ b/data/gnome-shell-sass
--- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
+++ b/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
@@ -1,46 +0,0 @@
-<schemalist>
-  <schema id="org.gnome.shell.extensions.classic-overrides"
-          path="/org/gnome/shell/extensions/classic-overrides/"
-	  gettext-domain="gnome-shell-extensions">
-    <key name="attach-modal-dialogs" type="b">
-      <default>true</default>
-      <summary>Attach modal dialog to the parent window</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running
-        GNOME Shell.
-      </description>
-    </key>
-
-    <key name="button-layout" type="s">
-      <default>"appmenu:minimize,maximize,close"</default>
-      <summary>Arrangement of buttons on the titlebar</summary>
-      <description>
-        This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="edge-tiling" type="b">
-      <default>true</default>
-      <summary>Enable edge tiling when dropping windows on screen edges</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="workspaces-only-on-primary" type="b">
-      <default>true</default>
-      <summary>Workspaces only on primary monitor</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-
-    <key name="focus-change-on-pointer-rest" type="b">
-      <default>true</default>
-      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
-      <description>
-        This key overrides the key in org.gnome.mutter when running GNOME Shell.
-      </description>
-    </key>
-  </schema>
-</schemalist>
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -7,7 +7,6 @@ const Shell = imports.gi.Shell;

 const AltTab = imports.ui.altTab;
 const Main = imports.ui.main;
-const WindowManager = imports.ui.windowManager;

 let injections = {};

@@ -15,45 +14,51 @@ function init(metadata) {
 }

 function setKeybinding(name, func) {
-    Main.wm.setCustomKeybindingHandler(name, Shell.ActionMode.NORMAL, func);
+    Main.wm.setCustomKeybindingHandler(name, Shell.KeyBindingMode.NORMAL, func);
 }

 function enable() {
+    injections['_initialSelection'] = AltTab.WindowSwitcherPopup.prototype._initialSelection;
+    AltTab.WindowSwitcherPopup.prototype._initialSelection = function(backward, binding) {
+        if (binding == 'switch-windows-backward' ||
+            binding == 'switch-applications-backward' ||
+            binding == 'switch-group-backward' || backward)
+            this._select(this._items.length - 1);
+        else if (this._items.length == 1)
+            this._select(0);
+        else
+            this._select(1);
+    };
    injections['_keyPressHandler'] = AltTab.WindowSwitcherPopup.prototype._keyPressHandler;
-    AltTab.WindowSwitcherPopup.prototype._keyPressHandler = function(keysym, action) {
-        switch(action) {
-            case Meta.KeyBindingAction.SWITCH_APPLICATIONS:
-              action = Meta.KeyBindingAction.SWITCH_WINDOWS;
-              break;
-            case Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD:
-              action = Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD;
-              break;
+    AltTab.WindowSwitcherPopup.prototype._keyPressHandler = function(keysym, backwards, action) {
+        if (action == Meta.KeyBindingAction.SWITCH_WINDOWS ||
+            action == Meta.KeyBindingAction.SWITCH_APPLICATIONS ||
+            action == Meta.KeyBindingAction.SWITCH_GROUP) {
+            this._select(backwards ? this._previous() : this._next());
+        } else if (action == Meta.KeyBindingAction.SWITCH_WINDOWS_BACKWARD ||
+                   action == Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD ||
+                   action == Meta.KeyBindingAction.SWITCH_GROUP_BACKWARD) {
+            this._select(this._previous());
+        } else {
+            if (keysym == Clutter.Left)
+                this._select(this._previous());
+            else if (keysym == Clutter.Right)
+                this._select(this._next());
        }
-        return injections['_keyPressHandler'].call(this, keysym, action);
    };

-    Main.wm._forcedWindowSwitcher = function(display, screen, window, binding) {
-        /* prevent a corner case where both popups show up at once */
-        if (this._workspaceSwitcherPopup != null)
-            this._workspaceSwitcherPopup.destroy();
-
-        let tabPopup = new AltTab.WindowSwitcherPopup();
-
-        if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
-            tabPopup.destroy();
-    };
-
-    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
-    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._forcedWindowSwitcher));
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
+    setKeybinding('switch-group', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
+    setKeybinding('switch-group-backward', Lang.bind(Main.wm, Main.wm._startWindowSwitcher));
 }

 function disable() {
-    var prop;
-
-    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startSwitcher));
-    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startSwitcher));
+    setKeybinding('switch-applications', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    setKeybinding('switch-group', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    setKeybinding('switch-applications-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));
+    setKeybinding('switch-group-backward', Lang.bind(Main.wm, Main.wm._startAppSwitcher));

    for (prop in injections)
        AltTab.WindowSwitcherPopup.prototype[prop] = injections[prop];
-    delete Main.wm._forcedWindowSwitcher;
 }
--- a/extensions/alternate-tab/metadata.json.in
+++ b/extensions/alternate-tab/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "AlternateTab",
-"description": "Substitute Alt-Tab with a window based switcher that does not group by application.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
 "original-authors": [  "jw@bargsten.org", "thomas.bouffon@gmail.com" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
--- a/extensions/alternate-tab/prefs.js
+++ b/extensions/alternate-tab/prefs.js
@@ -29,24 +29,16 @@ const AltTabSettingsWidget = new GObject.Class({

    _init : function(params) {
        this.parent(params);
-        this.margin = 24;
-        this.row_spacing = 6;
+        this.margin = 10;
 	this.orientation = Gtk.Orientation.VERTICAL;

-        this._settings = new Gio.Settings({ schema_id: 'org.gnome.shell.window-switcher' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.window-switcher' });

-        let presentLabel = '<b>' + _("Present windows as") + '</b>';
-        this.add(new Gtk.Label({ label: presentLabel, use_markup: true,
-                                 halign: Gtk.Align.START }));
-
-        let align = new Gtk.Alignment({ left_padding: 12 });
-        this.add(align);
-
-        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
-                                  row_spacing: 6,
-                                  column_spacing: 6 });
-        align.add(grid);
+        let presentLabel = _("Present windows as");
+        this.add(new Gtk.Label({ label: presentLabel, sensitive: true,
+                                 margin_bottom: 10, margin_top: 5 }));

+        let top = 1;
        let radio = null;
        let currentMode = this._settings.get_string(SETTINGS_APP_ICON_MODE);
        for (let mode in MODES) {
@@ -60,14 +52,15 @@ const AltTabSettingsWidget = new GObject.Class({
                if (widget.active)
                    this._settings.set_string(SETTINGS_APP_ICON_MODE, modeCapture);
            }));
-            grid.add(radio);
+            this.add(radio);

            if (mode == currentMode)
                radio.active = true;
+            top += 1;
        }

 	let check = new Gtk.CheckButton({ label: _("Show only windows in the current workspace"),
-	                                  margin_top: 6 });
+					  margin_top: 12 });
 	this._settings.bind(SETTINGS_CURRENT_WORKSPACE_ONLY, check, 'active', Gio.SettingsBindFlags.DEFAULT);
 	this.add(check);
    },
--- a/extensions/alternative-status-menu/Makefile.am
+++ b/extensions/alternative-status-menu/Makefile.am
@@ -1,4 +1,4 @@
-EXTENSION_ID = screenshot-window-sizer
+EXTENSION_ID = alternative-status-menu

 include ../../extension.mk
 include ../../settings.mk
--- a/extensions/alternative-status-menu/extension.js
+++ b/extensions/alternative-status-menu/extension.js
@@ -0,0 +1,172 @@
+/* -*- mode: js2 - indent-tabs-mode: nil - js2-basic-offset: 4 -*- */
+
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const St = imports.gi.St;
+
+const BoxPointer = imports.ui.boxpointer;
+const Main = imports.ui.main;
+const PopupMenu = imports.ui.popupMenu;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+const LOCK_ENABLED_KEY = 'lock-enabled';
+
+let extension;
+
+// Need to reimplement here the missing bits from LoginManager
+
+function loginManager_hibernate() {
+    if (this._proxy) {
+        // systemd path
+        this._proxy.call("Hibernate",
+                         GLib.Variant.new('(b)', [true]),
+                         Gio.DBusCallFlags.NONE,
+                         -1, null, null);
+    } else {
+        // Can't do in ConsoleKit
+        this.emit('prepare-for-sleep', true);
+        this.emit('prepare-for-sleep', false);
+    }
+}
+
+function loginManager_canHibernate(asyncCallback) {
+    if (this._proxy) {
+        // systemd path
+        this._proxy.call("CanHibernate",
+                         null,
+                         Gio.DBusCallFlags.NONE,
+                         -1, null, function(proxy, asyncResult) {
+                             let result, error;
+
+                             try {
+                                 result = proxy.call_finish(asyncResult);
+                             } catch(e) {
+                                 error = e;
+                             }
+
+                             if (error)
+                                 asyncCallback(false);
+                             else
+                                 asyncCallback(result[0] != 'no');
+                         });
+    } else {
+        Mainloop.idle_add(Lang.bind(this, function() {
+            asyncCallback(false);
+            return false;
+        }));
+    }
+}
+
+function statusMenu_updateHaveHibernate() {
+    loginManager_canHibernate.call(this._loginManager, Lang.bind(this,
+        function(result) {
+            this._haveHibernate = result;
+            this._updateSuspendOrPowerOff();
+        }));
+}
+
+function statusMenu_updateSuspendOrPowerOff() {
+    this._suspendOrPowerOffItem.actor.hide();
+
+    extension.suspendItem.actor.visible = this._haveSuspend;
+    extension.hibernateItem.actor.visible = this._haveHibernate;
+    extension.powerOffItem.actor.visible = this._haveShutdown;
+}
+
+function onSuspendActivate(item) {
+    Main.overview.hide();
+
+    this.menu.close(BoxPointer.PopupAnimation.NONE);
+    this._loginManager.suspend();
+}
+
+function onHibernateActivate(item) {
+    Main.overview.hide();
+
+    this.menu.close(BoxPointer.PopupAnimation.NONE);
+    loginManager_hibernate.call(this._loginManager);
+}
+
+const Extension = new Lang.Class({
+    Name: 'AlternativeStatusMenu.Extension',
+
+    _init: function() {
+        this.suspendItem = null;
+        this.hibernateItem = null;
+        this.powerOffItem = null;
+
+        Convenience.initTranslations();
+        this._settings = Convenience.getSettings();
+    },
+
+    enable: function() {
+        let statusMenu = Main.panel.statusArea.userMenu;
+
+        let children = statusMenu.menu._getMenuItems();
+        let index = children.length;
+
+        /* find the old entry */
+        for (let i = children.length - 1; i >= 0; i--) {
+            if (children[i] == statusMenu._suspendOrPowerOffItem) {
+                index = i;
+                break;
+            }
+        }
+
+        /* add the new entries */
+        this.suspendItem = new PopupMenu.PopupMenuItem(_("Suspend"));
+        this.suspendItem.connect('activate', Lang.bind(statusMenu, onSuspendActivate));
+
+        this.hibernateItem = new PopupMenu.PopupMenuItem(_("Hibernate"));
+        this.hibernateItem.connect('activate', Lang.bind(statusMenu, onHibernateActivate));
+
+        this.powerOffItem = new PopupMenu.PopupMenuItem(_("Power Off"));
+        this.powerOffItem.connect('activate', Lang.bind(statusMenu, function() {
+	    this._session.ShutdownRemote();
+        }));
+
+        /* insert the entries at the found position */
+        statusMenu.menu.addMenuItem(this.suspendItem, index);
+        statusMenu.menu.addMenuItem(this.hibernateItem, index + 1);
+        statusMenu.menu.addMenuItem(this.powerOffItem, index + 2);
+
+        this._openStateChangedId = statusMenu.menu.connect('open-state-changed', function() {
+            statusMenu_updateHaveHibernate.call(statusMenu);
+        });
+
+        this._previousUpdateSuspendOrPowerOff = statusMenu._updateSuspendOrPowerOff;
+        statusMenu._updateSuspendOrPowerOff = statusMenu_updateSuspendOrPowerOff;
+
+        this._settingsChangedId = this._settings.connect('changed', function() {
+            statusMenu._updateSuspendOrPowerOff();
+        });
+    },
+
+    disable: function() {
+        let statusMenu = Main.panel.statusArea.userMenu;
+
+        this.suspendItem.destroy();
+        this.hibernateItem.destroy();
+        this.powerOffItem.destroy();
+
+        statusMenu.menu.disconnect(this._openStateChangedId);
+        this._settings.disconnect(this._settingsChangedId);
+
+        statusMenu._updateSuspendOrPowerOff = this._previousUpdateSuspendOrPowerOff;
+        statusMenu._updateSuspendOrPowerOff();
+    },
+});
+
+// Put your extension initialization code here
+function init(metadata) {
+    return (extension = new Extension());
+}
+
--- a/extensions/alternative-status-menu/metadata.json.in
+++ b/extensions/alternative-status-menu/metadata.json.in
@@ -0,0 +1,10 @@
+{
+ "extension-id": "@extension_id@",
+ "uuid": "@uuid@",
+ "settings-schema": "@gschemaname@",
+ "gettext-domain": "@gettext_domain@",
+ "name": "Alternative Status Menu",
+ "description": "Replaces GNOME Shell Status Menu with one showing Suspend/Hibernate and Power Off as separate items",
+ "shell-version": [ "@shell_current@" ],
+ "url": "@url@"
+}
--- a/extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in
+++ b/extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="gnome-shell-extensions">
+  <schema id="org.gnome.shell.extensions.alternative-status-menu" path="/org/gnome/shell/extensions/alternative-status-menu/">
+    <key name="allow-suspend" type="b">
+      <default>true</default>
+      <_summary>Enable suspending</_summary>
+      <_description>Control the visibility of the Suspend menu item</_description>
+    </key>
+    <key name="allow-hibernate" type="b">
+      <default>true</default>
+      <_summary>Enable hibernating</_summary>
+      <_description>Control the visibility of the Hibernate menu item</_description>
+    </key>
+  </schema>
+</schemalist>
--- a/extensions/alternative-status-menu/stylesheet.css
+++ b/extensions/alternative-status-menu/stylesheet.css
@@ -0,0 +1,3 @@
+.popup-alternating-menu-item:alternate {
+    font-weight: normal !important;
+}
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -1,20 +1,18 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Atk = imports.gi.Atk;
-const DND = imports.ui.dnd;
 const GMenu = imports.gi.GMenu;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Clutter = imports.gi.Clutter;
 const Main = imports.ui.main;
-const Meta = imports.gi.Meta;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Gtk = imports.gi.Gtk;
 const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 const Signals = imports.signals;
+const Layout = imports.ui.layout;
 const Pango = imports.gi.Pango;

 const Gettext = imports.gettext.domain('gnome-shell-extensions');
@@ -38,7 +36,7 @@ const ActivitiesMenuItem = new Lang.Class({
    _init: function(button) {
 	this.parent();
        this._button = button;
-        this.actor.add_child(new St.Label({ text: _("Activities Overview") }));
+        this.addActor(new St.Label({ text: _("Activities Overview") }));
    },

    activate: function(event) {
@@ -58,11 +56,10 @@ const ApplicationMenuItem = new Lang.Class({
        this._button = button;

        this._iconBin = new St.Bin();
-        this.actor.add_child(this._iconBin);
+        this.addActor(this._iconBin);

-        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
-                                      y_align: Clutter.ActorAlign.CENTER });
-        this.actor.add_child(appLabel, { expand: true });
+        let appLabel = new St.Label({ text: app.get_name() });
+        this.addActor(appLabel, { span: -1, expand: true });
        this.actor.label_actor = appLabel;

        let textureCache = St.TextureCache.get_default();
@@ -73,27 +70,10 @@ const ApplicationMenuItem = new Lang.Class({
                textureCache.disconnect(iconThemeChangedId);
            }));
        this._updateIcon();
-
-        this.actor._delegate = this;
-        let draggable = DND.makeDraggable(this.actor);
-
-        let maybeStartDrag = draggable._maybeStartDrag;
-        draggable._maybeStartDrag = (event) => {
-            if (this._dragEnabled)
-                return maybeStartDrag.call(draggable, event);
-            return false;
-        };
-
-        draggable.connect('drag-begin', () => {
-            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, true);
-        });
-        draggable.connect('drag-end', () => {
-            Shell.util_set_hidden_from_pick(Main.legacyTray.actor, false);
-        });
    },

    activate: function(event) {
-	this._app.open_new_window(-1);
+	this._app.open_new_window(event.get_time());
        this._button.selectCategory(null, null);
        this._button.menu.toggle();
 	this.parent(event);
@@ -105,20 +85,12 @@ const ApplicationMenuItem = new Lang.Class({
        this.parent(active, params);
    },

-    setDragEnabled: function(enable) {
-        this._dragEnabled = enable;
-    },
-
-    getDragActor: function() {
-        return this._app.create_icon_texture(APPLICATION_ICON_SIZE);
-    },
-
-    getDragActorSource: function() {
-        return this._iconBin;
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        alloc.min_size = alloc.natural_size = -1;
    },

    _updateIcon: function() {
-        this._iconBin.set_child(this.getDragActor());
+        this._iconBin.set_child(this._app.create_icon_texture(APPLICATION_ICON_SIZE));
    }
 });

@@ -140,7 +112,7 @@ const CategoryMenuItem = new Lang.Class({
        else
            name = _("Favorites");

-        this.actor.add_child(new St.Label({ text: name }));
+        this.addActor(new St.Label({ text: name }));
        this.actor.connect('motion-event', Lang.bind(this, this._onMotionEvent));
    },

@@ -222,11 +194,6 @@ const CategoryMenuItem = new Lang.Class({
        this._oldY = -1;
        this.actor.hover = false;
        Clutter.ungrab_pointer();
-
-        let source = event.get_source();
-        if (source instanceof St.Widget)
-            source.sync_hover();
-
        return false;
    },

@@ -239,31 +206,45 @@ const CategoryMenuItem = new Lang.Class({
    }
 });

+const HotCorner = new Lang.Class({
+    Name: 'HotCorner',
+    Extends: Layout.HotCorner,
+
+    _onCornerEntered : function() {
+        if (!this._entered) {
+            this._entered = true;
+            if (!Main.overview.animationInProgress) {
+                this._activationTime = Date.now() / 1000;
+                this.rippleAnimation();
+                Main.overview.toggle();
+            }
+        }
+        return false;
+    }
+});
+
 const ApplicationsMenu = new Lang.Class({
    Name: 'ApplicationsMenu',
    Extends: PopupMenu.PopupMenu,

-    _init: function(sourceActor, arrowAlignment, arrowSide, button) {
+    _init: function(sourceActor, arrowAlignment, arrowSide, button, hotCorner) {
        this.parent(sourceActor, arrowAlignment, arrowSide);
        this._button = button;
-    },
-
-    isEmpty: function() {
-	return false;
+        this._hotCorner = hotCorner;
    },

    open: function(animate) {
-        this._button.hotCorner.setBarrierSize(0);
-        if (this._button.hotCorner.actor) // fallback corner
-            this._button.hotCorner.actor.hide();
+        this._hotCorner.setBarrierSize(0);
+        if (this._hotCorner.actor) // fallback corner
+            this._hotCorner.actor.hide();
        this.parent(animate);
    },

    close: function(animate) {
        let size = Main.layoutManager.panelBox.height;
-        this._button.hotCorner.setBarrierSize(size);
-        if (this._button.hotCorner.actor) // fallback corner
-            this._button.hotCorner.actor.show();
+        this._hotCorner.setBarrierSize(size);
+        if (this._hotCorner.actor) // fallback corner
+            this._hotCorner.actor.show();
        this.parent(animate);
    },

@@ -278,152 +259,15 @@ const ApplicationsMenu = new Lang.Class({
    }
 });

-const DesktopTarget = new Lang.Class({
-    Name: 'DesktopTarget',
-
-    _init: function() {
-        this._desktop = null;
-        this._desktopDestroyedId = 0;
-
-        this._windowAddedId =
-            global.window_group.connect('actor-added',
-                                        Lang.bind(this, this._onWindowAdded));
-
-        global.get_window_actors().forEach(a => {
-            this._onWindowAdded(a.get_parent(), a);
-        });
-    },
-
-    get hasDesktop() {
-        return this._desktop != null;
-    },
-
-    _onWindowAdded: function(group, actor) {
-        if (!(actor instanceof Meta.WindowActor))
-            return;
-
-        if (actor.meta_window.get_window_type() == Meta.WindowType.DESKTOP)
-            this._setDesktop(actor);
-    },
-
-    _setDesktop: function(desktop) {
-        if (this._desktop) {
-            this._desktop.disconnect(this._desktopDestroyedId);
-            this._desktopDestroyedId = 0;
-
-            delete this._desktop._delegate;
-        }
-
-        this._desktop = desktop;
-        this.emit('desktop-changed');
-
-        if (this._desktop) {
-            this._desktopDestroyedId = this._desktop.connect('destroy', () => {
-                this._setDesktop(null);
-            });
-            this._desktop._delegate = this;
-        }
-    },
-
-    _getSourceAppInfo: function(source) {
-        if (!(source instanceof ApplicationMenuItem))
-            return null;
-        return source._app.app_info;
-    },
-
-    _touchFile: function(file) {
-        let queryFlags = Gio.FileQueryInfoFlags.NONE;
-        let ioPriority = GLib.PRIORITY_DEFAULT;
-
-        let info = new Gio.FileInfo();
-        info.set_attribute_uint64(Gio.FILE_ATTRIBUTE_TIME_ACCESS,
-                                  GLib.get_real_time());
-        file.set_attributes_async (info, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    o.set_attributes_finish(res);
-                } catch(e) {
-                    log('Failed to update access time: ' + e.message);
-                }
-            });
-    },
-
-    _markTrusted: function(file) {
-        let modeAttr = Gio.FILE_ATTRIBUTE_UNIX_MODE;
-        let trustedAttr = 'metadata::trusted';
-        let queryFlags = Gio.FileQueryInfoFlags.NONE;
-        let ioPriority = GLib.PRIORITY_DEFAULT;
-
-        file.query_info_async(modeAttr, queryFlags, ioPriority, null,
-            (o, res) => {
-                try {
-                    let info = o.query_info_finish(res);
-                    let mode = info.get_attribute_uint32(modeAttr) | 0100;
-
-                    info.set_attribute_uint32(modeAttr, mode);
-                    info.set_attribute_string(trustedAttr, 'yes');
-                    file.set_attributes_async (info, queryFlags, ioPriority, null,
-                        (o, res) => {
-                            o.set_attributes_finish(res);
-
-                            // Hack: force nautilus to reload file info
-                            this._touchFile(file);
-                        });
-                } catch(e) {
-                    log('Failed to mark file as trusted: ' + e.message);
-                }
-            });
-    },
-
-    destroy: function() {
-        if (this._windowAddedId)
-            global.window_group.disconnect(this._windowAddedId);
-        this._windowAddedId = 0;
-
-        this._setDesktop(null);
-    },
-
-    handleDragOver: function(source, actor, x, y, time) {
-        let appInfo = this._getSourceAppInfo(source);
-        if (!appInfo)
-            return DND.DragMotionResult.CONTINUE;
-
-        return DND.DragMotionResult.COPY_DROP;
-    },
-
-    acceptDrop: function(source, actor, x, y, time) {
-        let appInfo = this._getSourceAppInfo(source);
-        if (!appInfo)
-            return false;
-
-        this.emit('app-dropped');
-
-        let desktop = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
-
-        let src = Gio.File.new_for_path(appInfo.get_filename());
-        let dst = Gio.File.new_for_path(GLib.build_filenamev([desktop, src.get_basename()]));
-
-        try {
-            // copy_async() isn't introspectable :-(
-            src.copy(dst, Gio.FileCopyFlags.OVERWRITE, null, null);
-            this._markTrusted(dst);
-        } catch(e) {
-            log('Failed to copy to desktop: ' + e.message);
-        }
-
-        return true;
-    }
-});
-Signals.addSignalMethods(DesktopTarget.prototype);
-
 const ApplicationsButton = new Lang.Class({
    Name: 'ApplicationsButton',
    Extends: PanelMenu.Button,

    _init: function() {
        this.parent(1.0, null, false);
+        this._hotCorner = Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];

-        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
+        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this, this._hotCorner));
        Main.panel.menuManager.addMenu(this.menu);

        // At this moment applications menu is not keyboard navigable at
@@ -431,46 +275,25 @@ const ApplicationsButton = new Lang.Class({
        // role ATK_ROLE_MENU like other elements of the panel.
        this.actor.accessible_role = Atk.Role.LABEL;

-        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
+        this._label = new St.Label({ text: _("Applications") });

-        this._label = new St.Label({ text: _("Applications"),
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
-        hbox.add_child(this._label);
-        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-
-        this.actor.add_actor(hbox);
+        this.actor.add_actor(this._label);
        this.actor.name = 'panelApplications';
        this.actor.label_actor = this._label;

        this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        this._showingId = Main.overview.connect('showing', Lang.bind(this, function() {
+        _showingId = Main.overview.connect('showing', Lang.bind(this, function() {
            this.actor.add_accessible_state (Atk.StateType.CHECKED);
        }));
-        this._hidingId = Main.overview.connect('hiding', Lang.bind(this, function() {
+        _hidingId = Main.overview.connect('hiding', Lang.bind(this, function() {
            this.actor.remove_accessible_state (Atk.StateType.CHECKED);
        }));
-        Main.layoutManager.connect('startup-complete',
-                                   Lang.bind(this, this._setKeybinding));
-        this._setKeybinding();

-        this._desktopTarget = new DesktopTarget();
-        this._desktopTarget.connect('app-dropped', () => {
-            this.menu.close();
-        });
-        this._desktopTarget.connect('desktop-changed', () => {
-            this._applicationsButtons.forEach(item => {
-                item.setDragEnabled(this._desktopTarget.hasDesktop);
-            });
-        });
-
-        this._applicationsButtons = new Map();
        this.reloadFlag = false;
        this._createLayout();
        this._display();
-        this._installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() {
+        _installedChangedId = appSys.connect('installed-changed', Lang.bind(this, function() {
            if (this.menu.isOpen) {
                this._redisplay();
                this.mainBox.show();
@@ -482,15 +305,11 @@ const ApplicationsButton = new Lang.Class({
        // Since the hot corner uses stage coordinates, Clutter won't
        // queue relayouts for us when the panel moves. Queue a relayout
        // when that happens.
-        this._panelBoxChangedId = Main.layoutManager.connect('panel-box-changed', Lang.bind(this, function() {
+        _panelBoxChangedId = Main.layoutManager.connect('panel-box-changed', Lang.bind(this, function() {
            container.queue_relayout();
        }));
    },

-    get hotCorner() {
-        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-    },
-
    _createVertSeparator: function() {
        let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
                                             pseudo_class: 'highlighted' });
@@ -498,22 +317,6 @@ const ApplicationsButton = new Lang.Class({
        return separator;
    },

-    _onDestroy: function() {
-        Main.overview.disconnect(this._showingId);
-        Main.overview.disconnect(this._hidingId);
-        Main.layoutManager.disconnect(this._panelBoxChangedId);
-        appSys.disconnect(this._installedChangedId);
-
-        Main.wm.setCustomKeybindingHandler('panel-main-menu',
-                                           Shell.ActionMode.NORMAL |
-                                           Shell.ActionMode.OVERVIEW,
-                                           Main.sessionMode.hasOverview ?
-                                           Lang.bind(Main.overview, Main.overview.toggle) :
-                                           null);
-
-        this._desktopTarget.destroy();
-    },
-
    _onCapturedEvent: function(actor, event) {
        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
            if (!Main.overview.shouldToggleByCornerOrButton())
@@ -559,15 +362,6 @@ const ApplicationsButton = new Lang.Class({
       this.parent(menu, open);
    },

-    _setKeybinding: function() {
-        Main.wm.setCustomKeybindingHandler('panel-main-menu',
-                                           Shell.ActionMode.NORMAL |
-                                           Shell.ActionMode.OVERVIEW,
-                                           Lang.bind(this, function() {
-                                               this.menu.toggle();
-                                           }));
-    },
-
    _redisplay: function() {
        this.applicationsBox.destroy_all_children();
        this.categoriesBox.destroy_all_children();
@@ -580,17 +374,11 @@ const ApplicationsButton = new Lang.Class({
        while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
            if (nextType == GMenu.TreeItemType.ENTRY) {
                let entry = iter.get_entry();
-                let id;
-                try {
-                    id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
-                } catch(e) {
-                    continue;
-                }
-                let app = appSys.lookup_app(id);
-                if (!app)
-                    app = new Shell.App({ app_info: entry.get_app_info() });
-                if (app.get_app_info().should_show())
+                if (!entry.get_app_info().get_nodisplay()) {
+                    let app = appSys.lookup_app_by_tree_entry(entry);
+                    let menu_id = dir.get_menu_id();
                    this.applicationsByCategory[categoryId].push(app);
+                }
            } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                let subdir = iter.get_directory();
                if (!subdir.get_is_nodisplay())
@@ -636,7 +424,7 @@ const ApplicationsButton = new Lang.Class({
        this.leftBox = new St.BoxLayout({ vertical: true });
        this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
                                                         y_align: St.Align.START,
-                                                         style_class: 'apps-menu vfade' });
+                                                         style_class: 'vfade' });
        this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        let vscroll = this.applicationsScrollBox.get_vscroll_bar();
        vscroll.connect('scroll-start', Lang.bind(this, function() {
@@ -668,7 +456,7 @@ const ApplicationsButton = new Lang.Class({
        this.applicationsBox = new St.BoxLayout({ vertical: true });
        this.applicationsScrollBox.add_actor(this.applicationsBox);
        this.categoriesBox = new St.BoxLayout({ vertical: true });
-        this.categoriesScrollBox.add_actor(this.categoriesBox);
+        this.categoriesScrollBox.add_actor(this.categoriesBox, { expand: true, x_fill: false });

        this.mainBox.add(this.leftBox);
        this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true});
@@ -677,14 +465,13 @@ const ApplicationsButton = new Lang.Class({
    },

    _display: function() {
-        this._applicationsButtons.clear();
-        this.mainBox.style=('width: 35em;');
+        this._applicationsButtons = new Array();
+        this.mainBox.style=('width: 640px;');
        this.mainBox.hide();

        //Load categories
        this.applicationsByCategory = {};
-        let tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
-        tree.load_sync();
+        let tree = appSys.get_tree();
        let root = tree.get_root_directory();
        let categoryMenuItem = new CategoryMenuItem(this, null);
        this.categoriesBox.add_actor(categoryMenuItem.actor);
@@ -736,14 +523,12 @@ const ApplicationsButton = new Lang.Class({
         if (apps) {
            for (let i = 0; i < apps.length; i++) {
               let app = apps[i];
-               let item = this._applicationsButtons.get(app);
-               if (!item) {
-                  item = new ApplicationMenuItem(this, app);
-                  item.setDragEnabled(this._desktopTarget.hasDesktop);
-                  this._applicationsButtons.set(app, item);
+               if (!this._applicationsButtons[app]) {
+                  let applicationMenuItem = new ApplicationMenuItem(this, app);
+                  this._applicationsButtons[app] = applicationMenuItem;
               }
-               if (!item.actor.get_parent())
-                  this.applicationsBox.add_actor(item.actor);
+               if (!this._applicationsButtons[app].actor.get_parent())
+                  this.applicationsBox.add_actor(this._applicationsButtons[app].actor);
            }
         }
    },
@@ -753,9 +538,6 @@ const ApplicationsButton = new Lang.Class({

        if (category_menu_id) {
            applist = this.applicationsByCategory[category_menu_id];
-            applist.sort(function(a,b) {
-                return a.get_name().toLowerCase() > b.get_name().toLowerCase();
-            });
        } else {
            applist = new Array();
            let favorites = global.settings.get_strv('favorite-apps');
@@ -766,6 +548,9 @@ const ApplicationsButton = new Lang.Class({
            }
        }

+        applist.sort(function(a,b) {
+            return a.get_name().toLowerCase() > b.get_name().toLowerCase();
+        });
        return applist;
    },

@@ -777,18 +562,40 @@ const ApplicationsButton = new Lang.Class({

 let appsMenuButton;
 let activitiesButton;
+let _hidingId;
+let _installedChangedId;
+let _panelBoxChangedId;
+let _showingId;

 function enable() {
    activitiesButton = Main.panel.statusArea['activities'];
    activitiesButton.container.hide();
    appsMenuButton = new ApplicationsButton();
    Main.panel.addToStatusArea('apps-menu', appsMenuButton, 1, 'left');
+
+    Main.wm.setCustomKeybindingHandler('panel-main-menu',
+                                       Shell.KeyBindingMode.NORMAL |
+                                       Shell.KeyBindingMode.OVERVIEW,
+                                       function() {
+                                           appsMenuButton.menu.toggle();
+                                       });
 }

 function disable() {
    Main.panel.menuManager.removeMenu(appsMenuButton.menu);
+    appSys.disconnect(_installedChangedId);
+    Main.layoutManager.disconnect(_panelBoxChangedId);
+    Main.overview.disconnect(_hidingId);
+    Main.overview.disconnect(_showingId);
    appsMenuButton.destroy();
    activitiesButton.container.show();
+
+    Main.wm.setCustomKeybindingHandler('panel-main-menu',
+                                       Shell.KeyBindingMode.NORMAL |
+                                       Shell.KeyBindingMode.OVERVIEW,
+                                       Main.sessionMode.hasOverview ?
+                                       Lang.bind(Main.overview, Main.overview.toggle) :
+                                       null);
 }

 function init(metadata) {
--- a/extensions/apps-menu/metadata.json.in
+++ b/extensions/apps-menu/metadata.json.in
@@ -3,7 +3,7 @@
 "uuid": "@uuid@",
 "gettext-domain": "@gettext_domain@",
 "name": "Applications Menu",
-"description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Add a gnome 2.x style menu for applications",
 "original-authors": [ "e2002@bk.ru", "debarshir@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
--- a/extensions/apps-menu/stylesheet.css
+++ b/extensions/apps-menu/stylesheet.css
@@ -1,7 +1 @@
-.apps-menu:ltr {
-    padding-right: 3px;
-}
-
-.apps-menu:rtl {
-    padding-left: 3px;
-}
+/* none used*/
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -40,13 +40,13 @@ const WindowMover = new Lang.Class({

    _ensureAtLeastWorkspaces: function(num, window) {
        for (let j = global.screen.n_workspaces; j <= num; j++) {
-            window.change_workspace_by_index(j-1, false);
+            window.change_workspace_by_index(j-1, false, global.get_current_time());
            global.screen.append_new_workspace(false, 0);
        }
    },

    _findAndMove: function(display, window, noRecurse) {
-        if (window.skip_taskbar)
+        if (!this._windowTracker.is_window_interesting(window))
            return;

        let spaces = this._settings.get_strv(SETTINGS_KEY);
@@ -73,7 +73,7 @@ const WindowMover = new Lang.Class({
                if (workspace_num >= global.screen.n_workspaces)
                    this._ensureAtLeastWorkspaces(workspace_num, window);

-                window.change_workspace_by_index(workspace_num, false);
+                window.change_workspace_by_index(workspace_num, false, global.get_current_time());
            }
        }
    }
@@ -89,40 +89,27 @@ function init() {

 function myCheckWorkspaces() {
    let i;
-    let emptyWorkspaces = new Array(this._workspaces.length);
+    let emptyWorkspaces = new Array(Main._workspaces.length);

-    if (!Meta.prefs_get_dynamic_workspaces()) {
-        this._checkWorkspacesId = 0;
-        return false;
-    }
-
-    for (i = 0; i < this._workspaces.length; i++) {
-        let lastRemoved = this._workspaces[i]._lastRemovedWindow;
-        if ((lastRemoved &&
-             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
-              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
-              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
-            this._workspaces[i]._keepAliveId)
+    for (i = 0; i < Main._workspaces.length; i++) {
+	let lastRemoved = Main._workspaces[i]._lastRemovedWindow;
+	if (lastRemoved &&
+            (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+             lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+             lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG))
            emptyWorkspaces[i] = false;
-        else
+	else
            emptyWorkspaces[i] = true;
    }

-    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
-    for (i = 0; i < sequences.length; i++) {
-        let index = sequences[i].get_workspace();
-        if (index >= 0 && index <= global.screen.n_workspaces)
-            emptyWorkspaces[index] = false;
-    }
-
    let windows = global.get_window_actors();
    for (i = 0; i < windows.length; i++) {
-	let winActor = windows[i];
-        let win = winActor.meta_window;
-	if (win.is_on_all_workspaces())
+	let win = windows[i];
+
+	if (win.get_meta_window().is_on_all_workspaces())
            continue;

-	let workspaceIndex = win.get_workspace().index();
+	let workspaceIndex = win.get_workspace();
 	emptyWorkspaces[workspaceIndex] = false;
    }

@@ -133,28 +120,48 @@ function myCheckWorkspaces() {
    }

    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-    emptyWorkspaces[activeWorkspaceIndex] = false;
+    let activeIsLast = activeWorkspaceIndex == global.screen.n_workspaces - 2;
+    let removingTrailWorkspaces = (emptyWorkspaces[activeWorkspaceIndex] &&
+                                   activeIsLast);
+    // Don't enter the overview when removing multiple empty workspaces at startup
+    let showOverview  = (removingTrailWorkspaces &&
+                         !emptyWorkspaces.every(function(x) { return x; }));
+
+    if (removingTrailWorkspaces) {
+        // "Merge" the empty workspace we are removing with the one at the end
+        Main.wm.blockAnimations();
+    }

    // Delete other empty workspaces; do it from the end to avoid index changes
    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
        if (emptyWorkspaces[i])
-            global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
+            global.screen.remove_workspace(Main._workspaces[i], global.get_current_time());
        else
            break;
    }

-    this._checkWorkspacesId = 0;
+    if (removingTrailWorkspaces) {
+        global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
+
+        Main.wm.unblockAnimations();
+
+        if (!Main.overview.visible && showOverview)
+            Main.overview.show();
+    }
+
+    Main._checkWorkspacesId = 0;
    return false;
 }

 function enable() {
-    prevCheckWorkspaces = Main.wm._workspaceTracker._checkWorkspaces;
-    Main.wm._workspaceTracker._checkWorkspaces = myCheckWorkspaces;
+    prevCheckWorkspaces = Main._checkWorkspaces;
+    if (Meta.prefs_get_dynamic_workspaces())
+	Main._checkWorkspaces = myCheckWorkspaces;

    winMover = new WindowMover();
 }

 function disable() {
-    Main.wm._workspaceTracker._checkWorkspaces = prevCheckWorkspaces;
+    Main._checkWorkspaces = prevCheckWorkspaces;
    winMover.destroy();
 }
--- a/extensions/auto-move-windows/metadata.json.in
+++ b/extensions/auto-move-windows/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Auto Move Windows",
- "description": "Move applications to specific workspaces when they create windows.",
+ "description": "Move applications to specific workspaces when they create windows",
 "shell-version": [ "@shell_current@" ],
 "original-authors": [ "alessandro.crismani@gmail.com", "thomas.bouffon@gmail.com" ],
 "url": "@url@"
--- a/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
+++ b/extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
@@ -3,8 +3,8 @@
    <key name="application-list" type="as">
      <!-- FIXME: should be a(su), when JS supports more of GVariant -->
      <default>[ ]</default>
-      <summary>Application and workspace list</summary>
-      <description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</description>
+      <_summary>Application and workspace list</_summary>
+      <_description>A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number</_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -37,7 +37,7 @@ const Widget = new GObject.Class({

    _init: function(params) {
 	this.parent(params);
-        this.set_orientation(Gtk.Orientation.VERTICAL);
+	this.set_orientation(Gtk.Orientation.VERTICAL);

 	this._settings = Convenience.getSettings();
 	this._settings.connect('changed', Lang.bind(this, this._refresh));
@@ -47,11 +47,6 @@ const Widget = new GObject.Class({
 	this._store.set_column_types([Gio.AppInfo, GObject.TYPE_STRING, Gio.Icon, GObject.TYPE_INT,
                                      Gtk.Adjustment]);

-        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN});
-        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this.add(scrolled);
-
-
 	this._treeView = new Gtk.TreeView({ model: this._store,
                                            hexpand: true, vexpand: true });
 	this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
@@ -75,29 +70,22 @@ const Widget = new GObject.Class({
        workspaceColumn.add_attribute(workspaceRenderer, "text", Columns.WORKSPACE);
 	this._treeView.append_column(workspaceColumn);

-	scrolled.add(this._treeView);
+	this.add(this._treeView);

-	let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+	let toolbar = new Gtk.Toolbar();
 	toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
 	this.add(toolbar);

-	let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
-                                             label: _("Add Rule"),
+	let newButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_NEW,
+                                             label: _("Add rule"),
 					     is_important: true });
 	newButton.connect('clicked', Lang.bind(this, this._createNew));
 	toolbar.add(newButton);

-	let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic'  });
+	let delButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_DELETE });
 	delButton.connect('clicked', Lang.bind(this, this._deleteSelected));
 	toolbar.add(delButton);

-        let selection = this._treeView.get_selection();
-        selection.connect('changed',
-            function() {
-                delButton.sensitive = selection.count_selected_rows() > 0;
-            });
-        delButton.sensitive = selection.count_selected_rows() > 0;
-
 	this._changedPermitted = true;
 	this._refresh();
    },
@@ -105,27 +93,18 @@ const Widget = new GObject.Class({
    _createNew: function() {
 	let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
 				      transient_for: this.get_toplevel(),
-                                      use_header_bar: true,
 				      modal: true });
 	dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
-	let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
+	dialog.add_button(_("Add"), Gtk.ResponseType.OK);
        dialog.set_default_response(Gtk.ResponseType.OK);

 	let grid = new Gtk.Grid({ column_spacing: 10,
                                  row_spacing: 15,
                                  margin: 10 });
 	dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
-        dialog._appChooser.connect('application-selected', Lang.bind(this,
-            function(w, appInfo) {
-                addButton.sensitive = appInfo &&
-                                      this._checkId(appInfo.get_id());
-            }));
-        let appInfo = dialog._appChooser.get_app_info();
-        addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
-
 	grid.attach(dialog._appChooser, 0, 0, 2, 1);
-	grid.attach(new Gtk.Label({ label: _("Workspace"),
-                                    halign: Gtk.Align.END }), 0, 1, 1, 1);
+	grid.attach(new Gtk.Label({ label: _("Workspace") }),
+		    0, 1, 1, 1);
 	let adjustment = new Gtk.Adjustment({ lower: 1,
 					      upper: WORKSPACE_MAX,
 					      step_increment: 1
@@ -150,9 +129,10 @@ const Widget = new GObject.Class({
 		index = 1;

 	    this._changedPermitted = false;
-	    this._appendItem(appInfo.get_id(), index);
-	    this._changedPermitted = true;
-
+	    if (!this._appendItem(appInfo.get_id(), index)) {
+                this._changedPermitted = true;
+                return;
+            }
 	    let iter = this._store.append();
 	    let adj = new Gtk.Adjustment({ lower: 1,
 					   upper: WORKSPACE_MAX,
@@ -161,6 +141,7 @@ const Widget = new GObject.Class({
 	    this._store.set(iter,
 			    [Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE, Columns.ADJUSTMENT],
 			    [appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
+	    this._changedPermitted = true;

            dialog.destroy();
 	}));
@@ -175,8 +156,8 @@ const Widget = new GObject.Class({

 	    this._changedPermitted = false;
 	    this._removeItem(appInfo.get_id());
-	    this._changedPermitted = true;
 	    this._store.remove(iter);
+	    this._changedPermitted = true;
 	}
    },

@@ -224,15 +205,20 @@ const Widget = new GObject.Class({
 	    this._settings.set_strv(SETTINGS_KEY, validItems);
    },

-    _checkId: function(id) {
-        let items = this._settings.get_strv(SETTINGS_KEY);
-        return !items.some(function(i) { return i.startsWith(id + ':'); });
-    },
-
    _appendItem: function(id, workspace) {
 	let currentItems = this._settings.get_strv(SETTINGS_KEY);
+	let alreadyHave = currentItems.map(function(el) {
+	    return el.split(':')[0];
+	}).indexOf(id) != -1;
+
+	if (alreadyHave) {
+            printerr("Already have an item for this id");
+	    return false;
+        }
+
 	currentItems.push(id + ':' + workspace);
 	this._settings.set_strv(SETTINGS_KEY, currentItems);
+        return true;
    },

    _removeItem: function(id) {
@@ -267,7 +253,7 @@ function init() {
 }

 function buildPrefsWidget() {
-    let widget = new Widget({ margin: 12 });
+    let widget = new Widget();
    widget.show_all();

    return widget;
--- a/extensions/default-min-max/Makefile.am
+++ b/extensions/default-min-max/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = default-min-max
+
+include ../../extension.mk
--- a/extensions/default-min-max/extension.js
+++ b/extensions/default-min-max/extension.js
@@ -0,0 +1,20 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+
+const Meta = imports.gi.Meta;
+
+const BUTTON_LAYOUT_KEY = 'button-layout';
+const EXTENSION_SCHEMA = 'org.gnome.desktop.wm.preferences';
+const SHELL_OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
+
+function init(metadata) {
+}
+
+function enable() {
+    // Override gnome-shell's overrides
+    Meta.prefs_override_preference_schema(BUTTON_LAYOUT_KEY, EXTENSION_SCHEMA);
+}
+
+function disable() {
+    // Restore gnome-shell's overrides
+    Meta.prefs_override_preference_schema(BUTTON_LAYOUT_KEY, SHELL_OVERRIDES_SCHEMA);
+}
--- a/extensions/default-min-max/metadata.json.in
+++ b/extensions/default-min-max/metadata.json.in
@@ -0,0 +1,11 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "Default Minimize and Maximize",
+"description": "Adds minimize and maximize buttons to the titlebar by default",
+"original-authors": [ "debarshir@gnome.org" ],
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}
--- a/extensions/default-min-max/stylesheet.css
+++ b/extensions/default-min-max/stylesheet.css
@@ -0,0 +1 @@
+/* This extensions requires no special styling */
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -1,5 +1,4 @@
 // Drive menu extension
-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
@@ -26,7 +25,7 @@ const MountMenuItem = new Lang.Class({
 	this.parent();

 	this.label = new St.Label({ text: mount.get_name() });
-	this.actor.add(this.label, { expand: true });
+	this.addActor(this.label);
        this.actor.label_actor = this.label;

 	this.mount = mount;
@@ -35,40 +34,7 @@ const MountMenuItem = new Lang.Class({
 				      style_class: 'popup-menu-icon ' });
 	let ejectButton = new St.Button({ child: ejectIcon });
 	ejectButton.connect('clicked', Lang.bind(this, this._eject));
-	this.actor.add(ejectButton);
-
-        this._changedId = mount.connect('changed', Lang.bind(this, this._syncVisibility));
-        this._syncVisibility();
-    },
-
-    destroy: function() {
-        if (this._changedId) {
-            this.mount.disconnect(this._changedId);
-            this._changedId = 0;
-        }
-
-        this.parent();
-    },
-
-    _isInteresting: function() {
-        if (!this.mount.can_eject() && !this.mount.can_unmount())
-            return false;
-        if (this.mount.is_shadowed())
-            return false;
-
-        let volume = this.mount.get_volume();
-
-        if (volume == null) {
-            // probably a GDaemonMount, could be network or
-            // local, but we can't tell; assume it's local for now
-            return true;
-        }
-
-        return volume.get_identifier('class') != 'network';
-    },
-
-    _syncVisibility: function() {
-        this.actor.visible = this._isInteresting();
+	this.addActor(ejectButton);
    },

    _eject: function() {
@@ -103,14 +69,13 @@ const MountMenuItem = new Lang.Class({
    },

    _reportFailure: function(exception) {
-	let msg = _("Ejecting drive “%s” failed:").format(this.mount.get_name());
+	let msg = _("Ejecting drive '%s' failed:").format(this.mount.get_name());
 	Main.notifyError(msg, exception.message);
    },

    activate: function(event) {
-        let context = global.create_app_launch_context(event.get_time(), -1);
        Gio.AppInfo.launch_default_for_uri(this.mount.get_root().get_uri(),
-                                           context);
+                                           global.create_app_launch_context());

 	this.parent(event);
    }
@@ -118,18 +83,10 @@ const MountMenuItem = new Lang.Class({

 const DriveMenu = new Lang.Class({
    Name: 'DriveMenu.DriveMenu',
-    Extends: PanelMenu.Button,
+    Extends: PanelMenu.SystemStatusButton,

    _init: function() {
-        this.parent(0.0, _("Removable devices"));
-
-        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
-                                 style_class: 'system-status-icon' });
-
-        hbox.add_child(icon);
-        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-        this.actor.add_child(hbox);
+	this.parent('media-eject-symbolic', _("Removable devices"));

 	this._monitor = Gio.VolumeMonitor.get();
 	this._addedId = this._monitor.connect('mount-added', Lang.bind(this, function(monitor, mount) {
@@ -146,9 +103,9 @@ const DriveMenu = new Lang.Class({
 	this._monitor.get_mounts().forEach(Lang.bind(this, this._addMount));

 	this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-	this.menu.addAction(_("Open Files"), function(event) {
+	this.menu.addAction(_("Open File"), function(event) {
 	    let appSystem = Shell.AppSystem.get_default();
-	    let app = appSystem.lookup_app('org.gnome.Nautilus.desktop');
+	    let app = appSystem.lookup_app('nautilus.desktop');
 	    app.activate_full(-1, event.get_time());
 	});

@@ -156,19 +113,40 @@ const DriveMenu = new Lang.Class({
    },

    _updateMenuVisibility: function() {
-	if (this._mounts.filter(function(i) i.actor.visible).length > 0)
+	if (this._mounts.length > 0)
 	    this.actor.show();
 	else
 	    this.actor.hide();
    },

+    _isMountInteresting: function(mount) {
+        if (!mount.can_eject() && !mount.can_unmount())
+            return false;
+
+        let volume = mount.get_volume();
+
+        if (volume == null) {
+            // probably a GDaemonMount, could be network or
+            // local, but we can't tell; assume it's local for now
+            return true;
+        }
+
+        return volume.get_identifier('class') != 'network';
+    },
+
    _addMount: function(mount) {
+	if (!this._isMountInteresting(mount))
+	    return;
+
 	let item = new MountMenuItem(mount);
 	this._mounts.unshift(item);
 	this.menu.addMenuItem(item, 0);
    },

    _removeMount: function(mount) {
+	if (!this._isMountInteresting(mount))
+	    return;
+
 	for (let i = 0; i < this._mounts.length; i++) {
 	    let item = this._mounts[i];
 	    if (item.mount == mount) {
--- a/extensions/drive-menu/metadata.json.in
+++ b/extensions/drive-menu/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Removable Drive Menu",
- "description": "A status menu for accessing and unmounting removable devices.",
+ "description": "A status menu for accessing and unmounting removable devices",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/example/org.gnome.shell.extensions.example.gschema.xml.in
+++ b/extensions/example/org.gnome.shell.extensions.example.gschema.xml.in
@@ -2,8 +2,8 @@
  <schema id="org.gnome.shell.extensions.example" path="/org/gnome/shell/extensions/example/">
    <key name="hello-text" type="s">
      <default>''</default>
-      <summary>Alternative greeting text.</summary>
-      <description>If not empty, it contains the text that will be shown when clicking on the panel.</description>
+      <_summary>Alternative greeting text.</_summary>
+      <_description>If not empty, it contains the text that will be shown when clicking on the panel.</_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/example/prefs.js
+++ b/extensions/example/prefs.js
@@ -23,29 +23,24 @@ const ExamplePrefsWidget = new GObject.Class({

    _init: function(params) {
 	this.parent(params);
-        this.margin = 12;
-        this.row_spacing = this.column_spacing = 6;
-        this.set_orientation(Gtk.Orientation.VERTICAL);
-
-	this.add(new Gtk.Label({ label: '<b>' + _("Message") + '</b>',
-                                 use_markup: true,
-                                 halign: Gtk.Align.START }));
-
-        let entry = new Gtk.Entry({ hexpand: true,
-                                    margin_bottom: 12 });
-        this.add(entry);
-
-	this._settings = Convenience.getSettings();
-	this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
+        this.margin = this.row_spacing = this.column_spacing = 10;

 	// TRANSLATORS: Example is the name of the extension, should not be
 	// translated
 	let primaryText = _("Example aims to show how to build well behaved \
 extensions for the Shell and as such it has little functionality on its own.\n\
-Nevertheless it’s possible to customize the greeting message.");
+Nevertheless it's possible to customize the greeting message.");

-	this.add(new Gtk.Label({ label: primaryText,
-                                 wrap: true, xalign: 0 }));
+	this.attach(new Gtk.Label({ label: primaryText, wrap: true }), 0, 0, 2, 1);
+
+	this.attach(new Gtk.Label({ label: '<b>' + _("Message:") + '</b>', use_markup: true }),
+		    0, 1, 1, 1);
+
+	let entry = new Gtk.Entry({ hexpand: true });
+	this.attach(entry, 1, 1, 1, 1);
+
+	this._settings = Convenience.getSettings();
+	this._settings.bind('hello-text', entry, 'text', Gio.SettingsBindFlags.DEFAULT);
    }
 });

--- a/extensions/launch-new-instance/extension.js
+++ b/extensions/launch-new-instance/extension.js
@@ -1,17 +1,37 @@
+const Main = imports.ui.main;
 const AppDisplay = imports.ui.appDisplay;

-let _activateOriginal = null;
+var _onActivateOriginal = null;
+var _activateResultOriginal = null;
+
+function _onActivate(event) {
+
+  this.emit('launching');
+
+  if (this._onActivateOverride) {
+    this._onActivateOverride(event);
+  } else {
+    this.app.open_new_window(-1);
+  }
+  Main.overview.hide();
+}
+
+function _activateResult(app) {
+  app.open_new_window(-1);
+}

 function init() {
 }

 function enable() {
-  _activateOriginal = AppDisplay.AppIcon.prototype.activate;
-  AppDisplay.AppIcon.prototype.activate = function() {
-      _activateOriginal.call(this, 2);
-  };
+  _onActivateOriginal = AppDisplay.AppIcon.prototype._onActivate;
+  AppDisplay.AppIcon.prototype._onActivate = _onActivate;
+
+  _activateResultOriginal = AppDisplay.AppSearchProvider.prototype.activateResult;
+  AppDisplay.AppSearchProvider.prototype.activateResult = _activateResult;
 }

 function disable() {
-  AppDisplay.AppIcon.prototype.activate = _activateOriginal;
+  AppDisplay.AppIcon.prototype._onActivate = _onActivateOriginal;
+  AppDisplay.AppSearchProvider.prototype.activateResult = _activateResultOriginal;
 }
--- a/extensions/launch-new-instance/metadata.json.in
+++ b/extensions/launch-new-instance/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Launch new instance",
-"description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Always launch a new instance",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/native-window-placement/extension.js
+++ b/extensions/native-window-placement/extension.js
@@ -36,7 +36,7 @@ const PLACE_WINDOW_CAPTIONS_ON_TOP = true;                          // place win
 const WORKSPACE_BORDER_GAP = 10;                                    // minimum gap between the workspace area and the workspace selector
 const WINDOW_AREA_TOP_GAP = 20;                                     // minimum gap between the workspace area and the top border. This keeps window captions and close buttons visible. 13px (26/2) should currently be enough.

-const BUTTON_LAYOUT_SCHEMA = 'org.gnome.desktop.wm.preferences';
+const BUTTON_LAYOUT_SCHEMA = 'org.gnome.shell.overrides';
 const BUTTON_LAYOUT_KEY = 'button-layout';

 function injectToFunction(parent, name, func) {
@@ -138,19 +138,57 @@ function enable() {
     * PresentWindowsEffect::calculateWindowTransformationsNatural() from KDE, see:
     * https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/master/entry/kwin/effects/presentwindows/presentwindows.cpp
     */
-    Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones, area) {
+    Workspace.Workspace.prototype._calculateWindowTransformationsNatural = function(clones) {
        // As we are using pseudo-random movement (See "slot") we need to make sure the list
        // is always sorted the same way no matter which window is currently active.
+        clones = clones.sort(function (win1, win2) {
+            return win2.metaWindow.get_stable_sequence() - win1.metaWindow.get_stable_sequence();
+        });

-        let area_rect = new Rect(area.x, area.y, area.width, area.height);
-        let bounds = area_rect.copy();
+        let node = this.actor.get_theme_node();
+        let columnSpacing = node.get_length('-horizontal-spacing');
+        let rowSpacing = node.get_length('-vertical-spacing');
+        let padding = {
+            left: node.get_padding(St.Side.LEFT),
+            top: node.get_padding(St.Side.TOP),
+            bottom: node.get_padding(St.Side.BOTTOM),
+            right: node.get_padding(St.Side.RIGHT),
+        };
+
+        let closeButtonHeight, captionHeight;
+        let leftBorder, rightBorder;
+        // If the window captions are below the window, put an additional gap to account for them
+        if (!windowCaptionsOnTop && this._windowOverlays.length) {
+            // All of the overlays have the same chrome sizes,
+            // so just pick the first one.
+            let overlay = this._windowOverlays[0];
+            [closeButtonHeight, captionHeight] = overlay.chromeHeights();
+            [leftBorder, rightBorder] = overlay.chromeWidths();
+        } else {
+            [closeButtonHeight, captionHeight] = [0, 0];
+            [leftBorder, rightBorder] = [0, 0];
+        }
+
+        rowSpacing += captionHeight;
+        columnSpacing += (rightBorder + leftBorder) / 2;
+        padding.top += closeButtonHeight;
+        padding.bottom += captionHeight;
+        padding.left += leftBorder;
+        padding.right += rightBorder;
+
+        let area = new Rect(this._x + padding.left,
+                            this._y + padding.top,
+                            this._width - padding.left - padding.right,
+                            this._height - padding.top - padding.bottom);
+
+        let bounds = area.copy();

        let direction = 0;
        let directions = [];
        let rects = [];
        for (let i = 0; i < clones.length; i++) {
            // save rectangles into 4-dimensional arrays representing two corners of the rectangular: [left_x, top_y, right_x, bottom_y]
-            let rect = clones[i].metaWindow.get_frame_rect();
+            let rect = clones[i].metaWindow.get_outer_rect();
            rects[i] = new Rect(rect.x, rect.y, rect.width, rect.height);
            bounds = bounds.union(rects[i]);

@@ -186,7 +224,7 @@ function enable() {
                        if (diff[0] == 0 && diff[1] == 0)
                            diff[0] = 1;
                        // Try to keep screen/workspace aspect ratio
-                        if ( bounds.height / bounds.width > area_rect.height / area_rect.width )
+                        if ( bounds.height / bounds.width > area.height / area.width )
                            diff[0] *= 2;
                        else
                            diff[1] *= 2;
@@ -258,15 +296,15 @@ function enable() {

        // Work out scaling by getting the most top-left and most bottom-right window coords.
        let scale;
-        scale = Math.min(area_rect.width / bounds.width,
-                         area_rect.height / bounds.height,
+        scale = Math.min(area.width / bounds.width,
+                         area.height / bounds.height,
                         1.0);

        // Make bounding rect fill the screen size for later steps
-        bounds.x = bounds.x - (area_rect.width - bounds.width * scale) / 2;
-        bounds.y = bounds.y - (area_rect.height - bounds.height * scale) / 2;
-        bounds.width = area_rect.width / scale;
-        bounds.height = area_rect.height / scale;
+        bounds.x = bounds.x - (area.width - bounds.width * scale) / 2;
+        bounds.y = bounds.y - (area.height - bounds.height * scale) / 2;
+        bounds.width = area.width / scale;
+        bounds.height = area.height / scale;

        // Move all windows back onto the screen and set their scale
        for (let i = 0; i < rects.length; i++) {
@@ -281,157 +319,137 @@ function enable() {
        let buttonOuterHeight, captionHeight;
        let buttonOuterWidth = 0;

-        let slots = [];
+        let targets = [];
        for (let i = 0; i < rects.length; i++) {
-            rects[i].x = rects[i].x * scale + area_rect.x;
-            rects[i].y = rects[i].y * scale + area_rect.y;
+            rects[i].x = rects[i].x * scale + area.x;
+            rects[i].y = rects[i].y * scale + area.y;

-            slots.push([rects[i].x, rects[i].y, scale, clones[i]]);
+            targets[i] = [rects[i].x, rects[i].y, scale];
        }

-        return slots;
+        return [clones, targets];
    }
    workspaceInjections['_calculateWindowTransformationsNatural'] = undefined;

    /**
-     * _updateWindowPositions:
+     * _realPositionWindows:
     * @flags:
     *  INITIAL - this is the initial positioning of the windows.
     *  ANIMATE - Indicates that we need animate changing position.
     */
-    workspaceInjections['_updateWindowPositions'] = Workspace.Workspace.prototype._updateWindowPositions;
-    Workspace.Workspace.prototype._updateWindowPositions = function(flags) {
-            if (this._currentLayout == null) {
-                this._recalculateWindowPositions(flags);
-                return;
-            }
-
-            let initialPositioning = flags & WindowPositionFlags.INITIAL;
-            let animate = flags & WindowPositionFlags.ANIMATE;
-
-            let layout = this._currentLayout;
-            let strategy = layout.strategy;
-
-            let [, , padding] = this._getSpacingAndPadding();
-            let area = Workspace.padArea(this._actualGeometry, padding);
-
-            /// EDIT replace this version by our own:
-            //let slots = strategy.computeWindowSlots(layout, area);
-
-
-            /// EDIT copied from _realRecalculateWindowPositions:
-            let clones = this._windows.slice();
-            if (clones.length == 0)
-                return;
-
-            clones.sort(function(a, b) {
-                return a.metaWindow.get_stable_sequence() - b.metaWindow.get_stable_sequence();
-            });
-
-            if (this._reservedSlot)
-                clones.push(this._reservedSlot);
-
-            /// EDIT our own window placement function:
-            let slots = this._calculateWindowTransformationsNatural(clones, area);
-
-
-            let currentWorkspace = global.screen.get_active_workspace();
-            let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
-
-            for (let i = 0; i < slots.length; i++) {
-                let slot = slots[i];
-                let [x, y, scale, clone] = slot;
-                let metaWindow = clone.metaWindow;
-                let overlay = clone.overlay;
-                clone.slotId = i;
-
-                // Positioning a window currently being dragged must be avoided;
-                // we'll just leave a blank spot in the layout for it.
-                if (clone.inDrag)
-                    continue;
-
-                let cloneWidth = clone.actor.width * scale;
-                let cloneHeight = clone.actor.height * scale;
-                clone.slot = [x, y, cloneWidth, cloneHeight];
-
-                if (overlay && (initialPositioning || !clone.positioned))
-                    overlay.hide();
-
-                if (!clone.positioned) {
-                    // This window appeared after the overview was already up
-                    // Grow the clone from the center of the slot
-                    clone.actor.x = x + cloneWidth / 2;
-                    clone.actor.y = y + cloneHeight / 2;
-                    clone.actor.scale_x = 0;
-                    clone.actor.scale_y = 0;
-                    clone.positioned = true;
-                }
-
-                if (animate && isOnCurrentWorkspace) {
-                    if (!metaWindow.showing_on_its_workspace()) {
-                        /* Hidden windows should fade in and grow
-                         * therefore we need to resize them now so they
-                         * can be scaled up later */
-                        if (initialPositioning) {
-                            clone.actor.opacity = 0;
-                            clone.actor.scale_x = 0;
-                            clone.actor.scale_y = 0;
-                            clone.actor.x = x;
-                            clone.actor.y = y;
-                        }
-
-                        Tweener.addTween(clone.actor,
-                                         { opacity: 255,
-                                           time: Overview.ANIMATION_TIME,
-                                           transition: 'easeInQuad'
-                                         });
-                    }
-
-                    this._animateClone(clone, overlay, x, y, scale, initialPositioning);
-                } else {
-                    // cancel any active tweens (otherwise they might override our changes)
-                    Tweener.removeTweens(clone.actor);
-                    clone.actor.set_position(x, y);
-                    clone.actor.set_scale(scale, scale);
-                    clone.overlay.relayout(false);
-                    this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
-                }
-            }
+    workspaceInjections['_realPositionWindows'] = Workspace.Workspace.prototype._realPositionWindows;
+    Workspace.Workspace.prototype._realPositionWindows = function(flags) {
+        if (this._repositionWindowsId > 0) {
+            Mainloop.source_remove(this._repositionWindowsId);
+            this._repositionWindowsId = 0;
        }

+        let clones = this._windows.slice();
+        if (this._reservedSlot)
+            clones.push(this._reservedSlot);

+        let initialPositioning = flags & WindowPositionFlags.INITIAL;
+        let animate = flags & WindowPositionFlags.ANIMATE;
+
+        // Start the animations
+        let targets = [];
+        let scales = [];
+
+        [clones, targets] = this._calculateWindowTransformationsNatural(clones);
+
+        let currentWorkspace = global.screen.get_active_workspace();
+        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
+
+        for (let i = 0; i < clones.length; i++) {
+            let clone = clones[i];
+            let [x, y , scale] = targets[i];
+            let metaWindow = clone.metaWindow;
+            let mainIndex = this._lookupIndex(metaWindow);
+            let overlay = this._windowOverlays[mainIndex];
+            clone.slotId = i;
+
+            // Positioning a window currently being dragged must be avoided;
+            // we'll just leave a blank spot in the layout for it.
+            if (clone.inDrag)
+                continue;
+
+            clone.slot = [x, y, clone.actor.width * scale, clone.actor.height * scale];
+
+            if (overlay && initialPositioning)
+                overlay.hide(initialPositioning);
+
+            if (animate && isOnCurrentWorkspace) {
+                if (!metaWindow.showing_on_its_workspace()) {
+                    /* Hidden windows should fade in and grow
+                     * therefore we need to resize them now so they
+                     * can be scaled up later */
+                    if (initialPositioning) {
+                        clone.actor.opacity = 0;
+                        clone.actor.scale_x = 0;
+                        clone.actor.scale_y = 0;
+                        clone.actor.x = x;
+                        clone.actor.y = y;
+                    }
+
+                    // Make the window slightly transparent to indicate it's hidden
+                    Tweener.addTween(clone.actor,
+                                     { opacity: 255,
+                                       time: Overview.ANIMATION_TIME,
+                                       transition: 'easeInQuad'
+                                     });
+                }
+
+                this._animateClone(clone, overlay, x, y, scale, initialPositioning);
+            } else {
+                clone.actor.set_position(x, y);
+                clone.actor.set_scale(scale, scale);
+                clone.overlay.relayout(false);
+                this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
+            }
+        }
+    }

    /// position window titles on top of windows in overlay ////
    if (windowCaptionsOnTop) {
+        winInjections['chromeHeights'] = Workspace.WindowOverlay.prototype.chromeHeights;
+        Workspace.WindowOverlay.prototype.chromeHeights = function () {
+            return [Math.max( this.closeButton.height - this.closeButton._overlap, this.title.height - this.title._overlap),
+                    0];
+        };

-        /// This is almost a direct copy of the original relayout function. Differences are marked.
-        winInjections['relayout'] = Workspace.WindowOverlay.prototype.relayout;
-        Workspace.WindowOverlay.prototype.relayout = function(animate) {
-            winInjections['relayout'].call(this, animate);
+        winInjections['updatePositions'] = Workspace.WindowOverlay.prototype.updatePositions;
+        Workspace.WindowOverlay.prototype.updatePositions = function(cloneX, cloneY, cloneWidth, cloneHeight, animate) {
+            let button = this.closeButton;
            let title = this.title;
-            let border = this.border;

-            this._parentActor.set_child_above_sibling(title, border);
+            let settings = new Gio.Settings({ schema: BUTTON_LAYOUT_SCHEMA });
+            let layout = settings.get_string(BUTTON_LAYOUT_KEY);
+            let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;

-            Tweener.removeTweens(title);
+            let split = layout.split(":");
+            let side;
+            if (split[0].indexOf("close") > -1)
+                side = rtl ? St.Side.RIGHT : St.Side.LEFT;
+            else
+                side = rtl ? St.Side.LEFT : St.Side.RIGHT;

-            let [cloneX, cloneY, cloneWidth, cloneHeight] = this._windowClone.slot;
+            let buttonX;
+            let buttonY = cloneY - (button.height - button._overlap);
+            if (side == St.Side.LEFT)
+                buttonX = cloneX - (button.width - button._overlap);
+            else
+                buttonX = cloneX + (cloneWidth - button._overlap);

-            // Clutter.Actor.get_preferred_width() will return the fixed width if one
-            // is set, so we need to reset the width by calling set_width(-1), to forward
-            // the call down to StLabel.
-            // We also need to save and restore the current width, otherwise the animation
-            // starts from the wrong point.
-            let prevTitleWidth = title.width;
-            title.set_width(-1);
-            let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
-            let titleWidth = Math.max(titleMinWidth, Math.min(titleNatWidth, cloneWidth));
-            title.width = prevTitleWidth;
+            if (animate)
+                this._animateOverlayActor(button, Math.floor(buttonX), Math.floor(buttonY), button.width);
+            else
+                button.set_position(Math.floor(buttonX), Math.floor(buttonY));
+
+            if (!title.fullWidth)
+                title.fullWidth = title.width;
+            let titleWidth = Math.min(title.fullWidth, cloneWidth);

            let titleX = cloneX + (cloneWidth - titleWidth) / 2;
-
-            /// this is the actual difference to original gnome-shell:
-            //let titleY = cloneY + cloneHeight + title._spacing;
            let titleY = cloneY - title.height + title._spacing;

            if (animate)
@@ -452,8 +470,6 @@ function removeInjection(object, injection, name) {
 }

 function disable() {
-    var i;
-
    for (i in workspaceInjections)
        removeInjection(Workspace.Workspace.prototype, workspaceInjections, i);
    for (i in winInjections)
--- a/extensions/native-window-placement/metadata.json.in
+++ b/extensions/native-window-placement/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Native Window Placement",
- "description": "Arrange windows in overview in a more compact way.",
+ "description": "Arrange windows in overview in a more native way",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@",
 "original-authors": [ "wepmaschda@gmx.de" ]
--- a/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
+++ b/extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
@@ -2,15 +2,15 @@
  <schema id="org.gnome.shell.extensions.native-window-placement" path="/org/gnome/shell/extensions/native-window-placement/">
    <key name="use-more-screen" type="b">
      <default>true</default>
-      <summary>Use more screen for windows</summary>
-      <description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating
-      them further to reduce the bounding box. This setting applies only with the natural placement strategy.</description>
+      <_summary>Use more screen for windows</_summary>
+      <_description>Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating
+      them further to reduce the bounding box. This setting applies only with the natural placement strategy.</_description>
    </key>
    <key name="window-captions-on-top" type="b">
      <default>true</default>
-      <summary>Place window captions on top</summary>
-      <description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at
-      the bottom. Changing this setting requires restarting the shell to have any effect.</description>
+      <_summary>Place window captions on top</_summary>
+      <_description>If true, place window captions on top the respective thumbnail, overriding shell default of placing it at
+      the bottom. Changing this setting requires restarting the shell to have any effect.</_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
@@ -33,10 +32,10 @@ const PlaceMenuItem = new Lang.Class({

        this._icon = new St.Icon({ gicon: info.icon,
                                   icon_size: PLACE_ICON_SIZE });
-	this.actor.add_child(this._icon);
+	this.addActor(this._icon);

        this._label = new St.Label({ text: info.name });
-        this.actor.add_child(this._label);
+        this.addActor(this._label);

        this._changedId = info.connect('changed',
                                       Lang.bind(this, this._propertiesChanged));
@@ -75,15 +74,9 @@ const PlacesMenu = new Lang.Class({
    Extends: PanelMenu.Button,

    _init: function() {
-        this.parent(0.0, _("Places"));
-
-        let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        let label = new St.Label({ text: _("Places"),
-                                   y_expand: true,
-                                   y_align: Clutter.ActorAlign.CENTER });
-        hbox.add_child(label);
-        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-        this.actor.add_actor(hbox);
+        let label = new St.Label({ text: _("Places") });
+        this.parent(0.0, label.text);
+        this.actor.add_actor(label);

        this.placesManager = new PlaceDisplay.PlacesManager();

--- a/extensions/places-menu/metadata.json.in
+++ b/extensions/places-menu/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Places Status Indicator",
-"description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Add a systems status menu for quickly navigating places in the system",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -18,13 +18,9 @@ const Gettext = imports.gettext.domain('gnome-shell-extensions');
 const _ = Gettext.gettext;
 const N_ = function(x) { return x; }

-const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
-
-const Hostname1Iface = '<node> \
-<interface name="org.freedesktop.hostname1"> \
-<property name="PrettyHostname" type="s" access="read" /> \
-</interface> \
-</node>';
+const Hostname1Iface = <interface name="org.freedesktop.hostname1">
+<property name="PrettyHostname" type="s" access="read" />
+</interface>;
 const Hostname1 = Gio.DBusProxy.makeProxyWrapper(Hostname1Iface);

 const PlaceInfo = new Lang.Class({
@@ -44,68 +40,42 @@ const PlaceInfo = new Lang.Class({
        return false;
    },

-    _createLaunchCallback: function(launchContext, tryMount) {
-        return (_ignored, result) => {
-            try {
-                Gio.AppInfo.launch_default_for_uri_finish(result);
-            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                this.file.mount_enclosing_volume(0, null, null, (file, result) => {
-                    try {
-                        file.mount_enclosing_volume_finish(result);
-                    } catch(e) {
-                        Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
-                        return;
-                    }
+    launch: function(timestamp) {
+        let launchContext = global.create_app_launch_context();
+        launchContext.set_timestamp(timestamp);

-                    if (tryMount) {
-                        let callback = this._createLaunchCallback(launchContext, false);
-                        Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
-                                                                 launchContext,
-                                                                 null,
-                                                                 callback);
-                    }
-                });
-            } catch(e) {
-                Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
-            }
+        try {
+            Gio.AppInfo.launch_default_for_uri(this.file.get_uri(),
+                                               launchContext);
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+            this.file.mount_enclosing_volume(0, null, null, function(file, result) {
+                file.mount_enclosing_volume_finish(result);
+                Gio.AppInfo.launch_default_for_uri(file.get_uri(), launchContext);
+            });
+        } catch(e) {
+            Main.notifyError(_("Failed to launch \"%s\"").format(this.name), e.message);
        }
    },

-    launch: function(timestamp) {
-        let launchContext = global.create_app_launch_context(timestamp, -1);
-        let callback = this._createLaunchCallback(launchContext, true);
-        Gio.AppInfo.launch_default_for_uri_async(this.file.get_uri(),
-                                                 launchContext,
-                                                 null,
-                                                 callback);
-    },
-
    getIcon: function() {
-        this.file.query_info_async('standard::symbolic-icon', 0, 0, null,
-                                   Lang.bind(this, function(file, result) {
-                                       try {
-                                           let info = file.query_info_finish(result);
-                                           this.icon = info.get_symbolic_icon();
-                                           this.emit('changed');
-                                       } catch(e if e instanceof Gio.IOErrorEnum) {
-                                           return;
-                                       }
-                                   }));
-
-        // return a generic icon for this kind for now, until we have the
-        // icon from the query info above
-        switch (this.kind) {
-        case 'network':
-            return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
-        case 'devices':
-            return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
-        case 'special':
-        case 'bookmarks':
-        default:
-            if (!this.file.is_native())
+        try {
+            let info = this.file.query_info('standard::symbolic-icon', 0, null);
+	    return info.get_symbolic_icon();
+        } catch(e if e instanceof Gio.IOErrorEnum) {
+            // return a generic icon for this kind
+            switch (this.kind) {
+            case 'network':
                return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
-            else
-                return new Gio.ThemedIcon({ name: 'folder-symbolic' });
+            case 'devices':
+                return new Gio.ThemedIcon({ name: 'drive-harddisk-symbolic' });
+            case 'special':
+            case 'bookmarks':
+            default:
+                if (!this.file.is_native())
+                    return new Gio.ThemedIcon({ name: 'folder-remote-symbolic' });
+                else
+                    return new Gio.ThemedIcon({ name: 'folder-symbolic' });
+            }
        }
    },

@@ -222,11 +192,32 @@ const PlacesManager = new Lang.Class({
            network: [],
        };

-        this._settings = new Gio.Settings({ schema_id: BACKGROUND_SCHEMA });
-        this._showDesktopIconsChangedId =
-            this._settings.connect('changed::show-desktop-icons',
-                                   Lang.bind(this, this._updateSpecials));
-        this._updateSpecials();
+        let homePath = GLib.get_home_dir();
+
+        this._places.special.push(new PlaceInfo('special',
+                                                Gio.File.new_for_path(homePath),
+                                                _("Home")));
+
+        let specials = [];
+        for (let i = 0; i < DEFAULT_DIRECTORIES.length; i++) {
+            let specialPath = GLib.get_user_special_dir(DEFAULT_DIRECTORIES[i]);
+            if (specialPath == homePath)
+                continue;
+
+            let file = Gio.File.new_for_path(specialPath), info;
+            try {
+                info = new PlaceInfo('special', file);
+            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+                continue;
+            }
+
+            specials.push(info);
+        }
+
+        specials.sort(function(a, b) {
+            return GLib.utf8_collate(a.name, b.name);
+        });
+        this._places.special = this._places.special.concat(specials);

        /*
        * Show devices, code more or less ported from nautilus-places-sidebar.c
@@ -270,10 +261,6 @@ const PlacesManager = new Lang.Class({
    },

    destroy: function() {
-        if (this._settings)
-            this._settings.disconnect(this._showDesktopIconsChangedId);
-        this._settings = null;
-
        for (let i = 0; i < this._volumeMonitorSignals.length; i++)
            this._volumeMonitor.disconnect(this._volumeMonitorSignals[i]);

@@ -283,45 +270,6 @@ const PlacesManager = new Lang.Class({
            Mainloop.source_remove(this._bookmarkTimeoutId);
    },

-    _updateSpecials: function() {
-        this._places.special.forEach(function (p) { p.destroy(); });
-        this._places.special = [];
-
-        let homePath = GLib.get_home_dir();
-
-        this._places.special.push(new PlaceInfo('special',
-                                                Gio.File.new_for_path(homePath),
-                                                _("Home")));
-
-        let specials = [];
-        let dirs = DEFAULT_DIRECTORIES.slice();
-
-        if (this._settings.get_boolean('show-desktop-icons'))
-            dirs.push(GLib.UserDirectory.DIRECTORY_DESKTOP);
-
-        for (let i = 0; i < dirs.length; i++) {
-            let specialPath = GLib.get_user_special_dir(dirs[i]);
-            if (specialPath == null || specialPath == homePath)
-                continue;
-
-            let file = Gio.File.new_for_path(specialPath), info;
-            try {
-                info = new PlaceInfo('special', file);
-            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
-                continue;
-            }
-
-            specials.push(info);
-        }
-
-        specials.sort(function(a, b) {
-            return GLib.utf8_collate(a.name, b.name);
-        });
-        this._places.special = this._places.special.concat(specials);
-
-        this.emit('special-updated');
-    },
-
    _updateMounts: function() {
        let networkMounts = [];
        let networkVolumes = [];
@@ -344,9 +292,8 @@ const PlacesManager = new Lang.Class({
            let volumes = drives[i].get_volumes();

            for(let j = 0; j < volumes.length; j++) {
-                let identifier = volumes[j].get_identifier('class');
-                if (identifier && identifier.indexOf('network') >= 0) {
-                    networkVolumes.push(volumes[j]);
+                if (volumes[j].get_identifier('class').indexOf('network') >= 0) {
+                    networkVolumes.push(volumes[i]);
                } else {
                    let mount = volumes[j].get_mount();
                    if(mount != null)
@@ -361,8 +308,7 @@ const PlacesManager = new Lang.Class({
            if(volumes[i].get_drive() != null)
                continue;

-            let identifier = volumes[i].get_identifier('class');
-            if (identifier && identifier.indexOf('network') >= 0) {
+            if (volumes[i].get_identifier('class').indexOf('network') >= 0) {
                networkVolumes.push(volumes[i]);
            } else {
                let mount = volumes[i].get_mount();
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -1,157 +0,0 @@
-/* Screenshot Window Sizer for Gnome Shell
- *
- * Copyright (c) 2013 Owen Taylor <otaylor@redhat.com>
- * Copyright (c) 2013 Richard Hughes <richard@hughsie.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-const Gio = imports.gi.Gio;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Convenience = Me.imports.convenience;
-
-const MESSAGE_FADE_TIME = 2;
-
-let text, button;
-
-function hideMessage() {
-    text.destroy();
-    text = null;
-}
-
-function flashMessage(message) {
-    if (!text) {
-        text = new St.Label({ style_class: 'screenshot-sizer-message' });
-        Main.uiGroup.add_actor(text);
-    }
-
-    Tweener.removeTweens(text);
-    text.text = message;
-
-    text.opacity = 255;
-
-    let monitor = Main.layoutManager.primaryMonitor;
-    text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
-                      monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
-
-    Tweener.addTween(text,
-                     { opacity: 0,
-                       time: MESSAGE_FADE_TIME,
-                       transition: 'easeOutQuad',
-                       onComplete: hideMessage });
-}
-
-let SIZES = [
-    [624, 351],
-    [800, 450],
-    [1024, 576],
-    [1200, 675],
-    [1600, 900]
-];
-
-function cycleScreenshotSizes(display, screen, window, binding) {
-    // Probably this isn't useful with 5 sizes, but you can decrease instead
-    // of increase by holding down shift.
-    let modifiers = binding.get_modifiers();
-    let backwards = (modifiers & Meta.VirtualModifier.SHIFT_MASK) != 0;
-
-    // Unmaximize first
-    if (window.maximized_horizontally || window.maximizedVertically)
-        window.unmaximize(Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);
-
-    let workArea = window.get_work_area_current_monitor();
-    let outerRect = window.get_frame_rect();
-
-    // Double both axes if on a hidpi display
-    let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-    let scaledSizes = SIZES.map(function(size) {
-        return size.map(function(wh) {
-            return wh * scaleFactor;
-        });
-    });
-
-    // Find the nearest 16:9 size for the current window size
-    let nearestIndex;
-    let nearestError;
-
-    for (let i = 0; i < scaledSizes.length; i++) {
-        let [width, height] = scaledSizes[i];
-
-        // ignore sizes bigger than the workArea
-        if (width > workArea.width || height > workArea.height)
-            continue;
-
-        // get the best initial window size
-        let error = Math.abs(width - outerRect.width) + Math.abs(height - outerRect.height);
-        if (nearestIndex == null || error < nearestError) {
-            nearestIndex = i;
-            nearestError = error;
-        }
-    }
-
-    // get the next size up or down from ideal
-    let newIndex = (nearestIndex + (backwards ? -1 : 1)) % scaledSizes.length;
-    let newWidth, newHeight;
-    [newWidth, newHeight] = scaledSizes[newIndex];
-    if (newWidth > workArea.width || newHeight > workArea.height)
-        [newWidth, newHeight] = scaledSizes[0];
-
-    // Push the window onscreen if it would be resized offscreen
-    let newX = outerRect.x;
-    let newY = outerRect.y;
-    if (newX + newWidth > workArea.x + workArea.width)
-        newX = Math.max(workArea.x + workArea.width - newWidth);
-    if (newY + newHeight > workArea.y + workArea.height)
-        newY = Math.max(workArea.y + workArea.height - newHeight);
-
-    window.move_resize_frame(true, newX, newY, newWidth, newHeight);
-
-    let newOuterRect = window.get_frame_rect();
-    let message = '%d×%d'.format(
-            (newOuterRect.width / scaleFactor),
-            (newOuterRect.height / scaleFactor));
-
-    // The new size might have been constrained by geometry hints (e.g. for
-    // a terminal) - in that case, include the actual ratio to the message
-    // we flash
-    let actualNumerator = (newOuterRect.width / newOuterRect.height) * 9;
-    if (Math.abs(actualNumerator - 16) > 0.01)
-        message += ' (%.2f:9)'.format(actualNumerator);
-
-    flashMessage(message);
-}
-
-function init() {
-}
-
-function enable() {
-    Main.wm.addKeybinding('cycle-screenshot-sizes',
-                          Convenience.getSettings(),
-                          Meta.KeyBindingFlags.PER_WINDOW | Meta.KeyBindingFlags.REVERSES,
-                          Shell.ActionMode.NORMAL,
-                          cycleScreenshotSizes);
-}
-
-function disable() {
-    Main.wm.removeKeybinding('cycle-screenshot-sizes');
-}
--- a/extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
+++ b/extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <schema id="org.gnome.shell.extensions.screenshot-window-sizer"
-          path="/org/gnome/shell/extensions/screenshot-window-sizer/">
-    <key type="as" name="cycle-screenshot-sizes">
-      <default><![CDATA[['<Alt><Control>s']]]></default>
-      <summary>Cycle Screenshot Sizes</summary>
-    </key>
-  </schema>
-</schemalist>
--- a/extensions/screenshot-window-sizer/stylesheet.css
+++ b/extensions/screenshot-window-sizer/stylesheet.css
@@ -1,8 +0,0 @@
-.screenshot-sizer-message {
-    font-size: 36px;
-    font-weight: bold;
-    color: #ffffff;
-    background-color: rgba(10,10,10,0.7);
-    border-radius: 5px;
-    padding: .5em;
-}
--- a/extensions/static-workspaces/Makefile.am
+++ b/extensions/static-workspaces/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = static-workspaces
+
+include ../../extension.mk
--- a/extensions/static-workspaces/extension.js
+++ b/extensions/static-workspaces/extension.js
@@ -0,0 +1,18 @@
+// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
+
+const Meta = imports.gi.Meta;
+
+function init(metadata) {
+}
+
+function enable() {
+    // Override gnome-shell's overrides
+    Meta.prefs_override_preference_schema('dynamic-workspaces',
+                                          'org.gnome.mutter');
+}
+
+function disable() {
+    // Restore gnome-shell's overrides
+    Meta.prefs_override_preference_schema('dynamic-workspaces',
+                                          'org.gnome.shell.overrides');
+}
--- a/extensions/screenshot-window-sizer/metadata.json.in
+++ b/extensions/screenshot-window-sizer/metadata.json.in
@@ -3,8 +3,9 @@
 "uuid": "@uuid@",
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
-"name": "Screenshot Window Sizer",
-"description": "Resize windows for GNOME Software screenshots",
+"name": "Static workspaces",
+"description": "Disable dynamic workspace management",
+"original-authors": [ "fmuellner@gnome.org" ],
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/static-workspaces/stylesheet.css
+++ b/extensions/static-workspaces/stylesheet.css
@@ -0,0 +1 @@
+/* This extensions requires no special styling */
--- a/extensions/systemMonitor/Makefile.am
+++ b/extensions/systemMonitor/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = systemMonitor
+
+include ../../extension.mk
--- a/extensions/systemMonitor/extension.js
+++ b/extensions/systemMonitor/extension.js
@@ -0,0 +1,360 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const GTop = imports.gi.GTop;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+const INDICATOR_UPDATE_INTERVAL = 500;
+const INDICATOR_NUM_GRID_LINES = 3;
+
+const ITEM_LABEL_SHOW_TIME = 0.15;
+const ITEM_LABEL_HIDE_TIME = 0.1;
+const ITEM_HOVER_TIMEOUT = 300;
+
+const Indicator = new Lang.Class({
+    Name: 'SystemMonitor.Indicator',
+
+    _init: function() {
+        this._initValues();
+        this.drawing_area = new St.DrawingArea({ reactive: true });
+        this.drawing_area.connect('repaint', Lang.bind(this, this._draw));
+        this.drawing_area.connect('button-press-event', function() {
+            let app = Shell.AppSystem.get_default().lookup_app('gnome-system-monitor.desktop');
+            app.open_new_window(-1);
+        });
+
+        this.actor = new St.Bin({ style_class: "extension-systemMonitor-indicator-area",
+                                  reactive: true, track_hover: true,
+				  x_fill: true, y_fill: true });
+        this.actor.add_actor(this.drawing_area);
+
+        this._timeout = Mainloop.timeout_add(INDICATOR_UPDATE_INTERVAL, Lang.bind(this, function () {
+            this._updateValues();
+            this.drawing_area.queue_repaint();
+            return true;
+        }));
+    },
+
+    showLabel: function() {
+        if (this.label == null)
+            return;
+
+        this.label.opacity = 0;
+        this.label.show();
+
+        let [stageX, stageY] = this.actor.get_transformed_position();
+
+	let itemWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
+        let itemHeight = this.actor.allocation.y2 - this.actor.allocation.y1;
+
+	let labelWidth = this.label.width;
+        let labelHeight = this.label.height;
+        let xOffset = Math.floor((itemWidth - labelWidth) / 2)
+
+        let x = stageX + xOffset;
+
+        let node = this.label.get_theme_node();
+        let yOffset = node.get_length('-y-offset');
+
+        let y = stageY - this.label.get_height() - yOffset;
+
+        this.label.set_position(x, y);
+        Tweener.addTween(this.label,
+                         { opacity: 255,
+                           time: ITEM_LABEL_SHOW_TIME,
+                           transition: 'easeOutQuad',
+                         });
+    },
+
+    setLabelText: function(text) {
+        if (this.label == null)
+            this.label = new St.Label({ style_class: 'extension-systemMonitor-indicator-label'});
+
+        this.label.set_text(text);
+        Main.layoutManager.addChrome(this.label);
+        this.label.hide();
+    },
+
+    hideLabel: function () {
+        Tweener.addTween(this.label,
+                         { opacity: 0,
+                           time: ITEM_LABEL_HIDE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function() {
+                               this.label.hide();
+                           })
+                         });
+    },
+
+    destroy: function() {
+        Mainloop.source_remove(this._timeout);
+
+        this.actor.destroy();
+	if (this.label)
+	    this.label.destroy();
+    },
+
+    _initValues: function() {
+    },
+
+    _updateValues: function() {
+    },
+
+    _draw: function(area) {
+        let [width, height] = area.get_surface_size();
+        let themeNode = this.actor.get_theme_node();
+        let cr = area.get_context();
+
+        //draw the background grid
+        let color = themeNode.get_color(this.gridColor);
+        let gridOffset = Math.floor(height / (INDICATOR_NUM_GRID_LINES + 1));
+        for (let i = 1; i <= INDICATOR_NUM_GRID_LINES; ++i) {
+                cr.moveTo(0, i * gridOffset + .5);
+                cr.lineTo(width, i * gridOffset + .5);
+        }
+        Clutter.cairo_set_source_color(cr, color);
+        cr.setLineWidth(1);
+        cr.setDash([4,1], 0);
+        cr.stroke();
+        
+        //draw the foreground
+
+        function makePath(values, reverse, nudge) {
+            if (nudge == null) {
+                nudge = 0;
+            }
+            //if we are going in reverse, we are completing the bottom of a chart, so use lineTo
+            if (reverse) {
+                cr.lineTo(values.length - 1, (1 - values[values.length - 1]) * height + nudge);
+                for (let k = values.length - 2; k >= 0; --k) {
+                    cr.lineTo(k, (1 - values[k]) * height + nudge);
+                }
+            } else {
+                cr.moveTo(0, (1 - values[0]) * height + nudge);
+                for (let k = 1; k < values.length; ++k) {
+                    cr.lineTo(k, (1 - values[k]) * height + nudge);
+                }
+
+            }
+        }
+        
+        let renderStats = this.renderStats;
+
+        // Make sure we don't have more sample points than pixels
+        renderStats.map(Lang.bind(this, function(k){
+            let stat = this.stats[k];
+            if (stat.values.length > width) {
+                stat.values = stat.values.slice(stat.values.length - width, stat.values.length);
+            }
+        }));
+
+        for (let i = 0; i < renderStats.length; ++i) {
+            let stat = this.stats[renderStats[i]];
+            // We outline at full opacity and fill with 40% opacity
+            let outlineColor = themeNode.get_color(stat.color);
+            let color = new Clutter.Color(outlineColor);
+            color.alpha = color.alpha * .4;
+           
+            // Render the background between us and the next level
+            makePath(stat.values, false);
+            // If there is a process below us, render the cpu between us and it, otherwise, 
+            // render to the bottom of the chart
+            if (i == renderStats.length - 1) {
+                cr.lineTo(stat.values.length - 1, height);
+                cr.lineTo(0, height);
+                cr.closePath();
+            } else {
+                let nextStat = this.stats[renderStats[i+1]];
+                makePath(nextStat.values, true);
+            }
+            cr.closePath()
+            Clutter.cairo_set_source_color(cr, color);
+            cr.fill();
+            
+            // Render the outline of this level
+            makePath(stat.values, false, .5);
+            Clutter.cairo_set_source_color(cr, outlineColor);
+            cr.setLineWidth(1.0);
+            cr.setDash([], 0);
+            cr.stroke();
+        }
+    }
+});
+
+const CpuIndicator = new Lang.Class({
+    Name: 'SystemMonitor.CpuIndicator',
+    Extends: Indicator,
+
+    _init: function() {
+        this.parent();
+
+        this.gridColor = '-grid-color';
+        this.renderStats = [ 'cpu-user', 'cpu-sys', 'cpu-iowait' ];
+        
+        // Make sure renderStats is sorted as necessary for rendering
+        let renderStatOrder = {'cpu-total': 0, 'cpu-user': 1, 'cpu-sys': 2, 'cpu-iowait': 3};
+        this.renderStats = this.renderStats.sort(function(a,b) {
+            return renderStatOrder[a] - renderStatOrder[b];
+        });
+
+	this.setLabelText(_("CPU"));
+    },
+
+    _initValues: function() {
+        this._prev = new GTop.glibtop_cpu;
+        GTop.glibtop_get_cpu(this._prev);
+
+        this.stats = { 
+                       'cpu-user': {color: '-cpu-user-color', values: []},
+                       'cpu-sys': {color: '-cpu-sys-color', values: []},
+                       'cpu-iowait': {color: '-cpu-iowait-color', values: []},
+                       'cpu-total': {color: '-cpu-total-color', values: []} 
+                     };
+    },
+
+    _updateValues: function() {
+        let cpu = new GTop.glibtop_cpu;
+        let t = 0.0;
+        GTop.glibtop_get_cpu(cpu);
+        let total = cpu.total - this._prev.total;
+        let user = cpu.user - this._prev.user;
+        let sys = cpu.sys - this._prev.sys;
+        let iowait = cpu.iowait - this._prev.iowait;
+        let idle = cpu.idle - this._prev.idle;
+
+        t += iowait / total;
+        this.stats['cpu-iowait'].values.push(t);
+        t += sys / total;
+        this.stats['cpu-sys'].values.push(t);
+        t += user / total;
+        this.stats['cpu-user'].values.push(t);
+        this.stats['cpu-total'].values.push(1 - idle / total);
+        
+        this._prev = cpu;
+    }
+});
+
+const MemoryIndicator = new Lang.Class({
+    Name: 'SystemMonitor.MemoryIndicator',
+    Extends: Indicator,
+    
+    _init: function() {
+        this.parent();
+
+        this.gridColor = '-grid-color';
+        this.renderStats = [ 'mem-user', 'mem-other', 'mem-cached' ];
+        
+        // Make sure renderStats is sorted as necessary for rendering
+        let renderStatOrder = { 'mem-cached': 0, 'mem-other': 1, 'mem-user': 2 };
+        this.renderStats = this.renderStats.sort(function(a,b) {
+            return renderStatOrder[a] - renderStatOrder[b];
+        });
+
+	this.setLabelText(_("Memory"));
+    },
+
+    _initValues: function() {
+        this.mem = new GTop.glibtop_mem;
+        this.stats = {
+                        'mem-user': { color: "-mem-user-color", values: [] },
+                        'mem-other': { color: "-mem-other-color", values: [] },
+                        'mem-cached': { color: "-mem-cached-color", values: [] }
+                     };
+    },
+
+    _updateValues: function() {
+        GTop.glibtop_get_mem(this.mem);
+
+        let t = this.mem.user / this.mem.total;
+        this.stats['mem-user'].values.push(t);
+        t += (this.mem.used - this.mem.user - this.mem.cached) / this.mem.total;
+        this.stats['mem-other'].values.push(t);
+        t += this.mem.cached / this.mem.total;
+        this.stats['mem-cached'].values.push(t);
+    }
+});
+
+const INDICATORS = [CpuIndicator, MemoryIndicator];
+
+const Extension = new Lang.Class({
+    Name: 'SystemMonitor.Extension',
+
+    _init: function() {
+	Convenience.initTranslations();
+
+	this._showLabelTimeoutId = 0;
+	this._resetHoverTimeoutId = 0;
+	this._labelShowing = false;
+    },
+
+    enable: function() {
+	this._box = new St.BoxLayout({ style_class: 'extension-systemMonitor-container',
+				       x_align: Clutter.ActorAlign.START,
+				       x_expand: true });
+	this._indicators = [ ];
+
+	for (let i = 0; i < INDICATORS.length; i++) {
+	    let indicator = new (INDICATORS[i])();
+
+            indicator.actor.connect('notify::hover', Lang.bind(this, function() {
+		this._onHover(indicator);
+	    }));
+	    this._box.add_actor(indicator.actor);
+	    this._indicators.push(indicator);
+	}
+
+	Main.messageTray.actor.add_actor(this._box);
+    },
+
+    disable: function() {
+	this._indicators.forEach(function(i) { i.destroy(); });
+	this._box.destroy();
+    },
+
+    _onHover: function (item) {
+        if (item.actor.get_hover()) {
+            if (this._showLabelTimeoutId == 0) {
+                let timeout = this._labelShowing ? 0 : ITEM_HOVER_TIMEOUT;
+                this._showLabelTimeoutId = Mainloop.timeout_add(timeout,
+                    Lang.bind(this, function() {
+                        this._labelShowing = true;
+                        item.showLabel();
+                        return false;
+                    }));
+                if (this._resetHoverTimeoutId > 0) {
+                    Mainloop.source_remove(this._resetHoverTimeoutId);
+                    this._resetHoverTimeoutId = 0;
+                }
+            }
+        } else {
+            if (this._showLabelTimeoutId > 0)
+                Mainloop.source_remove(this._showLabelTimeoutId);
+            this._showLabelTimeoutId = 0;
+            item.hideLabel();
+            if (this._labelShowing) {
+                this._resetHoverTimeoutId = Mainloop.timeout_add(ITEM_HOVER_TIMEOUT,
+                    Lang.bind(this, function() {
+                        this._labelShowing = false;
+                        return false;
+                    }));
+            }
+        }
+    },
+});
+
+function init() {
+    return new Extension();
+}
--- a/extensions/systemMonitor/metadata.json.in
+++ b/extensions/systemMonitor/metadata.json.in
@@ -0,0 +1,11 @@
+{
+    "shell-version": ["@shell_current@" ],
+    "uuid": "@uuid@",
+    "extension-id": "@extension_id@",
+    "settings-schema": "@gschemaname@",
+    "gettext-domain": "@gettext_domain@",
+    "original-author": "zaspire@rambler.ru",
+    "name": "SystemMonitor",
+    "description": "System Monitor",
+    "url": "@url@"
+}
--- a/extensions/systemMonitor/stylesheet.css
+++ b/extensions/systemMonitor/stylesheet.css
@@ -0,0 +1,35 @@
+.extension-systemMonitor-container {
+    spacing: 5px;
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+
+.extension-systemMonitor-indicator-area {
+    border: 1px solid #8d8d8d;
+    border-radius: 3px;
+    width: 100px;
+    /* message tray is 72px, so 20px padding of the container,
+       2px of border, makes it 50px */
+    height: 50px;
+    -grid-color: #575757;
+    -cpu-total-color: rgb(0,154,62);
+    -cpu-user-color: rgb(69,154,0);
+    -cpu-sys-color: rgb(255,253,81);
+    -cpu-iowait-color: rgb(210,148,0);
+    -mem-user-color: rgb(210,148,0);
+    -mem-cached-color: rgb(90,90,90);
+    -mem-other-color: rgb(205,203,41);
+    background-color: #1e1e1e;
+}
+
+.extension-systemMonitor-indicator-label {
+    border-radius: 7px;
+    padding: 4px 12px;
+    background-color: rgba(0,0,0,0.9);
+    text-align: center;
+    -y-offset: 8px;
+    font-size: 9pt;
+    font-weight: bold;
+}
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -45,7 +45,6 @@ const ThemeManager = new Lang.Class({
                _stylesheet = _userCssStylesheet;
            else {
                let sysdirs = GLib.get_system_data_dirs();
-                sysdirs.unshift(GLib.get_user_data_dir());
                for (let i = 0; i < sysdirs.length; i++) {
                    _userCssStylesheet = sysdirs[i] + '/themes/' + _themeName + '/gnome-shell/gnome-shell.css';
                    let file = Gio.file_new_for_path(_userCssStylesheet);
--- a/extensions/user-theme/metadata.json.in
+++ b/extensions/user-theme/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "User Themes",
- "description": "Load shell themes from user directory.",
+ "description": "Load shell themes from user directory",
 "shell-version": [ "@shell_current@" ],
 "original-authors": [ "john.stowers@gmail.com" ],
 "url": "@url@"
--- a/extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
+++ b/extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
@@ -2,8 +2,8 @@
  <schema id="org.gnome.shell.extensions.user-theme" path="/org/gnome/shell/extensions/user-theme/">
    <key name="name" type="s">
      <default>""</default>
-      <summary>Theme name</summary>
-      <description>The name of the theme, to be loaded from ~/.themes/name/gnome-shell</description>
+      <_summary>Theme name</_summary>
+      <_description>The name of the theme, to be loaded from ~/.themes/name/gnome-shell</_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/window-list/classic.css
+++ b/extensions/window-list/classic.css
@@ -3,44 +3,42 @@
 #panel.bottom-panel {
    border-top-width: 1px;
    border-bottom-width: 0px;
-    height: 2.25em ;
+    height: 32px !important;
  }

  .bottom-panel .window-button > StWidget {
-    background-gradient-drection: vertical;
-    background-color: #fff;
-    background-gradient-start: #fff;
-    background-gradient-end: #eee;
-    color: #000;
-    -st-natural-width: 18.7em;
-    max-width: 18.75em;
-    color: #2e3436;
-    background-color: #eee;
-    border-radius: 2px;
-    padding: 3px 6px 1px;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    background-color: #e9e9e9 !important;
+    background-gradient-direction: vertical;
+    background-gradient-end: #d0d0d0;
+    color: #555 !important;
+    border-radius: 2px !important;
+    padding: 4px 6px 2px !important;
    text-shadow: 0 0 transparent;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5) !important;
  }

  .bottom-panel .window-button:hover > StWidget {
-    background-color: #f9f9f9;
+    background-color: #f9f9f9 !important;
+    background-gradient-end: #e0e0e0;
  }

-  .bottom-panel .window-button:active > StWidget,
-  .bottom-panel .window-button:focus > StWidget {
-    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
+  .bottom-panel .window-button:active > StWidget {
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5) !important;
  }

  .bottom-panel .window-button.focused > StWidget {
-    background-color: #ddd;
-    box-shadow: inset 1px 1px 1px rgba(0,0,0,0.5);
+    background-color: #a9a9a9 !important;
+    background-gradient-end: #b0b0b0;
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5) !important;
  }

  .bottom-panel .window-button.focused:hover > StWidget {
-    background-color: #e9e9e9;
+    background-color: #b9b9b9 !important;
+    background-gradient-end: #c0c0c0;
  }

  .bottom-panel .window-button.minimized > StWidget {
-    color: #888;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+    color: #888 !important;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.4) !important;
  }
+
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
--- a/extensions/window-list/metadata.json.in
+++ b/extensions/window-list/metadata.json.in
@@ -4,7 +4,7 @@
 "settings-schema": "@gschemaname@",
 "gettext-domain": "@gettext_domain@",
 "name": "Window List",
-"description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME Bugzilla instead.",
+"description": "Display a window list at the bottom of the screen",
 "shell-version": [ "@shell_current@" ],
 "url": "@url@"
 }
--- a/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in
+++ b/extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in
@@ -9,19 +9,11 @@
    <key name="grouping-mode"
         enum="org.gnome.shell.extensions.window-list.GroupingMode">
      <default>'never'</default>
-      <summary>When to group windows</summary>
-      <description>
+      <_summary>When to group windows</_summary>
+      <_description>
        Decides when to group windows from the same application on the
-        window list. Possible values are “never”, “auto” and “always”.
-      </description>
-    </key>
-    <key name="show-on-all-monitors" type="b">
-      <default>false</default>
-      <summary>Show the window list on all monitors</summary>
-      <description>
-        Whether to show the window list on all connected monitors or
-        only on the primary one.
-      </description>
+        window list. Possible values are "never", "auto" and "always".
+      </_description>
    </key>
  </schema>
 </schemalist>
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -1,6 +1,5 @@
 // -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-

-const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
@@ -20,25 +19,25 @@ function init() {
 const WindowListPrefsWidget = new GObject.Class({
    Name: 'WindowList.Prefs.Widget',
    GTypeName: 'WindowListPrefsWidget',
-    Extends: Gtk.Grid,
+    Extends: Gtk.Frame,

    _init: function(params) {
        this.parent(params);

+        this.shadow_type = Gtk.ShadowType.NONE;
        this.margin = 24;
-        this.row_spacing = 6;
-        this.orientation = Gtk.Orientation.VERTICAL;

-        let groupingLabel = '<b>' + _("Window Grouping") + '</b>';
-        this.add(new Gtk.Label({ label: groupingLabel, use_markup: true,
-                                 halign: Gtk.Align.START }));
+        let title = '<b>' + _("Window Grouping") + '</b>';
+        let titleLabel = new Gtk.Label({ use_markup: true, label: title });
+        this.set_label_widget(titleLabel);

        let align = new Gtk.Alignment({ left_padding: 12 });
        this.add(align);

        let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
                                  row_spacing: 6,
-                                  column_spacing: 6 });
+                                  column_spacing: 6,
+                                  margin_top: 6 });
        align.add(grid);

        this._settings = Convenience.getSettings();
@@ -71,11 +70,6 @@ const WindowListPrefsWidget = new GObject.Class({
                    this._settings.set_string('grouping-mode', mode);
            }));
        }
-
-        let check = new Gtk.CheckButton({ label: _("Show on all monitors"),
-                                          margin_top: 6 });
-        this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
-        this.add(check);
    }
 });

--- a/extensions/window-list/stylesheet.css
+++ b/extensions/window-list/stylesheet.css
@@ -2,7 +2,7 @@
  /* .window-button-icon height +
     .window-button vertical padding +
     .window-button > StWidget vertical padding) */
-  height: 2.25em;
+  height: 30px;
 }

 .window-list {
@@ -22,19 +22,16 @@
  padding-right: 2px;
 }

-.window-button-box {
-  spacing: 4px;
-}
-
 .window-button > StWidget {
-  -st-natural-width: 18.75em;
-  max-width: 18.75em;
+  -st-natural-width: 250px;
+  max-width: 250px;
  color: #bbb;
  background-color: black;
  border-radius: 4px;
  padding: 3px 6px 1px;
  box-shadow: inset 1px 1px 4px rgba(255,255,255,0.5);
  text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
+  spacing: 4px;
 }

 .window-button:hover > StWidget {
@@ -71,14 +68,10 @@
 }

 .window-list-workspace-indicator {
-  padding: 3px;
-}
-
-.window-list-workspace-indicator > StWidget {
  background-color: rgba(200, 200, 200, .3);
  border: 1px solid #cccccc;
 }

-.notification {
-  font-weight: normal;
+.window-list-workspace-indicator > StLabel {
+  padding: 0 2px;
 }
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -47,23 +47,11 @@ function enable() {
    winInjections['hideTooltip'] = undefined;

    Workspace.Workspace.prototype.showTooltip = function() {
-        if (this._tip == null || this._actualGeometry == null)
+        if (this._tip == null)
            return;
        this._tip.text = (this.metaWorkspace.index() + 1).toString();
-
-        // Hand code this instead of using _getSpacingAndPadding
-        // because that fails on empty workspaces
-        let node = this.actor.get_theme_node();
-        let padding = {
-            left: node.get_padding(St.Side.LEFT),
-            top: node.get_padding(St.Side.TOP),
-            bottom: node.get_padding(St.Side.BOTTOM),
-            right: node.get_padding(St.Side.RIGHT),
-        };
-
-        let area = Workspace.padArea(this._actualGeometry, padding);
-        this._tip.x = area.x;
-        this._tip.y = area.y;
+        this._tip.x = this._x;
+        this._tip.y = this._y;
        this._tip.show();
        this._tip.raise_top();
    }
@@ -133,7 +121,7 @@ function enable() {
    workViewInjections['_onKeyRelease'] = undefined;

    WorkspacesView.WorkspacesView.prototype._onKeyPress = function(s, o) {
-        if(Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
+        if(Main.overview._viewSelector._activePage != Main.overview._viewSelector._workspacesPage)
            return false;

        if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
--- a/extensions/windowsNavigator/metadata.json.in
+++ b/extensions/windowsNavigator/metadata.json.in
@@ -6,6 +6,6 @@
    "gettext-domain": "@gettext_domain@",
    "original-author": "zaspire@rambler.ru",
    "name": "windowNavigator",
-    "description": "Allow keyboard selection of windows and workspaces in overlay mode. <Ctrl>number selects a workspace, and <Alt>number selects a window.",
+    "description": "Allow keyboard selection of windows and workspaces in overlay mode",
    "url": "@url@"
 }
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -30,8 +30,7 @@ const WorkspaceIndicator = new Lang.Class({
 	this.parent(0.0, _("Workspace Indicator"));

 	this._currentWorkspace = global.screen.get_active_workspace().index();
-	this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
-                                          text: this._labelText() });
+	this.statusLabel = new St.Label({ text: this._labelText() });

 	this.actor.add_actor(this.statusLabel);

@@ -50,7 +49,7 @@ const WorkspaceIndicator = new Lang.Class({
 	//styling
 	this.statusLabel.add_style_class_name('panel-workspace-indicator');

-        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
+        this._settings = new Gio.Settings({ schema: WORKSPACE_SCHEMA });
        this._settingsChangedId = this._settings.connect('changed::' + WORKSPACE_KEY, Lang.bind(this, this._createWorkspacesSection));
    },

@@ -67,9 +66,9 @@ const WorkspaceIndicator = new Lang.Class({
    },

    _updateIndicator: function() {
-	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
+	this.workspacesItems[this._currentWorkspace].setShowDot(false);
 	this._currentWorkspace = global.screen.get_active_workspace().index();
-	this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);
+	this.workspacesItems[this._currentWorkspace].setShowDot(true);

 	this.statusLabel.set_text(this._labelText());
    },
@@ -99,7 +98,7 @@ const WorkspaceIndicator = new Lang.Class({
 	    }));

 	    if (i == this._currentWorkspace)
-		this.workspacesItems[i].setOrnament(PopupMenu.Ornament.DOT);
+		this.workspacesItems[i].setShowDot(true);
 	}

 	this.statusLabel.set_text(this._labelText());
--- a/extensions/workspace-indicator/metadata.json.in
+++ b/extensions/workspace-indicator/metadata.json.in
@@ -4,7 +4,7 @@
    "settings-schema": "@gschemaname@",
    "gettext-domain": "@gettext_domain@",
    "name": "Workspace Indicator",
-    "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.",
+    "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one",
    "shell-version": [ "@shell_current@" ],
    "original-authors": [ "erick.red@gmail.com" ],
    "url": "@url@"
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -30,7 +30,7 @@ const WorkspaceNameModel = new GObject.Class({
        this.parent(params);
        this.set_column_types([GObject.TYPE_STRING]);

-        this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
+        this._settings = new Gio.Settings({ schema: WORKSPACE_SCHEMA });
        //this._settings.connect('changed::workspace-names', Lang.bind(this, this._reloadFromSettings));

        this._reloadFromSettings();
@@ -135,16 +135,11 @@ const WorkspaceSettingsWidget = new GObject.Class({

    _init: function(params) {
        this.parent(params);
-        this.margin = 12;
+        this.margin = 10;
        this.orientation = Gtk.Orientation.VERTICAL;

-        this.add(new Gtk.Label({ label: '<b>' + _("Workspace Names") + '</b>',
-                                 use_markup: true, margin_bottom: 6,
-                                 hexpand: true, halign: Gtk.Align.START }));
-
-        let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
-        scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this.add(scrolled);
+        this.add(new Gtk.Label({ label: _("Workspace names:"),
+                                 margin_bottom: 5 }));

        this._store = new WorkspaceNameModel();
        this._treeView = new Gtk.TreeView({ model: this._store,
@@ -161,26 +156,19 @@ const WorkspaceSettingsWidget = new GObject.Class({
        column.add_attribute(renderer, 'text', this._store.Columns.LABEL);
        this._treeView.append_column(column);

-        scrolled.add(this._treeView);
+        this.add(this._treeView);

-        let toolbar = new Gtk.Toolbar({ icon_size: Gtk.IconSize.SMALL_TOOLBAR });
+        let toolbar = new Gtk.Toolbar();
        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);

-        let newButton = new Gtk.ToolButton({ icon_name: 'list-add-symbolic' });
+        let newButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_NEW });
        newButton.connect('clicked', Lang.bind(this, this._newClicked));
        toolbar.add(newButton);

-        let delButton = new Gtk.ToolButton({ icon_name: 'list-remove-symbolic' });
+        let delButton = new Gtk.ToolButton({ stock_id: Gtk.STOCK_DELETE });
        delButton.connect('clicked', Lang.bind(this, this._delClicked));
        toolbar.add(delButton);

-        let selection = this._treeView.get_selection();
-        selection.connect('changed',
-            function() {
-                delButton.sensitive = selection.count_selected_rows() > 0;
-            });
-        delButton.sensitive = selection.count_selected_rows() > 0;
-
        this.add(toolbar);
    },

@@ -195,7 +183,7 @@ const WorkspaceSettingsWidget = new GObject.Class({
        let iter = this._store.append();
        let index = this._store.get_path(iter).get_indices()[0];

-        let label = _("Workspace %d").format(index + 1);
+        let label = _("Workspace %d").format(index);
        this._store.set(iter, [this._store.Columns.LABEL], [label]);
    },

--- a/extensions/xrandr-indicator/Makefile.am
+++ b/extensions/xrandr-indicator/Makefile.am
@@ -0,0 +1,3 @@
+EXTENSION_ID = xrandr-indicator
+
+include ../../extension.mk
--- a/extensions/xrandr-indicator/extension.js
+++ b/extensions/xrandr-indicator/extension.js
@@ -0,0 +1,151 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gdk = imports.gi.Gdk;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Panel = imports.ui.panel;
+
+const Gettext = imports.gettext.domain('gnome-shell-extensions');
+const _ = Gettext.gettext;
+const N_ = function(e) { return e };
+
+const ExtensionUtils = imports.misc.extensionUtils;
+const Me = ExtensionUtils.getCurrentExtension();
+const Convenience = Me.imports.convenience;
+
+const possibleRotations = [ GnomeDesktop.RRRotation.ROTATION_0,
+			    GnomeDesktop.RRRotation.ROTATION_90,
+			    GnomeDesktop.RRRotation.ROTATION_180,
+			    GnomeDesktop.RRRotation.ROTATION_270
+			  ];
+
+let rotations = [ [ GnomeDesktop.RRRotation.ROTATION_0, N_("Normal") ],
+		  [ GnomeDesktop.RRRotation.ROTATION_90, N_("Left") ],
+		  [ GnomeDesktop.RRRotation.ROTATION_270, N_("Right") ],
+		  [ GnomeDesktop.RRRotation.ROTATION_180, N_("Upside-down") ]
+		];
+
+const XRandr2Iface = <interface name='org.gnome.SettingsDaemon.XRANDR_2'>
+<method name='ApplyConfiguration'>
+    <arg type='x' direction='in'/>
+    <arg type='x' direction='in'/>
+</method>
+</interface>;
+
+const XRandr2 = Gio.DBusProxy.makeProxyWrapper(XRandr2Iface);
+
+const Indicator = new Lang.Class({
+    Name: 'XRandRIndicator',
+    Extends: PanelMenu.SystemStatusButton,
+
+    _init: function() {
+	this.parent('preferences-desktop-display-symbolic', _("Display"));
+
+        this._proxy = new XRandr2(Gio.DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR');
+
+        try {
+            this._screen = new GnomeDesktop.RRScreen({ gdk_screen: Gdk.Screen.get_default() });
+            this._screen.init(null);
+        } catch(e) {
+            // an error means there is no XRandR extension
+            this.actor.hide();
+            return;
+        }
+
+        this._createMenu();
+        this._screen.connect('changed', Lang.bind(this, this._randrEvent));
+    },
+
+    _randrEvent: function() {
+        this.menu.removeAll();
+        this._createMenu();
+    },
+
+    _createMenu: function() {
+        let config = GnomeDesktop.RRConfig.new_current(this._screen);
+        let outputs = config.get_outputs();
+        for (let i = 0; i < outputs.length; i++) {
+            if (outputs[i].is_connected())
+                this._addOutputItem(config, outputs[i]);
+        }
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+	this.menu.addSettingsAction(_("Display Settings"), 'gnome-display-panel.desktop');
+    },
+
+    _addOutputItem: function(config, output) {
+        let item = new PopupMenu.PopupMenuItem(output.get_display_name());
+        item.label.add_style_class_name('display-subtitle');
+        item.actor.reactive = false;
+        item.actor.can_focus = false;
+        this.menu.addMenuItem(item);
+
+        let allowedRotations = this._getAllowedRotations(config, output);
+        let currentRotation = output.get_rotation();
+        for (let i = 0; i < rotations.length; i++) {
+            let [bitmask, name] = rotations[i];
+            if (bitmask & allowedRotations) {
+                let item = new PopupMenu.PopupMenuItem(Gettext.gettext(name));
+                if (bitmask & currentRotation)
+                    item.setShowDot(true);
+                item.connect('activate', Lang.bind(this, function(item, event) {
+                    /* ensure config is saved so we get a backup if anything goes wrong */
+                    config.save();
+
+                    output.set_rotation(bitmask);
+                    try {
+                        config.save();
+                        this._proxy.ApplyConfigurationRemote(0, event.get_time());
+                    } catch (e) {
+                        log ('Could not save monitor configuration: ' + e);
+                    }
+                }));
+                this.menu.addMenuItem(item);
+            }
+        }
+    },
+
+    _getAllowedRotations: function(config, output) {
+        let retval = 0;
+
+        let current = output.get_rotation();
+
+        for (let i = 0; i < possibleRotations.length; i++) {
+            output.set_rotation(possibleRotations[i]);
+            if (config.applicable(this._screen)) {
+                retval |= possibleRotations[i];
+            }
+        }
+
+        output.set_rotation(current);
+
+        if (retval.lenght == 0) {
+            // what, no rotation?
+            // what's current then?
+            retval = current;
+        }
+        return retval;
+    }
+});
+
+function init(metadata) {
+    Convenience.initTranslations();
+}
+
+let _indicator;
+
+function enable() {
+    _indicator = new Indicator();
+    Main.panel.addToStatusArea('display', _indicator);
+}
+
+function disable() {
+    _indicator.destroy();
+}
--- a/extensions/xrandr-indicator/metadata.json.in
+++ b/extensions/xrandr-indicator/metadata.json.in
@@ -0,0 +1,10 @@
+{
+"extension-id": "@extension_id@",
+"uuid": "@uuid@",
+"settings-schema": "@gschemaname@",
+"gettext-domain": "@gettext_domain@",
+"name": "Monitor Status Indicator",
+"description": "Add a systems status menu for rotating monitors (overrides what is currently provided by gnome-settings-daemon)",
+"shell-version": [ "@shell_current@" ],
+"url": "@url@"
+}
--- a/extensions/xrandr-indicator/stylesheet.css
+++ b/extensions/xrandr-indicator/stylesheet.css
@@ -0,0 +1,3 @@
+.display-subtitle {
+    font-weight: bold;
+}
--- a/gnome-shell-extensions.doap
+++ b/gnome-shell-extensions.doap
@@ -4,7 +4,7 @@
         xmlns:gnome="http://api.gnome.org/doap-extensions#"
         xmlns="http://usefulinc.com/ns/doap#">

-  <name xml:lang="en">gnome-shell-extensions</name>
+  <name xml:lang="en">GNOME Shell Extensions</name>
  <shortdesc xml:lang="en">Modify and extend GNOME Shell functionality and behavior</shortdesc>
  <description xml:lang="en">
 GNOME Shell Extensions is a collection of extensions providing
@@ -12,26 +12,14 @@ additional and optional functionality to GNOME Shell.
 Most extensions can be installed by configuring --prefix=$HOME/.local,
 and will be picked automatically at next login.
  </description>
-  <homepage rdf:resource="https://wiki.gnome.org/Projects/GnomeShell/Extensions" />
-  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
-  <download-page rdf:resource="http://download.gnome.org/sources/gnome-shell-extensions/" />
  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnome-shell&amp;component=extensions" />
-
-  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
-  <programming-language>JavaScript</programming-language>
+  <homepage rdf:resource="http://live.gnome.org/GnomeShell/Extenstions" />

  <maintainer>
    <foaf:Person>
      <foaf:name>Giovanni Campagna</foaf:name>
-      <foaf:mbox rdf:resource="mailto:gcampagna@src.gnome.org" />
+      <foaf:mbox rdf:resource="mailto:scampa.giovanni@gmail.com" />
      <gnome:userid>gcampagna</gnome:userid>
    </foaf:Person>
  </maintainer>
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Florian Müllner</foaf:name>
-      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
-      <gnome:userid>fmuellner</gnome:userid>
-    </foaf:Person>
-  </maintainer>
 </Project>
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,13 +1,5 @@
-af
-an
 ar
-as
-be
-bg
-bn_IN
-bs
 ca
-ca@valencia
 cs
 da
 de
@@ -15,55 +7,33 @@ el
 en_GB
 eo
 es
-et
 eu
 fa
 fi
 fr
-fur
-gd
 gl
-gu
 he
-hi
-hr
 hu
 id
-is
 it
 ja
-kk
-km
-kn
 ko
-lt
 lv
-ml
-mr
-ms
+lt
 nb
-ne
-nl
-oc
-or
 pa
-pl
 pt
 pt_BR
-ro
+pl
 ru
 sk
 sl
 sr
 sr@latin
 sv
-ta
 te
-tg
-th
-tr
-uk
 vi
+uk
 zh_CN
 zh_HK
 zh_TW
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,68 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
-        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
-        --keyword=g_dngettext:2,3 --add-comments \
-        --flag=g_dngettext:2:pass-c-format \
-        --flag=g_strdup_printf:1:c-format \
-        --flag=g_string_printf:2:c-format \
-        --flag=g_string_append_printf:2:c-format \
-        --flag=g_error_new:3:c-format \
-        --flag=g_set_error:4:c-format \
-        --flag=g_markup_printf_escaped:1:c-format \
-        --flag=g_log:3:c-format \
-        --flag=g_print:1:c-format \
-        --flag=g_printerr:1:c-format \
-        --flag=g_printf:1:c-format \
-        --flag=g_fprintf:2:c-format \
-        --flag=g_sprintf:2:c-format \
-        --flag=g_snprintf:3:c-format
-
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Translation copyright holder
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# Ignore the timestamp of the .pot file, as git clones do not have
-# deterministic timestamps, and .po files are updated by translators
-# (only) in GNOME projects.
-PO_DEPENDS_ON_POT = no
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = no
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,25 +1,27 @@
 data/gnome-classic.desktop.in
-data/gnome-classic.session.desktop.in
-data/org.gnome.shell.extensions.classic-overrides.gschema.xml
+data/gnome-classic.session.desktop.in.in
+data/gnome-shell-classic.desktop.in.in
 extensions/alternate-tab/prefs.js
+extensions/alternative-status-menu/extension.js
+extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js
-extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml
+extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in
 extensions/auto-move-windows/prefs.js
 extensions/drive-menu/extension.js
 extensions/example/extension.js
-extensions/example/org.gnome.shell.extensions.example.gschema.xml
+extensions/example/org.gnome.shell.extensions.example.gschema.xml.in
 extensions/example/prefs.js
 extensions/native-window-placement/extension.js
-extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml
+extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in
 extensions/places-menu/extension.js
 extensions/places-menu/placeDisplay.js
-extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
+extensions/systemMonitor/extension.js
 extensions/user-theme/extension.js
-extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml
-extensions/window-list/extension.js
-extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml
+extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in
+extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in
 extensions/window-list/prefs.js
 extensions/windowsNavigator/extension.js
 extensions/workspace-indicator/extension.js
 extensions/workspace-indicator/prefs.js
+extensions/xrandr-indicator/extension.js
--- a/po/af.po
+++ b/po/af.po
@@ -1,311 +0,0 @@
-# Afrikaans translation for gnome-shell-extensions.
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# F Wolff <friedel@translate.org.za>, 2013.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2013-09-26 20:32+0000\n"
-"PO-Revision-Date: 2013-09-27 16:17+0200\n"
-"Last-Translator: F Wolff <friedel@translate.org.za>\n"
-"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
-"Language: af\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
-"X-Project-Style: gnome\n"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "GNOME Klassiek"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "Hierdie sessie laat mens aanmeld by GNOME Klassiek"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME Shell Klassiek"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Vensterbestuur en toepassinglansering"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr ""
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid "Workspaces only on primary monitor"
-msgstr "Werkruimtes slegs op primêre monitor"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr ""
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Slegs toepassingsikoon"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Duimnael en toepassingsikoon"
-
-#: ../extensions/alternate-tab/prefs.js:37
-msgid "Present windows as"
-msgstr "Wys vensters as"
-
-#: ../extensions/alternate-tab/prefs.js:62
-msgid "Show only windows in the current workspace"
-msgstr "Wys slegs vensters van die huidige werkruimte"
-
-#: ../extensions/apps-menu/extension.js:39
-msgid "Activities Overview"
-msgstr "Aktiwiteite-oorsig"
-
-#: ../extensions/apps-menu/extension.js:113
-msgid "Favorites"
-msgstr "Gunstelinge"
-
-#: ../extensions/apps-menu/extension.js:282
-msgid "Applications"
-msgstr "Toepassings"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid "Application and workspace list"
-msgstr "Toepassing- en werkruimtelys"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-
-#: ../extensions/auto-move-windows/prefs.js:55
-msgid "Application"
-msgstr "Toepassing"
-
-#: ../extensions/auto-move-windows/prefs.js:64
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Workspace"
-msgstr "Werkruimte"
-
-#: ../extensions/auto-move-windows/prefs.js:80
-msgid "Add rule"
-msgstr "Voeg reël by"
-
-#: ../extensions/auto-move-windows/prefs.js:94
-msgid "Create new matching rule"
-msgstr ""
-
-#: ../extensions/auto-move-windows/prefs.js:98
-msgid "Add"
-msgstr "Voeg by"
-
-#: ../extensions/drive-menu/extension.js:73
-#, c-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Kon nie skyf '%s' uitskiet nie:"
-
-#: ../extensions/drive-menu/extension.js:90
-msgid "Removable devices"
-msgstr "Verwyderbare toestelle"
-
-#: ../extensions/drive-menu/extension.js:117
-msgid "Open File"
-msgstr "Open lêer"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Hallo, wêreld!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr ""
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-
-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: ../extensions/example/prefs.js:30
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-
-#: ../extensions/example/prefs.js:36
-msgid "Message:"
-msgstr "Boodskap:"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid "Use more screen for windows"
-msgstr ""
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid "Place window captions on top"
-msgstr ""
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Plekke"
-
-#: ../extensions/places-menu/placeDisplay.js:56
-#, c-format
-msgid "Failed to launch \"%s\""
-msgstr "Kon nie \"%s\" lanseer nie"
-
-#: ../extensions/places-menu/placeDisplay.js:98
-#: ../extensions/places-menu/placeDisplay.js:121
-msgid "Computer"
-msgstr "Rekenaar"
-
-#: ../extensions/places-menu/placeDisplay.js:199
-msgid "Home"
-msgstr "Tuis"
-
-#: ../extensions/places-menu/placeDisplay.js:286
-msgid "Browse Network"
-msgstr "Blaai deur netwerk"
-
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "SVE"
-
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "Geheue"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "Theme name"
-msgstr "Temanaam"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr ""
-
-#: ../extensions/window-list/extension.js:92
-msgid "Close"
-msgstr "Sluit"
-
-#: ../extensions/window-list/extension.js:102
-msgid "Unminimize"
-msgstr ""
-
-#: ../extensions/window-list/extension.js:103
-msgid "Minimize"
-msgstr "Minimeer"
-
-#: ../extensions/window-list/extension.js:109
-msgid "Unmaximize"
-msgstr ""
-
-#: ../extensions/window-list/extension.js:110
-msgid "Maximize"
-msgstr "Maksimeer"
-
-#: ../extensions/window-list/extension.js:270
-msgid "Minimize all"
-msgstr "Minimeer almal"
-
-#: ../extensions/window-list/extension.js:278
-msgid "Unminimize all"
-msgstr ""
-
-#: ../extensions/window-list/extension.js:286
-msgid "Maximize all"
-msgstr "Maksimeer almal"
-
-#: ../extensions/window-list/extension.js:295
-msgid "Unmaximize all"
-msgstr ""
-
-#: ../extensions/window-list/extension.js:304
-msgid "Close all"
-msgstr "Sluit almal"
-
-#: ../extensions/window-list/extension.js:591
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr ""
-
-#: ../extensions/window-list/extension.js:743
-msgid "Window List"
-msgstr "Vensterlys"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "Wanneer om vensters te groepeer"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"Besluit wanneer om vensters van dieselfde toepassing in die vensterlys te "
-"groepeer. Moontlike waardes is \"never\", \"auto\" en \"always\"."
-
-#: ../extensions/window-list/prefs.js:30
-msgid "Window Grouping"
-msgstr "Venstergroepering"
-
-#: ../extensions/window-list/prefs.js:49
-msgid "Never group windows"
-msgstr "Moet nooit vensters groepeer nie"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Group windows when space is limited"
-msgstr "Groepeer vensters wanneer ruimte beperk is"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Always group windows"
-msgstr "Groepeer vensters altyd"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace names:"
-msgstr "Werkruimtename:"
-
-#: ../extensions/workspace-indicator/prefs.js:152
-msgid "Name"
-msgstr "Naam"
-
-#: ../extensions/workspace-indicator/prefs.js:186
-#, c-format
-msgid "Workspace %d"
-msgstr "Werkruimte %d"
--- a/po/an.po
+++ b/po/an.po
@@ -1,400 +0,0 @@
-# Aragonese translation for gnome-shell-extensions.
-# Copyright (C) 2013 gnome-shell-extensions's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Jorge Pérez Pérez <jorgtum@gmail.com>, 2013.
-# Daniel Martinez <entaltoaragon@gmail.com>, 2015.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-01-22 08:35+0000\n"
-"PO-Revision-Date: 2015-01-22 19:27+0100\n"
-"Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n"
-"Language-Team: Aragonés <softaragones@googlegroups.com>\n"
-"Language: an\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "GNOME clasico"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "Ista sesión encieta lo GNOME clasico"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Acoplar un dialogo modal a la finestra pai"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Ista clau sobrescribe a clau en org.gnome.mutter en executar o GNOME Shell."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Disposición d'os botons d'a barra de titol"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Ista clau sobrescribe a clau en org.gnome.desktop.wm.preferences en executar "
-"o GNOME Shell."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Activar o mosaico en os cantos en arrocegar as finestras a los cantos d'a "
-"finestra"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Arias de treballo nomás en a pantalla prencipal"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Retardar o cambeo d'o foco d'o churi dica que o puntero deixe de mover-se"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Nomás as miniaturas"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Nomás l'icono de l'aplicación"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Miniatura y icono de l'aplicación"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Presentar as finestras como"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Amostrar as finestras solament en l'aria de treballo actual"
-
-#: ../extensions/apps-menu/extension.js:39
-msgid "Activities Overview"
-msgstr "Anvista d'actividatz"
-
-#: ../extensions/apps-menu/extension.js:114
-msgid "Favorites"
-msgstr "Favoritos"
-
-#: ../extensions/apps-menu/extension.js:283
-msgid "Applications"
-msgstr "Aplicacions"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid "Application and workspace list"
-msgstr "Lista d'aplicacions y arias de treballo"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Una lista de cadenas, que cadaguna contién l'identificador  de l'aplicación "
-"(o nombre d'o fichero d'escritorio), seguiu por dos puntos y o numero de "
-"l'aria de treballo"
-
-#: ../extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "Aplicación"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Aria de treballo"
-
-#: ../extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
-msgstr "Adhibir un regle"
-
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Creyar un regle nuevo de coincidencia"
-
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Adhibir"
-
-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Ha fallau en fer fuera o dispositivo '%s'"
-
-#: ../extensions/drive-menu/extension.js:124
-msgid "Removable devices"
-msgstr "Dispositivos extraíbles"
-
-#: ../extensions/drive-menu/extension.js:151
-msgid "Open File"
-msgstr "Ubrir o fichero"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Ola, mundo!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "Texto alternativo de bienvenida"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Si no ye vuedo, contién o texto que s'amostrará quan se faiga clic en o "
-"panel."
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Mensache"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"'Example' tien por obchecto amostrar cómo construir as extensions de buen "
-"comportamiento ta la Shell y por ixo tien poca funcionalidat por ell "
-"solenco.\n"
-"Manimenos, ye posible presonalizar o mensache de bienvenida."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid "Use more screen for windows"
-msgstr "Fer servir mas pantalla ta las finestras"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"Intenta fer servir mas espacio ta situar as miniaturas, adaptando-las a la "
-"forma d'a pantalla, y consolidar-las encara mas ta reducir l'aria ocupada. "
-"Ista opción solament s'aplica a la estratechia de posicionamiento «natural»."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid "Place window captions on top"
-msgstr "Situar os titols de finestras alto"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"Si ye cierto, situar os titols d'as finestras dencima d'as miniaturas "
-"correspondients, cambiando o comportamiento predeterminau de shell, que los "
-"sitúa por debaixo. Cambiar ista configuración requier reiniciar a shell ta "
-"que tienga efecto."
-
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Puestos"
-
-#: ../extensions/places-menu/placeDisplay.js:57
-#, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "Ha fallau en lanzar \"%s\""
-
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
-msgid "Computer"
-msgstr "Equipo"
-
-#: ../extensions/places-menu/placeDisplay.js:200
-msgid "Home"
-msgstr "Carpeta presonal"
-
-#: ../extensions/places-menu/placeDisplay.js:287
-msgid "Browse Network"
-msgstr "Examinar o ret"
-
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
-msgid "Cycle Screenshot Sizes"
-msgstr "Mida d'os ciclos de captura de pantalla"
-
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "CPU"
-
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "CPU"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "Theme name"
-msgstr "Nombre d'o tema"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "O nombre d'o tema, que se carga dende /.themes/nombre/gnome-shell"
-
-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Zarrar"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Restaurar"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Minimizar"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Restaurar"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Maximizar"
-
-#: ../extensions/window-list/extension.js:390
-msgid "Minimize all"
-msgstr "Minimizar-lo tot"
-
-#: ../extensions/window-list/extension.js:398
-msgid "Unminimize all"
-msgstr "Restaurar-lo tot"
-
-#: ../extensions/window-list/extension.js:406
-msgid "Maximize all"
-msgstr "Maximizar-lo tot"
-
-#: ../extensions/window-list/extension.js:415
-msgid "Unmaximize all"
-msgstr "Restaurar-lo tot"
-
-#: ../extensions/window-list/extension.js:424
-msgid "Close all"
-msgstr "Zarrar-lo tot"
-
-#: ../extensions/window-list/extension.js:706
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Indicador d'aria de treballo"
-
-#: ../extensions/window-list/extension.js:870
-msgid "Window List"
-msgstr "Lista de finestras"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "Quan agrupar as finestras"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"Decide quan agrupar as finestras dende a mesma aplicación en a lista de "
-"finestras. As valors posibles son «never», «auto» y «always»."
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
-msgid "Show the window list on all monitors"
-msgstr "Amostrar a lista de finestras en todas as pantallas"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Indica si se debe amostrar a lista de finestras en todas as pantallas "
-"connectadas u solo que en a primaria."
-
-#: ../extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "Agrupación de finestras"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Nunca no agrupar as finestras"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Agrupar as finestras quan l'espacio siga limitau"
-
-#: ../extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Agrupar siempre as finestras"
-
-#: ../extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "Amostrar en todas as pantallas"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Nombres d'as arias de treballo"
-
-#: ../extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Nombre"
-
-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Aria de treballo %d"
-
-#~ msgid "GNOME Shell Classic"
-#~ msgstr "GNOME Shell clasico"
-
-#~ msgid "Window management and application launching"
-#~ msgstr "Chestión de finestras y inicio d'aplicacions"
-
-#~ msgid "Suspend"
-#~ msgstr "Suspender"
-
-#~ msgid "Hibernate"
-#~ msgstr "Hibernar"
-
-#~ msgid "Power Off"
-#~ msgstr "Amortar"
-
-#~ msgid "Enable suspending"
-#~ msgstr "Activar a suspensión"
-
-#~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "Controla la visibilidat de l'elemento de menú «Suspender»"
-
-#~ msgid "Enable hibernating"
-#~ msgstr "Activar a hibernación"
-
-#~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "Controla la visibilidat de l'elemento de menú «Hibernar»"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Left"
-#~ msgstr "Cucha"
-
-#~ msgid "Right"
-#~ msgstr "Dreita"
-
-#~ msgid "Upside-down"
-#~ msgstr "Enta baixo"
-
-#~ msgid "Display"
-#~ msgstr "Pantalla"
-
-#~ msgid "Display Settings"
-#~ msgstr "Opcions de pantalla"
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Khaled Hosny <khaledhosny@eglug.org>, 2012, 2013, 2015.
+# Khaled Hosny <khaledhosny@eglug.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 23:54+0200\n"
-"PO-Revision-Date: 2015-09-23 23:56+0200\n"
+"POT-Creation-Date: 2012-12-24 12:44+0200\n"
+"PO-Revision-Date: 2012-12-24 12:46+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -16,8 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.7.1\n"
-"X-Project-Style: gnome\n"
+"X-Generator: Virtaal 0.7.0\n"

 #: ../data/gnome-classic.desktop.in.h:1
 #: ../data/gnome-classic.session.desktop.in.in.h:1
@@ -28,36 +27,13 @@ msgstr "جنوم تقليدية"
 msgid "This session logs you into GNOME Classic"
 msgstr "تولجك هذه الجلسة في جنوم التقليدية"

-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "اربط المربعات الحوارية العائمة بالنافذة الأم"
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr "صدفة جنوم تقليدية"

-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "ترتيب الأزرار في شريط العناوين"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "مساحات عمل على الشاشة الرئيسية فقط"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
+#: ../data/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "إدارة النوافذ وإطلاق التطبيقات"

 #: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
@@ -71,25 +47,42 @@ msgstr "أيقونة التطبيق فقط"
 msgid "Thumbnail and application icon"
 msgstr "مصغّرة وأيقونة التطبيق"

-#: ../extensions/alternate-tab/prefs.js:38
+#: ../extensions/alternate-tab/prefs.js:37
 msgid "Present windows as"
 msgstr "كيفية عرض التطبيقات"

-#: ../extensions/alternate-tab/prefs.js:69
+#: ../extensions/alternate-tab/prefs.js:62
 msgid "Show only windows in the current workspace"
 msgstr "أظهر نوافذ مساحات العمل الحالية فقط"

-#: ../extensions/apps-menu/extension.js:38
-msgid "Activities Overview"
-msgstr "ملخص الأنشطة"
+#. add the new entries
+#: ../extensions/alternative-status-menu/extension.js:144
+msgid "Suspend"
+msgstr "علّق"

-#: ../extensions/apps-menu/extension.js:109
-msgid "Favorites"
-msgstr "المفضّلات"
+#: ../extensions/alternative-status-menu/extension.js:147
+msgid "Hibernate"
+msgstr "أسبِت"

-#: ../extensions/apps-menu/extension.js:261
-msgid "Applications"
-msgstr "التطبيقات"
+#: ../extensions/alternative-status-menu/extension.js:150
+msgid "Power Off"
+msgstr "أطفئ"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:1
+msgid "Enable suspending"
+msgstr "فعّل التعليق"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:2
+msgid "Control the visibility of the Suspend menu item"
+msgstr "تحكم في ظهور ”علّق“ في القائمة"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:3
+msgid "Enable hibernating"
+msgstr "فعّل الإسبات"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:4
+msgid "Control the visibility of the Hibernate menu item"
+msgstr "تحكم في ظهور ”أسبِت“ في القائمة"

 #: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
@@ -101,37 +94,37 @@ msgid ""
 "followed by a colon and the workspace number"
 msgstr ""

-#: ../extensions/auto-move-windows/prefs.js:60
+#: ../extensions/auto-move-windows/prefs.js:55
 msgid "Application"
 msgstr "التطبيق"

-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: ../extensions/auto-move-windows/prefs.js:64
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Workspace"
 msgstr "مساحة العمل"

-#: ../extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
+#: ../extensions/auto-move-windows/prefs.js:80
+msgid "Add rule"
 msgstr "أضِف قاعدة"

-#: ../extensions/auto-move-windows/prefs.js:106
+#: ../extensions/auto-move-windows/prefs.js:94
 msgid "Create new matching rule"
 msgstr "أنشئ قاعدة تطابق"

-#: ../extensions/auto-move-windows/prefs.js:111
+#: ../extensions/auto-move-windows/prefs.js:98
 msgid "Add"
 msgstr "أضِف"

-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
+#: ../extensions/drive-menu/extension.js:72
+#, c-format
 msgid "Ejecting drive '%s' failed:"
 msgstr "فشل إخراج '%s':"

-#: ../extensions/drive-menu/extension.js:124
+#: ../extensions/drive-menu/extension.js:89
 msgid "Removable devices"
 msgstr "الأجهزة المنفصلة"

-#: ../extensions/drive-menu/extension.js:149
+#: ../extensions/drive-menu/extension.js:106
 msgid "Open File"
 msgstr "افتح الملف"

@@ -141,7 +134,7 @@ msgstr "أهلا، يا عالم!"

 #: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
-msgstr "نص ترحيب بديل"
+msgstr ""

 #: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
@@ -149,19 +142,19 @@ msgid ""
 "panel."
 msgstr ""

-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "الرسالة"
-
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: ../extensions/example/prefs.js:43
+#: ../extensions/example/prefs.js:30
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
 "Nevertheless it's possible to customize the greeting message."
 msgstr ""

+#: ../extensions/example/prefs.js:36
+msgid "Message:"
+msgstr "الرسالة:"
+
 #: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr ""
@@ -184,32 +177,46 @@ msgid ""
 "restarting the shell to have any effect."
 msgstr ""

-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:46
 msgid "Places"
 msgstr "الأماكن"

-#: ../extensions/places-menu/placeDisplay.js:59
-#, javascript-format
+#: ../extensions/places-menu/extension.js:47
+msgid "Devices"
+msgstr "الأجهزة"
+
+#: ../extensions/places-menu/extension.js:48
+msgid "Bookmarks"
+msgstr "العلامات"
+
+#: ../extensions/places-menu/extension.js:49
+msgid "Network"
+msgstr "الشبكة"
+
+#: ../extensions/places-menu/placeDisplay.js:48
+#, c-format
 msgid "Failed to launch \"%s\""
 msgstr "فشل تشغيل \"%s\""

-#: ../extensions/places-menu/placeDisplay.js:101
-#: ../extensions/places-menu/placeDisplay.js:124
-msgid "Computer"
-msgstr "الحاسوب"
-
-#: ../extensions/places-menu/placeDisplay.js:267
+#: ../extensions/places-menu/placeDisplay.js:121
 msgid "Home"
 msgstr "المنزل"

-#: ../extensions/places-menu/placeDisplay.js:311
-msgid "Browse Network"
+#: ../extensions/places-menu/placeDisplay.js:195
+msgid "File System"
+msgstr "نظام الملفات"
+
+#: ../extensions/places-menu/placeDisplay.js:199
+msgid "Browse network"
 msgstr "تصفّح الشبكة"

-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
-msgid "Cycle Screenshot Sizes"
-msgstr ""
+#: ../extensions/systemMonitor/extension.js:213
+msgid "CPU"
+msgstr "المعالج"
+
+#: ../extensions/systemMonitor/extension.js:266
+msgid "Memory"
+msgstr "الذاكرة"

 #: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
@@ -219,173 +226,46 @@ msgstr "اسم السمة"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr ""

-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "أغلق"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "ألغِ التصغير"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "صغّر"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "ألغِ التكبير"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "كبّر"
-
-#: ../extensions/window-list/extension.js:403
-msgid "Minimize all"
-msgstr "صغّر الكل"
-
-#: ../extensions/window-list/extension.js:411
-msgid "Unminimize all"
-msgstr "ألغِ تصغير الكل"
-
-#: ../extensions/window-list/extension.js:419
-msgid "Maximize all"
-msgstr "كبّر الكل"
-
-#: ../extensions/window-list/extension.js:428
-msgid "Unmaximize all"
-msgstr "ألغِ تكبير الكل"
-
-#: ../extensions/window-list/extension.js:437
-msgid "Close all"
-msgstr "أغلق الكل"
-
-#: ../extensions/window-list/extension.js:661
 #: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "مؤشر مساحات العمل"

-#: ../extensions/window-list/extension.js:820
-msgid "Window List"
-msgstr "قائمة النوافذ"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "متى تجمّع النوافذ"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"يقرر متى تجمع نوافذ نفس التطبيق في قائمة النوافذ. القيم الممكنة هي \"never"
-"\"، \"auto\" و \"always\"."
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
-msgid "Show the window list on all monitors"
-msgstr ""
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-
-#: ../extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "تجميع النوافذ"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "لا تجمّع النوافذ أبدا"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "جمّع النوافذ عندما تكون المساحة محدودة"
-
-#: ../extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "جمّع النوافذ دائما"
-
-#: ../extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr ""
-
 #: ../extensions/workspace-indicator/prefs.js:141
-#, fuzzy
-msgid "Workspace Names"
+msgid "Workspace names:"
 msgstr "أسماء مساحات العمل"

-#: ../extensions/workspace-indicator/prefs.js:157
+#: ../extensions/workspace-indicator/prefs.js:152
 msgid "Name"
 msgstr "الاسم"

-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
+#: ../extensions/workspace-indicator/prefs.js:186
+#, c-format
 msgid "Workspace %d"
 msgstr "مساحة العمل %Id"

-#~ msgid "GNOME Shell Classic"
-#~ msgstr "صدفة جنوم تقليدية"
+#: ../extensions/xrandr-indicator/extension.js:30
+msgid "Normal"
+msgstr "عادي"

-#~ msgid "Window management and application launching"
-#~ msgstr "إدارة النوافذ وإطلاق التطبيقات"
+#: ../extensions/xrandr-indicator/extension.js:31
+msgid "Left"
+msgstr "يسار"

-#~ msgid "CPU"
-#~ msgstr "المعالج"
+#: ../extensions/xrandr-indicator/extension.js:32
+msgid "Right"
+msgstr "يمين"

-#~ msgid "Memory"
-#~ msgstr "الذاكرة"
+#: ../extensions/xrandr-indicator/extension.js:33
+msgid "Upside-down"
+msgstr "رأسا على عقب"

-#~ msgid "Normal"
-#~ msgstr "عادي"
+#: ../extensions/xrandr-indicator/extension.js:50
+msgid "Display"
+msgstr "العرض"

-#~ msgid "Left"
-#~ msgstr "يسار"
-
-#~ msgid "Right"
-#~ msgstr "يمين"
-
-#~ msgid "Upside-down"
-#~ msgstr "رأسا على عقب"
-
-#~ msgid "Display"
-#~ msgstr "العرض"
-
-#~ msgid "Display Settings"
-#~ msgstr "إعدادات العرض"
-
-#~ msgid "Suspend"
-#~ msgstr "علّق"
-
-#~ msgid "Hibernate"
-#~ msgstr "أسبِت"
-
-#~ msgid "Power Off"
-#~ msgstr "أطفئ"
-
-#~ msgid "Enable suspending"
-#~ msgstr "فعّل التعليق"
-
-#~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "تحكم في ظهور ”علّق“ في القائمة"
-
-#~ msgid "Enable hibernating"
-#~ msgstr "فعّل الإسبات"
-
-#~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "تحكم في ظهور ”أسبِت“ في القائمة"
-
-#~ msgid "Devices"
-#~ msgstr "الأجهزة"
-
-#~ msgid "Bookmarks"
-#~ msgstr "العلامات"
-
-#~ msgid "Network"
-#~ msgstr "الشبكة"
-
-#~ msgid "File System"
-#~ msgstr "نظام الملفات"
+#: ../extensions/xrandr-indicator/extension.js:80
+msgid "Display Settings"
+msgstr "إعدادات العرض"

 #~ msgid "Drag here to add favorites"
 #~ msgstr "اسحب إلى هنا ليضاف إلى المفضّلة"
@@ -399,6 +279,9 @@ msgstr "مساحة العمل %Id"
 #~ msgid "Remove from Favorites"
 #~ msgstr "أزِل من المفضّلة"

+#~ msgid "Add to Favorites"
+#~ msgstr "أضِف إلى المفضّلة"
+
 #~ msgid "Icon size"
 #~ msgstr "حجم الأيقونة"

--- a/po/as.po
+++ b/po/as.po
@@ -1,382 +0,0 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2013, 2014.
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2014-08-13 07:35+0000\n"
-"PO-Revision-Date: 2014-08-13 17:37+0530\n"
-"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: as\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "GNOME ক্লাচিক"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "এই অধিবেশনে আপোনাক GNOME ক্লাচিকলৈ লগ কৰে"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME শ্বেল ক্লাচিক"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "উইন্ডো ব্যৱস্থাপনা আৰু এপ্লিকেচনৰ লঞ্চ"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "মডাল ডাইলগ উপধায়ক উইন্ডোৰ সৈতে সংলগ্ন কৰক"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "GNOME শ্বেল চলাওতে এই কি'য়ে org.gnome.mutter ত থকা কি' অভাৰৰাইড কৰে।"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "শীৰ্ষলবাৰত বুটামসমূহৰ ব্যৱস্থাপনা"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-#| msgid ""
-#| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"এই কি'য়ে GNOME শ্বেল চলাওতে org.gnome.desktop.wm.preferences ত থকা কি'ক "
-"অভাৰৰাইড কৰে।"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "উইন্ডোসমূহক পৰ্দাৰ প্ৰান্তসমূহত এৰোতে প্ৰান্ত টাইলিং সামৰ্থবান কৰক"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "কাৰ্য্যস্থানসমূহ কেৱল প্ৰাথমিক মনিটৰত"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"বিলম্বৰ ফকাচ মাউছ অৱস্থাত পৰিবৰ্তন হয় যেতিয়ালৈকে পইন্টাৰে গমন কৰা বন্ধ নকৰে"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "কেৱল থাম্বনেইল"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "কেৱল এপ্লিকেচন আইকন"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "থাম্বনেইল আৰু এপ্লিকেচন আইকন"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "উইন্ডোসমূহক এই ধৰণে পৰিৱেশন কৰক"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "কেৱল বৰ্তমান কাৰ্য্যস্থানত থকা উইন্ডোসমূহ দেখুৱাওক"
-
-#: ../extensions/apps-menu/extension.js:39
-msgid "Activities Overview"
-msgstr "কাৰ্য্যসমূহৰ অভাৰভিউ"
-
-#: ../extensions/apps-menu/extension.js:113
-msgid "Favorites"
-msgstr "পছন্দৰ"
-
-#: ../extensions/apps-menu/extension.js:282
-msgid "Applications"
-msgstr "এপ্লিকেচনসমূহ"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid "Application and workspace list"
-msgstr "এপ্লিকেচন আৰু কাৰ্য্যস্থান তালিকা"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"স্ট্ৰিংসমূহৰ এটা তালিকা, প্ৰতিটোয়ে এটা এপ্লিকেচন আইডি (ডেস্কটপ ফাইল নাম), এটা "
-"কল'ন "
-"আৰু কাৰ্য্যস্থান নম্বৰৰ সৈতে অনুকৰণ কৰা অন্তৰ্ভুক্ত কৰে"
-
-#: ../extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "এপ্লিকেচন"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "কাৰ্য্যস্থান"
-
-#: ../extensions/auto-move-windows/prefs.js:85
-#| msgid "Add rule"
-msgid "Add Rule"
-msgstr "নিয়ম যোগ কৰক"
-
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "নতুন মিল খোৱা নিয়ম সৃষ্টি কৰক"
-
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "যোগ কৰক"
-
-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "ড্ৰাইভ '%s' বাহিৰ কৰাটো ব্যৰ্থ হ'ল:"
-
-#: ../extensions/drive-menu/extension.js:123
-msgid "Removable devices"
-msgstr "আতৰাব পৰা ডিভাইচসমূহ"
-
-#: ../extensions/drive-menu/extension.js:150
-msgid "Open File"
-msgstr "ফাইল খোলক"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "নমস্কাৰ, বিশ্ব!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "বৈকল্পিক অভিন্দন লিখনি।"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr "যদি ৰিক্ত নহয়, ই পেনেল ক্লিক কৰোতে দেখুৱা লিখনি অন্তৰ্ভুক্ত কৰিব।"
-
-#: ../extensions/example/prefs.js:30
-#| msgid "Message:"
-msgid "Message"
-msgstr "বাৰ্তা"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"উদাহৰণে শ্বেলৰ বাবে কিধৰণে ভাল ব্যৱহাৰ কৰা সম্প্ৰসাৰণসমূহ নিৰ্মাণ কৰিব লাগে "
-"দেখুৱাবলে লক্ষ্য লয় আৰু সেয়েহে ইয়াৰ খুব ক'ম নিজস্ব কাৰ্যকৰীতা থাকে।\n"
-"যি কি নহওক অভিন্দন বাৰ্তাটো স্বনিৰ্বাচন কৰাটো সম্ভব।"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid "Use more screen for windows"
-msgstr "উইন্ডোসমূহৰ বাবে অধিক পৰ্দা ব্যৱহাৰ কৰক"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"পৰ্দা অনুপাত হাৰৰ সৈতে অনুকূলন কৰি উইন্ডো থাম্বনেইলসমূহ উপস্থাপন কৰাৰ বাবে "
-"অধিক পৰ্দা "
-"ব্যৱহাৰ কৰাৰ, আৰু বান্ধনী বাকচ হ্ৰাস কৰিবলে সিহতক ততোধিক শৃঙ্খলাবদ্ধ কৰাৰ "
-"চেষ্টা "
-"কৰক। এই সংহতি কেৱল স্বাভাৱিক উপস্থাপন কৌশলৰ সৈতে প্ৰযোজ্য।"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid "Place window captions on top"
-msgstr "উইন্ডো কেপষণসমূহ ওপৰত ৰাখক"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"যদি সত্য, উইন্ডো কেপষণ প্ৰতিটো থাম্বনেইলৰ ওপৰত ৰাখক, ইয়াক তলত ৰখাৰ শ্বেলৰ "
-"অবিকল্পিত প্ৰক্ৰিয়াক অভাৰৰাইড কৰাকৈ। এই সংহতিৰ পৰিবৰ্তন প্ৰভাৱশালী হ'বলৈ "
-"শ্বেল "
-"পুনৰাম্ভ কৰাৰ প্ৰয়োজন।"
-
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "স্থানবোৰ"
-
-#: ../extensions/places-menu/placeDisplay.js:57
-#, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "\"%s\" লঞ্চ কৰিবলে ব্যৰ্থ"
-
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
-msgid "Computer"
-msgstr "কমপিউটাৰ"
-
-#: ../extensions/places-menu/placeDisplay.js:200
-msgid "Home"
-msgstr "ঘৰ"
-
-#: ../extensions/places-menu/placeDisplay.js:287
-msgid "Browse Network"
-msgstr "নেটৱৰ্ক ব্ৰাউছ কৰক"
-
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "CPU"
-
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "মেমৰি"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "Theme name"
-msgstr "থীম নাম"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "~/.themes/name/gnome-shell ৰ পৰা ল'ড কৰিব লগিয়া থীমৰ নাম"
-
-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "বন্ধ কৰক"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "ডাঙৰ কৰক"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "সৰু কৰক"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "সৰু কৰক"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "ডাঙৰ কৰক"
-
-#: ../extensions/window-list/extension.js:300
-msgid "Minimize all"
-msgstr "সকলো সৰু কৰক"
-
-#: ../extensions/window-list/extension.js:308
-msgid "Unminimize all"
-msgstr "সকলো ডাঙৰ কৰক"
-
-#: ../extensions/window-list/extension.js:316
-msgid "Maximize all"
-msgstr "সকলো ডাঙৰ কৰক"
-
-#: ../extensions/window-list/extension.js:325
-msgid "Unmaximize all"
-msgstr "সকলো সৰু কৰক"
-
-#: ../extensions/window-list/extension.js:334
-msgid "Close all"
-msgstr "সকলো বন্ধ কৰক"
-
-#: ../extensions/window-list/extension.js:644
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "কাৰ্য্যস্থান সূচক"
-
-#: ../extensions/window-list/extension.js:798
-msgid "Window List"
-msgstr "উইন্ডো তালিকা"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "উইন্ডোসমূহ কেতিয়া একত্ৰিত কৰা হ'ব"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"উইন্ডো তালিকাত একেটা এপ্লিকেচনৰ পৰা উইন্ডোসমূহ কেতিয়া দলবদ্ধ কৰা হ'ব নিৰ্ধাৰণ "
-"কৰে। "
-"সম্ভাব্য মানসমূহ হ'ল \"কেতিয়াও নহয়\", \"স্বচালিত\" আৰু \"সদায়\"।"
-
-#: ../extensions/window-list/prefs.js:30
-msgid "Window Grouping"
-msgstr "উইন্ডো দলবদ্ধকৰণ"
-
-#: ../extensions/window-list/prefs.js:49
-msgid "Never group windows"
-msgstr "উইন্ডোসমূহ কেতিয়াও দলবদ্ধ নকৰিব "
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Group windows when space is limited"
-msgstr "উইন্ডোসমূহ দলবদ্ধ কৰক যেতিয়া স্থান সীমিত থাকে"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Always group windows"
-msgstr "উইন্ডোসমূহ সদায় দলবদ্ধ কৰিব"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-#| msgid "Workspace names:"
-msgid "Workspace Names"
-msgstr "কাৰ্য্যস্থানৰ নামবোৰ"
-
-#: ../extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "নাম"
-
-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "কাৰ্য্যস্থান %d"
-
-#~ msgid "Suspend"
-#~ msgstr "স্থগিত কৰক"
-
-#~ msgid "Hibernate"
-#~ msgstr "হাইবাৰনেইট"
-
-#~ msgid "Power Off"
-#~ msgstr "বন্ধ কৰক"
-
-#~ msgid "Enable suspending"
-#~ msgstr "স্থগিত কৰা সামৰ্থবান কৰক"
-
-#~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "স্থগিত মেনু বস্তুৰ দৃশ্যমানতা নিয়ন্ত্ৰণ কৰক"
-
-#~ msgid "Enable hibernating"
-#~ msgstr "হাইবেৰনেইট কৰা সামৰ্থবান কৰক"
-
-#~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "হাইবেৰনেইট মেনু বস্তুৰ দৃশ্যমানতা নিয়ন্ত্ৰণ কৰক"
-
-#~ msgid "Normal"
-#~ msgstr "স্বাভাৱিক"
-
-#~ msgid "Left"
-#~ msgstr "বাঁওফাল"
-
-#~ msgid "Right"
-#~ msgstr "সোঁফাল"
-
-#~ msgid "Upside-down"
-#~ msgstr "উলোটা"
-
-#~ msgid "Display"
-#~ msgstr "প্ৰদৰ্শন"
-
-#~ msgid "Display Settings"
-#~ msgstr "প্ৰদৰ্শনৰ সংহতিসমূহ"
--- a/po/be.po
+++ b/po/be.po
@@ -1,345 +0,0 @@
-# Belarusian translation for gnome-shell-extensions.
-# Copyright (C) 2017 gnome-shell-extensions's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Yuras Shumovich <shumovichy@gmail.com>, 2017
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-02-22 18:40+0000\n"
-"PO-Revision-Date: 2017-03-02 19:49+0300\n"
-"Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
-"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
-"Language: be\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.11\n"
-
-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-msgid "GNOME Classic"
-msgstr "Класічны GNOME"
-
-#: data/gnome-classic.desktop.in:4
-msgid "This session logs you into GNOME Classic"
-msgstr "Гэты сеанс выкарыстоўвае класічны GNOME"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Прымацаваць мадальны дыялог да бацькоўскага акна"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr "Гэты ключ засланяе ключ у org.gnome.mutter калі запушчаны GNOME Shell."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Парадак кнопак у загалоўнай стужцы"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Гэты ключ засланяе ключ у org.gnome.desktop.wm.preferences калі запушчаны "
-"GNOME Shell."
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Аўтаматычна змяняць памеры акна пры перамяшчэнні да края экрана"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Працоўныя прасторы толькі на асноўным маніторы"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Затрымліваць змяненні фокуса ў рэжыме мышы да спынення паказальніка"
-
-#: extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Толькі мініяцюра"
-
-#: extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Толькі значок праграмы"
-
-#: extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Мініяцюра і значок праграмы"
-
-#: extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Адлюстроўваць вокны як"
-
-#: extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Паказваць вокны толькі з бягучай працоўная прасторы"
-
-#: extensions/apps-menu/extension.js:38
-msgid "Activities Overview"
-msgstr "Агляд заняткаў"
-
-#: extensions/apps-menu/extension.js:109
-msgid "Favorites"
-msgstr "Упадабаныя"
-
-#: extensions/apps-menu/extension.js:266
-msgid "Applications"
-msgstr "Праграмы"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
-msgid "Application and workspace list"
-msgstr "Праграма і спіс працоўных прастораў"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Спіс радкоў, кожны з якіх утрымлівае ідэнтыфікатар праграмы (імя *.desktop "
-"файла), затым двукроп'е і нумар працоўнай прасторы"
-
-#: extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "Праграма"
-
-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Працоўная прастора"
-
-#: extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
-msgstr "Дадаць правіла"
-
-#: extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Стварыць новае правіла адпаведнасці"
-
-#: extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Дадаць"
-
-#: extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "Не ўдалося выняць прывод \"%s\":"
-
-#: extensions/drive-menu/extension.js:124
-msgid "Removable devices"
-msgstr "Зменныя прыстасаванні"
-
-#: extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "Адкрыць файл"
-
-#: extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Прывітанне, свет!"
-
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
-msgid "Alternative greeting text."
-msgstr "Альтэрнатыўны тэкст вітання."
-
-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Калі не пуста, ўтрымлівае тэкст, які будзе паказвацца пры націсканні на "
-"панэль."
-
-#: extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Паведамленне"
-
-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
-msgstr ""
-"Example пакажа як ствараць пашырэнні для Shell. Сам па сабе ён мае мала "
-"функцыянальнасці.\n"
-"Тым не менш, можна змяніць тэкст прывітання."
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-msgid "Use more screen for windows"
-msgstr "Выкарыстоўваць большую плошчу экрана для вокнаў"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"Спрабаваць выкарыстаць большую плошчу экрана для размяшчэння мініяцюр шляхам "
-"змянення суадносінаў бакоў экрана і ўшчыльняючы іх з мэтай змяншэння памераў "
-"абмежавальнай рамкі. Гэты параметр ужываецца толькі разам з звычайным "
-"размяшчэннем мініяцюр."
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
-msgid "Place window captions on top"
-msgstr "Змяшчаць загалоўкі вокнаў зверху"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"Калі выбрана, загалоўкі вокнаў будуць размешчаны ўверсе мініяцюры, а не "
-"знізу, як прадвызначана. Для таго, каб гэтая настройка ўступіла ў сілу, "
-"трэба перазапусціць абалонку."
-
-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Месцы"
-
-#: extensions/places-menu/placeDisplay.js:59
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Не ўдалося запусціць \"%s\""
-
-#: extensions/places-menu/placeDisplay.js:101
-#: extensions/places-menu/placeDisplay.js:124
-msgid "Computer"
-msgstr "Камп'ютар"
-
-#: extensions/places-menu/placeDisplay.js:267
-msgid "Home"
-msgstr "Дамашняя папка"
-
-#: extensions/places-menu/placeDisplay.js:311
-msgid "Browse Network"
-msgstr "Агляд сеткі"
-
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-msgid "Cycle Screenshot Sizes"
-msgstr "Чаргаваць памеры экраннага здымка"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
-msgid "Theme name"
-msgstr "Імя матыву аздаблення"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr ""
-"Імя матыву аздаблення, які будзе загружаны з ~/.themes/name/gnome-shell"
-
-#: extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Закрыць"
-
-#: extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Скасаваць мінімалізацыю"
-
-#: extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Мінімалізаваць"
-
-#: extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Скасаваць максімалізацыю"
-
-#: extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Максімалізаваць"
-
-#: extensions/window-list/extension.js:411
-msgid "Minimize all"
-msgstr "Мінімалізаваць усе"
-
-#: extensions/window-list/extension.js:419
-msgid "Unminimize all"
-msgstr "Скасаваць мінімалізацыю для ўсіх"
-
-#: extensions/window-list/extension.js:427
-msgid "Maximize all"
-msgstr "Максімалізаваць усе"
-
-#: extensions/window-list/extension.js:436
-msgid "Unmaximize all"
-msgstr "Скасаваць максімалізацыю для ўсіх"
-
-#: extensions/window-list/extension.js:445
-msgid "Close all"
-msgstr "Закрыць усе"
-
-#: extensions/window-list/extension.js:669
-#: extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Індыкатар працоўнай прасторы"
-
-#: extensions/window-list/extension.js:833
-msgid "Window List"
-msgstr "Спіс вокнаў"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
-msgid "When to group windows"
-msgstr "Калі групаваць вокны"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
-msgstr ""
-"Вырашае калі групаваць вокны адной праграмы ў спісе вокнаў. Магчымыя "
-"значэнні: \"never\" (ніколі), \"auto\" (аўтаматычна), \"always\" (заўсёды)."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-msgid "Show the window list on all monitors"
-msgstr "Паказаць спіс вокнаў на ўсіх маніторах"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Ці паказваць спіс вокнаў на ўсіх злучаных маніторах або толькі на галоўным."
-
-#: extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "Групаванне вокнаў"
-
-#: extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Ніколі не групаваць вокны"
-
-#: extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Групаваць вокны калі не хапае месца"
-
-#: extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Заўсёды групаваць вокны"
-
-#: extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "Паказаць усе маніторы"
-
-#: extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Назвы працоўных прастораў"
-
-#: extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Імя"
-
-#: extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Працоўная прастора %d"
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,345 +0,0 @@
-# Bulgarian translation for gnome-shell-extensions po-file.
-# Copyright (C) 2014, 2015 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Ivaylo Valkov <ivaylo@e-valkov.org>, 2014.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-09 21:10+0200\n"
-"PO-Revision-Date: 2015-03-09 21:10+0200\n"
-"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\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"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "Класически GNOME"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "Работната среда изглежда като класическия GNOME (2.x)"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Прикрепяне на модалните прозорци към родителските им прозорци"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Този ключ при е с по-голям приоритет от „org.gnome.mutter“ при изпълнението "
-"на обвивката на GNOME."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Подредба на бутоните на заглавната лента"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Този ключ при е с по-голям приоритет от „org.gnome.desktop.wm.preferences“ "
-"при изпълнението на обвивката на GNOME."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Включване на специална подредба при приближаване на прозорец до ръбовете на "
-"екрана"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Работни плотове само на основния екран"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Забавяне на смяната на фокуса до спирането на движението на показалеца"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Само миниатюри"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Само икони на приложенията"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Миниатюри и икони на приложенията"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Показване на прозорците като"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Да се показват само прозорците на текущия работен плот"
-
-#: ../extensions/apps-menu/extension.js:39
-msgid "Activities Overview"
-msgstr "Показване на програмите"
-
-#: ../extensions/apps-menu/extension.js:110
-msgid "Favorites"
-msgstr "Любими"
-
-#: ../extensions/apps-menu/extension.js:279
-msgid "Applications"
-msgstr "Програми"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid "Application and workspace list"
-msgstr "Списък с програмите и работните плотове"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Списък от низове. Всеки съдържа идентификатор на програма (име на файл „."
-"desktop“ file name), следван от знака „:“ и номер на работен плот"
-
-#: ../extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "Програма"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Работен плот"
-
-#: ../extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
-msgstr "Добавяне на правило"
-
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Създаване на правило за съвпадение"
-
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Добавяне"
-
-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Неуспешно изваждане на устройство „%s“:"
-
-#: ../extensions/drive-menu/extension.js:124
-msgid "Removable devices"
-msgstr "Преносими медии"
-
-#: ../extensions/drive-menu/extension.js:151
-msgid "Open File"
-msgstr "Отваряне на файл"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Здравей, свят!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "Друго приветстващо съобщение."
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Ако ключът не е празен, съдържанието му се извежда при натискането на панела."
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Съобщение"
-
-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"Това е пример за добре работещо разширение на обвивката на GNOME и има "
-"минимална функционалност.\n"
-"С него можете да промените приветстващото съобщение на панела."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid "Use more screen for windows"
-msgstr "Повече пространство за прозорците"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"Използване на по-голяма част от екрана за поставянето на мини изображения "
-"чрез промяна на съотношението на страните и допълнително обединяване за "
-"смаляване на обхващащия ги правоъгълник. Тази настройка се прилага само при "
-"естествената стратегия за поставяне на прозорците."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid "Place window captions on top"
-msgstr "Заглавия на прозорците отгоре"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"Ако е истина, заглавията на прозорците се поставят над мини изображенията "
-"им, а не както е стандартно — отдолу. За прилагане на промяната на "
-"настройката трябва да рестартирате обвивката на GNOME."
-
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Места"
-
-#: ../extensions/places-menu/placeDisplay.js:57
-#, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "Неуспешно стартиране на „%s“"
-
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
-msgid "Computer"
-msgstr "Компютър"
-
-#: ../extensions/places-menu/placeDisplay.js:200
-msgid "Home"
-msgstr "Домашна папка"
-
-#: ../extensions/places-menu/placeDisplay.js:287
-msgid "Browse Network"
-msgstr "Мрежа"
-
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
-msgid "Cycle Screenshot Sizes"
-msgstr "Смяна на размера на снимката на екрана"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "Theme name"
-msgstr "Име на темата"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr ""
-"Името на темата, която да бъде заредена от „~/.themes/name/gnome-shell“"
-
-#: ../extensions/window-list/extension.js:109
-msgid "Close"
-msgstr "Затваряне"
-
-#: ../extensions/window-list/extension.js:119
-msgid "Unminimize"
-msgstr "Деминимизиране"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Minimize"
-msgstr "Минимизиране"
-
-#: ../extensions/window-list/extension.js:126
-msgid "Unmaximize"
-msgstr "Демаксимизиране"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Maximize"
-msgstr "Максимизиране"
-
-#: ../extensions/window-list/extension.js:399
-msgid "Minimize all"
-msgstr "Минимизиране на всички"
-
-#: ../extensions/window-list/extension.js:407
-msgid "Unminimize all"
-msgstr "Деминимизиране на всички"
-
-#: ../extensions/window-list/extension.js:415
-msgid "Maximize all"
-msgstr "Максимизиране на всички"
-
-#: ../extensions/window-list/extension.js:424
-msgid "Unmaximize all"
-msgstr "Демаксимизиране на всички"
-
-#: ../extensions/window-list/extension.js:433
-msgid "Close all"
-msgstr "Затваряне на всички"
-
-#: ../extensions/window-list/extension.js:650
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Индикатор на работните плотове"
-
-#: ../extensions/window-list/extension.js:807
-msgid "Window List"
-msgstr "Списък на прозорците"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "Кога да се групират прозорците"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"Кога да се групират прозорците на една програма в списъка с прозорците. "
-"Възможните стойности са „never“ (никога), „auto“ (автоматично) и "
-"„always“ (винаги)."
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
-msgid "Show the window list on all monitors"
-msgstr "Извеждане на списъка с прозорци на всички монитори"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Дали списъкът с прозорци да се извежда на всички монитори или само на "
-"основния"
-
-#: ../extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "Групиране на прозорци"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Никога да не се групират"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Групиране при ограничено място"
-
-#: ../extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Винаги да се групират"
-
-#: ../extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "На всички монитори"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Имена на работните плотове"
-
-#: ../extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Име"
-
-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Работен плот %d"
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,397 +0,0 @@
-# sray <sray@redhat.com>, 2013, 2014. #zanata.
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2014-09-22 07:38+0000\n"
-"PO-Revision-Date: 2014-09-22 16:37+0000\n"
-"Last-Translator: \n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: bn_IN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "GNOME ক্লাসিক"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "এই সেশন অাপনাকে GNOME ক্লাসিকে লগ করায়"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME সেল ক্লাসিক"
-
-# auto translated by TM merge from project: gnome-shell, version: 3.8.4, DocId: gnome-shell
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "উইন্ডো পরিচালনা ও অ্যাপ্লিকেশন প্রারম্ভ"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "প্রধান উইন্ডোতে মোডেল ডায়ালগ সংযুক্ত করুন"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"GNOME সেল চালানোর ক্ষেত্রে এই কী in org.gnome.mutter এর কী ওভাররাইড করে।"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "শিরোনাম দন্ডে বোতামগুলির সজ্জা"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-#| msgid ""
-#| "This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"GNOME সেল চালানোর সময়ে এই কী org.gnome.desktop.wm.preferences-এর কী ওভাররাইড "
-"করে।"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "উইন্ডো স্ক্রীন কিনারায় রাখার সময়ে কিনারা টাইলিং সক্রিয় করুন"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "শুধুমাত্র প্রধান মনিটরে ওয়ার্কস্পেস"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"পয়েন্টার অবস্থান পরিবর্তন না থামানো পর্যন্ত মাউস মোডে ফোকাস পরিবর্তন বিলম্বিত "
-"করুন"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "শুধুমাত্র থাম্বনেইল"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "শুধুমাত্র অ্যাপ্লিকেশন অাইকন"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "থাম্বনেইল এবং অ্যাপ্লিকেশন অাইকন"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "এই রূপে উইন্ডো উপস্থাপনা"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "শুধুমাত্র উইন্ডো বর্তমান ওয়ার্কস্পেসে দেখান"
-
-#: ../extensions/apps-menu/extension.js:39
-msgid "Activities Overview"
-msgstr "ক্রিয়াকলাপের পূর্বরূপ"
-
-# auto translated by TM merge from project: system-config-printer, version: 1.1.16-23, DocId: system-config-printer
-#: ../extensions/apps-menu/extension.js:113
-msgid "Favorites"
-msgstr "বিশেষ"
-
-# auto translated by TM merge from project: gnome-menus, version: 3.8.0, DocId: gnome-menus-3.0
-#: ../extensions/apps-menu/extension.js:282
-msgid "Applications"
-msgstr "অ্যাপ্লিকেশন"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid "Application and workspace list"
-msgstr "অ্যাপ্লেকেশন এবং ওয়ার্কস্পেস তালিকা"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"স্ট্রীঙের একটি তালিকা, প্রতিটিতে থাকে একটি অ্যাপ্লিকেশন অাইডি (ডেস্কটপ ফাইল "
-"নাম), "
-"সংগে থাকে যতিচিহ্ন এবং ওয়ার্কস্পেস নম্বর"
-
-# auto translated by TM merge from project: yelp, version: 3.8.1, DocId: yelp
-#: ../extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "অ্যাপ্লিকেশন"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "ওয়ার্কস্পেস"
-
-# auto translated by TM merge from project: evolution, version: el6, DocId: evolution-2.32
-#: ../extensions/auto-move-windows/prefs.js:85
-#| msgid "Add rule"
-msgid "Add Rule"
-msgstr "নিয়ম যোগ করুন"
-
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "মেলানোর নতুন নিয়ম তৈরি করুন"
-
-# auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "যোগ করুন"
-
-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "'%s' ড্রাইভ ইজেক্ট করা গেল না:"
-
-#: ../extensions/drive-menu/extension.js:123
-msgid "Removable devices"
-msgstr "অপসারণযোগ্য ডিভাইসগুলি"
-
-# auto translated by TM merge from project: gnome-user-share, version: 3.8, DocId: gnome-user-share
-#: ../extensions/drive-menu/extension.js:150
-msgid "Open File"
-msgstr "ফাইল খুলুন"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "ওহে, বিশ্ব!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "বিকল্প অভিবাদন পাঠ্য।"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr "খালি না থাকলে, তাতে পাঠ্য থাকবে যা প্যানেলে ক্লিক করা হলে দেখানো হবে।"
-
-#: ../extensions/example/prefs.js:30
-#| msgid "Message:"
-msgid "Message"
-msgstr "বার্তা"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"সেলের জন্য সুস্থিত এক্সটেনশন কীভাবে গঠন করা সম্ভব তা উদাহরণের মাধ্যমে "
-"উপস্থাপিত করা "
-"হয়।\n"
-"উপরন্তু অভিভাদন বার্তা নিজের পছন্দ মতোও করে নেওয়া যায়।"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid "Use more screen for windows"
-msgstr "উইন্ডোর জন্য অারো স্ক্রীন ব্যবহার করুন"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"স্ক্রীন অ্যাসপেক্ট অনুপাত সামঞ্জস্যপূর্ণ করে উইন্ডো থাম্বনেইল রাখার জন্য অারো "
-"স্ক্রীন "
-"ব্যবহারের চেষ্টা করুন, এবং বাউন্ডিং বক্স কমাতে তাদের সংঘবদ্ধ করার চেষ্টা "
-"করুন। এই "
-"সেটিং শুধুমাত্র স্বাভাবিক প্লেসমেন্ট কৌশলের ক্ষেত্রেই প্রযোজ্য হয়।"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid "Place window captions on top"
-msgstr "উইন্ডো ক্যাপশন একেবারে শীর্ষে রাখুন"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"যদি সত্য হয়, তলায় রাখার সেল ডিফল্ট ওভাররাইড করে সংশ্লিষ্ট থাম্বনেইলের শীর্ষে "
-"উইন্ডো "
-"ক্যাপশন রাখুন। এই সেটিং পরিবর্তন করলে তা প্রয়োগ করতে সেল বন্ধ করে চালু করতে "
-"হবে।"
-
-# auto translated by TM merge from project: file-roller, version: 3.8.3, DocId: file-roller
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "অবস্থান"
-
-#: ../extensions/places-menu/placeDisplay.js:57
-#, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "\"%s\" লঞ্চ করা গেল না"
-
-# auto translated by TM merge from project: gvfs, version: 1.16.3, DocId: gvfs
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
-msgid "Computer"
-msgstr "কম্পিউটার"
-
-# auto translated by TM merge from project: rhsm-web, version: 0.0, DocId: management
-#: ../extensions/places-menu/placeDisplay.js:200
-msgid "Home"
-msgstr "প্রথম পাতা"
-
-#: ../extensions/places-menu/placeDisplay.js:287
-msgid "Browse Network"
-msgstr "নেটওয়ার্ক ব্রাউজ"
-
-# auto translated by TM merge from project: gnome-system-monitor, version: 3.8.2.1, DocId: gnome-system-monitor
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "CPU"
-
-# auto translated by TM merge from project: RHEV Installation Guide, version: 3.1, DocId: topics/Planning_your_Data_Center
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "মেমরি"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "Theme name"
-msgstr "থিম নাম"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "থিমের নাম, ~/.themes/name/gnome-shell থেকে লোড করা হবে"
-
-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "বন্ধ করুন"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "অান-মিনিমাইজ"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "ছোট করুন"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "অান-ম্যাক্সিমাইজ"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "বড় করুন"
-
-#: ../extensions/window-list/extension.js:300
-msgid "Minimize all"
-msgstr "সকল ছোট করুন"
-
-#: ../extensions/window-list/extension.js:308
-msgid "Unminimize all"
-msgstr "সকল অান-মিনিমাইজ করুন"
-
-#: ../extensions/window-list/extension.js:316
-msgid "Maximize all"
-msgstr "সকল বড় করুন"
-
-#: ../extensions/window-list/extension.js:325
-msgid "Unmaximize all"
-msgstr "সকল অান-ম্যাক্সিমাইজ করুন"
-
-#: ../extensions/window-list/extension.js:334
-msgid "Close all"
-msgstr "সকল বন্ধ করুন"
-
-#: ../extensions/window-list/extension.js:644
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "ওয়ার্কস্পেস সূচক"
-
-#: ../extensions/window-list/extension.js:808
-#| msgid "Window Grouping"
-msgid "Window List"
-msgstr "উইন্ডো তালিকা"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "উইন্ডো দলভুক্তকরণ"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"উইন্ডো তালিকায় একই অ্যাপ্লিকেশন থেকে কখন উইন্ডো দলভুক্ত করা হবে তার সিদ্ধান্ত "
-"নেয়। "
-"সম্ভাব্য মানগুলি হল \"কখনও নয়\", \"স্বয়ংক্রিয়\" এবং \"সর্বদা\"।"
-
-#: ../extensions/window-list/prefs.js:30
-msgid "Window Grouping"
-msgstr "উইন্ডো দলভুক্তকরণ"
-
-#: ../extensions/window-list/prefs.js:49
-msgid "Never group windows"
-msgstr "উইন্ডো কখনও দলভুক্ত করবেন না"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Group windows when space is limited"
-msgstr "স্থান কম থাকলে উইন্ডো দলভুক্ত করুন"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Always group windows"
-msgstr "উইন্ডো সর্বদা দলভুক্ত করুন"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-#| msgid "Workspace names:"
-msgid "Workspace Names"
-msgstr "ওয়ার্কস্পেস নামগুলি"
-
-#: ../extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "নাম"
-
-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "ওয়ার্কস্পেস %d"
-
-# auto translated by TM merge from project: gdm, version: 3.8.4, DocId: gdm
-#~ msgid "Suspend"
-#~ msgstr "স্থগিত করুন"
-
-#~ msgid "Hibernate"
-#~ msgstr "নিদ্রিত অবস্থা"
-
-# auto translated by TM merge from project: gnome-shell, version: 3.8.4, DocId: gnome-shell
-#~ msgid "Power Off"
-#~ msgstr "বন্ধ করুন"
-
-#~ msgid "Enable suspending"
-#~ msgstr "স্থগিত সক্রিয় করুন"
-
-#~ msgid "Control the visibility of the Suspend menu item"
-#~ msgstr "স্থগিত মেনু অাইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
-
-#~ msgid "Enable hibernating"
-#~ msgstr "নিদ্রিত অবস্থা সক্রিয় করুন"
-
-#~ msgid "Control the visibility of the Hibernate menu item"
-#~ msgstr "নিদ্রিত অবস্থা মেনু অাইটেমের দৃশ্যমানতা নিয়ন্ত্রণ করুন"
-
-#~ msgid "Normal"
-#~ msgstr "স্বাভাবিক"
-
-#~ msgid "Left"
-#~ msgstr "বাম"
-
-#~ msgid "Right"
-#~ msgstr "ডান"
-
-#~ msgid "Upside-down"
-#~ msgstr "উল্টো"
-
-#~ msgid "Display"
-#~ msgstr "প্রদর্শন"
-
-#~ msgid "Display Settings"
-#~ msgstr "প্রদর্শন সেটিং"
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,349 +0,0 @@
-# Bosnian translation for bosnianuniversetranslation
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the bosnianuniversetranslation package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: bosnianuniversetranslation\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-02-26 20:44+0000\n"
-"PO-Revision-Date: 2015-03-02 15:41+0100\n"
-"Last-Translator: Samir Ribić <Unknown>\n"
-"Language-Team: Bosnian <bs@li.org>\n"
-"Language: bs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-02-17 06:21+0000\n"
-"X-Generator: Poedit 1.7.4\n"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "Klasični GNOME"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "Ova sesija vas prijavljuje na klasični GNOME"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Pričvrstite modalni dijalog na izvornom prozoru"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Ovaj ključ nadjačava ključ u org.gnome.mutter kada se izvodi GNOME školjka."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Uređenje funkcijskih dugmadi na naslovoj traci"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Ovaj ključ nadglasava org.gnome.desktop.wm.preferences kada je pokrenut "
-"GNOME Shell."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Omogući poravnanje rubova prilikom spuštanja prozora na rubove ekrana"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Radni prostori samo na glavnom monitoru"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Kašnjenje fokusa  rezultuje promjenama  u načinu miša dok pokazivač prestaje "
-"s kretanjem"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Samo sa sličicama"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Ikone aplikacija samo"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Ikona aplikacije i sličice"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Prikaži prozor kao"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Prikaži samo prozore  u radnom prostoru"
-
-#: ../extensions/apps-menu/extension.js:39
-msgid "Activities Overview"
-msgstr "Pregled aktivnosti"
-
-#: ../extensions/apps-menu/extension.js:114
-msgid "Favorites"
-msgstr "Omiljeni"
-
-#: ../extensions/apps-menu/extension.js:283
-msgid "Applications"
-msgstr "Aplikacije"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid "Application and workspace list"
-msgstr "Popis aplikacije i radnog prostora"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Popis stringova, koje sadrži  id aplikacija (naziv dektop file), pračene sa "
-"kolonom  i brojem radnog prostora"
-
-#: ../extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "Aplikacija"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Radni prostor"
-
-#: ../extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
-msgstr "Dodaj pravilo"
-
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Kreiranje novog odgovarajućeg pravila"
-
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../extensions/drive-menu/extension.js:106
-msgid "Ejecting drive '%s' failed:"
-msgstr "Izbacivanje diska '%s' nije uspjelo:"
-
-#: ../extensions/drive-menu/extension.js:124
-msgid "Removable devices"
-msgstr "Uklonjivi uređaji"
-
-#: ../extensions/drive-menu/extension.js:151
-msgid "Open File"
-msgstr "Otvori datoteku"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Pozdrav svima!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "Alternativni tekst pozdrava."
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Ako nije prazno,onda sadrži tekst koji će se prikazati na panelu kada se "
-"klikne."
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Poruka"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"Primjer ima za cilj pokazati kako izgraditi dobro ponašanje proširenja za "
-"školjku i kao takav ima malo funkcionalnost na sebi samom.\n"
-"Ipak je moguće prilagoditi pozdravnu poruku."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid "Use more screen for windows"
-msgstr "Koristite više zaslona za prozor"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"Pokušajte koristiti više zaslona za stavljanje sličice prozora prilagodbom "
-"omjera širine zaslona i konsoliduj ih dodatnim smanjenjem okvira. Ova "
-"postavka vrijedi samo uz strategiju prirodnog postavljanja na sebi samom."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid "Place window captions on top"
-msgstr "Postavite naslov prozora na vrh"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"Ako je tačno, stavite prozor naslova na vrh odgovarajuće sličice, "
-"preskakanjem ljuske zadane očekivano smještajući je na dno. Promjena ove "
-"postavke zahtijeva ponovno pokretanje ljuske kako bi postojao bilo kakav "
-"utjecaj."
-
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Mjesta"
-
-#: ../extensions/places-menu/placeDisplay.js:57
-msgid "Failed to launch \"%s\""
-msgstr "Neuspješno lansiranje \"%s\""
-
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
-msgid "Computer"
-msgstr "Računar"
-
-#: ../extensions/places-menu/placeDisplay.js:200
-msgid "Home"
-msgstr "Početna"
-
-#: ../extensions/places-menu/placeDisplay.js:287
-msgid "Browse Network"
-msgstr "Razgledaj mrežu"
-
-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.in.h:1
-msgid "Cycle Screenshot Sizes"
-msgstr "Prolazi kroz veličine slka ekrana"
-
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "CPU"
-
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "Memorija"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "Theme name"
-msgstr "Naziv teme"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "Ime teme ,da se učita iz  ~/.themes/name/gnome-shell"
-
-#: ../extensions/window-list/extension.js:109
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../extensions/window-list/extension.js:119
-msgid "Unminimize"
-msgstr "Ne minimiziraj"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Minimize"
-msgstr "Minimiziraj"
-
-#: ../extensions/window-list/extension.js:126
-msgid "Unmaximize"
-msgstr "Ne maksimizirati"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Maximize"
-msgstr "Maksimiziraj"
-
-#: ../extensions/window-list/extension.js:399
-msgid "Minimize all"
-msgstr "Minimiziraj sve"
-
-#: ../extensions/window-list/extension.js:407
-msgid "Unminimize all"
-msgstr "Ne minimiziraj sve"
-
-#: ../extensions/window-list/extension.js:415
-msgid "Maximize all"
-msgstr "Maksimizuj sve"
-
-#: ../extensions/window-list/extension.js:424
-msgid "Unmaximize all"
-msgstr "Ne maksimiziraj sve"
-
-#: ../extensions/window-list/extension.js:433
-msgid "Close all"
-msgstr "Zatvori sve"
-
-#: ../extensions/window-list/extension.js:650
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Indikator radnog prostora"
-
-#: ../extensions/window-list/extension.js:807
-msgid "Window List"
-msgstr "Lista Prozora"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "Kada grupisati prozore"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"Određuje kada grupisati prozore iz istog programa na listi prozora. "
-"Dozvoljene vrijednosti su \"never\" (nikad), \"auto\" (automatski) i \"always"
-"\" (uvijek)."
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
-msgid "Show the window list on all monitors"
-msgstr "Prikaži listu prozora na svim monitorima"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:4
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Da li prikazati listu prozora na svim spojenim monitorima ili samo na "
-"primarnom"
-
-#: ../extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "Grupisanje prozora"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Nikada ne grupiši prozore"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Grupiši prozore kada je prostor ograničen"
-
-#: ../extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Uvijek grupiši prozore"
-
-#: ../extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "Prikaži na svim monitorima"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Imena radnih površina"
-
-#: ../extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Ime"
-
-#: ../extensions/workspace-indicator/prefs.js:198
-msgid "Workspace %d"
-msgstr "Radni prostor %d"
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,98 +2,93 @@
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 # Jordi Mas i Hernandez <jmas@softcatala.org>, 2011.
-# Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014.
+# Gil Forcada <gilforcada@guifi.net>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-03-04 10:07+0100\n"
-"PO-Revision-Date: 2014-08-17 14:38+0200\n"
+"POT-Creation-Date: 2012-09-06 17:51+0000\n"
+"PO-Revision-Date: 2012-09-29 00:02+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Adjunta el diàleg modal a la finestra pare"
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:1
+msgid "The application icon mode."
+msgstr "El mode d'icona d'aplicació."

-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:2
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
 msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+"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 ""
-"Si s'executa el GNOME Shell, aquesta clau sobreescriu la clau «org.gnome."
-"mutter»."
+"Configura com es mostren les icones en l'intercanviador. Les possibilitats "
+"vàlides són «thumbnail-only» (només miniatures, mostra les miniatures de les "
+"finestres), «app-icon-only» (només icona de l'aplicació, mostra només la "
+"icona de l'aplicació) o «both» (ambdós, mostra tan la icona de l'aplicació "
+"com la miniatura). "

-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Disposició dels botons en la barra de títol"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Si s'executa el GNOME Shell, aquesta clau sobreescriu la clau «org.gnome."
-"desktop.wm.preferences»."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Habilita la tesselització a les vores en deixar anar les finestres a les "
-"vores de la pantalla"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Els espais de treball només es mostren en el monitor principal"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Retarda el canvi de focus, en mode ratolí, fins que el punter estigui quiet"
-
-#: ../extensions/alternate-tab/prefs.js:20
+#: ../extensions/alternate-tab/prefs.js:26
 msgid "Thumbnail only"
 msgstr "Només miniatures"

-#: ../extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:27
 msgid "Application icon only"
 msgstr "Només la icona de l'aplicació"

-#: ../extensions/alternate-tab/prefs.js:22
+#: ../extensions/alternate-tab/prefs.js:28
 msgid "Thumbnail and application icon"
 msgstr "Miniatura i icona de l'aplicació"

-#: ../extensions/alternate-tab/prefs.js:38
+#: ../extensions/alternate-tab/prefs.js:43
 msgid "Present windows as"
 msgstr "Mostra les finestres com a"

-#: ../extensions/alternate-tab/prefs.js:69
+#: ../extensions/alternate-tab/prefs.js:68
 msgid "Show only windows in the current workspace"
 msgstr "Mostra només les icones de l'espai de treball actual"

-#: ../extensions/apps-menu/extension.js:38
-msgid "Activities Overview"
-msgstr "Vista general d'activitats"
+#. add the new entries
+#: ../extensions/alternative-status-menu/extension.js:68
+msgid "Suspend"
+msgstr "Atura temporalment"

-#: ../extensions/apps-menu/extension.js:109
-msgid "Favorites"
-msgstr "Preferides"
+#: ../extensions/alternative-status-menu/extension.js:73
+msgid "Hibernate"
+msgstr "Hiberna"

-#: ../extensions/apps-menu/extension.js:266
-msgid "Applications"
-msgstr "Aplicacions"
+#: ../extensions/alternative-status-menu/extension.js:78
+msgid "Power Off"
+msgstr "Apaga"

-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:1
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:1
+msgid "Enable suspending"
+msgstr "Habilita l'aturada temporal"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:2
+msgid "Control the visibility of the Suspend menu item"
+msgstr "Permet controlar si es mostra l'element de menú «Atura temporalment»"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:3
+msgid "Enable hibernating"
+msgstr "Habilita la hibernació"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:4
+msgid "Control the visibility of the Hibernate menu item"
+msgstr "Permet controlar si es mostra l'element de menú «Hiberna»"
+
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
 msgstr "Aplicació i llista d'espais de treball"

-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.h:2
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -102,93 +97,184 @@ msgstr ""
 "d'aplicació (nom del fitxer de l'escriptori), seguit de dos punts i el "
 "número de l'espai de treball"

-#: ../extensions/auto-move-windows/prefs.js:60
+#: ../extensions/auto-move-windows/prefs.js:55
 msgid "Application"
 msgstr "Aplicació"

-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
+#: ../extensions/auto-move-windows/prefs.js:64
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Workspace"
 msgstr "Espai de treball"

-#: ../extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
+#: ../extensions/auto-move-windows/prefs.js:80
+msgid "Add rule"
 msgstr "Afegeix una regla"

-#: ../extensions/auto-move-windows/prefs.js:106
+#: ../extensions/auto-move-windows/prefs.js:94
 msgid "Create new matching rule"
 msgstr "Crea una regla de coincidència nova"

-#: ../extensions/auto-move-windows/prefs.js:111
+#: ../extensions/auto-move-windows/prefs.js:98
 msgid "Add"
 msgstr "Afegeix"

-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "Ha fallat l'expulsió de la unitat «%s»:"
+#: ../extensions/dock/extension.js:600
+msgid "Drag here to add favorites"
+msgstr "Arrossegueu aquí per afegir als preferits"

-#: ../extensions/drive-menu/extension.js:124
+#: ../extensions/dock/extension.js:926
+msgid "New Window"
+msgstr "Finestra nova"
+
+#: ../extensions/dock/extension.js:928
+msgid "Quit Application"
+msgstr "Surt de l'aplicació"
+
+#: ../extensions/dock/extension.js:933
+msgid "Remove from Favorites"
+msgstr "Suprimeix dels preferits"
+
+#: ../extensions/dock/extension.js:934
+msgid "Add to Favorites"
+msgstr "Afegeix als preferits"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
+msgid "Position of the dock"
+msgstr "Posició de l'acoblador"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
+msgid ""
+"Sets the position of the dock in the screen. Allowed values are 'right' or "
+"'left'"
+msgstr ""
+"Defineix la posició de l'acoblador a la pantalla. Els valors permesos són "
+"«right» (dreta) o «left» (esquerra)"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
+msgid "Icon size"
+msgstr "Mida de la icona"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
+msgid "Sets icon size of the dock."
+msgstr "Defineix la mida de la icona per l'acoblador."
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
+msgid "Enable/disable autohide"
+msgstr "Habilita/inhabilita l'ocultació automàtica"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
+msgid "Autohide effect"
+msgstr "Efecte de l'ocultació automàtica"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:7
+msgid ""
+"Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' and "
+"'move'"
+msgstr ""
+"Defineix l'efecte de l'acoblador ocult. Els valors permesos són "
+"«resize» (amplia), «rescale» (escala) i «move» (mou)"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:8
+msgid "Autohide duration"
+msgstr "Duració de l'ocultació automàtica"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
+msgid "Sets the time duration of the autohide effect."
+msgstr "Defineix la durada en temps de l'efecte d'ocultació automàtica."
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:10
+msgid "Monitor"
+msgstr "Pantalla"
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:11
+msgid ""
+"Sets monitor to display dock in. The default value (-1) is the primary "
+"monitor."
+msgstr ""
+"Estableix la pantalla a on es mostra l'acoblador. El valor per defecte és "
+"«-1», la pantalla principal."
+
+#: ../extensions/drive-menu/extension.js:56
 msgid "Removable devices"
 msgstr "Dispositius extraïbles"

-#: ../extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "Obre el fitxer"
+#: ../extensions/drive-menu/extension.js:67
+msgid "Open file manager"
+msgstr "Obre del gestor de fitxers"

 #: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hola, món!"

-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:1
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
 msgstr "Text de rebuda alternatiu."

-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.h:2
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
 "Si no és buit, conté el text que es mostrarà quan es faci clic en el quadre."

-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Missatge"
-
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: ../extensions/example/prefs.js:43
+#: ../extensions/example/prefs.js:30
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
+"Nevertheless it's possible to customize the greeting message."
 msgstr ""
 "L'«Example» està pensat com una extensió del GNOME Shell que demostri la "
 "manera correcta de crear extensions. Com a extensió pròpiament dita no fa "
 "gairebé res.\n"
-"Tot i així permet personalitzar el missatge de benvinguda."
+"Tot i així permet personalitzar el missatge del rebedor."

-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:1
+#: ../extensions/example/prefs.js:36
+msgid "Message:"
+msgstr "Missatge:"
+
+#: ../extensions/gajim/extension.js:226
+#, c-format
+msgid "%s is away."
+msgstr "%s està absent."
+
+#: ../extensions/gajim/extension.js:229
+#, c-format
+msgid "%s is offline."
+msgstr "%s està fora de línia."
+
+#: ../extensions/gajim/extension.js:232
+#, c-format
+msgid "%s is online."
+msgstr "%s està en línia."
+
+#: ../extensions/gajim/extension.js:235
+#, c-format
+msgid "%s is busy."
+msgstr "%s està ocupat."
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr "Utilitza més pantalla per les finestres"

-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:2
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
 "Intenta utilitzar més espai de la pantalla per posicionar les miniatures de "
-"les finestres adaptant-les a la ràtio d'aspecte de la pantalla, consolidant-"
+"les finestres adaptant-les al ràtio d'aspecte de la pantalla, consolidant-"
 "les més per reduir la capsa que les envolta. Aquest paràmetre de "
 "configuració només s'aplica a l'estratègia de posicionament de finestres "
 "natural."

-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:3
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
 msgid "Place window captions on top"
 msgstr "Posiciona els títols de les finestres al damunt"

-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.h:4
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -196,165 +282,246 @@ msgid ""
 msgstr ""
 "Si és «true» (cert), posiciona el títol de la finestra damunt de la "
 "miniatura corresponent, substituint el comportament per defecte del Shell de "
-"posicionar-lo a baix. Cal reiniciar el Shell per tal que aquest canvi "
+"posicionar-lo a baix. Cal reiniciar el Shell per tal de que aquest canvi "
 "tingui efecte."

-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:46
 msgid "Places"
 msgstr "Llocs"

-#: ../extensions/places-menu/placeDisplay.js:59
-#, javascript-format
-msgid "Failed to launch “%s”"
+#: ../extensions/places-menu/extension.js:47
+msgid "Devices"
+msgstr "Dispositius"
+
+#: ../extensions/places-menu/extension.js:48
+msgid "Bookmarks"
+msgstr "Adreces d'interès"
+
+#: ../extensions/places-menu/extension.js:49
+msgid "Network"
+msgstr "Xarxa"
+
+#: ../extensions/places-menu/placeDisplay.js:48
+#, c-format
+msgid "Failed to launch \"%s\""
 msgstr "No s'ha pogut iniciar «%s»"

-#: ../extensions/places-menu/placeDisplay.js:101
-#: ../extensions/places-menu/placeDisplay.js:124
-msgid "Computer"
-msgstr "Ordinador"
-
-#: ../extensions/places-menu/placeDisplay.js:267
+#: ../extensions/places-menu/placeDisplay.js:121
 msgid "Home"
 msgstr "Inici"

-#: ../extensions/places-menu/placeDisplay.js:311
-msgid "Browse Network"
+#: ../extensions/places-menu/placeDisplay.js:184
+msgid "File System"
+msgstr "Sistema de fitxers"
+
+#: ../extensions/places-menu/placeDisplay.js:188
+msgid "Browse network"
 msgstr "Navega per la xarxa"

-#: ../extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml.h:1
-msgid "Cycle Screenshot Sizes"
-msgstr "Mostra cíclicament mides de captura de pantalla"
+#: ../extensions/systemMonitor/extension.js:213
+msgid "CPU"
+msgstr "CPU"

-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:1
+#: ../extensions/systemMonitor/extension.js:266
+msgid "Memory"
+msgstr "Memòria"
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "Nom del tema"

-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.h:2
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "El nom del tema que es carregarà des de ~/.themes/name/gnome-shell"

-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Tanca"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Desminimitza"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Minimitza"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Desmaximitza"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Maximitza"
-
-#: ../extensions/window-list/extension.js:411
-msgid "Minimize all"
-msgstr "Minimitza-ho tot"
-
-#: ../extensions/window-list/extension.js:419
-msgid "Unminimize all"
-msgstr "Desminimitza-ho tot"
-
-#: ../extensions/window-list/extension.js:427
-msgid "Maximize all"
-msgstr "Maximitza-ho tot"
-
-#: ../extensions/window-list/extension.js:436
-msgid "Unmaximize all"
-msgstr "Desmaximitza-ho tot"
-
-#: ../extensions/window-list/extension.js:445
-msgid "Close all"
-msgstr "Tanca-ho tot"
-
-#: ../extensions/window-list/extension.js:669
 #: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "Indicador de l'espai de treball"

-#: ../extensions/window-list/extension.js:833
-msgid "Window List"
-msgstr "Llista de finestres"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:1
-msgid "When to group windows"
-msgstr "Quan s'han d'agrupar les finestres"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
-msgstr ""
-"Decideix quan s'han d'agrupar les finestres de la mateixa aplicació a la "
-"llista de finestres. Els valors possibles són: «never» (mai), "
-"«auto» (automàticament) i «always» (sempre)."
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:3
-msgid "Show the window list on all monitors"
-msgstr "Mostra la llista de finestres a tots els monitors"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.h:4
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Si es mostra la llista de finestres en tots els monitors connectats o només "
-"al primari."
-
-#: ../extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "Agrupació de finestres"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Mai agrupis les finestres"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Agrupa les finestres quan l'espai estigui limitat"
-
-#: ../extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Agrupa les finestres sempre"
-
-#: ../extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "Mostra a tots els monitors"
-
 #: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Noms dels espais de treball"
+msgid "Workspace names:"
+msgstr "Noms dels espais de treball:"

-#: ../extensions/workspace-indicator/prefs.js:157
+#: ../extensions/workspace-indicator/prefs.js:152
 msgid "Name"
 msgstr "Nom"

-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
+#: ../extensions/workspace-indicator/prefs.js:186
+#, c-format
 msgid "Workspace %d"
 msgstr "Espai de treball %d"

-#~ msgid "GNOME Classic"
-#~ msgstr "GNOME clàssic"
+#: ../extensions/xrandr-indicator/extension.js:30
+msgid "Normal"
+msgstr "Normal"

-#~ msgid "This session logs you into GNOME Classic"
-#~ msgstr "Aquesta sessió us permet utilitzar el GNOME clàssic"
+#: ../extensions/xrandr-indicator/extension.js:31
+msgid "Left"
+msgstr "Esquerra"

-#~ msgid "GNOME Shell Classic"
-#~ msgstr "GNOME Shell clàssic"
+#: ../extensions/xrandr-indicator/extension.js:32
+msgid "Right"
+msgstr "Dreta"

-#~ msgid "Window management and application launching"
-#~ msgstr "Gestió de finestres i iniciació d'aplicacions"
+#: ../extensions/xrandr-indicator/extension.js:33
+msgid "Upside-down"
+msgstr "Capgira"

-#~ msgid "CPU"
-#~ msgstr "CPU"
+#: ../extensions/xrandr-indicator/extension.js:50
+msgid "Display"
+msgstr "Pantalla"

-#~ msgid "Memory"
-#~ msgstr "Memòria"
+#: ../extensions/xrandr-indicator/extension.js:80
+msgid "Display Settings"
+msgstr "Paràmetres de la pantalla"
+
+#~ msgid "The alt tab behaviour."
+#~ msgstr "Comportament de l'«Alternate Tab»."
+
+#~ msgid ""
+#~ "Sets the Alt-Tab behaviour. Possible values are: all_thumbnails and "
+#~ "workspace_icons. See the configuration dialogs for details."
+#~ msgstr ""
+#~ "Defineix el comportament de l'«Alternate Tab». Els valors possibles són: "
+#~ "«all_thumbnails» (totes i les miniatures) i «workspace_icons» (espais de "
+#~ "treball i icones). Vegeu els diàlegs de configuració per saber-ne més."
+
+#~ msgid ""
+#~ "This mode presents all applications from all workspaces in one selection "
+#~ "list. Instead of using the application icon of every window, it uses "
+#~ "small thumbnails resembling the window itself."
+#~ msgstr ""
+#~ "Aquest mode mostra totes les aplicacions de tots els espais de treball en "
+#~ "una sola llista de selecció. En comptes de fer servir la icona de "
+#~ "l'aplicació per cada finestra, fa servir miniatures de les mateixes "
+#~ "finestres de les aplicacions."
+
+#~ msgid "Workspace & Icons"
+#~ msgstr "Espai de treball i icones"
+
+#~ msgid ""
+#~ "This mode let's you switch between the applications of your current "
+#~ "workspace and gives you additionally the option to switch to the last "
+#~ "used application of your previous workspace. This is always the last "
+#~ "symbol in the list and is segregated by a separator/vertical line if "
+#~ "available. \n"
+#~ "Every window is represented by its application icon."
+#~ msgstr ""
+#~ "Aquest mode us permet canviar entre les aplicacions de l'espai de treball "
+#~ "actual i us dóna la possibilitat de canviar a l'última aplicació "
+#~ "utilitzada de l'espai de treball anterior. Es mostra, en cas d'estar "
+#~ "disponible, sempre com a l'última icona de la llista, separada de la "
+#~ "resta amb un separador vertical.\n"
+#~ "Cada finestra està representada per la seva icona d'aplicació."
+
+#~ msgid "Move current selection to front before closing the popup"
+#~ msgstr ""
+#~ "Mou la selecció actual al primer pla abans de tancar el diàleg emergent"
+
+#~ msgid ""
+#~ "The Alternate Tab can be used in different modes, that affect the way "
+#~ "windows are chosen and presented."
+#~ msgstr ""
+#~ "L'«Alternate Tab» es pot utilitzar de diferents maneres que canvien la "
+#~ "forma en que es seleccionen i es mostren les finestres."
+
+#~ msgid "Removable Devices"
+#~ msgstr "Dispositius extraïbles"
+
+#~ msgid "Configure display settings..."
+#~ msgstr "Configura els paràmetres de visualització..."
+
+#~ msgid "Available"
+#~ msgstr "Disponible"
+
+#~ msgid "Busy"
+#~ msgstr "Ocupat"
+
+#~ msgid "My Account"
+#~ msgstr "El meu compte"
+
+#~ msgid "Lock Screen"
+#~ msgstr "Bloca la pantalla"
+
+#~ msgid "Switch User"
+#~ msgstr "Canvia d'usuari"
+
+#~ msgid "Log Out..."
+#~ msgstr "Surt..."
+
+#~ msgid ""
+#~ "This is the first time you use the Alternate Tab extension. \n"
+#~ "Please choose your preferred behaviour:\n"
+#~ "\n"
+#~ "All & Thumbnails:\n"
+#~ "    This mode presents all applications from all workspaces in one "
+#~ "selection \n"
+#~ "    list. Instead of using the application icon of every window, it uses "
+#~ "small \n"
+#~ "    thumbnails resembling the window itself. \n"
+#~ "\n"
+#~ "Workspace & Icons:\n"
+#~ "    This mode let's you switch between the applications of your current \n"
+#~ "    workspace and gives you additionally the option to switch to the last "
+#~ "used \n"
+#~ "    application of your previous workspace. This is always the last "
+#~ "symbol in \n"
+#~ "    the list and is segregated by a separator/vertical line if "
+#~ "available. \n"
+#~ "    Every window is represented by its application icon.  \n"
+#~ "\n"
+#~ "Native:\n"
+#~ "    This mode is the native GNOME 3 behaviour or in other words: "
+#~ "Clicking \n"
+#~ "    native switches the Alternate Tab extension off. \n"
+#~ msgstr ""
+#~ "Aquest és el primer cop que utilitzeu l'extensió «Alternate Tab». \n"
+#~ "Trieu el comportament que preferiu:\n"
+#~ "\n"
+#~ "Totes i miniatures:\n"
+#~ "    Aquest mode presenta totes les aplicacions de tots els espais de "
+#~ "treball com a\n"
+#~ "    una llista de selecció. En comptes de mostrar la icona d'aplicació de "
+#~ "cada finestra, mostra les \n"
+#~ "    miniatures que representen el contingut de la finestra. \n"
+#~ "\n"
+#~ "Espai de treball i icones:\n"
+#~ "    Aquest mode us permet canviar entre aplicacions de l'espai de treball "
+#~ "actual \n"
+#~ "    i us dóna la possibilitat de canviar a l'última aplicació usada de "
+#~ "l'espai de \n"
+#~ "    treball anterior. Aquest és sempre el darrer símbol a la llista i "
+#~ "està separat  \n"
+#~ "    per una línia vertical/separador quan està disponible. \n"
+#~ "    Cada finestra es representa per la seva icona d'aplicació.  \n"
+#~ "\n"
+#~ "Nadiu:\n"
+#~ "    Aquest és el mode de comportament nadiu al GNOME 3 o amb altres "
+#~ "paraules: fent \n"
+#~ "    clic inhabilita l'extensió «Alternate Tab». \n"
+
+#~ msgid "Alt Tab Behaviour"
+#~ msgstr "Comportament de l'«Alternate Tab»"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
+#~ msgid "Ask the user for a default behaviour if true."
+#~ msgstr ""
+#~ "Si és «true» (cert) pregunta a l'usuari pel comportament per defecte."
+
+#~ msgid "Indicates if Alternate Tab is newly installed"
+#~ msgstr "Indica si s'acaba d'instal·lar l'«Alternate Tab»"
+
+#~ msgid ""
+#~ "The algorithm used to layout thumbnails in the overview. 'grid' to use "
+#~ "the default grid based algorithm, 'natural' to use another one that "
+#~ "reflects more the position and size of the actual window"
+#~ msgstr ""
+#~ "L'algoritme per posicionar les miniatures en la perspectiva general. Useu "
+#~ "«grid» (graella) per a utilitzar l'algoritme per defecte basat en "
+#~ "disposició en graella, o «natural» (natural) per a usar un algoritme que "
+#~ "reflexa millor la posició i mida de la finestra actual."
+
+#~ msgid "Window placement strategy"
+#~ msgstr "Estratègia de posicionament de la finestra"
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -1,343 +0,0 @@
-# Catalan translation for gnome-shell-extensions.
-# Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# Jordi Mas i Hernandez <jmas@softcatala.org>, 2011.
-# Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-17 14:40+0200\n"
-"PO-Revision-Date: 2014-08-17 14:38+0200\n"
-"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
-"Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca@valencia\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "GNOME clàssic"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "Esta sessió vos permet utilitzar el GNOME clàssic"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:1
-msgid "GNOME Shell Classic"
-msgstr "GNOME Shell clàssic"
-
-#: ../data/gnome-shell-classic.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Gestió de finestres i iniciació d'aplicacions"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
-msgid "Attach modal dialog to the parent window"
-msgstr "Adjunta el diàleg modal a la finestra pare"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:2
-msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
-msgstr ""
-"Si s'executa el GNOME Shell, esta clau sobreescriu la clau «org.gnome."
-"mutter»."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Disposició dels botons en la barra de títol"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Si s'executa el GNOME Shell, esta clau sobreescriu la clau «org.gnome."
-"desktop.wm.preferences»."
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr ""
-"Habilita la tesselització a les vores en deixar anar les finestres a les "
-"vores de la pantalla"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-msgid "Workspaces only on primary monitor"
-msgstr "Els espais de treball només es mostren en el monitor principal"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:7
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Retarda el canvi de focus, en mode ratolí, fins que el punter estiga quiet"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Només miniatures"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Només la icona de l'aplicació"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Miniatura i icona de l'aplicació"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Mostra les finestres com a"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Mostra només les icones de l'espai de treball actual"
-
-#: ../extensions/apps-menu/extension.js:39
-msgid "Activities Overview"
-msgstr "Vista general d'activitats"
-
-#: ../extensions/apps-menu/extension.js:113
-msgid "Favorites"
-msgstr "Preferides"
-
-#: ../extensions/apps-menu/extension.js:282
-msgid "Applications"
-msgstr "Aplicacions"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid "Application and workspace list"
-msgstr "Aplicació i llista d'espais de treball"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"Una llista de cadenes, cada una de les quals conté un identificador "
-"d'aplicació (nom del fitxer de l'escriptori), seguit de dos punts i el "
-"número de l'espai de treball"
-
-#: ../extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "Aplicació"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Espai de treball"
-
-#: ../extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
-msgstr "Afig una regla"
-
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Crea una regla de coincidència nova"
-
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Afig"
-
-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Ha fallat l'expulsió de la unitat «%s»:"
-
-#: ../extensions/drive-menu/extension.js:123
-msgid "Removable devices"
-msgstr "Dispositius extraïbles"
-
-#: ../extensions/drive-menu/extension.js:150
-msgid "Open File"
-msgstr "Obri el fitxer"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Hola, món!"
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
-msgid "Alternative greeting text."
-msgstr "Text de rebuda alternatiu."
-
-#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Si no és buit, conté el text que es mostrarà quan es faça clic en el quadre."
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Missatge"
-
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"L'«Example» està pensat com una extensió del GNOME Shell que demostri la "
-"manera correcta de crear extensions. Com a extensió pròpiament dita no fa "
-"gairebé res.\n"
-"Tot i així permet personalitzar el missatge del rebedor."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid "Use more screen for windows"
-msgstr "Utilitza més pantalla per les finestres"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"Intenta utilitzar més espai de la pantalla per posicionar les miniatures de "
-"les finestres adaptant-les al ràtio d'aspecte de la pantalla, consolidant-"
-"les més per reduir la capsa que les envolta. Este paràmetre de configuració "
-"només s'aplica a l'estratègia de posicionament de finestres natural."
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid "Place window captions on top"
-msgstr "Posiciona els títols de les finestres al damunt"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"Si és «true» (cert), posiciona el títol de la finestra damunt de la "
-"miniatura corresponent, substituint el comportament per defecte del Shell de "
-"posicionar-lo a baix. Cal reiniciar el Shell per tal de que este canvi tinga "
-"efecte."
-
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Llocs"
-
-#: ../extensions/places-menu/placeDisplay.js:57
-#, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "No s'ha pogut iniciar «%s»"
-
-#: ../extensions/places-menu/placeDisplay.js:99
-#: ../extensions/places-menu/placeDisplay.js:122
-msgid "Computer"
-msgstr "Ordinador"
-
-#: ../extensions/places-menu/placeDisplay.js:200
-msgid "Home"
-msgstr "Inici"
-
-#: ../extensions/places-menu/placeDisplay.js:287
-msgid "Browse Network"
-msgstr "Navega per la xarxa"
-
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "CPU"
-
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-msgstr "Memòria"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "Theme name"
-msgstr "Nom del tema"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "El nom del tema que es carregarà des de ~/.themes/name/gnome-shell"
-
-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Tanca"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Desminimitza"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Minimitza"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Desmaximitza"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Maximitza"
-
-#: ../extensions/window-list/extension.js:300
-msgid "Minimize all"
-msgstr "Minimitza-ho tot"
-
-#: ../extensions/window-list/extension.js:308
-msgid "Unminimize all"
-msgstr "Desminimitza-ho tot"
-
-#: ../extensions/window-list/extension.js:316
-msgid "Maximize all"
-msgstr "Maximitza-ho tot"
-
-#: ../extensions/window-list/extension.js:325
-msgid "Unmaximize all"
-msgstr "Desmaximitza-ho tot"
-
-#: ../extensions/window-list/extension.js:334
-msgid "Close all"
-msgstr "Tanca-ho tot"
-
-#: ../extensions/window-list/extension.js:644
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Indicador de l'espai de treball"
-
-#: ../extensions/window-list/extension.js:798
-msgid "Window List"
-msgstr "Llista de finestres"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-msgid "When to group windows"
-msgstr "Quan s'han d'agrupar les finestres"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
-msgstr ""
-"Decideix quan s'han d'agrupar les finestres de la mateixa aplicació a la "
-"llista de finestres. Els valors possibles són: «never» (mai), "
-"«auto» (automàticament) i «always» (sempre)."
-
-#: ../extensions/window-list/prefs.js:30
-msgid "Window Grouping"
-msgstr "Agrupació de finestres"
-
-#: ../extensions/window-list/prefs.js:49
-msgid "Never group windows"
-msgstr "Mai agrupes les finestres"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Group windows when space is limited"
-msgstr "Agrupa les finestres quan l'espai estiga limitat"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Always group windows"
-msgstr "Agrupa les finestres sempre"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Noms dels espais de treball"
-
-#: ../extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Nom"
-
-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Espai de treball %d"
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,16 +1,16 @@
 # Czech translation for gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Petr Kovar <pknbe@volny.cz>, 2013.
-# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2017.
+#
+# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-02-22 18:40+0000\n"
-"PO-Revision-Date: 2017-03-08 17:42+0100\n"
+"POT-Creation-Date: 2013-04-19 19:12+0000\n"
+"PO-Revision-Date: 2013-04-20 15:34+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -20,87 +20,89 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Gtranslator 2.91.6\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "GNOME klasik"

-#: data/gnome-classic.desktop.in:4
+#: ../data/gnome-classic.desktop.in.h:2
 msgid "This session logs you into GNOME Classic"
 msgstr "Toto sezení vás přihlásí do GNOME klasik"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Modální dialogová okna připojovat k rodičovskému oknu"
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr "GNOME Shell klasik"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
-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/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "Správa oken a spouštění aplikací"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Uspořádání tlačítek v záhlaví"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
-msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
-msgstr ""
-"Když běží GNOME Shell, tento klíč přepíše klíč v org.gnome.desktop.wm."
-"preferences"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-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.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Pracovní plochy jen na hlavním monitoru"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr "Neměnit zaměření v režimu s myší, dokud se nezastaví ukazatel"
-
-#: extensions/alternate-tab/prefs.js:20
+#: ../extensions/alternate-tab/prefs.js:20
 msgid "Thumbnail only"
 msgstr "Pouze náhled"

-#: extensions/alternate-tab/prefs.js:21
+#: ../extensions/alternate-tab/prefs.js:21
 msgid "Application icon only"
 msgstr "Pouze ikona aplikace"

-#: extensions/alternate-tab/prefs.js:22
+#: ../extensions/alternate-tab/prefs.js:22
 msgid "Thumbnail and application icon"
 msgstr "Náhled a ikona aplikace"

-#: extensions/alternate-tab/prefs.js:38
+#: ../extensions/alternate-tab/prefs.js:37
 msgid "Present windows as"
 msgstr "Představovat okna jako"

-#: extensions/alternate-tab/prefs.js:69
+#: ../extensions/alternate-tab/prefs.js:62
 msgid "Show only windows in the current workspace"
 msgstr "Zobrazovat pouze okna z aktuální pracovní plochy"

-#: extensions/apps-menu/extension.js:38
+#. add the new entries
+#: ../extensions/alternative-status-menu/extension.js:125
+msgid "Suspend"
+msgstr "Uspat do paměti"
+
+#: ../extensions/alternative-status-menu/extension.js:128
+msgid "Hibernate"
+msgstr "Uspat na disk"
+
+#: ../extensions/alternative-status-menu/extension.js:131
+msgid "Power Off"
+msgstr "Vypnout"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:1
+msgid "Enable suspending"
+msgstr "Povolit uspávání do paměti"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:2
+msgid "Control the visibility of the Suspend menu item"
+msgstr "Řídí viditelnost položky „Uspat do paměti“ v nabídce"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:3
+msgid "Enable hibernating"
+msgstr "Povolit uspávání na disk"
+
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:4
+msgid "Control the visibility of the Hibernate menu item"
+msgstr "Řídí viditelnost položky „Uspat na disk“ v nabídce"
+
+#: ../extensions/apps-menu/extension.js:39
 msgid "Activities Overview"
 msgstr "Přehled činností"

-#: extensions/apps-menu/extension.js:109
+#: ../extensions/apps-menu/extension.js:113
 msgid "Favorites"
 msgstr "Oblíbené"

-#: extensions/apps-menu/extension.js:266
+#: ../extensions/apps-menu/extension.js:278
 msgid "Applications"
 msgstr "Aplikace"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid "Application and workspace list"
 msgstr "Seznam aplikací a pracovních ploch"

-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -108,76 +110,76 @@ msgstr ""
 "Seznam řetězců, z nichž každý obsahuje ID aplikace (název souboru pracovní "
 "plochy), následovaný dvojtečkou a číslem pracovní plochy"

-#: extensions/auto-move-windows/prefs.js:60
+#: ../extensions/auto-move-windows/prefs.js:55
 msgid "Application"
 msgstr "Aplikace"

-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: ../extensions/auto-move-windows/prefs.js:64
+#: ../extensions/auto-move-windows/prefs.js:106
 msgid "Workspace"
 msgstr "Pracovní plocha"

-#: extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
+#: ../extensions/auto-move-windows/prefs.js:80
+msgid "Add rule"
 msgstr "Přidat pravidlo"

-#: extensions/auto-move-windows/prefs.js:106
+#: ../extensions/auto-move-windows/prefs.js:94
 msgid "Create new matching rule"
 msgstr "Vytvoření nového srovnávacího pravidla"

-#: extensions/auto-move-windows/prefs.js:111
+#: ../extensions/auto-move-windows/prefs.js:98
 msgid "Add"
 msgstr "Přidat"

-#: extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
+#: ../extensions/drive-menu/extension.js:72
+#, c-format
+msgid "Ejecting drive '%s' failed:"
 msgstr "Vysunutí disku „%s“ selhalo:"

-#: extensions/drive-menu/extension.js:124
+#: ../extensions/drive-menu/extension.js:89
 msgid "Removable devices"
 msgstr "Výměnná zařízení"

-#: extensions/drive-menu/extension.js:149
+#: ../extensions/drive-menu/extension.js:106
 msgid "Open File"
 msgstr "Otevřít soubor"

-#: extensions/example/extension.js:17
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Ahoj světe!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
 msgid "Alternative greeting text."
 msgstr "Alternativní uvítací text"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
 msgid ""
 "If not empty, it contains the text that will be shown when clicking on the "
 "panel."
 msgstr ""
 "Pokud není prázdné, obsahuje text, který se objeví po kliknutí na panel."

-#: extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Zpráva"
-
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
+#: ../extensions/example/prefs.js:30
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
+"Nevertheless it's possible to customize the greeting message."
 msgstr ""
 "Rozšíření Example vám má jen ukázat, jak sestavit dobře fungující rozšíření "
 "pro Shell, a tak je jeho praktické využití pramalé.\n"
 "Přesto si můžete alespoň upravit uvítací zprávu."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
+#: ../extensions/example/prefs.js:36
+msgid "Message:"
+msgstr "Zpráva:"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid "Use more screen for windows"
 msgstr "Použít větší část obrazovky pro okna"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
 msgid ""
 "Try to use more screen for placing window thumbnails by adapting to screen "
 "aspect ratio, and consolidating them further to reduce the bounding box. "
@@ -187,11 +189,11 @@ msgstr ""
 "využít větší část obrazovky pro umístění náhledů oken. Toto nastavení se "
 "použije pouze dohromady se strategií umisťování „natural“."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
 msgid "Place window captions on top"
 msgstr "Umístit název okna nahoru"

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
@@ -201,144 +203,109 @@ msgstr ""
 "přepíše výchozí chování shellu, který jej umisťuje dolů. Změna tohoto "
 "nastavení vyžaduje restart shellu, aby se projevila."

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:77
 msgid "Places"
 msgstr "Místa"

-#: extensions/places-menu/placeDisplay.js:59
-#, javascript-format
-msgid "Failed to launch “%s”"
+#: ../extensions/places-menu/placeDisplay.js:56
+#, c-format
+msgid "Failed to launch \"%s\""
 msgstr "Selhalo spuštění „%s“"

-#: extensions/places-menu/placeDisplay.js:101
-#: extensions/places-menu/placeDisplay.js:124
+#: ../extensions/places-menu/placeDisplay.js:98
+#: ../extensions/places-menu/placeDisplay.js:121
 msgid "Computer"
 msgstr "Počítač"

-#: extensions/places-menu/placeDisplay.js:267
+#: ../extensions/places-menu/placeDisplay.js:199
 msgid "Home"
 msgstr "Domů"

-#: extensions/places-menu/placeDisplay.js:311
+#: ../extensions/places-menu/placeDisplay.js:286
 msgid "Browse Network"
 msgstr "Procházet síť"

-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-msgid "Cycle Screenshot Sizes"
-msgstr "Mění velikost pro snímky obrazovky"
+#: ../extensions/systemMonitor/extension.js:213
+msgid "CPU"
+msgstr "Procesor"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
+#: ../extensions/systemMonitor/extension.js:266
+msgid "Memory"
+msgstr "Paměť"
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "Theme name"
 msgstr "Název motivu"

-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Název motivu, který se má načíst z ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Zavřít"
-
-#: extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Zrušit minimalizaci"
-
-#: extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Minimalizovat"
-
-#: extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Zrušit maximalizaci"
-
-#: extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Maximalizovat"
-
-#: extensions/window-list/extension.js:411
-msgid "Minimize all"
-msgstr "Minimalizovat všechna"
-
-#: extensions/window-list/extension.js:419
-msgid "Unminimize all"
-msgstr "Zrušit minimalizaci všech"
-
-#: extensions/window-list/extension.js:427
-msgid "Maximize all"
-msgstr "Maximalizovat všechna"
-
-#: extensions/window-list/extension.js:436
-msgid "Unmaximize all"
-msgstr "Zrušit maximalizaci všech"
-
-#: extensions/window-list/extension.js:445
-msgid "Close all"
-msgstr "Zavřít všechna"
-
-#: extensions/window-list/extension.js:669
-#: extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Ukazatel pracovní plochy"
-
-#: extensions/window-list/extension.js:833
-msgid "Window List"
-msgstr "Seznam oken"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
 msgid "When to group windows"
 msgstr "Kdy seskupovat okna"

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:2
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
+"Possible values are \"never\", \"auto\" and \"always\"."
 msgstr ""
 "Rozhoduje, kdy se mají v seznamu oken seskupovat okna stejné aplikace. Možné "
 "hodnoty jsou „never“ (nikdy), „auto“ (automaticky) a „always“ (vždy)."

-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-msgid "Show the window list on all monitors"
-msgstr "Zobrazovat seznam oken na všech monitorech"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Zda zobrazovat seznam oken na všech připojených monitorech nebo jen na "
-"hlavním."
-
-#: extensions/window-list/prefs.js:32
+#: ../extensions/window-list/prefs.js:30
 msgid "Window Grouping"
 msgstr "Seskupování oken"

-#: extensions/window-list/prefs.js:50
+#: ../extensions/window-list/prefs.js:49
 msgid "Never group windows"
 msgstr "Nikdy neseskupovat okna"

-#: extensions/window-list/prefs.js:51
+#: ../extensions/window-list/prefs.js:50
 msgid "Group windows when space is limited"
 msgstr "Seskupovat okna při nedostatku místa"

-#: extensions/window-list/prefs.js:52
+#: ../extensions/window-list/prefs.js:51
 msgid "Always group windows"
 msgstr "Vždy seskupovat okna"

-#: extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "Zobrazovat na všech monitorech"
+#: ../extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Ukazatel pracovní plochy"

-#: extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
+#: ../extensions/workspace-indicator/prefs.js:141
+msgid "Workspace names:"
 msgstr "Názvy pracovních ploch"

-#: extensions/workspace-indicator/prefs.js:157
+#: ../extensions/workspace-indicator/prefs.js:152
 msgid "Name"
 msgstr "Název"

-#: extensions/workspace-indicator/prefs.js:198
-#, javascript-format
+#: ../extensions/workspace-indicator/prefs.js:186
+#, c-format
 msgid "Workspace %d"
 msgstr "Pracovní plocha %d"

+#: ../extensions/xrandr-indicator/extension.js:30
+msgid "Normal"
+msgstr "Normální"
+
+#: ../extensions/xrandr-indicator/extension.js:31
+msgid "Left"
+msgstr "Doleva"
+
+#: ../extensions/xrandr-indicator/extension.js:32
+msgid "Right"
+msgstr "Doprava"
+
+#: ../extensions/xrandr-indicator/extension.js:33
+msgid "Upside-down"
+msgstr "Vzhůru nohama"
+
+#: ../extensions/xrandr-indicator/extension.js:50
+msgid "Display"
+msgstr "Obrazovka"
+
+#: ../extensions/xrandr-indicator/extension.js:80
+msgid "Display Settings"
+msgstr "Nastavení obrazovky"
--- a/po/da.po
+++ b/po/da.po
@@ -1,19 +1,16 @@
 # Danish translation for gnome-shell-extensions.
-# Copyright (C) 2011-2017 gnome-shell-extensions's COPYRIGHT HOLDER
+# Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
 #
-# Kris Thomsen <mail@kristhomsen.dk>, 2011-2014.
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2015.
-# Joe Hansen <joedalton2@yahoo.dk>, 2017.
+# Kris Thomsen <lakristho@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2017-02-22 18:40+0000\n"
-"PO-Revision-Date: 2017-03-05 02:26+0100\n"
-"Last-Translator: Kris Thomsen <mail@kristhomsen.dk>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-02 12:35+0100\n"
+"PO-Revision-Date: 2011-12-27 00:32+0000\n"
+"Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
@@ -21,90 +18,106 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
-msgid "GNOME Classic"
-msgstr "GNOME Classic"
+#. add the new entries
+#: ../extensions/alternative-status-menu/extension.js:68
+msgid "Suspend"
+msgstr "Dvale"

-#: data/gnome-classic.desktop.in:4
-msgid "This session logs you into GNOME Classic"
-msgstr "Denne session logger dig ind i GNOME Classic"
+#: ../extensions/alternative-status-menu/extension.js:73
+msgid "Hibernate"
+msgstr "Hviletilstand"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:7
-msgid "Attach modal dialog to the parent window"
-msgstr "Tillæg modal-dialog til det overordnede vindue"
+#: ../extensions/alternative-status-menu/extension.js:78
+msgid "Power Off..."
+msgstr "Sluk..."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:8
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:25
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:33
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:41
+#: ../extensions/alternate-tab/extension.js:54
 msgid ""
-"This key overrides the key in org.gnome.mutter when running GNOME Shell."
+"This is the first time you use the Alternate Tab extension. \n"
+"Please choose your preferred behaviour:\n"
+"\n"
+"All & Thumbnails:\n"
+"    This mode presents all applications from all workspaces in one "
+"selection \n"
+"    list. Instead of using the application icon of every window, it uses "
+"small \n"
+"    thumbnails resembling the window itself. \n"
+"\n"
+"Workspace & Icons:\n"
+"    This mode let's you switch between the applications of your current \n"
+"    workspace and gives you additionally the option to switch to the last "
+"used \n"
+"    application of your previous workspace. This is always the last symbol "
+"in \n"
+"    the list and is segregated by a separator/vertical line if available. \n"
+"    Every window is represented by its application icon.  \n"
+"\n"
+"If you whish to revert to the default behavior for the Alt-Tab switcher, "
+"just\n"
+"disable the extension from extensions.gnome.org or the Advanced Settings "
+"application."
 msgstr ""
-"Denne nøgle tilsidesætter nøglen i org.gnome.mutter når GNOME Shell kører."
+"Dette er første gang du bruger Alternate Tab-udvidelsen. \n"
+"Vælg venligst din foretrukne opførsel:\n"
+"\n"
+"Alle & miniaturebilleder:\n"
+"    Denne tilstand præsenterer alle programmer fra alle arbejdsområder i en "
+"markerings- \n"
+"    liste. I stedet for at bruge programikonet for hvert vindue, bruges et "
+"lille \n"
+"    miniaturebillede af vinduet selv. \n"
+"\n"
+"Arbejdsområde & ikoner:\n"
+"    Denne tilstand giver mulighed for at skifte mellem programmerne i dit "
+"nuværende \n"
+"    arbejdsområde og giver dig derudover muligheden for at skifte til det "
+"seneste brugte \n"
+"    program i dit tidligere arbejdsområde. Dette er altid det sidste symbol "
+"i \n"
+"    listen og er visuelt adskilt af en vertikal linje, hvis tilgængelig. \n"
+"    Hvert vindue er repræsenteret af dets programikon.  \n"
+"\n"
+"Hvis du ønsker at skifte tilbage til standardopførslen for Alt-Tab-"
+"skifteren, skal du\n"
+"blot deaktivere udvidelsen fra extensions.gnome.org eller programmet "
+"Avancerede indstillinger."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:16
-msgid "Arrangement of buttons on the titlebar"
-msgstr "Placeringen af knapper i titellinjen"
+#: ../extensions/alternate-tab/extension.js:295
+msgid "Alt Tab Behaviour"
+msgstr "Alt-Tab-opførsel"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:17
+#: ../extensions/alternate-tab/extension.js:311
+msgid "All & Thumbnails"
+msgstr "Alle & miniaturebilleder"
+
+#: ../extensions/alternate-tab/extension.js:318
+msgid "Workspace & Icons"
+msgstr "Arbejdsområde & ikoner"
+
+#: ../extensions/alternate-tab/extension.js:325
+msgid "Cancel"
+msgstr "Annullér"
+
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:1
+msgid "Ask the user for a default behaviour if true."
+msgstr ""
+
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
+msgid "Indicates if Alternate Tab is newly installed"
+msgstr ""
+
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:3
 msgid ""
-"This key overrides the key in org.gnome.desktop.wm.preferences when running "
-"GNOME Shell."
+"Sets the Alt-Tab behaviour. Possible values are: native, all_thumbnails and "
+"workspace_icons."
 msgstr ""
-"Denne nøgle tilsidesætter nøglen i org.gnome.desktop.wm.preferences når "
-"GNOME Shell kører."

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:24
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Aktivér kant-fliselægning når vinduer slippes på skærmkanter"
+#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:4
+#, fuzzy
+msgid "The alt tab behaviour."
+msgstr "Alt-Tab-opførsel"

-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:32
-msgid "Workspaces only on primary monitor"
-msgstr "Kun arbejdsområder på primær skærm"
-
-#: data/org.gnome.shell.extensions.classic-overrides.gschema.xml:40
-msgid "Delay focus changes in mouse mode until the pointer stops moving"
-msgstr ""
-"Forsink fokusændringer i musetilstand indtil pegeren holder op med at bevæge "
-"sig"
-
-#: extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Kun miniaturebillede"
-
-#: extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Kun programikon"
-
-#: extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Miniaturebillede og programikon"
-
-#: extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Præsentér vindue som"
-
-#: extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Vis kun vinduer i det nuværende arbejdsområde"
-
-#: extensions/apps-menu/extension.js:38
-msgid "Activities Overview"
-msgstr "Aktivitetsoversigt"
-
-#: extensions/apps-menu/extension.js:109
-msgid "Favorites"
-msgstr "Favoritter"
-
-#: extensions/apps-menu/extension.js:266
-msgid "Applications"
-msgstr "Programmer"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:6
-msgid "Application and workspace list"
-msgstr "Liste over programmer og arbejdsområder"
-
-#: extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml:7
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
 msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
@@ -112,242 +125,166 @@ msgstr ""
 "En liste over strenge, som hver indeholder et program-id "
 "(skrivebordsfilnavn), efterfulgt af et kolon og arbejdsområdets nummer"

-#: extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "Program"
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+msgid "Application and workspace list"
+msgstr "Liste over programmer og arbejdsområder"

-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Arbejdsområde"
+#: ../extensions/dock/extension.js:561
+msgid "Drag here to add favorites"
+msgstr "Træk hertil for at føje til favoritter"

-#: extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
-msgstr "Tilføj regel"
+#: ../extensions/dock/extension.js:896
+msgid "New Window"
+msgstr "Nyt vindue"

-#: extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Opret ny regel for match"
+#: ../extensions/dock/extension.js:898
+msgid "Quit Application"
+msgstr "Afslut program"

-#: extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Tilføj"
+#: ../extensions/dock/extension.js:903
+msgid "Remove from Favorites"
+msgstr "Fjern fra favoritter"

-#: extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive “%s” failed:"
-msgstr "Udskubning af drevet “%s” mislykkedes:"
+#: ../extensions/dock/extension.js:904
+msgid "Add to Favorites"
+msgstr "Føj til favoritter"

-#: extensions/drive-menu/extension.js:124
-msgid "Removable devices"
-msgstr "Flytbare enheder"
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
+msgid "Autohide duration"
+msgstr ""

-#: extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "Åbn fil"
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
+msgid "Autohide effect"
+msgstr ""

-#: extensions/example/extension.js:17
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
+msgid "Enable/disable autohide"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
+msgid "Icon size"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
+msgid "Position of the dock"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
+msgid "Sets icon size of the dock."
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:7
+msgid ""
+"Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' and "
+"'move'"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:8
+msgid ""
+"Sets the position of the dock in the screen. Allowed values are 'right' or "
+"'left'"
+msgstr ""
+
+#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
+msgid "Sets the time duration of the autohide effect."
+msgstr ""
+
+#: ../extensions/drive-menu/extension.js:69
+msgid "Open file manager"
+msgstr ""
+
+#: ../extensions/example/extension.js:11
 msgid "Hello, world!"
 msgstr "Hej verden!"

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:5
-msgid "Alternative greeting text."
-msgstr "Alternativ velkomsttekst."
+#: ../extensions/gajim/extension.js:227
+#, c-format
+msgid "%s is away."
+msgstr "%s er ikke til stede."

-#: extensions/example/org.gnome.shell.extensions.example.gschema.xml:6
-msgid ""
-"If not empty, it contains the text that will be shown when clicking on the "
-"panel."
-msgstr ""
-"Hvis den ikke er tom, så indeholder den teksten, der vil blive vist når der "
-"klikkes på panelet."
+#: ../extensions/gajim/extension.js:230
+#, c-format
+msgid "%s is offline."
+msgstr "%s er frakoblet."

-#: extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Besked"
+#: ../extensions/gajim/extension.js:233
+#, c-format
+msgid "%s is online."
+msgstr "%s er tilgængelig."

-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it’s possible to customize the greeting message."
-msgstr ""
-"Example sigter efter at vise, hvordan man bygger udvidelser til skallen, som "
-"opfører sig ordentligt, og har som sådan meget lidt selvstændig "
-"funktionalitet.\n"
-"Alligevel er det muligt at tilpasse velkomstbeskeden."
+#: ../extensions/gajim/extension.js:236
+#, c-format
+msgid "%s is busy."
+msgstr "%s er optaget."

-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
-msgid "Use more screen for windows"
-msgstr "Brug mere skærmplads til vinduer"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"Prøv at bruge mere skærmplads til at placere vinduesminiaturer ved at "
-"tilpasse dem til skærmens størrelsesforhold, samt ved at konsolidere dem "
-"yderligere for at reducere den omkransende boks.Denne indstilling gælder kun "
-"med den naturlige placeringsstrategi."
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
-msgid "Place window captions on top"
-msgstr "Placér vinduestitler i toppen"
-
-#: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
 msgid ""
 "If true, place window captions on top the respective thumbnail, overriding "
 "shell default of placing it at the bottom. Changing this setting requires "
 "restarting the shell to have any effect."
 msgstr ""
-"Hvis sat, vil vinduestitler bliver placeret i toppen af de respektive "
-"miniaturer, tilsidesætter shell-standarden, som placerer den i bunden. "
-"Ændring af denne indstilling kræver at shell'en genstartes for at træde i "
-"kraft."

-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Steder"
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+msgid "Place window captions on top"
+msgstr ""

-#: extensions/places-menu/placeDisplay.js:59
-#, javascript-format
-msgid "Failed to launch “%s”"
-msgstr "Kunne ikke åbne “%s”"
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+msgid ""
+"Try to use more screen for placing window thumbnails by adapting to screen "
+"aspect ratio, and consolidating them further to reduce the bounding box. "
+"This setting applies only with the natural placement strategy."
+msgstr ""

-#: extensions/places-menu/placeDisplay.js:101
-#: extensions/places-menu/placeDisplay.js:124
-msgid "Computer"
-msgstr "Computer"
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+msgid "Use more screen for windows"
+msgstr ""

-#: extensions/places-menu/placeDisplay.js:267
-msgid "Home"
-msgstr "Hjem"
+#: ../extensions/places-menu/extension.js:36
+msgid "Removable Devices"
+msgstr ""

-#: extensions/places-menu/placeDisplay.js:311
-msgid "Browse Network"
-msgstr "Gennemse netværk"
-
-#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
-msgid "Cycle Screenshot Sizes"
-msgstr "Gennemgå størrelser af skærmbillede"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
-msgid "Theme name"
-msgstr "Temanavn"
-
-#: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:6
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "Navnet på temaet, som indlæses fra ~/.themes/name/gnome-shell"

-#: extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Luk"
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+msgid "Theme name"
+msgstr "Temanavn"

-#: extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Afminimér"
+#: ../extensions/xrandr-indicator/extension.js:26
+msgid "Normal"
+msgstr "Normal"

-#: extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Minimér"
+#: ../extensions/xrandr-indicator/extension.js:27
+msgid "Left"
+msgstr "Venstre"

-#: extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Afmaksimér"
+#: ../extensions/xrandr-indicator/extension.js:28
+msgid "Right"
+msgstr "Højre"

-#: extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Maksimér"
+#: ../extensions/xrandr-indicator/extension.js:29
+msgid "Upside-down"
+msgstr "På hovedet"

-#: extensions/window-list/extension.js:411
-msgid "Minimize all"
-msgstr "Minimér"
+#: ../extensions/xrandr-indicator/extension.js:78
+msgid "Configure display settings..."
+msgstr "Konfigurér skærmindstillinger..."

-#: extensions/window-list/extension.js:419
-msgid "Unminimize all"
-msgstr "Afminimér alle"
+#~ msgid "Notifications"
+#~ msgstr "Beskeder"

-#: extensions/window-list/extension.js:427
-msgid "Maximize all"
-msgstr "Maksimér alle"
+#~ msgid "Online Accounts"
+#~ msgstr "Online konti"

-#: extensions/window-list/extension.js:436
-msgid "Unmaximize all"
-msgstr "Afmaksimér alle"
+#~ msgid "System Settings"
+#~ msgstr "Systemindstillinger"

-#: extensions/window-list/extension.js:445
-msgid "Close all"
-msgstr "Luk alle"
+#~ msgid "Lock Screen"
+#~ msgstr "Lås skærm"

-#: extensions/window-list/extension.js:669
-#: extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Arbejdsområdeindikator"
-
-#: extensions/window-list/extension.js:833
-msgid "Window List"
-msgstr "Vinduesliste"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:12
-msgid "When to group windows"
-msgstr "Hvornår vinduer skal grupperes"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
-msgid ""
-"Decides when to group windows from the same application on the window list. "
-"Possible values are “never”, “auto” and “always”."
-msgstr ""
-"Afgør hvornår vinduer fra samme program skal grupperes i vindueslisten. "
-"Mulige værdier er “never” (aldrig), “auto” (automatisk) og “always” "
-"(altid)."
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
-msgid "Show the window list on all monitors"
-msgstr "Vis vindueslisten på alle skærme"
-
-#: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21
-msgid ""
-"Whether to show the window list on all connected monitors or only on the "
-"primary one."
-msgstr ""
-"Om vindueslisten skal vise på alle tilsluttede skærme, eller kun på den "
-"primære."
-
-#: extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "Vinduesgruppering"
-
-#: extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Gruppér aldrig vinduer"
-
-#: extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Gruppér vinduer når pladsen er begrænset"
-
-#: extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Gruppér altid vinduer"
-
-#: extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "Vis på alle skærme"
-
-#: extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Navne på arbejdsområder"
-
-#: extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Navn"
-
-#: extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Arbejdsområde %d"
+#~ msgid "Switch User"
+#~ msgstr "Skift bruger"

+#~ msgid "Log Out..."
+#~ msgstr "Log ud..."
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`/* This extensions requires no special styling */`