Merge lp:~noskcaj/ubuntu/wily/gnome-shell-extensions/merge into lp:ubuntu/wily/gnome-shell-extensions

[Jackson Doak]

Merge from debian

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2015-07-04 05:43:07 +0000
@@ -0,0 +1,3 @@
+dont-require-nautilus-classic.patch
+gnome-session-classic-wrapper-script.patch
+fix-ubuntu-sessions.patch
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2015-06-28 14:05:56 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-dont-require-nautilus-classic.patch
-gnome-session-classic-wrapper-script.patch
-fix-ubuntu-sessions.patch
 
=== added directory '.pc/dont-require-nautilus-classic.patch'
=== removed directory '.pc/dont-require-nautilus-classic.patch'
=== added file '.pc/dont-require-nautilus-classic.patch/.timestamp'
=== added directory '.pc/dont-require-nautilus-classic.patch/data'
=== removed directory '.pc/dont-require-nautilus-classic.patch/data'
=== added file '.pc/dont-require-nautilus-classic.patch/data/gnome-classic.session.desktop.in.in'
--- .pc/dont-require-nautilus-classic.patch/data/gnome-classic.session.desktop.in.in	1970-01-01 00:00:00 +0000
+++ .pc/dont-require-nautilus-classic.patch/data/gnome-classic.session.desktop.in.in	2015-07-04 05:43:07 +0000
@@ -0,0 +1,3 @@
+[GNOME Session]
+_Name=GNOME Classic
+RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic;
 
=== removed file '.pc/dont-require-nautilus-classic.patch/data/gnome-classic.session.desktop.in.in'
--- .pc/dont-require-nautilus-classic.patch/data/gnome-classic.session.desktop.in.in	2015-06-28 14:05:56 +0000
+++ .pc/dont-require-nautilus-classic.patch/data/gnome-classic.session.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[GNOME Session]
-_Name=GNOME Classic
-RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic;
 
=== added directory '.pc/fix-ubuntu-sessions.patch'
=== removed directory '.pc/fix-ubuntu-sessions.patch'
=== added file '.pc/fix-ubuntu-sessions.patch/.timestamp'
=== added directory '.pc/fix-ubuntu-sessions.patch/data'
=== removed directory '.pc/fix-ubuntu-sessions.patch/data'
=== added file '.pc/fix-ubuntu-sessions.patch/data/gnome-classic.desktop.in'
--- .pc/fix-ubuntu-sessions.patch/data/gnome-classic.desktop.in	1970-01-01 00:00:00 +0000
+++ .pc/fix-ubuntu-sessions.patch/data/gnome-classic.desktop.in	2015-07-04 05:43:07 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+_Name=GNOME Classic
+_Comment=This session logs you into GNOME Classic
+Exec=gnome-session-classic
+TryExec=gnome-session
+Icon=
+Type=Application
+DesktopNames=GNOME-Classic;GNOME
 
=== removed file '.pc/fix-ubuntu-sessions.patch/data/gnome-classic.desktop.in'
--- .pc/fix-ubuntu-sessions.patch/data/gnome-classic.desktop.in	2014-10-29 00:21:20 +0000
+++ .pc/fix-ubuntu-sessions.patch/data/gnome-classic.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-_Name=GNOME Classic
-_Comment=This session logs you into GNOME Classic
-Exec=gnome-session-classic
-TryExec=gnome-session
-Icon=
-Type=Application
-DesktopNames=GNOME-Classic;GNOME
 
=== added directory '.pc/gnome-session-classic-wrapper-script.patch'
=== removed directory '.pc/gnome-session-classic-wrapper-script.patch'
=== added file '.pc/gnome-session-classic-wrapper-script.patch/.timestamp'
=== added directory '.pc/gnome-session-classic-wrapper-script.patch/data'
=== removed directory '.pc/gnome-session-classic-wrapper-script.patch/data'
=== added file '.pc/gnome-session-classic-wrapper-script.patch/data/gnome-classic.desktop.in'
--- .pc/gnome-session-classic-wrapper-script.patch/data/gnome-classic.desktop.in	1970-01-01 00:00:00 +0000
+++ .pc/gnome-session-classic-wrapper-script.patch/data/gnome-classic.desktop.in	2015-07-04 05:43:07 +0000
@@ -0,0 +1,8 @@
+[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
+TryExec=gnome-session
+Icon=
+Type=Application
+DesktopNames=GNOME-Classic;GNOME
 
=== removed file '.pc/gnome-session-classic-wrapper-script.patch/data/gnome-classic.desktop.in'
--- .pc/gnome-session-classic-wrapper-script.patch/data/gnome-classic.desktop.in	2014-09-06 11:16:39 +0000
+++ .pc/gnome-session-classic-wrapper-script.patch/data/gnome-classic.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[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
-TryExec=gnome-session
-Icon=
-Type=Application
-DesktopNames=GNOME-Classic;GNOME
 
=== modified file 'NEWS'
--- NEWS	2015-06-28 14:05:56 +0000
+++ NEWS	2015-07-04 05:43:07 +0000
@@ -1,3 +1,8 @@
+3.16.2
+======
+* classic: Update theme
+* updated translations (oc, zh_CN)
+
 3.16.1
 ======
 * window-list: Fix workspace indicators popup menu position
 
=== modified file 'configure'
--- configure	2015-06-28 14:05:56 +0000
+++ configure	2015-07-04 05:43:07 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-shell-extensions 3.16.1.
+# Generated by GNU Autoconf 2.69 for gnome-shell-extensions 3.16.2.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-shell-extensions'
 PACKAGE_TARNAME='gnome-shell-extensions'
-PACKAGE_VERSION='3.16.1'
-PACKAGE_STRING='gnome-shell-extensions 3.16.1'
+PACKAGE_VERSION='3.16.2'
+PACKAGE_STRING='gnome-shell-extensions 3.16.2'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions'
 PACKAGE_URL=''
 
@@ -1257,7 +1257,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gnome-shell-extensions 3.16.1 to adapt to many kinds of systems.
+\`configure' configures gnome-shell-extensions 3.16.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1324,7 +1324,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-shell-extensions 3.16.1:";;
+     short | recursive ) echo "Configuration of gnome-shell-extensions 3.16.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1420,7 +1420,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-shell-extensions configure 3.16.1
+gnome-shell-extensions configure 3.16.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1437,7 +1437,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-shell-extensions $as_me 3.16.1, which was
+It was created by gnome-shell-extensions $as_me 3.16.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2303,7 +2303,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-shell-extensions'
- VERSION='3.16.1'
+ VERSION='3.16.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4122,7 +4122,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-shell-extensions $as_me 3.16.1, which was
+This file was extended by gnome-shell-extensions $as_me 3.16.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4179,7 +4179,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-shell-extensions config.status 3.16.1
+gnome-shell-extensions config.status 3.16.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2015-06-28 14:05:56 +0000
+++ configure.ac	2015-07-04 05:43:07 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.16.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.16.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
 
=== modified file 'data/gnome-classic.css'
--- data/gnome-classic.css	2015-06-28 14:05:56 +0000
+++ data/gnome-classic.css	2015-07-04 05:43:07 +0000
@@ -96,10 +96,10 @@
     background-color: transparent; }
   StScrollBar StButton#vhandle, StScrollBar StButton#hhandle {
     border-radius: 8px;
-    background-color: #ededed;
+    background-color: #7a7e7f;
     margin: 3px; }
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
-      background-color: white; }
+      background-color: #54595a; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
       background-color: #4a90d9; }
 
@@ -489,10 +489,9 @@
 
 .switcher-arrow {
   border-color: transparent;
-  color: #a1a1a1; }
-
-.switcher-arrow:highlighted {
-  color: #2e3436; }
+  color: rgba(46, 52, 54, 0.8); }
+  .switcher-arrow:highlighted {
+    color: #2e3436; }
 
 .input-source-switcher-symbol {
   font-size: 34pt;
@@ -1742,13 +1741,13 @@
     border-bottom: none; }
     #panel.lock-screen .panel-button, #panel.unlock-screen .panel-button, #panel.login-screen .panel-button {
       color: #eeeeec; }
+  #panel .popup-menu-arrow {
+    width: 0;
+    height: 0; }
 
 #appMenu {
-  padding: 0 8px 0 8px; }
-
-.popup-menu-arrow {
-  width: 0;
-  height: 0; }
+  padding: 0 8px 0 8px;
+  spinner-image: url("classic-process-working.svg"); }
 
 .tile-preview-left.on-primary,
 .tile-preview-right.on-primary,
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-28 14:05:56 +0000
+++ debian/changelog	2015-07-04 05:43:07 +0000
@@ -1,3 +1,25 @@
+gnome-shell-extensions (3.16.2-1ubuntu1) wily; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/fix-ubuntu-sessions.patch:
+      + Set X-LightDM-DesktopName to GNOME for GNOME session.
+
+ -- Jackson Doak <[e-mail]>  Sat, 04 Jul 2015 15:32:43 +1000
+
+gnome-shell-extensions (3.16.2-1) unstable; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/gnome-shell-extensions.gsettings-override:
+    + Dropped, no longer needed as the enabled extension no longer exists.
+      Thanks Artur Rona for noticing. (Closes: #782747)
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Update Homepage.
+  * Bump debhelper compatibility level to 9.
+
+ -- Michael Biebl <[e-mail]>  Thu, 02 Jul 2015 19:13:32 +0200
+
 gnome-shell-extensions (3.16.1-1ubuntu1) wily; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
 
=== modified file 'debian/compat'
--- debian/compat	2011-11-12 18:32:22 +0000
+++ debian/compat	2015-07-04 05:43:07 +0000
@@ -1,1 +1,1 @@
-8
+9
 
=== modified file 'debian/control'
--- debian/control	2015-06-28 14:05:56 +0000
+++ debian/control	2015-07-04 05:43:07 +0000
@@ -7,8 +7,8 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Victor Seva <[e-mail]>, Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
-Build-Depends: debhelper (>= 8.0.0),
+Uploaders: Victor Seva <[e-mail]>, Andreas Henriksson <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
+Build-Depends: debhelper (>= 9),
                cdbs,
                dh-autoreconf,
                gnome-common,
@@ -16,7 +16,7 @@
                intltool,
                libgnome-desktop-3-dev (>= 3.2.0)
 Standards-Version: 3.9.6
-Homepage: https://wiki.gnome.org/GnomeShell/Extensions
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
 
 
=== modified file 'debian/control.in'
--- debian/control.in	2015-06-28 14:05:56 +0000
+++ debian/control.in	2015-07-04 05:43:07 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Victor Seva <[e-mail]>, @GNOME_TEAM@
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 9),
                cdbs,
                dh-autoreconf,
                gnome-common,
@@ -12,7 +12,7 @@
                intltool,
                libgnome-desktop-3-dev (>= 3.2.0)
 Standards-Version: 3.9.6
-Homepage: https://wiki.gnome.org/GnomeShell/Extensions
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
 
 
=== modified file 'extensions/apps-menu/extension.js'
--- extensions/apps-menu/extension.js	2015-06-28 14:05:56 +0000
+++ extensions/apps-menu/extension.js	2015-07-04 05:43:07 +0000
@@ -74,7 +74,7 @@
     },
 
     activate: function(event) {
-	this._app.open_new_window(event.get_time());
+	this._app.open_new_window(-1);
         this._button.selectCategory(null, null);
         this._button.menu.toggle();
 	this.parent(event);
 
=== modified file 'po/LINGUAS'
--- po/LINGUAS	2015-06-28 14:05:56 +0000
+++ po/LINGUAS	2015-07-04 05:43:07 +0000
@@ -41,6 +41,7 @@
 nb
 ne
 nl
+oc
 or
 pa
 pl
 
=== added file 'po/oc.po'
--- po/oc.po	1970-01-01 00:00:00 +0000
+++ po/oc.po	2015-07-04 05:43:07 +0000
@@ -0,0 +1,406 @@
+# Occitan translation for gnome-shell-extensions.
+# Copyright (C) 2011-12 Listed translators
+# This file is distributed under the same license as the gnome-shell-extensions package.
+# Cédric Valmary (Tot en òc) <[e-mail]>, 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: 2013-09-27 14:18+0000\n"
+"PO-Revision-Date: 2015-05-18 16:36+0200\n"
+"Last-Translator: Cédric Valmary (Tot en òc) <[e-mail]>\n"
+"Language-Team: Tot en òc (totenoc.eu)\n"
+"Language: oc\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 Classic"
+
+#: ../data/gnome-classic.desktop.in.h:2
+msgid "This session logs you into GNOME Classic"
+msgstr "Aquesta sesilha vos connècta a GNOME Classic"
+
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr "GNOME Shell Classic"
+
+#: ../data/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr "Gestion de las fenèstras e aviada d'aplicacions"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:1
+msgid "Attach modal dialog to the parent window"
+msgstr "Estacar las bóstias de dialòg modalas a lor fenèstra parenta"
+
+#: ../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 ""
+"Aquesta clau remplaça la clau dins org.gnome.mutter quand GNOME Shell es en "
+"cors d'execucion."
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+"Activar la disposicion verticala quand las fenèstras son depausadas als "
+"bòrds de l'ecran"
+
+#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:4
+msgid "Workspaces only on primary monitor"
+msgstr "Espacis de trabalh unicament sus l'ecran principal"
+
+#: ../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 ""
+"Retardar los cambiaments de focus en mòde mirga fins al moment que lo "
+"puntador arrèsta de bolegar"
+
+#: ../extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr "Vinheta solament"
+
+#: ../extensions/alternate-tab/prefs.js:21
+msgid "Application icon only"
+msgstr "Icòna d'aplicacion solament"
+
+#: ../extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr "Vinheta e icòna d'aplicacion"
+
+#: ../extensions/alternate-tab/prefs.js:37
+msgid "Present windows as"
+msgstr "Presentar la fenèstra coma"
+
+#: ../extensions/alternate-tab/prefs.js:62
+msgid "Show only windows in the current workspace"
+msgstr "Afichar pas las fenèstras que sus l'espaci de trabalh actual"
+
+#: ../extensions/apps-menu/extension.js:39
+msgid "Activities Overview"
+msgstr "Vista d'ensemble de las activitats"
+
+#: ../extensions/apps-menu/extension.js:113
+msgid "Favorites"
+msgstr "Favorits"
+
+#: ../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 "Lista d'aplicacions e d'espacis de trabalh"
+
+#: ../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 de caratèrs, que contenon caduna un identificant "
+"d'aplicacion (nom de fichièr desktop), seguit per un dos-punts e lo numèro "
+"de l'espaci de trabalh"
+
+#: ../extensions/auto-move-windows/prefs.js:55
+msgid "Application"
+msgstr "Aplicacion"
+
+#: ../extensions/auto-move-windows/prefs.js:64
+#: ../extensions/auto-move-windows/prefs.js:106
+msgid "Workspace"
+msgstr "Espaci de trabalh"
+
+#: ../extensions/auto-move-windows/prefs.js:80
+msgid "Add rule"
+msgstr "Apondre una règla"
+
+#: ../extensions/auto-move-windows/prefs.js:94
+msgid "Create new matching rule"
+msgstr "Crear una règla novèla de concordància"
+
+#: ../extensions/auto-move-windows/prefs.js:98
+msgid "Add"
+msgstr "Apondre"
+
+#: ../extensions/drive-menu/extension.js:73
+#, javascript-format, javascript-format
+msgid "Ejecting drive '%s' failed:"
+msgstr "L'ejeccion del disc « %s » a fracassat :"
+
+#: ../extensions/drive-menu/extension.js:90
+msgid "Removable devices"
+msgstr "Periferics amovibles"
+
+#: ../extensions/drive-menu/extension.js:117
+msgid "Open File"
+msgstr "Dobrir lo fichièr"
+
+#: ../extensions/example/extension.js:17
+msgid "Hello, world!"
+msgstr "Adieu, lo mond !"
+
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+msgid "Alternative greeting text."
+msgstr "Autre tèxte d'acuèlh."
+
+#: ../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 ""
+"S'es pas void, conten lo tèxte que s'aficha quand clicatz "
+"sul tablèu de bòrd."
+
+#: ../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 ""
+"Example a per tòca de far veire cossí bastir de bonas èxtensions pel Shell e "
+"en tant que tal, a pas tant de foncionalitats en se qu'aquò.\n"
+"Pasmens, es possible de personalizar lo messatge d'acuèlh."
+
+#: ../extensions/example/prefs.js:36
+msgid "Message:"
+msgstr "Messatge :"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
+msgid "Use more screen for windows"
+msgstr "Utilizar mai d'ecran per las fenèstras"
+
+#: ../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 ""
+"Ensaja d'utilizar mai d'espaci d'ecran per plaçar las vinhetas de las fenèstras "
+"en s'adaptant a las proporcions de l'ecran e en las consolidant mai per "
+"redusir la zòna englobanta. Aqueste paramètre s'aplica pas qu'en utilizant "
+"l'estrategia de plaçament « natural »."
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+msgid "Place window captions on top"
+msgstr "Plaçar los títols de las fenèstras en dessús"
+
+#: ../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 ""
+"Se verai, plaça los títols de las fenèstras en dessús de la vinheta "
+"correspondenta, aquò remplaça lo comportament per defaut que los plaça en "
+"dejós. Per qu'aqueste paramètre siá pres en compte, cal reaviar lo Shell."
+
+#: ../extensions/places-menu/extension.js:78
+#: ../extensions/places-menu/extension.js:81
+msgid "Places"
+msgstr "Emplaçaments"
+
+#: ../extensions/places-menu/placeDisplay.js:56
+#, javascript-format, javascript-format
+msgid "Failed to launch \"%s\""
+msgstr "Impossible d'aviar « %s »"
+
+#: ../extensions/places-menu/placeDisplay.js:98
+#: ../extensions/places-menu/placeDisplay.js:121
+msgid "Computer"
+msgstr "Ordenador"
+
+#: ../extensions/places-menu/placeDisplay.js:199
+msgid "Home"
+msgstr "Dorsièr personal"
+
+#: ../extensions/places-menu/placeDisplay.js:286
+msgid "Browse Network"
+msgstr "Percórrer la ret"
+
+#: ../extensions/systemMonitor/extension.js:214
+msgid "CPU"
+msgstr "CPU"
+
+#: ../extensions/systemMonitor/extension.js:267
+msgid "Memory"
+msgstr "Memòria"
+
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
+msgid "Theme name"
+msgstr "Nom del tèma"
+
+#: ../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 "Lo nom del tèma, de cargar a partir de ~/.themes/name/gnome-shell"
+
+#: ../extensions/window-list/extension.js:92
+msgid "Close"
+msgstr "Tampar"
+
+#: ../extensions/window-list/extension.js:102
+msgid "Unminimize"
+msgstr "Restablir"
+
+#: ../extensions/window-list/extension.js:103
+msgid "Minimize"
+msgstr "Redusir"
+
+#: ../extensions/window-list/extension.js:109
+msgid "Unmaximize"
+msgstr "Restablir"
+
+#: ../extensions/window-list/extension.js:110
+msgid "Maximize"
+msgstr "Maximizar"
+
+#: ../extensions/window-list/extension.js:270
+msgid "Minimize all"
+msgstr "Redusir tot"
+
+#: ../extensions/window-list/extension.js:278
+msgid "Unminimize all"
+msgstr "Restablir tot"
+
+#: ../extensions/window-list/extension.js:286
+msgid "Maximize all"
+msgstr "Maximizar tot"
+
+#: ../extensions/window-list/extension.js:295
+msgid "Unmaximize all"
+msgstr "Restablir tot"
+
+#: ../extensions/window-list/extension.js:304
+msgid "Close all"
+msgstr "Tampar tot"
+
+#: ../extensions/window-list/extension.js:591
+#: ../extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr "Indicator d'espaci de trabalh"
+
+#: ../extensions/window-list/extension.js:743
+msgid "Window List"
+msgstr "Lista de fenèstras"
+
+#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
+msgid "When to group windows"
+msgstr "Quand regropar las fenèstras"
+
+#: ../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 ""
+"Decidís quora regropar las fenèstras d'una meteissa aplicacion sus la lista "
+"de las fenèstras. Las valors possiblas son « never » (pas jamai), « auto » e "
+"« always » (totjorn)."
+
+#: ../extensions/window-list/prefs.js:30
+msgid "Window Grouping"
+msgstr "Regropament de fenèstras"
+
+#: ../extensions/window-list/prefs.js:49
+msgid "Never group windows"
+msgstr "Regropar pas jamai las fenèstras"
+
+#: ../extensions/window-list/prefs.js:50
+msgid "Group windows when space is limited"
+msgstr "Regropar las fenèstras quand l'espaci es limitat"
+
+#: ../extensions/window-list/prefs.js:51
+msgid "Always group windows"
+msgstr "Regropar totjorn las fenèstras"
+
+#: ../extensions/workspace-indicator/prefs.js:141
+msgid "Workspace names:"
+msgstr "Noms dels espacis de trabalh :"
+
+#: ../extensions/workspace-indicator/prefs.js:152
+msgid "Name"
+msgstr "Nom"
+
+#: ../extensions/workspace-indicator/prefs.js:186
+#, javascript-format, javascript-format
+msgid "Workspace %d"
+msgstr "Espaci de trabalh %d"
+
+#~ msgid "Suspend"
+#~ msgstr "Metre en velha"
+
+#~ msgid "Hibernate"
+#~ msgstr "Ivernar"
+
+#~ msgid "Power Off"
+#~ msgstr "Atudar"
+
+#~ msgid "Enable suspending"
+#~ msgstr "Activar la mesa en velha"
+
+#~ msgid "Control the visibility of the Suspend menu item"
+#~ msgstr "Gerís la visibilitat de l'element de menú « mesa en velha »"
+
+#~ msgid "Enable hibernating"
+#~ msgstr "Activer l'hibernation"
+
+#~ msgid "Control the visibility of the Hibernate menu item"
+#~ msgstr "Gerís la visibilitat de l'element de menú « ivernacion »"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Left"
+#~ msgstr "Esquèrra"
+
+#~ msgid "Right"
+#~ msgstr "Drecha"
+
+#~ msgid "Upside-down"
+#~ msgstr "Capvirat"
+
+#~ msgid "Display"
+#~ msgstr "Afichar"
+
+#~ msgid "Display Settings"
+#~ msgstr "Afichar los paramètres"
+
+#~ msgid "Arrangement of buttons on the titlebar"
+#~ msgstr "Ordre des boutons dans la barre de titre"
+
+#~ msgid ""
+#~ "This key overrides the key in org.gnome.desktop.wm.preferences when running "
+#~ "GNOME Shell."
+#~ msgstr ""
+#~ "Cette clé remplace la clé dans org.gnome.desktop.wm.preferences lorsque "
+#~ "GNOME Shell est en cours d'exécution."
+
+#~ msgid "Add Rule"
+#~ msgstr "Ajouter une règle"
+
+#~ msgid "Message"
+#~ msgstr "Message"
+
+#~ msgid "Cycle Screenshot Sizes"
+#~ msgstr "Passer à la taille de capture suivante"
+
+#~ msgid "Show the window list on all monitors"
+#~ msgstr "Afficher la liste des fenêtres sur tous les écrans"
+
+#~ msgid ""
+#~ "Whether to show the window list on all connected monitors or only on the "
+#~ "primary one."
+#~ msgstr ""
+#~ "Indique s'il faut afficher la liste des fenêtres sur tous les écrans "
+#~ "connectés ou seulement l'écran principal."
+
+#~ msgid "Show on all monitors"
+#~ msgstr "Afficher sur tous les écrans"
+
+#~ msgid "Workspace Names"
+#~ msgstr "Noms des espaces de travail"
 
=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2014-10-29 00:21:20 +0000
+++ po/zh_CN.po	2015-07-04 05:43:07 +0000
@@ -11,19 +11,18 @@
 "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: 2014-05-31 18:51+0000\n"
-"PO-Revision-Date: 2014-06-01 10:36+0800\n"
-"Last-Translator: irisgyq <[e-mail]>\n"
+"POT-Creation-Date: 2015-04-17 08:12+0000\n"
+"PO-Revision-Date: 2015-05-03 10:39+0800\n"
+"Last-Translator: YunQiang Su <[e-mail]>\n"
 "Language-Team: Chinese (China) <[e-mail]>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
+#: ../data/gnome-classic.desktop.in.h:1 ../data/gnome-classic.session.desktop.in.in.h:1
 msgid "GNOME Classic"
 msgstr "GNOME 经典模式"
 
@@ -31,21 +30,12 @@
 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 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."
+msgid "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr "当运行 GNOME Shell 时该键会覆盖 org.gnome.mutter 中的键。"
 
 #: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:3
@@ -54,8 +44,8 @@
 
 #: ../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."
+"This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME "
+"Shell."
 msgstr "当运行 GNOME Shell 时该键会覆盖 org.gnome.desktop.wm.preferences 中的键。"
 
 #: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:5
@@ -94,11 +84,11 @@
 msgid "Activities Overview"
 msgstr "活动概览"
 
-#: ../extensions/apps-menu/extension.js:113
+#: ../extensions/apps-menu/extension.js:110
 msgid "Favorites"
 msgstr "收藏"
 
-#: ../extensions/apps-menu/extension.js:282
+#: ../extensions/apps-menu/extension.js:279
 msgid "Applications"
 msgstr "应用程序"
 
@@ -108,10 +98,9 @@
 
 #: ../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 ""
-"一系列字符串，每个字符串包含一个应用程序标识(桌面文件名称)、冒号加工作区号"
+"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"
@@ -139,11 +128,11 @@
 msgid "Ejecting drive '%s' failed:"
 msgstr "弹出驱动器“%s”失败："
 
-#: ../extensions/drive-menu/extension.js:123
+#: ../extensions/drive-menu/extension.js:124
 msgid "Removable devices"
 msgstr "可移动设备"
 
-#: ../extensions/drive-menu/extension.js:150
+#: ../extensions/drive-menu/extension.js:149
 msgid "Open File"
 msgstr "打开文件管理器"
 
@@ -157,8 +146,7 @@
 
 #: ../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."
+"If not empty, it contains the text that will be shown when clicking on the panel."
 msgstr "如果不为空，所包含的文本会在点击面板时显示。"
 
 #: ../extensions/example/prefs.js:30
@@ -167,8 +155,8 @@
 
 #: ../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"
+"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 ""
 "示例意在展示如何为 Shell 创建良好工作的扩展，本身功能有限。\n"
@@ -180,12 +168,12 @@
 
 #: ../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."
+"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"
@@ -193,15 +181,14 @@
 
 #: ../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."
+"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 ""
-"如果设置为 true，则将窗口说明文字放置在对应窗口的缩略图上方，而不是默认的下"
-"方。修改此设置需要重启 GNOME Shell 以使设置生效。"
+"如果设置为 true，则将窗口说明文字放置在对应窗口的缩略图上方，而不是默认的下方。修改此"
+"设置需要重启 GNOME Shell 以使设置生效。"
 
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
+#: ../extensions/places-menu/extension.js:78 ../extensions/places-menu/extension.js:81
 msgid "Places"
 msgstr "位置"
 
@@ -223,13 +210,9 @@
 msgid "Browse Network"
 msgstr "浏览网络"
 
-#: ../extensions/systemMonitor/extension.js:214
-msgid "CPU"
-msgstr "CPU"
-
-#: ../extensions/systemMonitor/extension.js:267
-msgid "Memory"
-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"
@@ -239,52 +222,52 @@
 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
+#: ../extensions/window-list/extension.js:109
 msgid "Close"
 msgstr "关闭"
 
-#: ../extensions/window-list/extension.js:120
+#: ../extensions/window-list/extension.js:119
 msgid "Unminimize"
 msgstr "取消最小化"
 
-#: ../extensions/window-list/extension.js:121
+#: ../extensions/window-list/extension.js:120
 msgid "Minimize"
 msgstr "最小化"
 
-#: ../extensions/window-list/extension.js:127
+#: ../extensions/window-list/extension.js:126
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: ../extensions/window-list/extension.js:128
+#: ../extensions/window-list/extension.js:127
 msgid "Maximize"
 msgstr "最大化"
 
-#: ../extensions/window-list/extension.js:300
+#: ../extensions/window-list/extension.js:399
 msgid "Minimize all"
 msgstr "全部最小化"
 
-#: ../extensions/window-list/extension.js:308
+#: ../extensions/window-list/extension.js:407
 msgid "Unminimize all"
 msgstr "全部取消最小化"
 
-#: ../extensions/window-list/extension.js:316
+#: ../extensions/window-list/extension.js:415
 msgid "Maximize all"
 msgstr "全部最大化"
 
-#: ../extensions/window-list/extension.js:325
+#: ../extensions/window-list/extension.js:424
 msgid "Unmaximize all"
 msgstr "全部取消最大化"
 
-#: ../extensions/window-list/extension.js:334
+#: ../extensions/window-list/extension.js:433
 msgid "Close all"
 msgstr "全部关闭"
 
-#: ../extensions/window-list/extension.js:644
+#: ../extensions/window-list/extension.js:650
 #: ../extensions/workspace-indicator/extension.js:30
 msgid "Workspace Indicator"
 msgstr "工作区指示器"
 
-#: ../extensions/window-list/extension.js:798
+#: ../extensions/window-list/extension.js:809
 msgid "Window List"
 msgstr "窗口列表"
 
@@ -294,28 +277,41 @@
 
 #: ../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\"."
+"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/prefs.js:30
+"决定何时对窗口列表上的同一应用的窗口进行分组。可用值有“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:49
+#: ../extensions/window-list/prefs.js:50
 msgid "Never group windows"
 msgstr "从不将窗口分组"
 
-#: ../extensions/window-list/prefs.js:50
+#: ../extensions/window-list/prefs.js:51
 msgid "Group windows when space is limited"
 msgstr "当空间有限时将窗口分组"
 
-#: ../extensions/window-list/prefs.js:51
+#: ../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 "工作区名称"
@@ -329,6 +325,18 @@
 msgid "Workspace %d"
 msgstr "工作区 %d"
 
+#~ msgid "GNOME Shell Classic"
+#~ msgstr "GNOME Shell 经典模式"
+
+#~ msgid "Window management and application launching"
+#~ msgstr "窗口管理与应用启动"
+
+#~ msgid "CPU"
+#~ msgstr "CPU"
+
+#~ msgid "Memory"
+#~ msgstr "内存"
+
 #~ msgid "Suspend"
 #~ msgstr "挂起"
 
@@ -372,12 +380,12 @@
 #~ msgstr "应用程序图标模式。"
 
 #~ msgid ""
-#~ "Configures how the windows are shown in the switcher. Valid possibilities "
-#~ "are 'thumbnail-only' (shows a thumbnail of the window), 'app-icon-"
-#~ "only' (shows only the application icon) or 'both'."
+#~ "Configures how the windows are shown in the switcher. Valid possibilities are "
+#~ "'thumbnail-only' (shows a thumbnail of the window), 'app-icon-only' (shows only "
+#~ "the application icon) or 'both'."
 #~ msgstr ""
-#~ "配置窗口在切换器中的显示方式。有效值包括“仅缩略图”(显示窗口的缩略图)、“仅"
-#~ "应用程序图标”(仅显示应用程序图标)或“全部”。"
+#~ "配置窗口在切换器中的显示方式。有效值包括“仅缩略图”(显示窗口的缩略图)、“仅应用程序图"
+#~ "标”(仅显示应用程序图标)或“全部”。"
 
 #~ msgid "Drag here to add favorites"
 #~ msgstr "拖放到这里以添加收藏"
@@ -395,8 +403,7 @@
 #~ msgstr "Dock 位置"
 
 #~ msgid ""
-#~ "Sets the position of the dock in the screen. Allowed values are 'right' "
-#~ "or 'left'"
+#~ "Sets the position of the dock in the screen. Allowed values are 'right' or 'left'"
 #~ msgstr "设置 Dock 在屏幕上的位置。允许的值有“右”或“左”。"
 
 #~ msgid "Icon size"
@@ -412,8 +419,7 @@
 #~ msgstr "自动隐藏效果"
 
 #~ msgid ""
-#~ "Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' "
-#~ "and 'move'"
+#~ "Sets the effect of the hide dock. Allowed values are 'resize', 'rescale' and 'move'"
 #~ msgstr "设置隐藏 Dock 的效果。允许的值有“resize”、“rescale”和“move”"
 
 #~ msgid "Autohide duration"
@@ -426,8 +432,7 @@
 #~ msgstr "显示器"
 
 #~ msgid ""
-#~ "Sets monitor to display dock in. The default value (-1) is the primary "
-#~ "monitor."
+#~ "Sets monitor to display dock in. The default value (-1) is the primary monitor."
 #~ msgstr "设置显示 Dock 的显示器。默认值(-1)是主显示器。"
 
 #~ msgid "%s is away."
@@ -461,40 +466,38 @@
 #~ "Sets the Alt-Tab behaviour. Possible values are: all_thumbnails and "
 #~ "workspace_icons. See the configuration dialogs for details."
 #~ msgstr ""
-#~ "设置 Alt-Tab 行为。可取的值有：native(原生)、all_thumbnails(所有缩略图) "
-#~ "和 workspace_icons(工作区内图标)。详情参阅配置对话框。"
+#~ "设置 Alt-Tab 行为。可取的值有：native(原生)、all_thumbnails(所有缩略图) 和 "
+#~ "workspace_icons(工作区内图标)。详情参阅配置对话框。"
 
 #~ 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."
+#~ "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 ""
-#~ "此模式将在一个选择列表中展示全部工作区中的所有应用程序。它使用小缩略图而非"
-#~ "各窗口的应用程序图标来代表窗口。"
+#~ "此模式将在一个选择列表中展示全部工作区中的所有应用程序。它使用小缩略图而非各窗口的"
+#~ "应用程序图标来代表窗口。"
 
 #~ msgid "Workspace & Icons"
 #~ msgstr "工作区和图标"
 
 #~ 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"
+#~ "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 ""
-#~ "此模式让您在当前工作区中的应用程序及上个工作区、上次使用的应用程序间切换。"
-#~ "上次使用这项总是列表中的最后一个符号，并以分隔符或竖线区别(若可能)。\n"
+#~ "此模式让您在当前工作区中的应用程序及上个工作区、上次使用的应用程序间切换。上次使用"
+#~ "这项总是列表中的最后一个符号，并以分隔符或竖线区别(若可能)。\n"
 #~ "每个窗口以其应用程序图标展示。"
 
 #~ msgid "Move current selection to front before closing the popup"
 #~ msgstr "在关闭弹出界面前将当前选择移到前面"
 
 #~ msgid ""
-#~ "The Alternate Tab can be used in different modes, that affect the way "
-#~ "windows are chosen and presented."
-#~ msgstr ""
-#~ "Alternate Tab 有多种使用模式，所使用模式会影响窗口展示和选择的方式。"
+#~ "The Alternate Tab can be used in different modes, that affect the way windows are "
+#~ "chosen and presented."
+#~ msgstr "Alternate Tab 有多种使用模式，所使用模式会影响窗口展示和选择的方式。"
 
 #~ msgid "Removable Devices"
 #~ msgstr "可移动设备"