diff --git a/configure.ac b/configure.ac
index dc712da6d..d37abcb6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[2.91.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[2.91.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 61de6943f..88fbc00e0 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -6,6 +6,8 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Mainloop = imports.mainloop;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
 
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2aa7d7c48..a23f9bf51 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,6 +17,7 @@ js/ui/statusMenu.js
 js/ui/status/accessibility.js
 js/ui/windowAttentionHandler.js
 js/ui/workspacesView.js
+src/gvc/gvc-mixer-control.c
 src/gdmuser/gdm-user.c
 src/shell-global.c
 src/shell-uri-util.c
diff --git a/po/es.po b/po/es.po
index 373bcf1fe..443343293 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-10-25 21:45+0000\n"
-"PO-Revision-Date: 2010-10-26 10:43+0200\n"
+"POT-Creation-Date: 2010-10-27 23:15+0000\n"
+"PO-Revision-Date: 2010-10-28 01:42+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -478,7 +478,9 @@ msgstr "No hay extensiones instaladas"
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../js/ui/lookingGlass.js:591
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -606,7 +608,6 @@ msgid "My Account..."
 msgstr "Mi cuenta…"
 
 #: ../js/ui/statusMenu.js:123
-#| msgid "Preferences"
 msgid "System Preferences..."
 msgstr "Preferencias del sistema…"
 
@@ -699,6 +700,29 @@ msgstr ""
 msgid "Can't remove the first workspace."
 msgstr "No se puede quitar el primer área de trabajo."
 
+#. translators:
+#. * The number of sound outputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1094
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u salida"
+msgstr[1] "%u salidas"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1104
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u entrada"
+msgstr[1] "%u entradas"
+
+#: ../src/gvc/gvc-mixer-control.c:1402
+#| msgid "System Settings..."
+msgid "System Sounds"
+msgstr "Sonidos del sistema"
+
 #: ../src/shell-global.c:1204
 msgid "Less than a minute ago"
 msgstr "Hace menos de un minuto"
@@ -758,9 +782,6 @@ msgstr "%1$s: %2$s"
 #~ msgid "Account Information..."
 #~ msgstr "Información de la cuenta…"
 
-#~ msgid "System Settings..."
-#~ msgstr "Ajustes del sistema…"
-
 #~ msgid "ON"
 #~ msgstr "ENCENDIDO"
 
diff --git a/po/he.po b/po/he.po
index b4662371f..be704419f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-26 08:20+0200\n"
-"PO-Revision-Date: 2010-10-26 08:20+0200\n"
+"POT-Creation-Date: 2010-10-28 08:56+0200\n"
+"PO-Revision-Date: 2010-10-28 08:58+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -469,7 +469,9 @@ msgstr "לא מותקנות הרחבות"
 msgid "Enabled"
 msgstr "פעיל"
 
-#: ../js/ui/lookingGlass.js:591
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
 msgid "Disabled"
 msgstr "מנוטרל"
 
@@ -687,6 +689,30 @@ msgstr "לא ניתן להוסיף מרחבי עבודה כיוון שהם ממ
 msgid "Can't remove the first workspace."
 msgstr "לא ניתן להסיר את מרחב העבודה הראשון."
 
+#. translators:
+#. * The number of sound outputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1094
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "פלט אחד"
+msgstr[1] "%u פלטים"
+msgstr[2] "2 פלטים"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1104
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "קלט אחד"
+msgstr[1] "%u קלטים"
+msgstr[2] "2 קלטים"
+
+#: ../src/gvc/gvc-mixer-control.c:1402
+msgid "System Sounds"
+msgstr "צלילי מערכת"
+
 #: ../src/shell-global.c:1204
 msgid "Less than a minute ago"
 msgstr "לפני פחות מדקה"
@@ -750,9 +776,6 @@ msgstr "%1$s: %2$s"
 #~ msgid "Account Information..."
 #~ msgstr "פרטי המשתמש..."
 
-#~ msgid "System Settings..."
-#~ msgstr "הגדרות מערכת..."
-
 #~ msgid "ON"
 #~ msgstr "1"
 
diff --git a/po/nb.po b/po/nb.po
index f82b0bf31..b75f5b4a2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-16 21:23+0200\n"
-"PO-Revision-Date: 2010-10-16 21:24+0200\n"
+"POT-Creation-Date: 2010-10-28 17:35+0200\n"
+"PO-Revision-Date: 2010-10-28 17:38+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -37,7 +37,9 @@ msgstr "Tilpass klokken på panelet"
 msgid ""
 "Allows access to internal debugging and monitoring tools using the Alt-F2 "
 "dialog."
-msgstr "Tillat tilgang til interne feilsøkings og overvåkingsverktøy ved å bruke Alt-F2-dialogen."
+msgstr ""
+"Tillat tilgang til interne feilsøkings og overvåkingsverktøy ved å bruke Alt-"
+"F2-dialogen."
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:2
 msgid "Custom format of the clock"
@@ -400,7 +402,9 @@ msgstr "Ingen utvidelser installert"
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../js/ui/lookingGlass.js:591
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
 msgid "Disabled"
 msgstr "Deaktivert"
 
@@ -425,58 +429,58 @@ msgid "Undo"
 msgstr "Angre"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:468
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "Avslutt %s"
 
-#: ../js/ui/panel.js:493
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "Brukervalg"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:579
+#: ../js/ui/panel.js:580
 msgid "%a %b %e, %R:%S"
 msgstr "%a %e %b, %R.%S"
 
-#: ../js/ui/panel.js:580
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:584
+#: ../js/ui/panel.js:585
 msgid "%a %R:%S"
 msgstr "%a %R.%S"
 
-#: ../js/ui/panel.js:585
+#: ../js/ui/panel.js:586
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:592
+#: ../js/ui/panel.js:593
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e %b, %l.%M.%S %p"
 
-#: ../js/ui/panel.js:593
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e %b, %l.%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:597
+#: ../js/ui/panel.js:598
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l.%M.%S %p"
 
-#: ../js/ui/panel.js:598
+#: ../js/ui/panel.js:599
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:743
+#: ../js/ui/panel.js:744
 msgid "Activities"
 msgstr "Aktiviteter"
 
@@ -511,42 +515,94 @@ msgstr "Oppgi en kommando:"
 msgid "Execution of '%s' failed:"
 msgstr "Kjøring av «%s» feilet:"
 
-#: ../js/ui/statusMenu.js:97
+#: ../js/ui/statusMenu.js:101
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../js/ui/statusMenu.js:101
+#: ../js/ui/statusMenu.js:106
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../js/ui/statusMenu.js:105
+#: ../js/ui/statusMenu.js:111
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../js/ui/statusMenu.js:112
-msgid "Account Information..."
-msgstr "Kontoinformasjon..."
-
-#: ../js/ui/statusMenu.js:116
-msgid "System Settings..."
-msgstr "Innstillinger for systemet..."
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr "Min konto..."
 
 #: ../js/ui/statusMenu.js:123
+msgid "System Preferences..."
+msgstr "Brukervalg for systemet..."
+
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
 msgstr "Lås skjerm"
 
-#: ../js/ui/statusMenu.js:127
+#: ../js/ui/statusMenu.js:134
 msgid "Switch User"
 msgstr "Bytt bruker"
 
-#: ../js/ui/statusMenu.js:132
+#: ../js/ui/statusMenu.js:139
 msgid "Log Out..."
 msgstr "Logg ut..."
 
-#: ../js/ui/statusMenu.js:136
+#: ../js/ui/statusMenu.js:146
+msgid "Suspend"
+msgstr "Hvilemodus"
+
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr "Start på nytt..."
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "Avslutt..."
 
+#: ../js/ui/status/accessibility.js:88
+msgid "Screen Reader"
+msgstr "Skjermleser"
+
+#: ../js/ui/status/accessibility.js:91
+msgid "Screen Keyboard"
+msgstr "Tastatur på skjermen"
+
+#: ../js/ui/status/accessibility.js:94
+msgid "Visual Alerts"
+msgstr "Synlig varsling"
+
+#: ../js/ui/status/accessibility.js:97
+msgid "Sticky Keys"
+msgstr "Klebrige taster"
+
+#: ../js/ui/status/accessibility.js:100
+msgid "Slow Keys"
+msgstr "Trege taster"
+
+#: ../js/ui/status/accessibility.js:103
+msgid "Bounce Keys"
+msgstr "Spretne taster"
+
+#: ../js/ui/status/accessibility.js:106
+msgid "Mouse Keys"
+msgstr "Mustaster"
+
+#: ../js/ui/status/accessibility.js:110
+msgid "Universal Access Settings"
+msgstr "Innstillinger for tilgjengelighet"
+
+#: ../js/ui/status/accessibility.js:163
+msgid "High Contrast"
+msgstr "Høy kontrast"
+
+#: ../js/ui/status/accessibility.js:202
+msgid "Large Text"
+msgstr "Stor tekst"
+
+#: ../js/ui/status/accessibility.js:223
+msgid "Zoom"
+msgstr "Zoom"
+
 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
 msgid "%s has finished starting"
@@ -557,43 +613,65 @@ msgstr "%s er ferdig startet"
 msgid "'%s' is ready"
 msgstr "«%s» er klar"
 
-#: ../js/ui/workspacesView.js:230
+#: ../js/ui/workspacesView.js:229
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr ""
 "Kan ikke legge til nytt arbeidsområde fordi grensen for maksimalt antall "
 "arbeidsområder er nådd."
 
-#: ../js/ui/workspacesView.js:247
+#: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
 msgstr "Kan ikke fjerne første arbeidsområde"
 
-#: ../src/shell-global.c:1196
+#. translators:
+#. * The number of sound outputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1094
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u utgang"
+msgstr[1] "%u utganger"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: ../src/gvc/gvc-mixer-control.c:1104
+#, c-format
+msgid "%u Input"
+msgid_plural "%u Inputs"
+msgstr[0] "%u inngang"
+msgstr[1] "%u innganger"
+
+#: ../src/gvc/gvc-mixer-control.c:1402
+msgid "System Sounds"
+msgstr "Systemlyder"
+
+#: ../src/shell-global.c:1204
 msgid "Less than a minute ago"
 msgstr "Mindre enn ett minutt siden"
 
-#: ../src/shell-global.c:1200
+#: ../src/shell-global.c:1208
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../src/shell-global.c:1205
+#: ../src/shell-global.c:1213
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../src/shell-global.c:1210
+#: ../src/shell-global.c:1218
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../src/shell-global.c:1215
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
diff --git a/po/sl.po b/po/sl.po
index ba64768b0..cae2d06e9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2010-10-11 18:48+0000\n"
-"PO-Revision-Date: 2010-10-12 19:57+0100\n"
+"POT-Creation-Date: 2010-10-26 14:37+0000\n"
+"PO-Revision-Date: 2010-10-26 19:29+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: Slovenian\n"
@@ -147,7 +147,7 @@ msgstr "Ali naj se beleži statistika uporabe programov"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
 msgid "Clip the crosshairs at the center"
-msgstr ""
+msgstr "Ali merek prekriva kazalko miške v središču"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
 msgid "Color of the crosshairs"
@@ -364,58 +364,58 @@ msgid "Undo"
 msgstr "Razveljavi"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:468
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "Končaj %s"
 
-#: ../js/ui/panel.js:493
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "Možnosti"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:579
+#: ../js/ui/panel.js:580
 msgid "%a %b %e, %R:%S"
 msgstr "%a. %e. %b., %R:%S"
 
-#: ../js/ui/panel.js:580
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %R"
 msgstr "%a, %e. %b., %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:584
+#: ../js/ui/panel.js:585
 msgid "%a %R:%S"
 msgstr "%a. %R:%S"
 
-#: ../js/ui/panel.js:585
+#: ../js/ui/panel.js:586
 msgid "%a %R"
 msgstr "%a. %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:592
+#: ../js/ui/panel.js:593
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a. %e. %b., %H:%M:%S"
 
-#: ../js/ui/panel.js:593
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a. %e. %b., %H:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:597
+#: ../js/ui/panel.js:598
 msgid "%a %l:%M:%S %p"
 msgstr "%a, %H:%M:%S"
 
-#: ../js/ui/panel.js:598
+#: ../js/ui/panel.js:599
 msgid "%a %l:%M %p"
 msgstr "%a, %H:%M"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:743
+#: ../js/ui/panel.js:744
 msgid "Activities"
 msgstr "Dejavnosti"
 
@@ -450,42 +450,94 @@ msgstr "Vnos ukaza:"
 msgid "Execution of '%s' failed:"
 msgstr "Izvedba '%s' je spodletela:"
 
-#: ../js/ui/statusMenu.js:91
+#: ../js/ui/statusMenu.js:101
 msgid "Available"
 msgstr "Na voljo"
 
-#: ../js/ui/statusMenu.js:95
+#: ../js/ui/statusMenu.js:106
 msgid "Busy"
 msgstr "Zaposleno"
 
-#: ../js/ui/statusMenu.js:99
+#: ../js/ui/statusMenu.js:111
 msgid "Invisible"
 msgstr "Nevidno"
 
-#: ../js/ui/statusMenu.js:106
-msgid "Account Information..."
-msgstr "Podrobnosti računa ..."
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr "Račun ..."
 
-#: ../js/ui/statusMenu.js:110
-msgid "System Settings..."
-msgstr "Sistemske nastavitve ..."
+#: ../js/ui/statusMenu.js:123
+msgid "System Preferences..."
+msgstr "Sistemske možnosti ..."
 
-#: ../js/ui/statusMenu.js:117
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
 msgstr "Zakleni zaslon"
 
-#: ../js/ui/statusMenu.js:121
+#: ../js/ui/statusMenu.js:134
 msgid "Switch User"
 msgstr "Preklopi uporabnika"
 
-#: ../js/ui/statusMenu.js:126
+#: ../js/ui/statusMenu.js:139
 msgid "Log Out..."
 msgstr "Odjava ..."
 
-#: ../js/ui/statusMenu.js:130
+#: ../js/ui/statusMenu.js:146
+msgid "Suspend"
+msgstr "V mirovanje"
+
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr "Ponoven zagon ..."
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "Izklopi ..."
 
+#: ../js/ui/status/accessibility.js:88
+msgid "Screen Reader"
+msgstr "Zaslonski bralnik"
+
+#: ../js/ui/status/accessibility.js:91
+msgid "Screen Keyboard"
+msgstr "Zaslonska tipkovnica"
+
+#: ../js/ui/status/accessibility.js:94
+msgid "Visual Alerts"
+msgstr "Vidna opozorila"
+
+#: ../js/ui/status/accessibility.js:97
+msgid "Sticky Keys"
+msgstr "Lepljive tipke"
+
+#: ../js/ui/status/accessibility.js:100
+msgid "Slow Keys"
+msgstr "Počasne tipke"
+
+#: ../js/ui/status/accessibility.js:103
+msgid "Bounce Keys"
+msgstr "Odskočne tipke"
+
+#: ../js/ui/status/accessibility.js:106
+msgid "Mouse Keys"
+msgstr "Miškine tipke"
+
+#: ../js/ui/status/accessibility.js:110
+msgid "Universal Access Settings"
+msgstr "Splošne nastavitve dostopa"
+
+#: ../js/ui/status/accessibility.js:163
+msgid "High Contrast"
+msgstr "Visok kontrast"
+
+#: ../js/ui/status/accessibility.js:202
+msgid "Large Text"
+msgstr "Veliko besedilo"
+
+#: ../js/ui/status/accessibility.js:223
+msgid "Zoom"
+msgstr "Približanje"
+
 #: ../js/ui/windowAttentionHandler.js:43
 #, c-format
 msgid "%s has finished starting"
@@ -496,19 +548,19 @@ msgstr "%s je končal začenjanje"
 msgid "'%s' is ready"
 msgstr "'%s' storitev je pripravljena"
 
-#: ../js/ui/workspacesView.js:230
+#: ../js/ui/workspacesView.js:229
 msgid "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr "Ni mogoče dodati nove delovne površine, ker je doseženo njihovo največje dovoljeno število."
 
-#: ../js/ui/workspacesView.js:247
+#: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
 msgstr "Ni mogoče odstraniti prve delovne površine."
 
-#: ../src/shell-global.c:1196
+#: ../src/shell-global.c:1204
 msgid "Less than a minute ago"
 msgstr "Pred manj kot eno minuto"
 
-#: ../src/shell-global.c:1200
+#: ../src/shell-global.c:1208
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -517,7 +569,7 @@ msgstr[1] "Pred %d minuto"
 msgstr[2] "Pred %d minutama"
 msgstr[3] "Pred %d minutami"
 
-#: ../src/shell-global.c:1205
+#: ../src/shell-global.c:1213
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -526,7 +578,7 @@ msgstr[1] "Pred %d uro"
 msgstr[2] "Pred %d urama"
 msgstr[3] "Pred %d urami"
 
-#: ../src/shell-global.c:1210
+#: ../src/shell-global.c:1218
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -535,7 +587,7 @@ msgstr[1] "Pred %d dnevom"
 msgstr[2] "Pred %d dnevoma"
 msgstr[3] "Pred %d dnevi"
 
-#: ../src/shell-global.c:1215
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -568,6 +620,10 @@ msgstr "Poišči"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
+#~ msgid "Account Information..."
+#~ msgstr "Podrobnosti računa ..."
+#~ msgid "System Settings..."
+#~ msgstr "Sistemske nastavitve ..."
 #~ msgid "ON"
 #~ msgstr "⚪"
 #~ msgid "OFF"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 77deec705..b6642f113 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
 # Chinese (China) translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
+# Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-shell package.
 # Ray Wang <raywang@gnome.org>, 2009.
 # jiero <lililjlj@gmail.com>, 2010.
@@ -11,9 +11,9 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-07-22 17:09+0000\n"
-"PO-Revision-Date: 2010-07-23 19:29+0800\n"
-"Last-Translator: Jessica Ban <bancage@gmail.com>\n"
+"POT-Creation-Date: 2010-10-25 21:45+0000\n"
+"PO-Revision-Date: 2010-10-28 00:26+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,6 +204,132 @@ msgstr "要禁用的扩展的 uuid"
 msgid "Whether to collect stats about applications usage"
 msgstr "是否收集应用程序的使用情况"
 
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
+msgid "Clip the crosshairs at the center"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
+msgid "Color of the crosshairs"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:3
+msgid ""
+"Determines the length of the vertical and horizontal lines that make up the "
+"crosshairs."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:4
+msgid ""
+"Determines the position of the magnified mouse image within the magnified "
+"view and how it reacts to system mouse movement. The values are - none: no "
+"mouse tracking; - centered: the mouse image is displayed at the center of "
+"the zoom region (which also represents the point under the system mouse) and "
+"the magnified contents are scrolled as the system mouse moves; - "
+"proportional: the position of the magnified mouse in the zoom region is "
+"proportionally the same as the position of the system mouse on screen; - "
+"push: when the magnified mouse intersects a boundary of the zoom region, the "
+"contents are scrolled into view."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5
+msgid ""
+"Determines the transparency of the crosshairs, from fully opaque to fully "
+"transparent."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:6
+msgid ""
+"Determines whether the crosshairs intersect the magnified mouse sprite, or "
+"are clipped such that the ends of the horizontal and vertical lines surround "
+"the mouse image."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
+#, fuzzy
+msgid "Enable lens mode"
+msgstr "启用"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8
+msgid ""
+"Enables/disables display of crosshairs centered on the magnified mouse "
+"sprite."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:9
+msgid ""
+"For centered mouse tracking, when the system pointer is at or near the edge "
+"of the screen, the magnified contents continue to scroll such that the "
+"screen edge moves into the magnified view."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:10
+msgid "Length of the crosshairs"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:11
+msgid "Magnification factor"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:12
+msgid "Mouse Tracking Mode"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:13
+msgid "Opacity of the crosshairs"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:14
+msgid "Screen position"
+msgstr "屏幕位置"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:15
+msgid "Scroll magnified contents beyond the edges of the desktop"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
+msgid "Show or hide crosshairs"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
+msgid "Show or hide the magnifier"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
+msgid "Show or hide the magnifier and all of its zoom regions."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
+msgid ""
+"The color of the the vertical and horizontal lines that make up the "
+"crosshairs."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:20
+msgid ""
+"The magnified view either fills the entire screen, or occupies the top-half, "
+"bottom-half, left-half, or right-half of the screen."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:21
+msgid ""
+"The power of the magnification. A value of 1.0 means no magnification. A "
+"value of 2.0 doubles the size."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22
+msgid "Thickness of the crosshairs"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:23
+msgid ""
+"Whether the magnified view should be centered over the location of the "
+"system mouse and move with it."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:24
+msgid "Width of the vertical and horizontal lines that make up the crosshairs."
+msgstr ""
+
 #: ../data/clock-preferences.ui.h:1
 msgid "Clock Format"
 msgstr "时钟格式"
@@ -233,27 +359,27 @@ msgid "_24 hour format"
 msgstr "_24 小时格式"
 
 #. **** Applications ****
-#: ../js/ui/appDisplay.js:384 ../js/ui/dash.js:773
+#: ../js/ui/appDisplay.js:316 ../js/ui/dash.js:778
 msgid "APPLICATIONS"
 msgstr "应用程序"
 
-#: ../js/ui/appDisplay.js:416
+#: ../js/ui/appDisplay.js:348
 msgid "PREFERENCES"
 msgstr "首选项"
 
-#: ../js/ui/appDisplay.js:721
+#: ../js/ui/appDisplay.js:648
 msgid "New Window"
 msgstr "新窗口"
 
-#: ../js/ui/appDisplay.js:725
+#: ../js/ui/appDisplay.js:652
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: ../js/ui/appDisplay.js:726
+#: ../js/ui/appDisplay.js:653
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: ../js/ui/appDisplay.js:1033
+#: ../js/ui/appDisplay.js:830
 msgid "Drag here to add favorites"
 msgstr "拖到这里加入收藏夹"
 
@@ -271,138 +397,135 @@ msgstr "%s 已经从您的收藏夹移除。"
 msgid "Find"
 msgstr "查找"
 
-#: ../js/ui/dash.js:471
+#: ../js/ui/dash.js:473
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: ../js/ui/dash.js:485
+#: ../js/ui/dash.js:487
 msgid "No matching results."
 msgstr "无匹配结果。"
 
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:792 ../js/ui/placeDisplay.js:550
+#: ../js/ui/dash.js:797 ../js/ui/placeDisplay.js:554
 msgid "PLACES & DEVICES"
 msgstr "位置和设备"
 
 #. **** Documents ****
-#: ../js/ui/dash.js:799 ../js/ui/docDisplay.js:494
+#: ../js/ui/dash.js:804 ../js/ui/docDisplay.js:494
 msgid "RECENT ITEMS"
 msgstr "最近的项目"
 
-#: ../js/ui/lookingGlass.js:471
+#: ../js/ui/lookingGlass.js:552
 msgid "No extensions installed"
 msgstr "未安装扩展"
 
-#: ../js/ui/lookingGlass.js:508
+#: ../js/ui/lookingGlass.js:589
 msgid "Enabled"
 msgstr "启用"
 
-#: ../js/ui/lookingGlass.js:510
+#: ../js/ui/lookingGlass.js:591
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../js/ui/lookingGlass.js:512
+#: ../js/ui/lookingGlass.js:593
 msgid "Error"
 msgstr "错误"
 
-#: ../js/ui/lookingGlass.js:514
+#: ../js/ui/lookingGlass.js:595
 msgid "Out of date"
 msgstr "过时"
 
-#: ../js/ui/lookingGlass.js:539
+#: ../js/ui/lookingGlass.js:620
 msgid "View Source"
 msgstr "查看源"
 
-#: ../js/ui/lookingGlass.js:545
+#: ../js/ui/lookingGlass.js:626
 msgid "Web Page"
 msgstr "网页"
 
-#: ../js/ui/overview.js:159
+#: ../js/ui/overview.js:160
 msgid "Undo"
 msgstr "撤销"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:473
+#: ../js/ui/panel.js:469
 #, c-format
 msgid "Quit %s"
 msgstr "退出 %s"
 
-#: ../js/ui/panel.js:498
+#: ../js/ui/panel.js:494
 msgid "Preferences"
 msgstr "首选项"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:584
+#: ../js/ui/panel.js:580
 msgid "%a %b %e, %R:%S"
 msgstr "%A %b %e, %R:%S"
 
-#: ../js/ui/panel.js:585
+#: ../js/ui/panel.js:581
 msgid "%a %b %e, %R"
 msgstr "%A %m月%d日 %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:589
+#: ../js/ui/panel.js:585
 msgid "%a %R:%S"
 msgstr "%A %R:%S"
 
-#: ../js/ui/panel.js:590
+#: ../js/ui/panel.js:586
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:597
+#: ../js/ui/panel.js:593
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%A %m月%d日 %p%I:%M:%S"
 
-#: ../js/ui/panel.js:598
+#: ../js/ui/panel.js:594
 msgid "%a %b %e, %l:%M %p"
 msgstr "%A %m月%d日 %p%I:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:602
+#: ../js/ui/panel.js:598
 msgid "%a %l:%M:%S %p"
 msgstr "%A %p%I:%M:%S"
 
-#: ../js/ui/panel.js:603
+#: ../js/ui/panel.js:599
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:741
+#: ../js/ui/panel.js:744
 msgid "Activities"
 msgstr "活动"
 
-#: ../js/ui/placeDisplay.js:107
+#: ../js/ui/placeDisplay.js:111
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "卸载 %s 失败"
 
-#: ../js/ui/placeDisplay.js:110
+#: ../js/ui/placeDisplay.js:114
 msgid "Retry"
 msgstr "重试"
 
-#: ../js/ui/placeDisplay.js:155
+#: ../js/ui/placeDisplay.js:159
 msgid "Connect to..."
 msgstr "连接到..."
 
-#. Translators: the "ON" and "OFF" strings are used in the
-#. toggle switches in the status area menus, and must be SHORT.
-#. If you don't have suitable short words, consider initials,
-#. "0"/"1", "⚪"/"⚫", etc.
-#: ../js/ui/popupMenu.js:30 ../js/ui/popupMenu.js:40
-msgid "ON"
-msgstr "开"
-
-#: ../js/ui/popupMenu.js:31 ../js/ui/popupMenu.js:45
-msgid "OFF"
-msgstr "关"
+#. Translators: this MUST be either "toggle-switch-us"
+#. (for toggle switches containing the English words
+#. "ON" and "OFF") or "toggle-switch-intl" (for toggle
+#. switches containing "◯" and "|"). Other values will
+#. simply result in invisible toggle switches.
+#: ../js/ui/popupMenu.js:33
+msgid "toggle-switch-us"
+msgstr ""
 
 #: ../js/ui/runDialog.js:233
 msgid "Please enter a command:"
@@ -413,84 +536,136 @@ msgstr "请输入一个命令："
 msgid "Execution of '%s' failed:"
 msgstr "运行“%s”失败："
 
-#: ../js/ui/statusMenu.js:91
+#: ../js/ui/statusMenu.js:101
 msgid "Available"
 msgstr "可用"
 
-#: ../js/ui/statusMenu.js:95
+#: ../js/ui/statusMenu.js:106
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../js/ui/statusMenu.js:99
+#: ../js/ui/statusMenu.js:111
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../js/ui/statusMenu.js:106
-msgid "Account Information..."
-msgstr "帐户信息..."
+#: ../js/ui/statusMenu.js:119
+msgid "My Account..."
+msgstr "我的帐户..."
 
-#: ../js/ui/statusMenu.js:110
+#: ../js/ui/statusMenu.js:123
 msgid "System Preferences..."
 msgstr "系统首选项..."
 
-#: ../js/ui/statusMenu.js:117
+#: ../js/ui/statusMenu.js:130
 msgid "Lock Screen"
 msgstr "锁住屏幕"
 
-#: ../js/ui/statusMenu.js:121
+#: ../js/ui/statusMenu.js:134
 msgid "Switch User"
 msgstr "切换用户"
 
-#: ../js/ui/statusMenu.js:126
+#: ../js/ui/statusMenu.js:139
 msgid "Log Out..."
 msgstr "退出..."
 
-#: ../js/ui/statusMenu.js:130
+#: ../js/ui/statusMenu.js:146
+msgid "Suspend"
+msgstr "休眠"
+
+#: ../js/ui/statusMenu.js:150
+msgid "Restart..."
+msgstr "重启..."
+
+#: ../js/ui/statusMenu.js:154
 msgid "Shut Down..."
 msgstr "关机..."
 
-#: ../js/ui/windowAttentionHandler.js:45
+#: ../js/ui/status/accessibility.js:88
+msgid "Screen Reader"
+msgstr ""
+
+#: ../js/ui/status/accessibility.js:91
+msgid "Screen Keyboard"
+msgstr "屏幕键盘"
+
+#: ../js/ui/status/accessibility.js:94
+msgid "Visual Alerts"
+msgstr "视觉响铃"
+
+#: ../js/ui/status/accessibility.js:97
+msgid "Sticky Keys"
+msgstr "粘滞键"
+
+#: ../js/ui/status/accessibility.js:100
+msgid "Slow Keys"
+msgstr "慢速键"
+
+#: ../js/ui/status/accessibility.js:103
+msgid "Bounce Keys"
+msgstr ""
+
+#: ../js/ui/status/accessibility.js:106
+msgid "Mouse Keys"
+msgstr ""
+
+#: ../js/ui/status/accessibility.js:110
+msgid "Universal Access Settings"
+msgstr ""
+
+#: ../js/ui/status/accessibility.js:163
+msgid "High Contrast"
+msgstr "高对比度"
+
+#: ../js/ui/status/accessibility.js:202
+msgid "Large Text"
+msgstr "大号文本"
+
+#: ../js/ui/status/accessibility.js:223
+msgid "Zoom"
+msgstr "缩放"
+
+#: ../js/ui/windowAttentionHandler.js:43
 #, c-format
 msgid "%s has finished starting"
 msgstr "%s 已启动"
 
-#: ../js/ui/windowAttentionHandler.js:47
+#: ../js/ui/windowAttentionHandler.js:45
 #, c-format
 msgid "'%s' is ready"
 msgstr "%s 已就绪"
 
-#: ../js/ui/workspacesView.js:230
+#: ../js/ui/workspacesView.js:229
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr "无法添加新工作区，因为已经达到了工作区数量限制。"
 
-#: ../js/ui/workspacesView.js:247
+#: ../js/ui/workspacesView.js:246
 msgid "Can't remove the first workspace."
 msgstr "不能移除第一个工作区。"
 
-#: ../src/shell-global.c:1105
+#: ../src/shell-global.c:1204
 msgid "Less than a minute ago"
 msgstr "少于一分钟前"
 
-#: ../src/shell-global.c:1109
+#: ../src/shell-global.c:1208
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../src/shell-global.c:1114
+#: ../src/shell-global.c:1213
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../src/shell-global.c:1119
+#: ../src/shell-global.c:1218
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../src/shell-global.c:1124
+#: ../src/shell-global.c:1223
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -520,6 +695,15 @@ msgstr "搜索"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
+#~ msgid "ON"
+#~ msgstr "开"
+
+#~ msgid "OFF"
+#~ msgstr "关"
+
+#~ msgid "Account Information..."
+#~ msgstr "帐户信息..."
+
 #~ msgid "%H:%M"
 #~ msgstr "%H:%M"
 
diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index abf6df9cd..35e83342f 100644
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -135,7 +135,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="mutter" autogenargs="--with-gtk=3.0">
+  <autotools id="mutter">
     <branch repo="git.gnome.org" module="mutter"/>
     <dependencies>
       <dep package="clutter"/>