[meego-commits] 5321: Changes to MeeGo:1.0:Netbook:Update:Testing/gnome-control-center-netbook

Thomas Wood thomas.wood at intel.com
Fri Jul 2 17:17:53 UTC 2010


Hi,
I have made the following changes to gnome-control-center-netbook in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Thomas Wood

[This message was auto-generated]

---

Request #5321:

  submit:   home:thomas:branches:MeeGo:1.0:Netbook:Update:Testing/gnome-control-center-netbook(r2)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/gnome-control-center-netbook


Message:
    None

State:   new          2010-07-02T05:14:02 thomas
Comment: None



changes files:
--------------
--- gnome-control-center-netbook.changes
+++ gnome-control-center-netbook.changes
@@ -0,0 +1,3 @@
+* Fri Jul 02 2010 Thomas Wood <thomas.wood at intel.com> - 2.29.16
+- Update translations (BMC#1633)
+

spec files:
-----------
--- gnome-control-center-netbook.spec
+++ gnome-control-center-netbook.spec
@@ -1,6 +1,6 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.17
+# spectacle version 0.16
 # 
 # >> macros
 # << macros
@@ -30,8 +30,8 @@
 Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(post): /sbin/ldconfig
-Requires(post): GConf2
 Requires(post): /bin/touch
+Requires(post): GConf2
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
@@ -62,7 +62,6 @@
 BuildRequires:  gnome-common
 Provides:   gnome-control-center
 
-
 %description
 The GNOME control-center provides a number of extension points
 for applications. This package contains directories where applications 

other changes:
--------------

++++++ gnome-control-center-2.29.16.tar.bz2
--- ChangeLog
+++ ChangeLog
@@ -1,6 +1,220 @@
 # Generated by Makefile. Do not edit.
 
-commit db8b7971d581e1fe6e7ba1909f072993b1c9890c
+commit 39795c370dbd409ec239ca0e988eb7786fda1b3f
+Merge: 52583b6 daa5d32
+Author: Thomas Wood <thomas.wood at intel.com>
+Date:   Fri Jul 2 14:04:32 2010 +0100
+
+    Merge master from git.moblin.org
+
+commit daa5d3202ca3703640496313208399a84b8e1918
+Author: gls_esn1 <pablox.barbecho at intel.com>
+Date:   Thu Jul 1 18:56:12 2010 -0700
+
+    l10n: Updates to Spanish (Castilian) (es) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/es.po |  189 ++------------------------------------------------------------
+ 1 files changed, 5 insertions(+), 184 deletions(-)
+
+commit eb4fc23ea91c3c167674c0fcd85b7fa14ae473ff
+Author: gls_rus1 <bogdanx.nosach at intel.com>
+Date:   Thu Jul 1 17:25:55 2010 -0700
+
+    l10n: Updates to Russian (ru) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/ru.po |  409 +++++++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 files changed, 299 insertions(+), 110 deletions(-)
+
+commit be125918080be4f8fc0499305e5554ef05fb7040
+Author: GLS_FIN4 <annax.bergman at intel.com>
+Date:   Thu Jul 1 14:25:59 2010 -0700
+
+    l10n: Updates to Finnish (fi) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/fi.po |  112 +++----------------------------------------------------------
+ 1 files changed, 6 insertions(+), 106 deletions(-)
+
+commit 52583b6fec05ed3ebcb8510738aa6cc89afda045
+Author: Ross Burton <ross at linux.intel.com>
+Date:   Thu Jun 24 17:40:27 2010 +0100
+
+    display: hook up the apply button (MBC#2721)
+
+ capplets/display/cc-display-minimal-page.c |   20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+commit 97372bad927d465db9da2ea46bba705150258877
+Author: ivarela <malditoastur at gmail.com>
+Date:   Thu Jun 17 04:32:33 2010 -0700
+
+    l10n: Updates to Asturian (ast) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/ast.po |   14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+commit 8331869aeeff4e9dfd3f6764a7454d41e11f5ff9
+Author: GLSQA <namfonx.thasanon at intel.com>
+Date:   Wed Jun 16 10:04:28 2010 -0700
+
+    l10n: Updates to Chinese (China) (zh_CN) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/zh_CN.po |  389 +++++++++++------------------------------------------------
+ 1 files changed, 70 insertions(+), 319 deletions(-)
+
+commit 0d3669cce7eadde59ac8d8ab717025064407187d
+Author: GLSQA <namfonx.thasanon at intel.com>
+Date:   Wed Jun 16 10:00:47 2010 -0700
+
+    l10n: Updates to Brazilian Portuguese (pt_BR) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/pt_BR.po |   14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+commit ad7f411bdade62dfdfb2f7474ad68f52d9e79681
+Author: GLSJPN_Yukari <yukarix.yamashita at intel.com>
+Date:   Wed Jun 16 09:50:49 2010 -0700
+
+    l10n: Updates to Japanese (ja) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/ja.po | 4465 +++++++++++++++++++++++++++++++++++++++++++++++---------------
+ 1 files changed, 3419 insertions(+), 1046 deletions(-)
+
+commit d82855b2ad9bc715635bd5f8a73175677d0b40a6
+Author: GLSQA <namfonx.thasanon at intel.com>
+Date:   Wed Jun 16 09:48:44 2010 -0700
+
+    l10n: Updates to Spanish (Castilian) (es) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/es.po |  197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 192 insertions(+), 5 deletions(-)
+
+commit a1c9989c95526c9ff2342d9bba08a186a7ac1ba1
+Author: GLS_DEU <andreasx.machoy at intel.com>
+Date:   Tue Jun 15 23:13:17 2010 -0700
+
+    l10n: Updates to German (de) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/de.po |   35 ++++++++++++++++++++++++++++-------
+ 1 files changed, 28 insertions(+), 7 deletions(-)
+
+commit b2dc4a8a7fbade4b0d648e5534affdce65b57d62
+Author: GLS_CHT <wen.hsinx.moh at intel.com>
+Date:   Tue Jun 15 22:58:43 2010 -0700
+
+    l10n: Updates to Chinese (Taiwan) (zh_TW) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/zh_TW.po |  124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 117 insertions(+), 7 deletions(-)
+
+commit a8b6175be780cd299f6caddbdbef0cf5c4406f7a
+Author: GLS_KOR <sunx.kim at intel.com>
+Date:   Tue Jun 15 22:31:02 2010 -0700
+
+    l10n: Updates to Korean (ko) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/ko.po |  506 +++++++------------------------------------------------------
+ 1 files changed, 58 insertions(+), 448 deletions(-)
+
+commit 25cff5dfcb7458b378e45484f78bd5db9263bc43
+Author: gls_rus1 <bogdanx.nosach at intel.com>
+Date:   Tue Jun 15 18:35:34 2010 -0700
+
+    l10n: Updates to Russian (ru) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/ru.po |  421 ++++++++++++++++++--------------------------------------------
+ 1 files changed, 120 insertions(+), 301 deletions(-)
+
+commit b4c9a3264a5013087e2a418c641b9575b8b9f3b8
+Author: GLS_NLD <albert.dijkstra at ptiglobal.net>
+Date:   Tue Jun 15 10:14:25 2010 -0700
+
+    l10n: Updates to Dutch (Flemish) (nl) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/nl.po |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e4b04a5d5b2b69562cd9d917b8dd379e6b01191e
+Author: GLS_SVE1 <anna-lenax.schon at intel.com>
+Date:   Mon Jun 14 21:52:23 2010 -0700
+
+    l10n: Updates to Swedish (sv) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/sv.po |  118 ++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 58 insertions(+), 60 deletions(-)
+
+commit a8eec5fa68cedb202de122e324cf05dd1997d378
+Author: GLS_FIN4 <annax.bergman at intel.com>
+Date:   Mon Jun 14 21:05:50 2010 -0700
+
+    l10n: Updates to Finnish (fi) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/fi.po |  378 ++++++++++++++++++--------------------------------------------
+ 1 files changed, 109 insertions(+), 269 deletions(-)
+
+commit 332a415545d8c62a7dc1580c579c4272a4b67911
+Author: GLS_ITA1 <francescax.godani.muzi at intel.com>
+Date:   Mon Jun 14 19:12:43 2010 -0700
+
+    l10n: Updates to Italian (it) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/it.po |  120 ++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 59 insertions(+), 61 deletions(-)
+
+commit 287af124106fa13d1fd2826e5a5d609a6660bd62
+Author: GLS_NLD <albert.dijkstra at ptiglobal.net>
+Date:   Mon Jun 14 17:56:15 2010 -0700
+
+    l10n: Updates to Dutch (Flemish) (nl) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/nl.po |   24 +++++++++++++++++++-----
+ 1 files changed, 19 insertions(+), 5 deletions(-)
+
+commit 7d63774a1a7bb6cad82e7f4d08ca1085402df192
+Author: GLSJPN_Yukari <yukarix.yamashita at intel.com>
+Date:   Mon Jun 14 15:16:28 2010 -0700
+
+    l10n: Updates to Japanese (ja) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/ja.po | 4455 +++++++++++++++-----------------------------------------------
+ 1 files changed, 1046 insertions(+), 3409 deletions(-)
+
+commit 1a4020da709b04a686820a9396a9f09aa45f54af
 Author: Thomas Wood <thomas.wood at intel.com>
 Date:   Tue Jun 8 17:58:07 2010 +0100
 
@@ -9,7 +223,7 @@
  configure.ac |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-commit 2c3b42f134b88327596662bb8ee334dda414569b
+commit 25db06da5a238385a3d9f685dcf6c1f06af5a4d4
 Author: Thomas Wood <thomas.wood at intel.com>
 Date:   Tue Jun 8 17:57:53 2010 +0100
 
@@ -19,7 +233,7 @@
  .../keyboard/gnome-keyboard-properties-dialog.ui   |  167 +++++++++++---------
  2 files changed, 94 insertions(+), 78 deletions(-)
 
-commit cecc0a0f2a3bd2928316df9d578aa63a645ad5e4
+commit 13d0718b8b665c20390220cbc03442df8c4605fa
 Author: Thomas Wood <thomas.wood at intel.com>
 Date:   Tue Jun 8 14:32:29 2010 +0100
 
@@ -38,6 +252,39 @@
  typing-break/Makefile.am                           |    2 +-
  7 files changed, 266 insertions(+), 5 deletions(-)
 
+commit 2082b8f412f925aa53aaf18dc64138f0a0bb4d89
+Author: solt <marcin.p.soltysiak at gmail.com>
+Date:   Tue Jun 8 23:22:49 2010 -0700
+
+    l10n: Updates to Polish (pl) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/pl.po |  116 ++++++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 57 insertions(+), 59 deletions(-)
+
+commit b9a56cc1ceda5205cda5fc39cc0b8dc180c5faf1
+Author: mlandais <martine.landais at intel.com>
+Date:   Tue Jun 8 14:09:22 2010 -0700
+
+    l10n: Updates to French (fr) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/fr.po |   73 ++++++++++---------------------------------------------------
+ 1 files changed, 12 insertions(+), 61 deletions(-)
+
+commit fb038164c974ff4f2966417a04efec26b26d5df7
+Author: margie <margie.foster at intel.com>
+Date:   Tue Jun 8 14:00:55 2010 -0700
+
+    l10n: Updates to English (United Kingdom) (en_GB) translation
+    
+    Transmitted-via: Transifex (translate.moblin.org)
+
+ po/en_GB.po |  568 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 551 insertions(+), 17 deletions(-)
+
 commit 0f69041619508c89f38a22776de36942d4fc3811
 Merge: b10f6fd 7dde820
 Author: Thomas Wood <thomas.wood at intel.com>
--- capplets/display/cc-display-minimal-page.c
+++ capplets/display/cc-display-minimal-page.c
@@ -591,6 +591,25 @@
 }
 
 static void
+on_resolution_changed (GtkComboBox *combo, gpointer user_data)
+{
+        CcDisplayPage *page = CC_DISPLAY_PAGE (user_data);
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+        GnomeRRMode *mode;
+
+        if (!gtk_combo_box_get_active_iter (combo, &iter))
+                return;
+
+        model = gtk_combo_box_get_model (combo);
+        gtk_tree_model_get (model, &iter, COL_MODE, &mode, COL_END);
+        g_assert (mode);
+
+        page->priv->external_output->width = gnome_rr_mode_get_width (mode);
+        page->priv->external_output->height = gnome_rr_mode_get_height (mode);
+}
+
+static void
 setup_page (CcDisplayPage *page)
 {
         GtkBuilder      *builder;
@@ -616,6 +635,7 @@
         page->priv->state_label = WID ("state_label");
         page->priv->resolution_box = WID ("resolution_box");
         page->priv->resolution_combo = WID ("res_combo");
+        g_signal_connect (page->priv->resolution_combo, "changed", G_CALLBACK (on_resolution_changed), page);
         page->priv->resolution_store = GTK_TREE_MODEL (gtk_builder_get_object (builder, "mode_store"));
         widget = WID ("apply_button");
         g_signal_connect (widget, "clicked", G_CALLBACK (on_apply_button_clicked), page);
--- po/POTFILES.in
+++ po/POTFILES.in
@@ -56,6 +56,7 @@
 [type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-options-dialog.ui
 capplets/keyboard/cc-keyboard-panel.c
 capplets/keyboard/cc-keyboard-page.c
+capplets/keyboard/cc-layout-page.c
 capplets/keyboard/cc-shortcuts-page.c
 capplets/keyboard/00-multimedia-key.xml.in
 capplets/keyboard/01-desktop-key.xml.in
--- po/ast.po
+++ po/ast.po
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: control-center-2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-19 09:22+0000\n"
-"PO-Revision-Date: 2010-05-19 20:29+0100\n"
+"POT-Creation-Date: 2010-06-16 09:25+0000\n"
+"PO-Revision-Date: 2010-06-17 13:32+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <gnome at softastur.org>\n"
 "MIME-Version: 1.0\n"
@@ -2280,7 +2280,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Opciones de distribución del tecláu"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -3274,6 +3274,14 @@
 msgid "Control Center"
 msgstr "Centru de control"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Axustes del Sistema"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Tolos Axustes"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Posponer el descansu"
--- po/de.po
+++ po/de.po
@@ -19,9 +19,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:40+0000\n"
-"PO-Revision-Date: 2010-05-12 13:22-0800\n"
-"Last-Translator: Clara Steiner-Jay <csteiner at aracnet.com>\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-15 22:59-0800\n"
+"Last-Translator: Andreas Machoy <amachoy at hotmail.com>\n"
 "Language-Team: German <gnome-de at gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2301,7 +2301,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Tastaturbelegungseinstellungen"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -2765,7 +2765,7 @@
 
 #: ../capplets/network/gnome-network-properties.ui.h:25
 msgid "_Use the same proxy for all protocols"
-msgstr "Den se_lben Proxy für alle Protokolle verwenden"
+msgstr "Den g_leichen Proxy für alle Protokolle verwenden"
 
 #: ../capplets/security/run-passwd.c:427
 msgid "Authentication failed"
@@ -2809,7 +2809,7 @@
 #: ../capplets/security/run-passwd.c:531
 #, c-format
 msgid "Unknown error"
-msgstr "Unbekanner Fehler"
+msgstr "Unbekannter Fehler"
 
 #: ../capplets/security/cc-security-panel.c:154
 msgid "Sorry, the passwords do not match"
@@ -3306,6 +3306,14 @@
 msgid "Control Center"
 msgstr "Kontrollzentrum"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Systemeinstellungen"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Alle Einstellungen"
+
 # CHECK
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
@@ -3518,33 +3526,46 @@
 
 #~ msgid "- GNOME Network Preferences"
 #~ msgstr "- GNOME Netzwerk-Einstellungen"
+
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr ""
 #~ "Die beim Anmelden zu startenden Hilfsmittel für Barrierefreiheit festlegen"
+
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "Befehlen eine Tastenkombination zuweisen"
+
 #~ msgid "key not found [%s]\n"
 #~ msgstr "Schlüssel »%s« konnte nicht gefunden werden\n"
+
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "Beim Start verbergen (nützlich, um die Shell vorab zu laden)"
+
 #~ msgid "Filter"
 #~ msgstr "Filter"
+
 #~ msgid "Groups"
 #~ msgstr "Gruppen"
+
 #~ msgid "Common Tasks"
 #~ msgstr "Häufige Aktionen"
+
 #~ msgid "Your filter \"%s\" does not match any items."
 #~ msgstr "Ihr Filter »%s« führt zu keinen Übereinstimmungen."
+
 #~ msgid "No matches found."
 #~ msgstr "Keine Treffer gefunden."
+
 #~ msgid "Other"
 #~ msgstr "Sonstige"
+
 #~ msgid "Start %s"
 #~ msgstr "%s starten"
+
 #~ msgid "Help"
 #~ msgstr "Hilfe"
+
 #~ msgid "Upgrade"
 #~ msgstr "Hochrüsten"
+
 #~ msgid "Uninstall"
 #~ msgstr "Entfernen"
-
--- po/en_GB.po
+++ po/en_GB.po
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-26 09:38+0000\n"
-"PO-Revision-Date: 2010-04-27 16:19-0800\n"
+"POT-Creation-Date: 2010-06-08 20:19+0000\n"
+"PO-Revision-Date: 2010-06-08 14:01-0800\n"
 "Last-Translator: Margie Foster <margie at linux.intel.com>\n"
 "Language-Team: British English <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -206,7 +206,7 @@
 
 #: ../capplets/about-me/gnome-about-me.c:746
 #: ../capplets/appearance/appearance-desktop.c:659
-#: ../capplets/appearance/cc-background-page.c:1168
+#: ../capplets/appearance/cc-background-page.c:1171
 msgid "Images"
 msgstr "Images"
 
@@ -785,12 +785,12 @@
 msgstr "Universal Access"
 
 #: ../capplets/appearance/appearance-desktop.c:628
-#: ../capplets/appearance/cc-background-page.c:1133
+#: ../capplets/appearance/cc-background-page.c:1136
 msgid "Add Wallpaper"
 msgstr "Add Wallpaper"
 
 #: ../capplets/appearance/appearance-desktop.c:663
-#: ../capplets/appearance/cc-background-page.c:1173
+#: ../capplets/appearance/cc-background-page.c:1176
 msgid "All files"
 msgstr "All files"
 
@@ -826,7 +826,7 @@
 msgstr "Use selected font"
 
 #: ../capplets/appearance/appearance-main.c:54
-#: ../capplets/appearance/cc-background-page.c:1414
+#: ../capplets/appearance/cc-background-page.c:1417
 #: ../capplets/appearance/cc-font-details-dialog.c:408
 #: ../capplets/appearance/cc-font-page.c:458
 #: ../capplets/appearance/cc-theme-customize-dialog.c:1203
@@ -835,7 +835,7 @@
 #: ../capplets/display/cc-display-minimal-page.c:609
 #: ../capplets/keyboard/cc-keyboard-page.c:129
 #: ../capplets/keyboard/cc-shortcuts-page.c:1844
-#: ../capplets/network/cc-network-proxy-page.c:1287
+#: ../capplets/network/cc-network-proxy-page.c:1285
 #: ../capplets/power/cc-power-panel.c:374
 #, c-format
 msgid "Could not load user interface file: %s"
@@ -1012,7 +1012,7 @@
 msgid "No Desktop Background"
 msgstr "No Desktop Background"
 
-#: ../capplets/appearance/cc-background-page.c:1575
+#: ../capplets/appearance/cc-background-page.c:1578
 #: ../capplets/appearance/data/appearance.ui.h:2
 msgid "Background"
 msgstr "Background"
@@ -2608,27 +2608,28 @@
 msgid "Set your mouse preferences"
 msgstr "Set your mouse preferences"
 
-#: ../capplets/network/cc-network-panel.c:139
+#: ../capplets/network/cc-network-panel.c:114
 msgid "Network"
 msgstr "Network"
 
-#: ../capplets/network/cc-network-proxy-page.c:753
-#: ../capplets/network/cc-network-proxy-page.c:919
+#: ../capplets/network/cc-network-proxy-page.c:751
+#: ../capplets/network/cc-network-proxy-page.c:917
 #: ../capplets/network/gnome-network-properties.c:701
 #: ../capplets/network/gnome-network-properties.c:852
 msgid "New Location..."
 msgstr "New Location…"
 
-#: ../capplets/network/cc-network-proxy-page.c:887
+#: ../capplets/network/cc-network-proxy-page.c:885
 #: ../capplets/network/gnome-network-properties.c:818
 msgid "Location already exists"
 msgstr "Location already exists"
 
-#: ../capplets/network/cc-network-proxy-page.c:1306
+#. Locations
+#: ../capplets/network/cc-network-proxy-page.c:1305
 msgid "Delete Location"
 msgstr "Delete Location"
 
-#: ../capplets/network/cc-network-proxy-page.c:1546
+#: ../capplets/network/cc-network-proxy-page.c:1545
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -3272,6 +3273,14 @@
 msgid "Control Center"
 msgstr "Control Centre"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "System Settings"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_All Settings"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Postpone Break"
@@ -3482,122 +3491,181 @@
 
 #~ msgid "- GNOME Network Preferences"
 #~ msgstr "- GNOME Network Preferences"
+
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr "Choose which accessibility features to enable when you log in"
+
 #~ msgid "Edit"
 #~ msgstr "Edit"
+
 #~ msgid "Fill screen"
 #~ msgstr "Fill screen"
+
 #~ msgid "Interface"
 #~ msgstr "Interface"
+
 #~ msgid "Menus and Toolbars"
 #~ msgstr "Menus and Toolbars"
+
 #~ msgid "Preview"
 #~ msgstr "Preview"
+
 #~ msgid "Show _icons in menus"
 #~ msgstr "Show _icons in menus"
+
 #~ msgid "Toolbar _button labels:"
 #~ msgstr "Toolbar _button labels:"
+
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "_Editable menu shortcut keys"
+
 #~ msgid "_File"
 #~ msgstr "_File"
+
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "Assign shortcut keys to commands"
+
 #~ msgid "A_cceleration:"
 #~ msgstr "A_cceleration:"
+
 #~ msgid "Layout _Options..."
 #~ msgstr "Layout _Options…"
+
 #~ msgid "_Selected layouts:"
 #~ msgstr "_Selected layouts:"
+
 #~ msgid "C_ontrol"
 #~ msgstr "C_ontrol"
+
 #~ msgid "key not found [%s]\n"
 #~ msgstr "key not found [%s]\n"
+
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "Hide on start (useful to preload the shell)"
+
 #~ msgid "Filter"
 #~ msgstr "Filter"
+
 #~ msgid "Groups"
 #~ msgstr "Groups"
+
 #~ msgid "Common Tasks"
 #~ msgstr "Common Tasks"
+
 #~ msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 #~ msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
+
 #~ msgid "Your filter \"%s\" does not match any items."
 #~ msgstr "Your filter \"%s\" does not match any items."
+
 #~ msgid "No matches found."
 #~ msgstr "No matches found."
+
 #~ msgid "Other"
 #~ msgstr "Other"
+
 #~ msgid "Start %s"
 #~ msgstr "Start %s"
+
 #~ msgid "Help"
 #~ msgstr "Help"
+
 #~ msgid "Upgrade"
 #~ msgstr "Upgrade"
+
 #~ msgid "Uninstall"
 #~ msgstr "Uninstall"
+
 #~ msgid "Remove from Favorites"
 #~ msgstr "Remove from Favourites"
+
 #~ msgid "Add to Favorites"
 #~ msgstr "Add to Favourites"
+
 #~ msgid "Remove from Startup Programs"
 #~ msgstr "Remove from Startup Programs"
+
 #~ msgid "Add to Startup Programs"
 #~ msgstr "Add to Startup Programs"
+
 #~ msgid "New Spreadsheet"
 #~ msgstr "New Spreadsheet"
+
 #~ msgid "New Document"
 #~ msgstr "New Document"
+
 #~ msgid "Documents"
 #~ msgstr "Documents"
+
 #~ msgid "File System"
 #~ msgstr "File System"
+
 #~ msgid "Network Servers"
 #~ msgstr "Network Servers"
+
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>Open</b>"
+
 #~ msgid "Rename..."
 #~ msgstr "Rename…"
+
 #~ msgid "Send To..."
 #~ msgstr "Send To…"
+
 #~ msgid "Move to Trash"
 #~ msgstr "Move to the Wastebasket"
+
 #~ msgid "Delete"
 #~ msgstr "Delete"
+
 #~ msgid "Are you sure you want to permanently delete \"%s\"?"
 #~ msgstr "Are you sure you want to permanently delete \"%s\"?"
+
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "If you delete an item, it is permanently lost."
+
 #~ msgid "Open with \"%s\""
 #~ msgstr "Open with \"%s\""
+
 #~ msgid "Open with Default Application"
 #~ msgstr "Open with Default Application"
+
 #~ msgid "Open in File Manager"
 #~ msgstr "Open in File Manager"
+
 #~ msgid "?"
 #~ msgstr "?"
+
 #~ msgid "%l:%M %p"
 #~ msgstr "%H:%M"
+
 #~ msgid "Today %l:%M %p"
 #~ msgstr "Today %H:%M"
+
 #~ msgid "Yesterday %l:%M %p"
 #~ msgstr "Yesterday %H:%M"
+
 #~ msgid "%a %l:%M %p"
 #~ msgstr "%a %H:%M"
+
 #~ msgid "%b %d %l:%M %p"
 #~ msgstr "%d %b %H:%M"
+
 #~ msgid "%b %d %Y"
 #~ msgstr "%d %b %Y"
+
 #~ msgid "Find Now"
 #~ msgstr "Find Now"
+
 #~ msgid "<b>Open %s</b>"
 #~ msgstr "<b>Open %s</b>"
+
 #~ msgid "Remove from System Items"
 #~ msgstr "Remove from System Items"
+
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr "Unknown login ID, the user database might be corrupted"
+
 #~ msgid ""
 #~ "Left thumb\n"
 #~ "Left middle finger\n"
@@ -3616,36 +3684,52 @@
 #~ "Right middle finger\n"
 #~ "Right ring finger\n"
 #~ "Right little finger"
+
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>E-mail</b>"
+
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>Home</b>"
+
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>Job</b>"
+
 #~ msgid "<b>Web</b>"
 #~ msgstr "<b>Web</b>"
+
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>Work</b>"
+
 #~ msgid "<span size=\"larger\" weight=\"bold\">Change your password</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">Change your password</span>"
+
 #~ msgid "<b>Assistive Technologies</b>"
 #~ msgstr "<b>Assistive Technologies</b>"
+
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>Preferences</b>"
+
 #~ msgid "<b>C_olors</b>"
 #~ msgstr "<b>C_olours</b>"
+
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>Preview</b>"
+
 #~ msgid "<b>_Desktop Background</b>"
 #~ msgstr "<b>_Desktop Background</b>"
+
 #~ msgid "C_ut"
 #~ msgstr "C_ut"
+
 #~ msgid "New File"
 #~ msgstr "New File"
+
 #~ msgid "Open File"
 #~ msgstr "Open File"
+
 #~ msgid "Save File"
 #~ msgstr "Save File"
+
 #~ msgid ""
 #~ "Solid color\n"
 #~ "Horizontal gradient\n"
@@ -3654,6 +3738,7 @@
 #~ "Solid colour\n"
 #~ "Horizontal gradient\n"
 #~ "Vertical gradient"
+
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -3664,6 +3749,7 @@
 #~ "Text beside items\n"
 #~ "Icons only\n"
 #~ "Text only"
+
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -3676,22 +3762,31 @@
 #~ "Centred\n"
 #~ "Scaled\n"
 #~ "Fill screen"
+
 #~ msgid "_Copy"
 #~ msgstr "_Copy"
+
 #~ msgid "_New"
 #~ msgstr "_New"
+
 #~ msgid "_Open"
 #~ msgstr "_Open"
+
 #~ msgid "_Print"
 #~ msgstr "_Print"
+
 #~ msgid "_Quit"
 #~ msgstr "_Quit"
+
 #~ msgid "_Save"
 #~ msgstr "_Save"
+
 #~ msgid "<b>Mobility</b>"
 #~ msgstr "<b>Mobility</b>"
+
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<b>Visual</b>"
+
 #~ msgid ""
 #~ "Normal\n"
 #~ "Left\n"
@@ -3702,40 +3797,58 @@
 #~ "Left\n"
 #~ "Right\n"
 #~ "Upside-down\n"
+
 #~ msgid "Could not apply the selected configuration"
 #~ msgstr "Could not apply the selected configuration"
+
 #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR"
 #~ msgstr "Could not get org.gnome.SettingsDaemon.XRANDR"
+
 #~ msgid "_Command:"
 #~ msgstr "_Command:"
+
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Bounce Keys</b>"
+
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>General</b>"
+
 #~ msgid "<b>Slow Keys</b>"
 #~ msgstr "<b>Slow Keys</b>"
+
 #~ msgid "<b>Sticky Keys</b>"
 #~ msgstr "<b>Sticky Keys</b>"
+
 #~ msgid "<small><i>Fast</i></small>"
 #~ msgstr "<small><i>Fast</i></small>"
+
 #~ msgid "<small><i>Long</i></small>"
 #~ msgstr "<small><i>Long</i></small>"
+
 #~ msgid "<small><i>Short</i></small>"
 #~ msgstr "<small><i>Short</i></small>"
+
 #~ msgid "<small><i>Slow</i></small>"
 #~ msgstr "<small><i>Slow</i></small>"
+
 #~ msgid "<b>Locate Pointer</b>"
 #~ msgstr "<b>Locate Pointer</b>"
+
 #~ msgid "<small><i>High</i></small>"
 #~ msgstr "<small><i>High</i></small>"
+
 #~ msgid "<small><i>Large</i></small>"
 #~ msgstr "<small><i>Large</i></small>"
+
 #~ msgid "<small><i>Low</i></small>"
 #~ msgstr "<small><i>Low</i></small>"
+
 #~ msgid "<small><i>Small</i></small>"
 #~ msgstr "<small><i>Small</i></small>"
+
 #~ msgid "<b>Ignore Host List</b>"
 #~ msgstr "<b>Ignore Host List</b>"
+
 #~ msgid ""
 #~ "<span size=\"large\"><b>No matches found.</b> </span><span>\n"
 #~ "\n"
@@ -3744,160 +3857,227 @@
 #~ "<span size=\"large\"><b>No matches found.</b> </span><span>\n"
 #~ "\n"
 #~ " Your filter \"<b>%s</b>\" does not match any items.</span>"
+
 #~ msgid "/_About"
 #~ msgstr "/_About"
+
 #~ msgid "<b>_Wallpaper</b>"
 #~ msgstr "<b>_Wallpaper</b>"
+
 #~ msgid "No Wallpaper"
 #~ msgstr "No Wallpaper"
+
 #~ msgid "Monitor Resolution Settings"
 #~ msgstr "Monitor Resolution Settings"
+
 #~ msgid "Screen Resolution"
 #~ msgstr "Screen Resolution"
+
 #~ msgid "Retrieve and store legacy settings"
 #~ msgstr "Retrieve and store legacy settings"
+
 #~ msgid "Enable sound and associate sounds with events"
 #~ msgstr "Enable sound and associate sounds with events"
+
 #~ msgid "Unknown Volume Control %d"
 #~ msgstr "Unknown Volume Control %d"
+
 #~ msgid "Failed to construct test pipeline for '%s'"
 #~ msgstr "Failed to construct test pipeline for '%s'"
+
 #~ msgid "Not connected"
 #~ msgstr "Not connected"
+
 #~ msgid "Autodetect"
 #~ msgstr "Autodetect"
+
 #~ msgid "ALSA - Advanced Linux Sound Architecture"
 #~ msgstr "ALSA - Advanced Linux Sound Architecture"
+
 #~ msgid "Artsd - ART Sound Daemon"
 #~ msgstr "Artsd - ART Sound Daemon"
+
 #~ msgid "ESD - Enlightened Sound Daemon"
 #~ msgstr "ESD - Enlightened Sound Daemon"
+
 #~ msgid "OSS - Open Sound System"
 #~ msgstr "OSS - Open Sound System"
+
 #~ msgid "PulseAudio Sound Server"
 #~ msgstr "PulseAudio Sound Server"
+
 #~ msgid "Test Sound"
 #~ msgstr "Test Sound"
+
 #~ msgid "Silence"
 #~ msgstr "Silence"
+
 #~ msgid "- GNOME Sound Preferences"
 #~ msgstr "- GNOME Sound Preferences"
+
 #~ msgid "<b>Alerts and Sound Effects</b>"
 #~ msgstr "<b>Alerts and Sound Effects</b>"
+
 #~ msgid "<b>Audio Conferencing</b>"
 #~ msgstr "<b>Audio Conferencing</b>"
+
 #~ msgid "<b>Default Mixer Tracks</b>"
 #~ msgstr "<b>Default Mixer Tracks</b>"
+
 #~ msgid "<b>Music and Movies</b>"
 #~ msgstr "<b>Music and Movies</b>"
+
 #~ msgid "<b>Sound Events</b>"
 #~ msgstr "<b>Sound Events</b>"
+
 #~ msgid "<b>Sound Theme</b>"
 #~ msgstr "<b>Sound Theme</b>"
+
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Testing...</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Testing…</span>"
+
 #~ msgid "Click OK to finish."
 #~ msgstr "Click OK to finish."
+
 #~ msgid "Play _alert sound"
 #~ msgstr "Play _alert sound"
+
 #~ msgid "Play _sound effects when buttons are clicked"
 #~ msgstr "Play _sound effects when buttons are clicked"
+
 #~ msgid "S_ound playback:"
 #~ msgstr "S_ound playback:"
+
 #~ msgid ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
 #~ msgstr ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
+
 #~ msgid "So_und playback:"
 #~ msgstr "So_und playback:"
+
 #~ msgid "Sou_nd capture:"
 #~ msgstr "Sou_nd capture:"
+
 #~ msgid "Sound Preferences"
 #~ msgstr "Sound Preferences"
+
 #~ msgid "Sounds"
 #~ msgstr "Sounds"
+
 #~ msgid "Test"
 #~ msgstr "Test"
+
 #~ msgid "Testing Pipeline"
 #~ msgstr "Testing Pipeline"
+
 #~ msgid "_Device:"
 #~ msgstr "_Device:"
+
 #~ msgid "_Play alerts and sound effects"
 #~ msgstr "_Play alerts and sound effects"
+
 #~ msgid "_Sound playback:"
 #~ msgstr "_Sound playback:"
 #~ msgctxt "Sound event"
+
 #~ msgid "Alert sound"
 #~ msgstr "Alert sound"
 #~ msgctxt "Sound event"
+
 #~ msgid "Windows and Buttons"
 #~ msgstr "Windows and Buttons"
 #~ msgctxt "Sound event"
+
 #~ msgid "Button clicked"
 #~ msgstr "Button clicked"
 #~ msgctxt "Sound event"
+
 #~ msgid "Toggle button clicked"
 #~ msgstr "Toggle button clicked"
 #~ msgctxt "Sound event"
+
 #~ msgid "Window maximized"
 #~ msgstr "Window maximised"
 #~ msgctxt "Sound event"
+
 #~ msgid "Window unmaximized"
 #~ msgstr "Window unmaximised"
 #~ msgctxt "Sound event"
+
 #~ msgid "Window minimised"
 #~ msgstr "Window minimised"
 #~ msgctxt "Sound event"
+
 #~ msgid "Desktop"
 #~ msgstr "Desktop"
 #~ msgctxt "Sound event"
+
 #~ msgid "Login"
 #~ msgstr "Login"
 #~ msgctxt "Sound event"
+
 #~ msgid "Logout"
 #~ msgstr "Logout"
 #~ msgctxt "Sound event"
+
 #~ msgid "New e-mail"
 #~ msgstr "New e-mail"
 #~ msgctxt "Sound event"
+
 #~ msgid "Empty trash"
 #~ msgstr "Empty wastebasket"
 #~ msgctxt "Sound event"
+
 #~ msgid "Long action completed (download, CD burning, etc.)"
 #~ msgstr "Long action completed (download, CD burning, etc.)"
 #~ msgctxt "Sound event"
+
 #~ msgid "Alerts"
 #~ msgstr "Alerts"
 #~ msgctxt "Sound event"
+
 #~ msgid "Information or question"
 #~ msgstr "Information or question"
 #~ msgctxt "Sound event"
+
 #~ msgid "Warning"
 #~ msgstr "Warning"
 #~ msgctxt "Sound event"
+
 #~ msgid "Error"
 #~ msgstr "Error"
 #~ msgctxt "Sound event"
+
 #~ msgid "Battery warning"
 #~ msgstr "Battery warning"
+
 #~ msgid "Testing event sound"
 #~ msgstr "Testing event sound"
+
 #~ msgid "Select Sound File"
 #~ msgstr "Select Sound File"
+
 #~ msgid "Sound files"
 #~ msgstr "Sound files"
+
 #~ msgid "Custom..."
 #~ msgstr "Custom…"
+
 #~ msgid "Lock Screen"
 #~ msgstr "Lock Screen"
+
 #~ msgid "Logout"
 #~ msgstr "Logout"
+
 #~ msgid "Shutdown"
 #~ msgstr "Shutdown"
+
 #~ msgid "Enable support for GNOME assistive technologies at login"
 #~ msgstr "Enable support for GNOME assistive technologies at login"
+
 #~ msgid ""
 #~ "Centered\n"
 #~ "Fill screen\n"
@@ -3910,25 +4090,33 @@
 #~ "Scaled\n"
 #~ "Zoom\n"
 #~ "Tiled"
+
 #~ msgid ""
 #~ "%s is the path where the theme files will be installed. This can not be "
 #~ "selected as the source location"
 #~ msgstr ""
 #~ "%s is the path where the theme files will be installed. This can not be "
 #~ "selected as the source location"
+
 #~ msgid "Just apply settings and quit"
 #~ msgstr "Just apply settings and quit"
+
 #~ msgid "Inverted"
 #~ msgstr "Inverted"
+
 #~ msgid "Screen %d Settings\n"
 #~ msgstr "Screen %d Settings\n"
+
 #~ msgid "Screen Resolution Preferences"
 #~ msgstr "Screen Resolution Preferences"
+
 #~ msgid "_Make default for this computer (%s) only"
 #~ msgstr "_Make default for this computer (%s) only"
+
 #~ msgid ""
 #~ "Testing the new settings. If you don't respond in %d second the previous "
 #~ "settings will be restored."
+
 #~ msgid_plural ""
 #~ "Testing the new settings. If you don't respond in %d seconds the previous "
 #~ "settings will be restored."
@@ -3938,74 +4126,105 @@
 #~ msgstr[1] ""
 #~ "Testing the new settings. If you don't respond in %d seconds the previous "
 #~ "settings will be restored."
+
 #~ msgid "Keep Resolution"
 #~ msgstr "Keep Resolution"
+
 #~ msgid "Do you want to keep this resolution?"
 #~ msgstr "Do you want to keep this resolution?"
+
 #~ msgid "Use _Previous Resolution"
 #~ msgstr "Use _Previous Resolution"
+
 #~ msgid "_Keep Resolution"
 #~ msgstr "_Keep Resolution"
+
 #~ msgid ""
 #~ "The X server does not support the XRandR extension.  Runtime resolution "
 #~ "changes to the display size are not available."
 #~ msgstr ""
 #~ "The X server does not support the XRandR extension.  Runtime resolution "
 #~ "changes to the display size are not available."
+
 #~ msgid ""
 #~ "The version of the XRandR extension is incompatible with this program. "
 #~ "Runtime changes to the display size are not available."
 #~ msgstr ""
 #~ "The version of the XRandR extension is incompatible with this program. "
 #~ "Runtime changes to the display size are not available."
+
 #~ msgid "New accelerator..."
 #~ msgstr "New accelerator…"
+
 #~ msgid "Error setting new accelerator in configuration database: %s\n"
 #~ msgstr "Error setting new accelerator in configuration database: %s\n"
+
 #~ msgid "Keyboard Accessibility Notifications"
 #~ msgstr "Keyboard Accessibility Notifications"
+
 #~ msgid "_Layouts:"
 #~ msgstr "_Layouts:"
+
 #~ msgid "Advanced Configuration"
 #~ msgstr "Advanced Configuration"
+
 #~ msgid "E_nable software sound mixing (ESD)"
 #~ msgstr "E_nable software sound mixing (ESD)"
+
 #~ msgid "System Beep"
 #~ msgstr "System Beep"
+
 #~ msgid "_Enable system beep"
 #~ msgstr "_Enable system beep"
+
 #~ msgid "_Visual system beep"
 #~ msgstr "_Visual system beep"
+
 #~ msgid "Unexpected attribute '%s' for element '%s'"
 #~ msgstr "Unexpected attribute '%s' for element '%s'"
+
 #~ msgid "Attribute '%s' of element '%s' not found"
 #~ msgstr "Attribute '%s' of element '%s' not found"
+
 #~ msgid "Unexpected tag '%s', tag '%s' expected"
 #~ msgstr "Unexpected tag '%s', tag '%s' expected"
+
 #~ msgid "Unexpected tag '%s' inside '%s'"
 #~ msgstr "Unexpected tag '%s' inside '%s'"
+
 #~ msgid "No valid bookmark file found in data dirs"
 #~ msgstr "No valid bookmark file found in data dirs"
+
 #~ msgid "A bookmark for URI '%s' already exists"
 #~ msgstr "A bookmark for URI '%s' already exists"
+
 #~ msgid "No bookmark found for URI '%s'"
 #~ msgstr "No bookmark found for URI '%s'"
+
 #~ msgid "No MIME type defined in the bookmark for URI '%s'"
 #~ msgstr "No MIME type defined in the bookmark for URI '%s'"
+
 #~ msgid "No private flag has been defined in bookmark for URI '%s'"
 #~ msgstr "No private flag has been defined in bookmark for URI '%s'"
+
 #~ msgid "No groups set in bookmark for URI '%s'"
 #~ msgstr "No groups set in bookmark for URI '%s'"
+
 #~ msgid "No application with name '%s' registered a bookmark for '%s'"
 #~ msgstr "No application with name '%s' registered a bookmark for '%s'"
+
 #~ msgid "Siren"
 #~ msgstr "Siren"
+
 #~ msgid "Clink"
 #~ msgstr "Clink"
+
 #~ msgid "Beep"
 #~ msgstr "Beep"
+
 #~ msgid "Sound not set for this event."
 #~ msgstr "Sound not set for this event."
+
 #~ msgid ""
 #~ "The sound file for this event does not exist.\n"
 #~ "You may want to install the gnome-audio package for a set of default "
@@ -4014,240 +4233,339 @@
 #~ "The sound file for this event does not exist.\n"
 #~ "You may want to install the gnome-audio package for a set of default "
 #~ "sounds."
+
 #~ msgid "The sound file for this event does not exist."
 #~ msgstr "The sound file for this event does not exist."
+
 #~ msgid "The file %s is not a valid wav file"
 #~ msgstr "The file %s is not a valid wav file"
+
 #~ msgid "Select sound file..."
 #~ msgstr "Select sound file…"
-#~ msgid "System Sounds"
-#~ msgstr "System Sounds"
+
 #~ msgid "Set as Application Font"
 #~ msgstr "Set as Application Font"
+
 #~ msgid "Sets the default application font"
 #~ msgstr "Sets the default application font"
+
 #~ msgid "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
+
 #~ msgid "Do _not apply font"
 #~ msgstr "Do _not apply font"
+
 #~ msgid ""
 #~ "The theme you have selected suggests a new font. A preview of the font is "
 #~ "shown below."
 #~ msgstr ""
 #~ "The theme you have selected suggests a new font. A preview of the font is "
 #~ "shown below."
+
 #~ msgid "_Apply font"
 #~ msgstr "_Apply font"
+
 #~ msgid "Themes"
 #~ msgstr "Themes"
+
 #~ msgid "Description"
 #~ msgstr "Description"
+
 #~ msgid "Control theme"
 #~ msgstr "Control theme"
+
 #~ msgid "Window border theme"
 #~ msgstr "Window border theme"
+
 #~ msgid "Icon theme"
 #~ msgstr "Icon theme"
+
 #~ msgid "If set to true, then installed themes will be thumbnailed."
 #~ msgstr "If set to true, then installed themes will be thumbnailed."
+
 #~ msgid "If set to true, then themes will be thumbnailed."
 #~ msgstr "If set to true, then themes will be thumbnailed."
+
 #~ msgid ""
 #~ "Set this key to the command used to create thumbnails for installed "
 #~ "themes."
 #~ msgstr ""
 #~ "Set this key to the command used to create thumbnails for installed "
 #~ "themes."
+
 #~ msgid "Set this key to the command used to create thumbnails for themes."
 #~ msgstr "Set this key to the command used to create thumbnails for themes."
+
 #~ msgid "Thumbnail command for installed themes"
 #~ msgstr "Thumbnail command for installed themes"
+
 #~ msgid "Thumbnail command for themes"
 #~ msgstr "Thumbnail command for themes"
+
 #~ msgid "Whether to thumbnail installed themes"
 #~ msgstr "Whether to thumbnail installed themes"
+
 #~ msgid "Whether to thumbnail themes"
 #~ msgstr "Whether to thumbnail themes"
+
 #~ msgid "ABCDEFG"
 #~ msgstr "ABCDEFG"
+
 #~ msgid "[FILE]"
 #~ msgstr "[FILE]"
+
 #~ msgid "Apply theme"
 #~ msgstr "Apply theme"
+
 #~ msgid "Sets the default theme"
 #~ msgstr "Sets the default theme"
+
 #~ msgid " "
 #~ msgstr " "
+
 #~ msgid "    "
 #~ msgstr "    "
+
 #~ msgid "There was an error launching the mouse preferences dialog: %s"
 #~ msgstr "There was an error launching the mouse preferences dialogue: %s"
+
 #~ msgid "Unable to import AccessX settings from file '%s'"
 #~ msgstr "Unable to import AccessX settings from file '%s'"
+
 #~ msgid "Import Feature Settings File"
 #~ msgstr "Import Feature Settings File"
+
 #~ msgid "_Import"
 #~ msgstr "_Import"
+
 #~ msgid "Set your keyboard accessibility preferences"
 #~ msgstr "Set your keyboard accessibility preferences"
+
 #~ msgid ""
 #~ "This system does not seem to have the XKB extension.  The keyboard "
 #~ "accessibility features will not operate without it."
 #~ msgstr ""
 #~ "This system does not seem to have the XKB extension.  The keyboard "
 #~ "accessibility features will not operate without it."
+
 #~ msgid "<b>Enable _Mouse Keys</b>"
 #~ msgstr "<b>Enable _Mouse Keys</b>"
+
 #~ msgid "<b>Enable _Repeat Keys</b>"
 #~ msgstr "<b>Enable _Repeat Keys</b>"
+
 #~ msgid "<b>Features</b>"
 #~ msgstr "<b>Features</b>"
+
 #~ msgid "<b>Toggle Keys</b>"
 #~ msgstr "<b>Toggle Keys</b>"
+
 #~ msgid "Basic"
 #~ msgstr "Basic"
+
 #~ msgid "Beep when an LED is turned on and two beeps when one is turned off."
 #~ msgstr "Beep when an LED is turned on and two beeps when one is turned off."
+
 #~ msgid "Delay between keypress and pointer mo_vement:"
 #~ msgstr "Delay between keypress and pointer mo_vement:"
+
 #~ msgid "E_nable Toggle Keys"
 #~ msgstr "E_nable Toggle Keys"
+
 #~ msgid "Filters"
 #~ msgstr "Filters"
+
 #~ msgid ""
 #~ "Ignore all subsequent presses of the SAME key if they happen within a "
 #~ "user selectable period of time."
 #~ msgstr ""
 #~ "Ignore all subsequent presses of the SAME key if they happen within a "
 #~ "user selectable period of time."
+
 #~ msgid "Keyboard Accessibility Preferences (AccessX)"
 #~ msgstr "Keyboard Accessibility Preferences (AccessX)"
+
 #~ msgid "Ma_ximum pointer speed:"
 #~ msgstr "Ma_ximum pointer speed:"
+
 #~ msgid "Mouse _Preferences..."
 #~ msgstr "Mouse _Preferences…"
+
 #~ msgid ""
 #~ "Only accept keys after they have been pressed and held for a user "
 #~ "adjustable amount of time."
 #~ msgstr ""
 #~ "Only accept keys after they have been pressed and held for a user "
 #~ "adjustable amount of time."
+
 #~ msgid ""
 #~ "Perform multiple simultaneous key press operations by pressing modifier "
 #~ "keys in sequence."
 #~ msgstr ""
 #~ "Perform multiple simultaneous key press operations by pressing modifier "
 #~ "keys in sequence."
+
 #~ msgid "Time to acce_lerate to maximum speed:"
 #~ msgstr "Time to acce_lerate to maximum speed:"
+
 #~ msgid "Turn the numeric keypad into a mouse control pad."
 #~ msgstr "Turn the numeric keypad into a mouse control pad."
+
 #~ msgid "_Disable if unused for:"
 #~ msgstr "_Disable if unused for:"
+
 #~ msgid "_Enable keyboard accessibility features"
 #~ msgstr "_Enable keyboard accessibility features"
+
 #~ msgid "_Import Feature Settings..."
 #~ msgstr "_Import Feature Settings…"
+
 #~ msgid "_accepted"
 #~ msgstr "_accepted"
+
 #~ msgid "_pressed"
 #~ msgstr "_pressed"
+
 #~ msgid "characters/second"
 #~ msgstr "characters/second"
+
 #~ msgid "milliseconds"
 #~ msgstr "milliseconds"
+
 #~ msgid "pixels/second"
 #~ msgstr "pixels/second"
+
 #~ msgid "Go _to Fonts Folder"
 #~ msgstr "Go _to Fonts Folder"
+
 #~ msgid "The theme is an engine. You need to compile it."
 #~ msgstr "The theme is an engine. You need to compile it."
+
 #~ msgid "The file format is invalid"
 #~ msgstr "The file format is invalid"
+
 #~ msgid "This theme is not in a supported format."
 #~ msgstr "This theme is not in a supported format."
+
 #~ msgid "The file format is invalid."
 #~ msgstr "The file format is invalid."
+
 #~ msgid "Connecting..."
 #~ msgstr "Connecting…"
+
 #~ msgid "Autostart the preferred AT"
 #~ msgstr "Autostart the preferred AT"
+
 #~ msgid "Evolution Mail Reader 1.4"
 #~ msgstr "Evolution Mail Reader 1.4"
+
 #~ msgid "Evolution Mail Reader 1.5"
 #~ msgstr "Evolution Mail Reader 1.5"
+
 #~ msgid "Evolution Mail Reader 1.6"
 #~ msgstr "Evolution Mail Reader 1.6"
+
 #~ msgid "Evolution Mail Reader 2.0"
 #~ msgstr "Evolution Mail Reader 2.0"
+
 #~ msgid "Evolution Mail Reader 2.2"
 #~ msgstr "Evolution Mail Reader 2.2"
+
 #~ msgid "Evolution Mail Reader 2.4"
 #~ msgstr "Evolution Mail Reader 2.4"
+
 #~ msgid "Links Text Browser"
 #~ msgstr "Links Text Browser"
+
 #~ msgid "Lynx Text Browser"
 #~ msgstr "Lynx Text Browser"
+
 #~ msgid "Simple OnScreen Keyboard"
 #~ msgstr "Simple OnScreen Keyboard"
+
 #~ msgid "W3M Text Browser"
 #~ msgstr "W3M Text Browser"
+
 #~ msgid "There was an error launching the keyboard tool: %s"
 #~ msgstr "There was an error launching the keyboard tool: %s"
+
 #~ msgid "Choose..."
 #~ msgstr "Choose…"
+
 #~ msgid "Microsoft Natural Keyboard"
 #~ msgstr "Microsoft Natural Keyboard"
+
 #~ msgid "_Accessibility..."
 #~ msgstr "_Accessibility…"
+
 #~ msgid "%d millisecond"
+
 #~ msgid_plural "%d milliseconds"
 #~ msgstr[0] "%d millisecond"
 #~ msgstr[1] "%d milliseconds"
+
 #~ msgid "<i>Fast</i>"
 #~ msgstr "<i>Fast</i>"
+
 #~ msgid "<i>High</i>"
 #~ msgstr "<i>High</i>"
+
 #~ msgid "<i>Large</i>"
 #~ msgstr "<i>Large</i>"
+
 #~ msgid "<i>Low</i>"
 #~ msgstr "<i>Low</i>"
+
 #~ msgid "<i>Slow</i>"
 #~ msgstr "<i>Slow</i>"
+
 #~ msgid "<i>Small</i>"
 #~ msgstr "<i>Small</i>"
+
 #~ msgid "Buttons"
 #~ msgstr "Buttons"
+
 #~ msgid "Motion"
 #~ msgstr "Motion"
+
 #~ msgid "      "
 #~ msgstr "      "
+
 #~ msgid "Volume"
 #~ msgstr "Volume"
+
 #~ msgid ""
 #~ "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 #~ "the Slow Keys feature, which affects the way your keyboard works."
 #~ msgstr ""
 #~ "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 #~ "the Slow Keys feature, which affects the way your keyboard works."
+
 #~ msgid "Do you want to activate Slow Keys?"
 #~ msgstr "Do you want to activate Slow Keys?"
+
 #~ msgid "Do you want to deactivate Slow Keys?"
 #~ msgstr "Do you want to deactivate Slow Keys?"
+
 #~ msgid "_Activate"
 #~ msgstr "_Activate"
+
 #~ msgid "_Deactivate"
 #~ msgstr "_Deactivate"
+
 #~ msgid "Do_n't activate"
 #~ msgstr "Do_n't activate"
+
 #~ msgid "Do_n't deactivate"
 #~ msgstr "Do_n't deactivate"
+
 #~ msgid ""
 #~ "You just pressed the Shift key 5 times in a row.  This is the shortcut "
 #~ "for the Sticky Keys feature, which affects the way your keyboard works."
 #~ msgstr ""
 #~ "You just pressed the Shift key 5 times in a row.  This is the shortcut "
 #~ "for the Sticky Keys feature, which affects the way your keyboard works."
+
 #~ msgid ""
 #~ "You just pressed two keys at once, or pressed the Shift key 5 times in a "
 #~ "row.  This turns off the Sticky Keys feature, which affects the way your "
@@ -4256,38 +4574,49 @@
 #~ "You just pressed two keys at once, or pressed the Shift key 5 times in a "
 #~ "row.  This turns off the Sticky Keys feature, which affects the way your "
 #~ "keyboard works."
+
 #~ msgid "Do you want to activate Sticky Keys?"
 #~ msgstr "Do you want to activate Sticky Keys?"
+
 #~ msgid "Do you want to deactivate Sticky Keys?"
 #~ msgstr "Do you want to deactivate Sticky Keys?"
+
 #~ msgid ""
 #~ "Cannot create the directory \"%s\".\n"
 #~ "This is needed to allow changing the mouse pointer theme."
 #~ msgstr ""
 #~ "Cannot create the directory \"%s\".\n"
 #~ "This is needed to allow changing the mouse pointer theme."
+
 #~ msgid ""
 #~ "Cannot create the directory \"%s\".\n"
 #~ "This is needed to allow changing cursors."
 #~ msgstr ""
 #~ "Cannot create the directory \"%s\".\n"
 #~ "This is needed to allow changing cursors."
+
 #~ msgid "Key Binding (%s) has its action defined multiple times\n"
 #~ msgstr "Key Binding (%s) has its action defined multiple times\n"
+
 #~ msgid "Key Binding (%s) has its binding defined multiple times\n"
 #~ msgstr "Key Binding (%s) has its binding defined multiple times\n"
+
 #~ msgid "Key Binding (%s) is incomplete\n"
 #~ msgstr "Key Binding (%s) is incomplete\n"
+
 #~ msgid "Key Binding (%s) is invalid\n"
 #~ msgstr "Key Binding (%s) is invalid\n"
+
 #~ msgid "It seems that another application already has access to key '%u'."
 #~ msgstr "It seems that another application already has access to key '%u'."
+
 #~ msgid ""
 #~ "Error while trying to run (%s)\n"
 #~ "which is linked to the key (%s)"
 #~ msgstr ""
 #~ "Error while trying to run (%s)\n"
 #~ "which is linked to the key (%s)"
+
 #~ msgid ""
 #~ "Error activating XKB configuration.\n"
 #~ "It can happen under various circumstances:\n"
@@ -4316,6 +4645,7 @@
 #~ "If you report this situation as a bug, please include:\n"
 #~ "- The result of <b>%s</b>\n"
 #~ "- The result of <b>%s</b>"
+
 #~ msgid ""
 #~ "You are using XFree 4.3.0.\n"
 #~ "There are known problems with complex XKB configurations.\n"
@@ -4326,8 +4656,10 @@
 #~ "There are known problems with complex XKB configurations.\n"
 #~ "Try using a simpler configuration or taking a fresher version of XFree "
 #~ "software."
+
 #~ msgid "Do _not show this warning again"
 #~ msgstr "Do _not show this warning again"
+
 #~ msgid ""
 #~ "<b>The X system keyboard settings differ from your current GNOME keyboard "
 #~ "settings.</b>\n"
@@ -4342,28 +4674,34 @@
 #~ "Expected was %s, but the the following settings were found: %s.\n"
 #~ "\n"
 #~ "Which set would you like to use?"
+
 #~ msgid "Use X settings"
 #~ msgstr "Use X settings"
+
 #~ msgid "Keep GNOME settings"
 #~ msgstr "Keep GNOME settings"
+
 #~ msgid ""
 #~ "Could not get default terminal. Verify that your default terminal command "
 #~ "is set and points to a valid application."
 #~ msgstr ""
 #~ "Could not get default terminal. Verify that your default terminal command "
 #~ "is set and points to a valid application."
+
 #~ msgid ""
 #~ "Couldn't execute command: %s\n"
 #~ "Verify that this is a valid command."
 #~ msgstr ""
 #~ "Couldn't execute command: %s\n"
 #~ "Verify that this is a valid command."
+
 #~ msgid ""
 #~ "Couldn't put the machine to sleep.\n"
 #~ "Verify that the machine is correctly configured."
 #~ msgstr ""
 #~ "Couldn't put the machine to sleep.\n"
 #~ "Verify that the machine is correctly configured."
+
 #~ msgid ""
 #~ "There was an error starting up the screensaver:\n"
 #~ "\n"
@@ -4376,164 +4714,241 @@
 #~ "%s\n"
 #~ "\n"
 #~ "Screensaver functionality will not work in this session."
+
 #~ msgid "_Do not show this message again"
 #~ msgstr "_Do not show this message again"
+
 #~ msgid "Couldn't load sound file %s as sample %s"
 #~ msgstr "Couldn't load sound file %s as sample %s"
+
 #~ msgid "Cannot determine user's home directory"
 #~ msgstr "Cannot determine user's home directory"
+
 #~ msgid "GConf key %s set to type %s but its expected type was %s\n"
 #~ msgstr "GConf key %s set to type %s but its expected type was %s\n"
+
 #~ msgid "A_vailable files:"
 #~ msgstr "A_vailable files:"
+
 #~ msgid "Do _not show this warning again."
 #~ msgstr "Do _not show this warning again."
+
 #~ msgid "Load modmap files"
 #~ msgstr "Load modmap files"
+
 #~ msgid "Would you like to load the modmap file(s)?"
 #~ msgstr "Would you like to load the modmap file(s)?"
+
 #~ msgid "_Load"
 #~ msgstr "_Load"
+
 #~ msgid "_Loaded files:"
 #~ msgstr "_Loaded files:"
+
 #~ msgid "Error creating signal pipe."
 #~ msgstr "Error creating signal pipe."
+
 #~ msgid "Type"
 #~ msgstr "Type"
+
 #~ msgid ""
 #~ "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
 #~ "for preview"
 #~ msgstr ""
 #~ "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
 #~ "for preview"
+
 #~ msgid "Width if applier is a preview: Defaults to 64."
 #~ msgstr "Width if applier is a preview: Defaults to 64."
+
 #~ msgid "Preview Height"
 #~ msgstr "Preview Height"
+
 #~ msgid "Height if applier is a preview: Defaults to 48."
 #~ msgstr "Height if applier is a preview: Defaults to 48."
+
 #~ msgid "Screen"
 #~ msgstr "Screen"
+
 #~ msgid "Screen on which BGApplier is to draw"
 #~ msgstr "Screen on which BGApplier is to draw"
+
 #~ msgid "Edited %m/%d/%Y"
 #~ msgstr "Edited %d/%m/%Y"
+
 #~ msgid ""
 #~ "If true, the mime handlers for text/plain and text/* will be kept in sync"
 #~ msgstr ""
 #~ "If true, the mime handlers for text/plain and text/* will be kept in sync"
+
 #~ msgid "Sync text/plain and text/* handlers"
 #~ msgstr "Sync text/plain and text/* handlers"
+
 #~ msgid "E-mail's shortcut."
 #~ msgstr "Shortcut for e-mail."
+
 #~ msgid "Eject"
 #~ msgstr "Eject"
+
 #~ msgid "Home folder"
 #~ msgstr "Home folder"
+
 #~ msgid "Home folder's shortcut."
 #~ msgstr "Shortcut for home folder."
+
 #~ msgid "Launch help browser"
 #~ msgstr "Launch help browser"
+
 #~ msgid "Launch help browser's shortcut."
 #~ msgstr "Shortcut for Launch help browser."
+
 #~ msgid "Launch web browser"
 #~ msgstr "Launch web browser"
+
 #~ msgid "Launch web browser's shortcut."
 #~ msgstr "shortcut for launch web browser."
+
 #~ msgid "Lock screen's shortcut."
 #~ msgstr "Shortcut for lock screen."
+
 #~ msgid "Log out"
 #~ msgstr "Log out"
+
 #~ msgid "Log out's shortcut."
 #~ msgstr "shortcut for log out."
+
 #~ msgid "Media player"
 #~ msgstr "Media player"
+
 #~ msgid "Media player key's shortcut."
 #~ msgstr "Shortcut key for media player."
+
 #~ msgid "Next track key's shortcut."
 #~ msgstr "Shortcut for next track key."
+
 #~ msgid "Pause"
 #~ msgstr "Pause"
+
 #~ msgid "Pause key's shortcut."
 #~ msgstr "Shortcut for the pause kay."
+
 #~ msgid "Play (or play/pause)"
 #~ msgstr "Play (or play/pause)"
+
 #~ msgid "Play (or play/pause) key's shortcut."
 #~ msgstr "Shortcut for the play (or play/pause) key."
+
 #~ msgid "Previous track key's shortcut."
 #~ msgstr "Shortcut for the previous track key."
+
 #~ msgid "Search's shortcut."
 #~ msgstr "Shortcut for search."
+
 #~ msgid "Skip to next track"
 #~ msgstr "Skip to next track"
+
 #~ msgid "Skip to previous track"
 #~ msgstr "Skip to previous track"
+
 #~ msgid "Sleep's shortcut."
 #~ msgstr "Sleep's shortcut."
+
 #~ msgid "Stop playback key"
 #~ msgstr "Stop playback key"
+
 #~ msgid "Stop playback key's shortcut."
 #~ msgstr "Shortcut for the stop playback key."
+
 #~ msgid "Volume down"
 #~ msgstr "Volume down"
+
 #~ msgid "Volume down's shortcut."
 #~ msgstr "Shortcut for volume down."
+
 #~ msgid "Volume mute"
 #~ msgstr "Volume mute"
+
 #~ msgid "Volume mute's shortcut."
 #~ msgstr "Shortcut for volume mute."
+
 #~ msgid "Volume step"
 #~ msgstr "Volume step"
+
 #~ msgid "Volume step as percentage of volume."
 #~ msgstr "Volume step as percentage of volume."
+
 #~ msgid "Volume up"
 #~ msgstr "Volume up"
+
 #~ msgid "Volume up's shortcut."
 #~ msgstr "Shortcut for volume up."
+
 #~ msgid "Display a dialog when there are errors running the screensaver"
 #~ msgstr "Display a dialogue when there are errors running the screensaver"
+
 #~ msgid "Run screensaver at login"
 #~ msgstr "Run screensaver at login"
+
 #~ msgid "Show Startup Errors"
 #~ msgstr "Show Startup Errors"
+
 #~ msgid "Start screensaver"
 #~ msgstr "Start screensaver"
+
 #~ msgid "Change your Desktop Background settings"
 #~ msgstr "Change your Desktop Background settings"
+
 #~ msgid "Desktop Background Preferences"
 #~ msgstr "Desktop Background Preferences"
+
 #~ msgid "_Add Wallpaper"
 #~ msgstr "_Add Wallpaper"
+
 #~ msgid "_Finish"
 #~ msgstr "_Finish"
+
 #~ msgid "_Remove"
 #~ msgstr "_Remove"
+
 #~ msgid "- Desktop Background Preferences"
 #~ msgstr "- Desktop Background Preferences"
+
 #~ msgid "background size|%s, %d %s x %d %s"
 #~ msgstr "%s, %d %s x %d %s"
+
 #~ msgid "Preferred Assistive Technology"
 #~ msgstr "Preferred Assistive Technology"
+
 #~ msgid "Run the the preferred GNOME Mobility Assitive Technology"
 #~ msgstr "Run the the preferred GNOME Mobility Assitive Technology"
+
 #~ msgid "Select fonts for the desktop"
 #~ msgstr "Select fonts for the desktop"
+
 #~ msgid "Font Preferences"
 #~ msgstr "Font Preferences"
+
 #~ msgid "The default pointer that ships with X"
 #~ msgstr "The default pointer that ships with X"
+
 #~ msgid "The default pointer inverted"
 #~ msgstr "The default pointer inverted"
+
 #~ msgid "Large version of normal pointer"
 #~ msgstr "Large version of normal pointer"
+
 #~ msgid "Large version of white pointer"
 #~ msgstr "Large version of white pointer"
+
 #~ msgid "Pointer Theme"
 #~ msgstr "Pointer Theme"
+
 #~ msgid "Highlight the _pointer when you press Ctrl"
 #~ msgstr "Highlight the _pointer when you press Ctrl"
+
 #~ msgid "Pointer Size:"
 #~ msgstr "Pointer Size:"
+
 #~ msgid ""
 #~ "Small\n"
 #~ "Medium\n"
@@ -4542,8 +4957,10 @@
 #~ "Small\n"
 #~ "Medium\n"
 #~ "Large"
+
 #~ msgid "Theme deleted succesfully. Please select another theme."
 #~ msgstr "Theme deleted succesfully. Please select another theme."
+
 #~ msgid ""
 #~ "No themes could be found on your system.  This probably means that your "
 #~ "\"Theme Preferences\" dialog was improperly installed, or you haven't "
@@ -4552,10 +4969,13 @@
 #~ "No themes could be found on your system.  This probably means that your "
 #~ "\"Theme Preferences\" dialogue was improperly installed, or you haven't "
 #~ "installed the \"gnome-themes\" package."
+
 #~ msgid "The theme file location specified to install is invalid"
 #~ msgstr "The theme file location specified to install is invalid"
+
 #~ msgid "You can save this theme by pressing the Save Theme button."
 #~ msgstr "You can save this theme by pressing the Save Theme button."
+
 #~ msgid ""
 #~ "The default theme schemas could not be found on your system.  This means "
 #~ "that you probably don't have metacity installed, or that your gconf is "
@@ -4564,46 +4984,67 @@
 #~ "The default theme schemas could not be found on your system.  This means "
 #~ "that you probably don't have metacity installed, or that your gconf is "
 #~ "configured incorrectly."
+
 #~ msgid "Select themes for various parts of the desktop"
 #~ msgstr "Select themes for various parts of the desktop"
+
 #~ msgid "<b>You do not have permission to change theme settings</b>"
 #~ msgstr "<b>You do not have permission to change theme settings</b>"
+
 #~ msgid "Theme Details"
 #~ msgstr "Theme Details"
+
 #~ msgid "This theme does not suggest any particular font or background."
 #~ msgstr "This theme does not suggest any particular font or background."
+
 #~ msgid "This theme suggests a font and a background:"
 #~ msgstr "This theme suggests a font and a background:"
+
 #~ msgid "_Install Theme..."
 #~ msgstr "_Install Theme…"
+
 #~ msgid "_Save Theme..."
 #~ msgstr "_Save Theme…"
+
 #~ msgid "theme selection tree"
 #~ msgstr "theme selection tree"
+
 #~ msgid "Customize the appearance of toolbars and menubars in applications"
 #~ msgstr "Customise the appearance of toolbars and menubars in applications"
+
 #~ msgid "<b>Behavior and Appearance</b>"
 #~ msgstr "<b>Behaviour and Appearance</b>"
+
 #~ msgid "Menu and Toolbar Preferences"
 #~ msgstr "Menu and Toolbar Preferences"
+
 #~ msgid "_Detachable toolbars"
 #~ msgstr "_Detachable toolbars"
+
 #~ msgid "Accessible Login"
 #~ msgstr "Accessible Login"
+
 #~ msgid "Medium"
 #~ msgstr "Medium"
+
 #~ msgid "<b>Applications</b>"
 #~ msgstr "<b>Applications</b>"
+
 #~ msgid "<b>Support</b>"
 #~ msgstr "<b>Support</b>"
+
 #~ msgid "Start these assistive technologies every time you log in:"
 #~ msgstr "Start these assistive technologies every time you log in:"
+
 #~ msgid "_Magnifier"
 #~ msgstr "_Magnifier"
+
 #~ msgid "_On-screen keyboard"
 #~ msgstr "_On-screen keyboard"
+
 #~ msgid "_Screenreader"
 #~ msgstr "_Screenreader"
+
 #~ msgid ""
 #~ "No Assistive Technology is available on your system.  The 'gok' package "
 #~ "must be installed in order to get on-screen keyboard support, and the "
@@ -4614,6 +5055,7 @@
 #~ "must be installed in order to get on-screen keyboard support, and the "
 #~ "'orca' package must be installed for screenreading and magnifying "
 #~ "capabilities."
+
 #~ msgid ""
 #~ "Not all available assistive technologies are installed on your system.  "
 #~ "The 'gok' package must be installed in order to get on-screen keyboard "
@@ -4622,6 +5064,7 @@
 #~ "Not all available assistive technologies are installed on your system.  "
 #~ "The 'gok' package must be installed in order to get on-screen keyboard "
 #~ "support."
+
 #~ msgid ""
 #~ "Not all available assistive technologies are installed on your system.  "
 #~ "The 'orca' package must be installed for screenreading and magnifying "
@@ -4630,30 +5073,41 @@
 #~ "Not all available assistive technologies are installed on your system.  "
 #~ "The 'orca' package must be installed for screenreading and magnifying "
 #~ "capabilities."
+
 #~ msgid "*"
 #~ msgstr "*"
+
 #~ msgid "A_vailable layouts:"
 #~ msgstr "A_vailable layouts:"
+
 #~ msgid "Help Unavailable"
 #~ msgstr "Help Unavailable"
+
 #~ msgid "Sound & Video Preferences"
 #~ msgstr "Sound & Video Preferences"
+
 #~ msgid "Save Color Scheme"
 #~ msgstr "Save Colour Scheme"
+
 #~ msgid "Save color scheme as:"
 #~ msgstr "Save colour scheme as:"
+
 #~ msgid ""
 #~ " \n"
 #~ "Custom"
 #~ msgstr ""
 #~ " \n"
 #~ "Custom"
+
 #~ msgid "S_aved schemes:"
 #~ msgstr "S_aved schemes:"
+
 #~ msgid "_Enable custom colors"
 #~ msgstr "_Enable custom colours"
+
 #~ msgid "GNOME Control Center"
 #~ msgstr "GNOME Control Centre"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">The theme \"%s\" has been installed."
 #~ "</span>\n"
@@ -4664,52 +5118,76 @@
 #~ "</span>\n"
 #~ "\n"
 #~ "Would you like to apply it now, or keep your current theme?"
+
 #~ msgid "Keyboard Indicator Test (%s)"
 #~ msgstr "Keyboard Indicator Test (%s)"
+
 #~ msgid "Indicator:"
 #~ msgstr "Indicator:"
+
 #~ msgid "layout \"%s\""
+
 #~ msgid_plural "layouts \"%s\""
 #~ msgstr[0] "layout \"%s\""
 #~ msgstr[1] "layouts \"%s\""
+
 #~ msgid "option \"%s\""
+
 #~ msgid_plural "options \"%s\""
 #~ msgstr[0] "option \"%s\""
 #~ msgstr[1] "options \"%s\""
+
 #~ msgid "model \"%s\", %s and %s"
 #~ msgstr "model \"%s\", %s and %s"
+
 #~ msgid "no layout"
 #~ msgstr "no layout"
+
 #~ msgid "no options"
 #~ msgstr "no options"
+
 #~ msgid "No description."
 #~ msgstr "No description."
+
 #~ msgid "Failed to init GConf: %s\n"
 #~ msgstr "Failed to init GConf: %s\n"
+
 #~ msgid "Enable/disable installed plugins"
 #~ msgstr "Enable/disable installed plugins"
+
 #~ msgid "Keyboard Indicator plugins"
 #~ msgstr "Keyboard Indicator plugins"
+
 #~ msgid "Activate more plugins"
 #~ msgstr "Activate more plugins"
+
 #~ msgid "Active _plugins:"
 #~ msgstr "Active _plugins:"
+
 #~ msgid "Add Plugin"
 #~ msgstr "Add Plugin"
+
 #~ msgid "Close the dialog"
 #~ msgstr "Close the dialogue"
+
 #~ msgid "Configure the selected plugin"
 #~ msgstr "Configure the selected plugin"
+
 #~ msgid "Deactivate selected plugin"
 #~ msgstr "Deactivate selected plugin"
+
 #~ msgid "Decrease the plugin priority"
 #~ msgstr "Decrease the plugin priority"
+
 #~ msgid "Increase the plugin priority"
 #~ msgstr "Increase the plugin priority"
+
 #~ msgid "Keyboard Indicator Plugins"
 #~ msgstr "Keyboard Indicator Plugins"
+
 #~ msgid "The list of active plugins"
 #~ msgstr "The list of active plugins"
+
 #~ msgid "_Available plugins:"
 #~ msgstr "_Available plugins:"
 
@@ -4724,130 +5202,179 @@
 #, fuzzy
 #~ msgid "To:"
 #~ msgstr "To: %s"
+
 #~ msgid "Epiphany"
 #~ msgstr "Epiphany"
+
 #~ msgid "Please specify a name and a command for this editor."
 #~ msgstr "Please specify a name and a command for this editor."
+
 #~ msgid "Add..."
 #~ msgstr "Add…"
+
 #~ msgid "C_ustom:"
 #~ msgstr "C_ustom:"
+
 #~ msgid "Can open _URIs"
 #~ msgstr "Can open _URIs"
+
 #~ msgid "Custom Editor Properties"
 #~ msgstr "Custom Editor Properties"
+
 #~ msgid "Default Mail Reader"
 #~ msgstr "Default Mail Reader"
+
 #~ msgid "Default Terminal"
 #~ msgstr "Default Terminal"
+
 #~ msgid "Default Text Editor"
 #~ msgstr "Default Text Editor"
+
 #~ msgid "Default Web Browser"
 #~ msgstr "Default Web Browser"
+
 #~ msgid "Edit..."
 #~ msgstr "Edit…"
+
 #~ msgid "Run in a _terminal"
 #~ msgstr "Run in a _terminal"
+
 #~ msgid ""
 #~ "Select the window manager you want.  You will need to hit apply, wave the "
 #~ "magic wand, and do a magic dance for it to work."
 #~ msgstr ""
 #~ "Select the window manager you want.  You will need to hit apply, wave the "
 #~ "magic wand, and do a magic dance for it to work."
+
 #~ msgid "Understands _Netscape Remote Control"
 #~ msgstr "Understands _Netscape Remote Control"
+
 #~ msgid "Use this _editor to open text files in the file manager"
 #~ msgstr "Use this _editor to open text files in the file manager"
+
 #~ msgid "Window Manager"
 #~ msgstr "Window Manager"
+
 #~ msgid "_Properties..."
 #~ msgstr "_Properties…"
+
 #~ msgid "_Select:"
 #~ msgstr "_Select:"
+
 #~ msgid "_Terminal font:"
 #~ msgstr "_Terminal font:"
+
 #~ msgid "..."
 #~ msgstr "…"
+
 #~ msgid "Large Cursor"
 #~ msgstr "Large Cursor"
+
 #~ msgid "E_nable sound server startup"
 #~ msgstr "E_nable sound server startup"
+
 #~ msgid "_Sound an audible bell"
 #~ msgstr "_Sound an audible bell"
+
 #~ msgid "_Visual feedback:"
 #~ msgstr "_Visual feedback:"
+
 #~ msgid ""
 #~ "Can not install themes. \n"
 #~ "The gzip utility is not installed."
 #~ msgstr ""
 #~ "Can not install themes. \n"
 #~ "The gzip utility is not installed."
+
 #~ msgid ""
 #~ "Icon Theme %s correctly installed.\n"
 #~ "You can select it in the theme details."
 #~ msgstr ""
 #~ "Icon Theme %s correctly installed.\n"
 #~ "You can select it in the theme details."
+
 #~ msgid ""
 #~ "Windows Border Theme %s correctly installed.\n"
 #~ "You can select it in the theme details."
 #~ msgstr ""
 #~ "Windows Border Theme %s correctly installed.\n"
 #~ "You can select it in the theme details."
+
 #~ msgid ""
 #~ "Controls Theme %s correctly installed.\n"
 #~ "You can select it in the theme details."
 #~ msgstr ""
 #~ "Controls Theme %s correctly installed.\n"
 #~ "You can select it in the theme details."
+
 #~ msgid "<span size=\"larger\" weight=\"bold\">Install a Theme</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">Install a Theme</span>"
+
 #~ msgid "New themes can also be installed by dragging them into the window."
 #~ msgstr "New themes can also be installed by dragging them into the window."
+
 #~ msgid "Short _description:"
 #~ msgstr "Short _description:"
+
 #~ msgid "Theme _Details"
 #~ msgstr "Theme _Details"
+
 #~ msgid "_Go To Theme Folder"
 #~ msgstr "_Go To Theme Folder"
+
 #~ msgid "_Theme name:"
 #~ msgstr "_Theme name:"
+
 #~ msgid "Could not initialize Bonobo"
 #~ msgstr "Could not initialise Bonobo"
+
 #~ msgid "Permissions on the file %s are broken\n"
 #~ msgstr "Permissions on the file %s are broken\n"
 
 #, fuzzy
 #~ msgid "There was an error loading an image: %s"
 #~ msgstr "There was an error displaying help: %s"
+
 #~ msgid "Event"
 #~ msgstr "Event"
+
 #~ msgid "_Sounds:"
 #~ msgstr "_Sounds:"
+
 #~ msgid "_Play"
 #~ msgstr "_Play"
+
 #~ msgid "Brightness down"
 #~ msgstr "Brightness down"
+
 #~ msgid "Brightness down's shortcut."
 #~ msgstr "Brightness down's shortcut."
+
 #~ msgid "Brightness up's shortcut."
 #~ msgstr "Brightness up's shortcut."
+
 #~ msgid ""
 #~ "A collection of scripts to run whenever the keyboard state is reloaded. "
 #~ "Useful for re-applying xmodmap based adjustments"
 #~ msgstr ""
 #~ "A collection of scripts to run whenever the keyboard state is reloaded. "
 #~ "Useful for re-applying xmodmap based adjustments"
+
 #~ msgid "A list of modmap files available in the $HOME directory."
 #~ msgstr "A list of modmap files available in the $HOME directory."
+
 #~ msgid "Default group, assigned on window creation"
 #~ msgstr "Default group, assigned on window creation"
+
 #~ msgid "Keep and manage separate group per window"
 #~ msgstr "Keep and manage separate group per window"
+
 #~ msgid "Keyboard Update Handlers"
 #~ msgstr "Keyboard Update Handlers"
+
 #~ msgid "Keyboard layout"
 #~ msgstr "Keyboard layout"
+
 #~ msgid "Keyboard model"
 #~ msgstr "Keyboard model"
 
@@ -4856,24 +5383,31 @@
 #~ "Keyboard settings in gconf will be overridden from the system ASAP "
 #~ "(deprecated)"
 #~ msgstr "Keyboard settings in gconf will be overridden from the system ASAP"
+
 #~ msgid "Save/restore indicators together with layout groups"
 #~ msgstr "Save/restore indicators together with layout groups"
+
 #~ msgid "Show layout names instead of group names"
 #~ msgstr "Show layout names instead of group names"
+
 #~ msgid ""
 #~ "Show layout names instead of group names (only for versions of XFree "
 #~ "supporting multiple layouts)"
 #~ msgstr ""
 #~ "Show layout names instead of group names (only for versions of XFree "
 #~ "supporting multiple layouts)"
+
 #~ msgid "Suppress the \"X sysconfig changed\" warning message"
 #~ msgstr "Suppress the \"X sysconfig changed\" warning message"
+
 #~ msgid "keyboard model"
 #~ msgstr "keyboard model"
+
 #~ msgid "modmap file list"
 #~ msgstr "modmap file list"
+
 #~ msgid "Break reminder"
 #~ msgstr "Break reminder"
+
 #~ msgid "The typing monitor is already running."
 #~ msgstr "The typing monitor is already running."
-
--- po/es.po
+++ po/es.po
@@ -15,9 +15,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-19 09:22+0000\n"
-"PO-Revision-Date: 2010-05-19 12:13-0800\n"
-"Last-Translator: Tomás Galicia <tomas.galicia at intel.com>\n"
+"POT-Creation-Date: 2010-06-30 09:23+0000\n"
+"PO-Revision-Date: 2010-07-01 18:55-0800\n"
+"Last-Translator: Pablo Barbecho <pablo.barbecho at ptiglobal.net>\n"
 "Language-Team: Español <gnome-es-list at gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -317,7 +317,7 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:15
 msgid "Email"
-msgstr "Correo-e"
+msgstr "Correo electrónico"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:16
 msgid "Enable _Fingerprint Login..."
@@ -2293,7 +2293,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Opciones de distribución del teclado"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -3287,6 +3287,14 @@
 msgid "Control Center"
 msgstr "Centro de control"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Configuración del sistema"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Configurar todo"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Posponer el descanso"
--- po/fi.po
+++ po/fi.po
@@ -15,14 +15,14 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-05 09:39+0000\n"
-"PO-Revision-Date: 2010-04-08 13:22+0700\n"
-"Last-Translator: Eija <eija at wimma.com>\n"
+"POT-Creation-Date: 2010-06-30 09:23+0000\n"
+"PO-Revision-Date: 2010-07-01 12:50-0800\n"
+"Last-Translator: Anna Bergman <anna.b.bergman at gmail.com>\n"
 "Language-Team: \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"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 "X-Poedit-Language: Finnish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -39,28 +39,16 @@
 msgstr "Lisää teemoja-URL"
 
 #: ../gnome-control-center.schemas.in.h:4
-msgid ""
-"Set this to your current location name. This is used to determine the "
-"appropriate network proxy configuration."
-msgstr ""
-"Aseta tähän nykyisen sijaintisi nimi. Tätä käytetään määrittämään soveltuva "
-"verkon välityspalvelimen kokoonpano."
+msgid "Set this to your current location name. This is used to determine the appropriate network proxy configuration."
+msgstr "Aseta tähän nykyisen sijaintisi nimi. Tätä käytetään määrittämään soveltuva verkon välityspalvelimen kokoonpano."
 
 #: ../gnome-control-center.schemas.in.h:5
-msgid ""
-"URL for where to get more desktop backgrounds. If set to an empty string the "
-"link will not appear."
-msgstr ""
-"URL, josta noudetaan lisää työpöydän taustakuvia. Jos tämä on tyhjä "
-"merkkijono, linkkiä ei näytetä."
+msgid "URL for where to get more desktop backgrounds. If set to an empty string the link will not appear."
+msgstr "URL, josta noudetaan lisää työpöydän taustakuvia. Jos tämä on tyhjä merkkijono, linkkiä ei näytetä."
 
 #: ../gnome-control-center.schemas.in.h:6
-msgid ""
-"URL for where to get more desktop themes. If set to an empty string the link "
-"will not appear."
-msgstr ""
-"URL, josta noudetaan lisää työpöytäteemoja. Jos tämä on tyhjä merkkijono, "
-"linkkiä ei näytetä."
+msgid "URL for where to get more desktop themes. If set to an empty string the link will not appear."
+msgstr "URL, josta noudetaan lisää työpöytäteemoja. Jos tämä on tyhjä merkkijono, linkkiä ei näytetä."
 
 #: ../capplets/about-me/eel-alert-dialog.c:114
 msgid "Image/label border"
@@ -475,10 +463,8 @@
 msgstr "Aseta omat tiedot"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:97
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr ""
-"Sinulla ei ole oikeutta käyttää laitetta. Ota yhteyttä ylläpitäjäjääsi."
+msgid "You are not allowed to access the device. Contact your system administrator."
+msgstr "Sinulla ei ole oikeutta käyttää laitetta. Ota yhteyttä ylläpitäjäjääsi."
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:99
 msgid "The device is already in use."
@@ -497,12 +483,8 @@
 msgstr "_Poista sormenjäljet"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:228
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
-msgstr ""
-"Haluatko poistaa rekisteröidyt sormenjälkesi, jolloin sormenjäljillä "
-"kirjautuminen poistetaan käytöstä?"
+msgid "Do you want to delete your registered fingerprints so fingerprint login is disabled?"
+msgstr "Haluatko poistaa rekisteröidyt sormenjälkesi, jolloin sormenjäljillä kirjautuminen poistetaan käytöstä?"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:356
 #: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:1
@@ -545,12 +527,8 @@
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:581
 #, c-format
-msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
-msgstr ""
-"Jotta voit ottaa sormenjäljellä kirjautumisen käyttöön, täytyy yksi "
-"sormenjäljistä tallentaa käyttäen laitetta \"%s\"."
+msgid "To enable fingerprint login, you need to save one of your fingerprints, using the '%s' device."
+msgstr "Jotta voit ottaa sormenjäljellä kirjautumisen käyttöön, täytyy yksi sormenjäljistä tallentaa käyttäen laitetta \"%s\"."
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:590
 msgid "Swipe finger on reader"
@@ -609,12 +587,8 @@
 msgstr "Valitse sormi"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:15
-msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
-msgstr ""
-"Sormenjälkesi tallennettiin onnistuneesti. Sinun pitäisi nyt pystyä "
-"kirjautumaan sisään sormenjäljen avulla."
+msgid "Your fingerprint was successfully saved. You should now be able to log in using your fingerprint reader."
+msgstr "Sormenjälkesi tallennettiin onnistuneesti. Sinun pitäisi nyt pystyä kirjautumaan sisään sormenjäljen avulla."
 
 #: ../capplets/about-me/gnome-about-me-password.c:161
 msgid "Child exited unexpectedly"
@@ -642,12 +616,8 @@
 #. Authentication failure
 #: ../capplets/about-me/gnome-about-me-password.c:474
 #: ../capplets/about-me/gnome-about-me-password.c:550
-msgid ""
-"Your password has been changed since you initially authenticated! Please re-"
-"authenticate."
-msgstr ""
-"Salasana on vaihtunut sen jälkeen kun alunperin tunnistauduit. Ole hyvä ja "
-"tunnistaudu uudestaan."
+msgid "Your password has been changed since you initially authenticated! Please re-authenticate."
+msgstr "Salasana on vaihtunut sen jälkeen kun alunperin tunnistauduit. Ole hyvä ja tunnistaudu uudestaan."
 
 #: ../capplets/about-me/gnome-about-me-password.c:476
 msgid "That password was incorrect."
@@ -713,8 +683,7 @@
 
 #: ../capplets/about-me/gnome-about-me-password.c:936
 #: ../capplets/about-me/gnome-about-me-password.ui.h:5
-msgid ""
-"Please type your password again in the <b>Retype new password</b> field."
+msgid "Please type your password again in the <b>Retype new password</b> field."
 msgstr "Syötä salasana uudestaan kenttään <b>Salasana uudestaan</b>."
 
 #: ../capplets/about-me/gnome-about-me-password.c:939
@@ -740,15 +709,11 @@
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:6
 msgid ""
-"To change your password, enter your current password in the field below and "
-"click <b>Authenticate</b>.\n"
-"After you have authenticated, enter your new password, retype it for "
-"verification and click <b>Change password</b>."
+"To change your password, enter your current password in the field below and click <b>Authenticate</b>.\n"
+"After you have authenticated, enter your new password, retype it for verification and click <b>Change password</b>."
 msgstr ""
-"Voit vaihtaa salasanasi syöttämällä nykyisen salasanasi alla olevaan "
-"kenttään ja napsauttamalla painiketta <b>Tunnistaudu</b>.\n"
-"Kun olet tunnistautunut, voit vaihtaa salasanan antamalla uuden salasanan "
-"kahdesti ja napsauttamalla painiketta <b>Vaihda salasana</b>."
+"Voit vaihtaa salasanasi syöttämällä nykyisen salasanasi alla olevaan kenttään ja napsauttamalla painiketta <b>Tunnistaudu</b>.\n"
+"Kun olet tunnistautunut, voit vaihtaa salasanan antamalla uuden salasanan kahdesti ja napsauttamalla painiketta <b>Vaihda salasana</b>."
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:8
 msgid "_Authenticate"
@@ -775,12 +740,8 @@
 msgstr "Esteettömyysohjelmien asetukset"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:4
-msgid ""
-"Changes to enable assistive technologies will not take effect until your "
-"next log in."
-msgstr ""
-"Muutokset esteettömyysasetuksiin tulevat voimaan seuraavalla "
-"sisäänkirjautumiskerralla."
+msgid "Changes to enable assistive technologies will not take effect until your next log in."
+msgstr "Muutokset esteettömyysasetuksiin tulevat voimaan seuraavalla sisäänkirjautumiskerralla."
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:5
 msgid "Close and _Log Out"
@@ -848,38 +809,18 @@
 #: ../capplets/appearance/appearance-font.c:498
 #: ../capplets/appearance/cc-font-page.c:324
 #, c-format
-msgid ""
-"The font selected is %d point large, and may make it difficult to "
-"effectively use the computer.  It is recommended that you select a size "
-"smaller than %d."
-msgid_plural ""
-"The font selected is %d points large, and may make it difficult to "
-"effectively use the computer. It is recommended that you select a size "
-"smaller than %d."
-msgstr[0] ""
-"Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen "
-"käyttöä. On suositeltavaa, että valitset %d pistettä pienemmän koon."
-msgstr[1] ""
-"Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen "
-"käyttöä. On suositeltavaa, että valitset %d pistettä pienemmän koon."
+msgid "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a size smaller than %d."
+msgid_plural "The font selected is %d points large, and may make it difficult to effectively use the computer. It is recommended that you select a size smaller than %d."
+msgstr[0] "Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen käyttöä. On suositeltavaa, että valitset %d pistettä pienemmän koon."
+msgstr[1] "Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen käyttöä. On suositeltavaa, että valitset %d pistettä pienemmän koon."
 
 #: ../capplets/appearance/appearance-font.c:511
 #: ../capplets/appearance/cc-font-page.c:337
 #, c-format
-msgid ""
-"The font selected is %d point large, and may make it difficult to "
-"effectively use the computer.  It is recommended that you select a smaller "
-"sized font."
-msgid_plural ""
-"The font selected is %d points large, and may make it difficult to "
-"effectively use the computer. It is recommended that you select a smaller "
-"sized font."
-msgstr[0] ""
-"Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen "
-"käyttöä. On suositeltavaa, että valitset pienemmän kirjasinlajin."
-msgstr[1] ""
-"Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen "
-"käyttöä. On suositeltavaa, että valitset pienemmän kirjasinlajin."
+msgid "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a smaller sized font."
+msgid_plural "The font selected is %d points large, and may make it difficult to effectively use the computer. It is recommended that you select a smaller sized font."
+msgstr[0] "Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen käyttöä. On suositeltavaa, että valitset pienemmän kirjasinlajin."
+msgstr[1] "Valittu kirjasinlaji on %d pisteen kokoinen, mikä voi haitata koneen käyttöä. On suositeltavaa, että valitset pienemmän kirjasinlajin."
 
 #: ../capplets/appearance/appearance-font.c:534
 #: ../capplets/appearance/cc-font-page.c:360
@@ -948,12 +889,8 @@
 #: ../capplets/appearance/cc-theme-customize-dialog.c:210
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1646
 #, c-format
-msgid ""
-"This theme will not look as intended because the required GTK+ theme engine "
-"'%s' is not installed."
-msgstr ""
-"Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua GTK+-"
-"teemamoottoria \"%s\" ei ole asennettu."
+msgid "This theme will not look as intended because the required GTK+ theme engine '%s' is not installed."
+msgstr "Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua GTK+-teemamoottoria \"%s\" ei ole asennettu."
 
 #: ../capplets/appearance/appearance-themes.c:673
 #: ../capplets/appearance/cc-theme-page.c:779
@@ -972,21 +909,13 @@
 
 #: ../capplets/appearance/appearance-themes.c:711
 #: ../capplets/appearance/cc-theme-page.c:815
-msgid ""
-"The current theme suggests a background and a font. Also, the last applied "
-"font suggestion can be reverted."
-msgstr ""
-"Tämä teema ehdottaa taustakuvaa ja kirjasinta. Samoin viimeisin asetettu "
-"kirjasinehdotus voi muuttua."
+msgid "The current theme suggests a background and a font. Also, the last applied font suggestion can be reverted."
+msgstr "Tämä teema ehdottaa taustakuvaa ja kirjasinta. Samoin viimeisin asetettu kirjasinehdotus voi muuttua."
 
 #: ../capplets/appearance/appearance-themes.c:713
 #: ../capplets/appearance/cc-theme-page.c:818
-msgid ""
-"The current theme suggests a background. Also, the last applied font "
-"suggestion can be reverted."
-msgstr ""
-"Tämä teema ehdottaa taustakuvaa ja kirjasinta. Samoin viimeisin asetettu "
-"kirjasinehdotus voi muuttua."
+msgid "The current theme suggests a background. Also, the last applied font suggestion can be reverted."
+msgstr "Tämä teema ehdottaa taustakuvaa ja kirjasinta. Samoin viimeisin asetettu kirjasinehdotus voi muuttua."
 
 #: ../capplets/appearance/appearance-themes.c:715
 #: ../capplets/appearance/cc-theme-page.c:821
@@ -995,12 +924,8 @@
 
 #: ../capplets/appearance/appearance-themes.c:717
 #: ../capplets/appearance/cc-theme-page.c:824
-msgid ""
-"The current theme suggests a font. Also, the last applied font suggestion "
-"can be reverted."
-msgstr ""
-"Valittu teema ehdottaa kirjasinta. Viimeisin valittu kirjasinehdotus voi "
-"muuttua."
+msgid "The current theme suggests a font. Also, the last applied font suggestion can be reverted."
+msgstr "Valittu teema ehdottaa kirjasinta. Viimeisin valittu kirjasinehdotus voi muuttua."
 
 #: ../capplets/appearance/appearance-themes.c:719
 #: ../capplets/appearance/cc-theme-page.c:826
@@ -1466,12 +1391,8 @@
 
 #: ../capplets/appearance/theme-installer.c:266
 #, c-format
-msgid ""
-"\"%s\" does not appear to be a valid theme. It may be a theme engine which "
-"you need to compile."
-msgstr ""
-"\"%s\" ei ole kelvollinen teematiedosto. Se saattaa olla teemamoottori, joka "
-"täytyy kääntää ensin."
+msgid "\"%s\" does not appear to be a valid theme. It may be a theme engine which you need to compile."
+msgstr "\"%s\" ei ole kelvollinen teematiedosto. Se saattaa olla teemamoottori, joka täytyy kääntää ensin."
 
 #: ../capplets/appearance/theme-installer.c:372
 #, c-format
@@ -1902,12 +1823,8 @@
 
 #: ../capplets/display/cc-display-minimal-page.c:478
 #: ../capplets/display/cc-display-minimal-page.c:487
-msgid ""
-"You are only showing your desktop on your computer's screen. Plug in another "
-"display to share your view and then turn display sharing on above."
-msgstr ""
-"Näytät vain työpöytäsi tietokoneesi ruudulla. Kytke toinen näyttö jakaaksesi "
-"näkymäsi ja kytke näytön jako päälle yläpuolelta."
+msgid "You are only showing your desktop on your computer's screen. Plug in another display to share your view and then turn display sharing on above."
+msgstr "Näytät vain työpöytäsi tietokoneesi ruudulla. Kytke toinen näyttö jakaaksesi näkymäsi ja kytke näytön jako päälle yläpuolelta."
 
 #: ../capplets/display/cc-display-minimal-page.c:496
 #: ../capplets/display/display-minimal.ui.h:4
@@ -2053,11 +1970,8 @@
 
 #: ../capplets/keyboard/gnome-keyboard-properties.c:205
 #: ../capplets/keyboard/gnome-keyboard-properties.c:210
-msgid ""
-"Just apply settings and quit (compatibility only; now handled by daemon)"
-msgstr ""
-"Pelkästään ota muutokset käyttöön ja lopeta (vain yhteensopivuuden vuoksi; "
-"nyt tämän tekee demoni)"
+msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgstr "Pelkästään ota muutokset käyttöön ja lopeta (vain yhteensopivuuden vuoksi; nyt tämän tekee demoni)"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.c:215
 msgid "Start the page with the typing break settings showing"
@@ -2208,12 +2122,8 @@
 msgstr "Asettelut"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:21
-msgid ""
-"Lock screen after a certain duration to help prevent repetitive keyboard use "
-"injuries"
-msgstr ""
-"Lukitse näyttö tietyin väliajoin näppäimistön toistuvasta käytöstä johtuvien "
-"vammojen estämiseksi"
+msgid "Lock screen after a certain duration to help prevent repetitive keyboard use injuries"
+msgstr "Lukitse näyttö tietyin väliajoin näppäimistön toistuvasta käytöstä johtuvien vammojen estämiseksi"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:22
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:18
@@ -2263,12 +2173,8 @@
 msgstr "Hidas"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:35
-msgid ""
-"To edit a shortcut key, click on the corresponding row and type a new key "
-"combination, or press backspace to clear."
-msgstr ""
-"Voit muokata pikanäppäintä napsauttamalla sen riviä ja syöttämällä uusi "
-"näppäinyhdistelmä. Askelpalauttimen painaminen tyhjentää pikanäppäimen."
+msgid "To edit a shortcut key, click on the corresponding row and type a new key combination, or press backspace to clear."
+msgstr "Voit muokata pikanäppäintä napsauttamalla sen riviä ja syöttämällä uusi näppäinyhdistelmä. Askelpalauttimen painaminen tyhjentää pikanäppäimen."
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:36
 msgid "Typing Break"
@@ -2281,8 +2187,7 @@
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:38
 msgid "_Accessibility features can be toggled with keyboard shortcuts"
-msgstr ""
-"_Salli esteettömyystoimintojen kytkeminen päälle ja pois näppäimistöltä"
+msgstr "_Salli esteettömyystoimintojen kytkeminen päälle ja pois näppäimistöltä"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:40
 msgid "_Break interval lasts:"
@@ -2381,7 +2286,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Näppäimistöasettelun valinnat"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -2409,12 +2314,10 @@
 #: ../capplets/keyboard/cc-shortcuts-page.c:1172
 #, c-format
 msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
+"The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
-"Pikanäppäintä \"%s\" ei voi käyttää, koska tällöin kyseistä näppäintä ei "
-"enää voi käyttää kirjoittamiseen.\n"
+"Pikanäppäintä \"%s\" ei voi käyttää, koska tällöin kyseistä näppäintä ei enää voi käyttää kirjoittamiseen.\n"
 "Kokeile yhdistämällä näppäin esimerkiksi Control-, Alt- tai vaihtonäppäimeen."
 
 #: ../capplets/keyboard/cc-shortcuts-page.c:1201
@@ -2428,11 +2331,8 @@
 
 #: ../capplets/keyboard/cc-shortcuts-page.c:1208
 #, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
-msgstr ""
-"Jos siirrät pikanäppäimen toimintoon \"%s\", poistetann pikanäppäin \"%s\" "
-"käytöstä."
+msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
+msgstr "Jos siirrät pikanäppäimen toimintoon \"%s\", poistetann pikanäppäin \"%s\" käytöstä."
 
 #: ../capplets/keyboard/cc-shortcuts-page.c:1216
 msgid "_Reassign"
@@ -2648,10 +2548,8 @@
 msgstr "_Kynnysarvo:"
 
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:32
-msgid ""
-"To test your double-click settings, try to double-click on the light bulb."
-msgstr ""
-"Kaksoisnapsauta hehkulamppua kokeillaksesi kaksoisnapsautuksen asetuksia."
+msgid "To test your double-click settings, try to double-click on the light bulb."
+msgstr "Kaksoisnapsauta hehkulamppua kokeillaksesi kaksoisnapsautuksen asetuksia."
 
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:33
 msgid "Touchpad"
@@ -2663,9 +2561,7 @@
 
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:35
 msgid "You can also use the Dwell Click panel applet to choose the click type."
-msgstr ""
-"Napsautustapa voidaan valita myös käyttämällä pysenapsautuksen "
-"paneelisovelmaa."
+msgstr "Napsautustapa voidaan valita myös käyttämällä pysenapsautuksen paneelisovelmaa."
 
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:38
 msgid "_Disable touchpad while typing"
@@ -2898,7 +2794,7 @@
 
 #: ../capplets/security/cc-security-panel.c:154
 msgid "Sorry, the passwords do not match"
-msgstr "Sorry, salasana ei vastaa"
+msgstr "Sori, salasana ei vastaa"
 
 #: ../capplets/security/cc-security-panel.c:179
 msgid "The new password is now saved"
@@ -2906,11 +2802,11 @@
 
 #: ../capplets/security/cc-security-panel.c:210
 msgid "Sorry, the password could not be changed"
-msgstr "Sorry, salasanaasi ei voitu vaihtaa"
+msgstr "Sori, salasanaasi ei voitu vaihtaa"
 
 #: ../capplets/security/cc-security-panel.c:445
 msgid "Sorry, that password is incorrect"
-msgstr "Sorry, salasana oli väärin"
+msgstr "Sori, salasana oli väärin"
 
 #: ../capplets/security/cc-security-panel.c:500
 msgid "Security"
@@ -2978,12 +2874,8 @@
 msgstr "Tämä tyhjentää ruudun ja asettaa viestityksen tilan arvoon 'pois'."
 
 #: ../capplets/power/power.ui.h:6
-msgid ""
-"This will suspend everything on your computer. It'll wake up in just the "
-"same state as it was before."
-msgstr ""
-"Tämä keskeyttää kaikki tietokoneellasi. Se herää samaan tilaan, jossa se oli "
-"aikaisemmin."
+msgid "This will suspend everything on your computer. It'll wake up in just the same state as it was before."
+msgstr "Tämä keskeyttää kaikki tietokoneellasi. Se herää samaan tilaan, jossa se oli aikaisemmin."
 
 #: ../capplets/power/power.ui.h:7
 msgid "To change your brightness, you can use the keys on your computer."
@@ -3064,16 +2956,10 @@
 #: ../libgnome-control-center-extension/activate-settings-daemon.c:16
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
-"Without the GNOME settings manager running, some preferences may not take "
-"effect. This could indicate a problem with DBus, or a non-GNOME (e.g. KDE) "
-"settings manager may already be active and conflicting with the GNOME "
-"settings manager."
+"Without the GNOME settings manager running, some preferences may not take effect. This could indicate a problem with DBus, or a non-GNOME (e.g. KDE) settings manager may already be active and conflicting with the GNOME settings manager."
 msgstr ""
 "Asetushallinta ”gnome-settings-daemon” ei käynnistynyt.\n"
-"Kun Gnomen asetustenhallinta ei ole käynnissä, kaikki asetukset eivät "
-"välttämättä tule voimaan. Tämä voi johtua ongelmasta DBusissa tai siitä, "
-"että joku muu kuin Gnomen (esim. KDE:n) asetushallinta on käynnissä ja "
-"häiritsee Gnomen asetushallintaa."
+"Kun Gnomen asetustenhallinta ei ole käynnissä, kaikki asetukset eivät välttämättä tule voimaan. Tämä voi johtua ongelmasta DBusissa tai siitä, että joku muu kuin Gnomen (esim. KDE:n) asetushallinta on käynnissä ja häiritsee Gnomen asetushallintaa."
 
 #: ../libgnome-control-center-extension/capplet-stock-icons.c:66
 #, c-format
@@ -3182,19 +3068,15 @@
 msgstr "Muutosjoukko"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:150
-msgid ""
-"GConf change set containing data to be forwarded to the gconf client on apply"
-msgstr ""
-"GConf-muutosjoukko, joka sisältää datan, joka lähtee asetukset "
-"toteutettaessa gconf-asiakkaalle"
+msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgstr "GConf-muutosjoukko, joka sisältää datan, joka lähtee asetukset toteutettaessa gconf-asiakkaalle"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:155
 msgid "Conversion to widget callback"
 msgstr "Säätimeenmuunnoksen kutsu"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:156
-msgid ""
-"Callback to be issued when data are to be converted from GConf to the widget"
+msgid "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "Funktio, jota kutsutaan, kun data muuntuu GConfista säätimeen"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:161
@@ -3202,8 +3084,7 @@
 msgstr "Säätimestämuunnoksen kutsu"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:162
-msgid ""
-"Callback to be issued when data are to be converted to GConf from the widget"
+msgid "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "Funktio, jota kutsutaan, kun data muuntuu säätimestä GConfiin"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:167
@@ -3228,22 +3109,18 @@
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:191
 msgid "Callback to be issued when property editor object data is to be freed"
-msgstr ""
-"Funktio, joka saa kutsun kun ominaisuusmuokkainolion dataa ollaan "
-"vapauttamassa"
+msgstr "Funktio, joka saa kutsun kun ominaisuusmuokkainolion dataa ollaan vapauttamassa"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:1407
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
 "\n"
-"Please make sure it exists and try again, or choose a different background "
-"picture."
+"Please make sure it exists and try again, or choose a different background picture."
 msgstr ""
 "Tiedostoa \"%s\" ei löydy.\n"
 "\n"
-"Varmista, että se on olemassa ja yritä uudelleen tai valitse toinen "
-"taustakuva."
+"Varmista, että se on olemassa ja yritä uudelleen tai valitse toinen taustakuva."
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:1415
 #, c-format
@@ -3296,30 +3173,18 @@
 
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1622
 #, c-format
-msgid ""
-"This theme will not look as intended because the required GTK+ theme '%s' is "
-"not installed."
-msgstr ""
-"Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua GTK+-teemaa \"%s"
-"\" ei ole asennettu."
+msgid "This theme will not look as intended because the required GTK+ theme '%s' is not installed."
+msgstr "Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua GTK+-teemaa \"%s\" ei ole asennettu."
 
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1630
 #, c-format
-msgid ""
-"This theme will not look as intended because the required window manager "
-"theme '%s' is not installed."
-msgstr ""
-"Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua ikkunamanagerin "
-"teemaa \"%s\" ei ole asennettu."
+msgid "This theme will not look as intended because the required window manager theme '%s' is not installed."
+msgstr "Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua ikkunamanagerin teemaa \"%s\" ei ole asennettu."
 
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1637
 #, c-format
-msgid ""
-"This theme will not look as intended because the required icon theme '%s' is "
-"not installed."
-msgstr ""
-"Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua kuvaketeemaa \"%"
-"s\" ei ole asennettu."
+msgid "This theme will not look as intended because the required icon theme '%s' is not installed."
+msgstr "Tämä teema ei näytä siltä miltä sen pitäisi, koska vaadittua kuvaketeemaa \"%s\" ei ole asennettu."
 
 #: ../libwindow-settings/gnome-wm-manager.c:316
 #, c-format
@@ -3379,47 +3244,29 @@
 msgstr "Kertoo, suljetaanko komentotulkki käynnistystoiminnon jälkeen."
 
 #: ../shell/control-center.schemas.in.h:8
-msgid ""
-"Indicates whether to close the shell when an add or remove action is "
-"performed."
+msgid "Indicates whether to close the shell when an add or remove action is performed."
 msgstr "Kertoo, suljetaanko komentotulkki lisäyksen tai poiston jälkeen."
 
 #: ../shell/control-center.schemas.in.h:9
-msgid ""
-"Indicates whether to close the shell when an upgrade or uninstall action is "
-"performed."
-msgstr ""
-"Kertoo, suljetaanko komentotulkki päivityksen tai asennuksen perumisen "
-"jälkeen."
+msgid "Indicates whether to close the shell when an upgrade or uninstall action is performed."
+msgstr "Kertoo, suljetaanko komentotulkki päivityksen tai asennuksen perumisen jälkeen."
 
 #: ../shell/control-center.schemas.in.h:10
 msgid "Task names and associated .desktop files"
 msgstr "Tehtävien nimet ja niihin liittyvät .desktop-tiedostot"
 
 #: ../shell/control-center.schemas.in.h:11
-msgid ""
-"The task name to be displayed in the control-center followed by a \";\" "
-"separator then the filename of an associated .desktop file to launch for "
-"that task."
-msgstr ""
-"Ohjauskeskuksessa näytettävä tehtävän nimi (käännettävä merkkijono), jota "
-"seuraa \";\" ja tehtävän käynnistyksen suorittava .desktop-tiedoston nimi."
+msgid "The task name to be displayed in the control-center followed by a \";\" separator then the filename of an associated .desktop file to launch for that task."
+msgstr "Ohjauskeskuksessa näytettävä tehtävän nimi (käännettävä merkkijono), jota seuraa \";\" ja tehtävän käynnistyksen suorittava .desktop-tiedoston nimi."
 
 #. Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a ","
 #: ../shell/control-center.schemas.in.h:13
-msgid ""
-"[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-"
-"applications.desktop,Add Printer;gnome-cups-manager.desktop]"
-msgstr ""
-"[Vaihda teemaa;gtk-theme-selector.desktop,Aseta ensisijaiset sovellukset;"
-"default-applications.desktop, Lisää tulostin;gnome-cups-manager.desktop]"
+msgid "[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-applications.desktop,Add Printer;gnome-cups-manager.desktop]"
+msgstr "[Vaihda teemaa;gtk-theme-selector.desktop,Aseta ensisijaiset sovellukset;default-applications.desktop, Lisää tulostin;gnome-cups-manager.desktop]"
 
 #: ../shell/control-center.schemas.in.h:14
-msgid ""
-"if true, the control-center will close when a \"Common Task\" is activated."
-msgstr ""
-"jos tosi, hallintakeskus suljetaan, kun joku \"yleisistä tehtävistä\" "
-"käynnistetään."
+msgid "if true, the control-center will close when a \"Common Task\" is activated."
+msgstr "jos tosi, hallintakeskus suljetaan, kun joku \"yleisistä tehtävistä\" käynnistetään."
 
 #: ../shell/gnome-control-center.desktop.in.in.h:1
 msgid "Settings"
@@ -3433,6 +3280,14 @@
 msgid "Control Center"
 msgstr "Hallintakeskus"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Järjestelmän asetukset"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Kaikki asetukset"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Lykkää taukoa"
@@ -3459,12 +3314,8 @@
 
 #: ../typing-break/drwright.c:526
 #, c-format
-msgid ""
-"Unable to bring up the typing break properties dialog with the following "
-"error: %s"
-msgstr ""
-"Kirjoitustaukojen ominaisuusikkunan avaaminen ei onnistunut, sillä seuraava "
-"virhe tapahtui: %s"
+msgid "Unable to bring up the typing break properties dialog with the following error: %s"
+msgstr "Kirjoitustaukojen ominaisuusikkunan avaaminen ei onnistunut, sillä seuraava virhe tapahtui: %s"
 
 #: ../typing-break/drwright.c:543
 msgid "Written by Richard Hult <richard at imendio.com>"
@@ -3501,16 +3352,8 @@
 msgstr "Kirjoituksen tarkkailija"
 
 #: ../typing-break/main.c:105
-msgid ""
-"The typing monitor uses the notification area to display information. You "
-"don't seem to have a notification area on your panel. You can add it by "
-"right-clicking on your panel and choosing 'Add to panel', selecting "
-"'Notification area' and clicking 'Add'."
-msgstr ""
-"Kirjoituksen tarkkailimen viestit näkyvät ilmoitusalueessa, jota tällä "
-"hetkellä ei ole paneelissa. Voit lisätä ilmoitusalueen paneeliin "
-"napsauttamalla paneelia hiiren oikealla painikkeella ja valitsemalla \"Lisää "
-"paneeliin\" ja valitsemalla \"Ilmoitusalue\"."
+msgid "The typing monitor uses the notification area to display information. You don't seem to have a notification area on your panel. You can add it by right-clicking on your panel and choosing 'Add to panel', selecting 'Notification area' and clicking 'Add'."
+msgstr "Kirjoituksen tarkkailimen viestit näkyvät ilmoitusalueessa, jota tällä hetkellä ei ole paneelissa. Voit lisätä ilmoitusalueen paneeliin napsauttamalla paneelia hiiren oikealla painikkeella ja valitsemalla \"Lisää paneeliin\" ja valitsemalla \"Ilmoitusalue\"."
 
 #: ../font-viewer/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3529,25 +3372,20 @@
 msgstr "Jos tosi, Type1-kirjasimista luodaan pienoiskuvia."
 
 #: ../font-viewer/fontilus.schemas.in.h:5
-msgid ""
-"Set this key to the command used to create thumbnails for OpenType fonts."
-msgstr ""
-"Aseta tähän avaimeen komento, joka luo pienoiskuvia OpenType-kirjasimista."
+msgid "Set this key to the command used to create thumbnails for OpenType fonts."
+msgstr "Aseta tähän avaimeen komento, joka luo pienoiskuvia OpenType-kirjasimista."
 
 #: ../font-viewer/fontilus.schemas.in.h:6
 msgid "Set this key to the command used to create thumbnails for PCF fonts."
 msgstr "Aseta tähän avaimeen komento, joka luo pienoiskuvia PCF-kirjasimista."
 
 #: ../font-viewer/fontilus.schemas.in.h:7
-msgid ""
-"Set this key to the command used to create thumbnails for TrueType fonts."
-msgstr ""
-"Aseta tähän avaimeen komento, joka luo pienoiskuvia TrueType-kirjasimista."
+msgid "Set this key to the command used to create thumbnails for TrueType fonts."
+msgstr "Aseta tähän avaimeen komento, joka luo pienoiskuvia TrueType-kirjasimista."
 
 #: ../font-viewer/fontilus.schemas.in.h:8
 msgid "Set this key to the command used to create thumbnails for Type1 fonts."
-msgstr ""
-"Aseta tähän avaimeen komento, joka luo pienoiskuvia Type1-kirjasimista."
+msgstr "Aseta tähän avaimeen komento, joka luo pienoiskuvia Type1-kirjasimista."
 
 #: ../font-viewer/fontilus.schemas.in.h:9
 msgid "Thumbnail command for OpenType fonts"
@@ -3597,11 +3435,13 @@
 msgid "Size:"
 msgstr "Koko:"
 
-#: ../font-viewer/font-view.c:353 ../font-viewer/font-view.c:366
+#: ../font-viewer/font-view.c:353
+#: ../font-viewer/font-view.c:366
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../font-viewer/font-view.c:357 ../font-viewer/font-view.c:368
+#: ../font-viewer/font-view.c:357
+#: ../font-viewer/font-view.c:368
 msgid "Copyright:"
 msgstr "Tekijänoikeus:"
 
@@ -3661,183 +3501,124 @@
 
 #~ msgid "- GNOME Network Preferences"
 #~ msgstr "- GNOME verkon asetukset"
-
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr ""
 #~ "Valitse sisäänkirjauduttaessa käyttöön otettavat esteettömyysominaisuudet"
-
 #~ msgid "Edit"
 #~ msgstr "Muokkaa"
-
 #~ msgid "Fill screen"
 #~ msgstr "Täytä näyttö"
-
 #~ msgid "Interface"
 #~ msgstr "Käyttöliittymä"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "Valikot ja työkalupalkit"
-
 #~ msgid "Preview"
 #~ msgstr "Esikatselu"
-
 #~ msgid "Show _icons in menus"
 #~ msgstr "_Näytä kuvakkeet valikoissa"
-
 #~ msgid "Toolbar _button labels:"
 #~ msgstr "Työkalupalkkien _painikkeiden nimet:"
-
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "_Muokattavat valikoiden pikanäppäimet"
-
 #~ msgid "_File"
 #~ msgstr "_Tiedosto"
-
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "Liitä pikanäppäimiä komentoihin"
-
 #~ msgid "A_cceleration:"
 #~ msgstr "_Kiihtyvyys:"
-
 #~ msgid "_Selected layouts:"
 #~ msgstr "_Valitut asettelut:"
-
 #~ msgid "C_ontrol"
 #~ msgstr "C_ontrol"
-
 #~ msgid "key not found [%s]\n"
 #~ msgstr "avainta ei löydy [%s]\n"
-
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "Piilota käynnistettäessä (hyödyllinen kuoren esilataukseen)"
-
 #~ msgid "Filter"
 #~ msgstr "Suodata"
-
 #~ msgid "Groups"
 #~ msgstr "Ryhmät"
-
 #~ msgid "Common Tasks"
 #~ msgstr "Yleiset tehtävät"
-
 #~ msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 #~ msgstr "Abcdefghijklmnopqrsštuvwxyzåäö. 0123456789"
-
 #~ msgid "Your filter \"%s\" does not match any items."
 #~ msgstr "Suodattimesi ”%s” ei täsmää yhteenkään kohteeseen."
-
 #~ msgid "No matches found."
 #~ msgstr "Ei osumia."
-
 #~ msgid "Other"
 #~ msgstr "Muut"
-
 #~ msgid "Start %s"
 #~ msgstr "Käynnistä %s"
-
 #~ msgid "Help"
 #~ msgstr "Ohje"
-
 #~ msgid "Upgrade"
 #~ msgstr "Päivitä"
-
 #~ msgid "Uninstall"
 #~ msgstr "Poista asennus"
-
 #~ msgid "Remove from Favorites"
 #~ msgstr "Poista suosikeista"
-
 #~ msgid "Add to Favorites"
 #~ msgstr "Lisää suosikkeihin"
-
 #~ msgid "Remove from Startup Programs"
 #~ msgstr "Poista kirjautumisohjelmista"
-
 #~ msgid "Add to Startup Programs"
 #~ msgstr "Lisää käynnistettäviin ohjelmiin"
-
 #~ msgid "New Spreadsheet"
 #~ msgstr "Uusi laskentataulukko"
-
 #~ msgid "New Document"
 #~ msgstr "Uusi asiakirja"
-
 #~ msgid "Documents"
 #~ msgstr "Asiakirjat"
-
 #~ msgid "File System"
 #~ msgstr "Tiedostojärjestelmä"
-
 #~ msgid "Network Servers"
 #~ msgstr "Verkkopalvelimet"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>Avaa</b>"
-
 #~ msgid "Rename..."
 #~ msgstr "Nimeä uudelleen..."
-
 #~ msgid "Send To..."
 #~ msgstr "Lähetä..."
-
 #~ msgid "Move to Trash"
 #~ msgstr "Siirrä roskakoriin"
-
 #~ msgid "Delete"
 #~ msgstr "Poista"
-
 #~ msgid "Are you sure you want to permanently delete \"%s\"?"
 #~ msgstr "Haluatko varmasti poistaa pysyvästi kohteen \"%s\"?"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "Jos poistat kohdan, se hukataan pysyvästi."
-
 #~ msgid "Open with \"%s\""
 #~ msgstr "Avaa ohjelmalla ”%s”"
-
 #~ msgid "Open with Default Application"
 #~ msgstr "Avaa oletussovelluksella"
-
 #~ msgid "Open in File Manager"
 #~ msgstr "Avaa tiedostonhallinnassa"
-
 #~ msgid "?"
 #~ msgstr "?"
-
 #~ msgid "%l:%M %p"
 #~ msgstr "%l.%M %p"
-
 #~ msgid "Today %l:%M %p"
 #~ msgstr "Tänään %l.%M %p"
-
 #~ msgid "Yesterday %l:%M %p"
 #~ msgstr "Eilen %l.%M %p"
-
 #~ msgid "%a %l:%M %p"
 #~ msgstr "%a %l.%M %p"
-
 #~ msgid "%b %d %l:%M %p"
 #~ msgstr "%d. %bta %l.%M %p"
-
 #~ msgid "%b %d %Y"
 #~ msgstr "%d. %bta %Y"
-
 #~ msgid "Find Now"
 #~ msgstr "Etsi nyt"
-
 #~ msgid "<b>Open %s</b>"
 #~ msgstr "<b>Avaa %s</b>"
-
 #~ msgid "Remove from System Items"
 #~ msgstr "Poista järjestelmän kohdista"
-
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr ""
 #~ "Tuntematon kirjautumistunniste, käyttäjätietokanta voi olla vioittunut"
-
 #~ msgid "_Desktop Background"
 #~ msgstr "_Työpöydän tausta"
-
 #~ msgid ""
 #~ "<span size=\"large\"><b>No matches found.</b> </span><span>\n"
 #~ "\n"
@@ -3846,7 +3627,6 @@
 #~ "<span size=\"large\"><b>Osumia ei löytynyt.</b> </span><span>\n"
 #~ "\n"
 #~ "Suodattimesi \"<b>%s</b>\" ei täsmää yhteenkään kohtaan.</span>"
-
 #~ msgid ""
 #~ "Left thumb\n"
 #~ "Left middle finger\n"
@@ -3865,88 +3645,60 @@
 #~ "Oikea keskisormi\n"
 #~ "Oikea nimetön\n"
 #~ "Oikea pikkusormi"
-
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>Sähköposti</b>"
-
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>Koti</b>"
-
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>Työ</b>"
-
 #~ msgid "<b>Web</b>"
 #~ msgstr "<b>WWW</b>"
-
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>Työ</b>"
-
 #~ msgid "<span size=\"larger\" weight=\"bold\">Change your password</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">Vaihda salasanasi</span>"
-
 #~ msgid "<b>Assistive Technologies</b>"
 #~ msgstr "<b>Esteettömyysohjelmat</b>"
-
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>Asetukset</b>"
-
 #~ msgid "<b>C_olors</b>"
 #~ msgstr "<b>_Värit</b> "
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>Esikatselu</b>"
-
 #~ msgid "<b>_Desktop Background</b>"
 #~ msgstr "<b>Työpöydän tausta</b>"
-
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>Kimmonäppäimet</b>"
-
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>Yleisasetukset</b>"
-
 #~ msgid "<small><i>Fast</i></small>"
 #~ msgstr "<small><i>Nopea</i></small>"
-
 #~ msgid "<small><i>Long</i></small>"
 #~ msgstr "<small><i>Pitkä</i></small>"
-
 #~ msgid "<small><i>Short</i></small>"
 #~ msgstr "<small><i>Lyhyt</i></small>"
-
 #~ msgid "<small><i>Slow</i></small>"
 #~ msgstr "<small><i>Hidas</i></small>"
-
 #~ msgid "<b>Locate Pointer</b>"
 #~ msgstr "<b>Paikanna osoitin</b>"
-
 #~ msgid "<small><i>High</i></small>"
 #~ msgstr "<small><i>Korkea</i></small>"
-
 #~ msgid "<small><i>Large</i></small>"
 #~ msgstr "<small><i>Suuri</i></small>"
-
 #~ msgid "<small><i>Low</i></small>"
 #~ msgstr "<small><i>Matala</i></small>"
-
 #~ msgid "<small><i>Small</i></small>"
 #~ msgstr "<small><i>Pieni</i></small>"
-
 #~ msgid "<b>Ignore Host List</b>"
 #~ msgstr "<b>Luettelo ohitettavista verkkonimistä</b>"
-
 #~ msgid "C_ut"
 #~ msgstr "_Leikkaa"
-
 #~ msgid "New File"
 #~ msgstr "Uusi tiedosto"
-
 #~ msgid "Open File"
 #~ msgstr "Avaa tiedosto"
-
 #~ msgid "Save File"
 #~ msgstr "Tallenna tiedosto"
-
 #~ msgid ""
 #~ "Solid color\n"
 #~ "Horizontal gradient\n"
@@ -3955,7 +3707,6 @@
 #~ "Kiinteä väri\n"
 #~ "Vaakasuuntainen väriliuku\n"
 #~ "Pystysuuntainen väriliuku"
-
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -3966,7 +3717,6 @@
 #~ "Teksti kuvakkeen vieressä\n"
 #~ "Vain kuvakkeet\n"
 #~ "Vain teksti"
-
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -3979,25 +3729,18 @@
 #~ "Keskitä\n"
 #~ "Venytä\n"
 #~ "Täytä ruutu"
-
 #~ msgid "_Copy"
 #~ msgstr "_Kopioi"
-
 #~ msgid "_New"
 #~ msgstr "_Uusi"
-
 #~ msgid "_Open"
 #~ msgstr "_Avaa"
-
 #~ msgid "_Print"
 #~ msgstr "Tul_osta"
-
 #~ msgid "_Quit"
 #~ msgstr "_Lopeta"
-
 #~ msgid "_Save"
 #~ msgstr "_Tallenna"
-
 #~ msgid ""
 #~ "Normal\n"
 #~ "Left\n"
@@ -4008,15 +3751,12 @@
 #~ "Vasen\n"
 #~ "Oikea\n"
 #~ "Ylösalaisin\n"
-
 #~ msgid "Could not apply the selected configuration"
 #~ msgstr "Valittuja asetuksia ei voitu toteuttaa"
-
 #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR"
 #~ msgstr "Avainta org.gnome.SettingsDaemon.XRANDR ei saatu"
-
 #~ msgid "/_About"
 #~ msgstr "/_Tietoja"
-
 #~ msgid "_Command:"
 #~ msgstr "_Komento:"
+
--- po/fr.po
+++ po/fr.po
@@ -28,9 +28,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-28 09:39+0000\n"
-"PO-Revision-Date: 2010-04-29 19:37-0800\n"
-"Last-Translator: David Cicognani <david.cicognani at ptiglobal.net>\n"
+"POT-Creation-Date: 2010-06-08 20:19+0000\n"
+"PO-Revision-Date: 2010-06-08 14:09-0800\n"
+"Last-Translator: Martine <martine.landais at intel.com>\n"
 "Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3296,6 +3296,14 @@
 msgid "Control Center"
 msgstr "Centre de contrôle"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Paramètres du système"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Tous les paramètres"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Différer la pause"
@@ -3524,183 +3532,126 @@
 
 #~ msgid "- GNOME Network Preferences"
 #~ msgstr "- Préférences du réseau GNOME"
-
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr ""
 #~ "Choix des fonctionnalités d'accessibilité à activer au moment de la "
 #~ "connexion"
-
 #~ msgid "Edit"
 #~ msgstr "Édition"
-
 #~ msgid "Fill screen"
 #~ msgstr "Plein écran"
-
 #~ msgid "Interface"
 #~ msgstr "Interface"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "Menus et barres d'outils"
-
 #~ msgid "Preview"
 #~ msgstr "Aperçu"
-
 #~ msgid "Show _icons in menus"
 #~ msgstr "Afficher les _icônes dans les menus"
-
 #~ msgid "Toolbar _button labels:"
 #~ msgstr "É_tiquettes des boutons de la barre d'outils :"
-
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "_Raccourcis clavier des menus modifiables"
-
 #~ msgid "_File"
 #~ msgstr "_Fichier"
-
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "Assigner des raccourcis clavier aux commandes"
-
 #~ msgid "A_cceleration:"
 #~ msgstr "A_ccélération :"
-
 #~ msgid "_Selected layouts:"
 #~ msgstr "_Agencements sélectionnés :"
-
 #~ msgid "C_ontrol"
 #~ msgstr "C_trl"
-
 #~ msgid "key not found [%s]\n"
 #~ msgstr "touche non trouvée [%s]\n"
-
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "Masquer au démarrage (utile pour précharger le shell)"
-
 #~ msgid "Filter"
 #~ msgstr "Filtres"
-
 #~ msgid "Groups"
 #~ msgstr "Groupes"
-
 #~ msgid "Common Tasks"
 #~ msgstr "Tâches courantes"
-
 #~ msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 #~ msgstr ""
 #~ "Dès Noël où un zéphyr haï me vêt de glaçons würmiens je dîne d’exquis "
 #~ "rôtis de bœuf au kir à l’aÿ d’âge mûr & cætera ! 0123456789."
-
 #~ msgid "Your filter \"%s\" does not match any items."
 #~ msgstr "Votre filtre « %s » ne correspond à aucun élément."
-
 #~ msgid "No matches found."
 #~ msgstr "Aucune correspondance trouvée."
-
 #~ msgid "Other"
 #~ msgstr "Autre"
-
 #~ msgid "Start %s"
 #~ msgstr "Démarrer %s"
-
 #~ msgid "Help"
 #~ msgstr "Aide"
-
 #~ msgid "Upgrade"
 #~ msgstr "Mettre à jour"
-
 #~ msgid "Uninstall"
 #~ msgstr "Désinstaller"
-
 #~ msgid "Remove from Favorites"
 #~ msgstr "Enlever des favoris"
-
 #~ msgid "Add to Favorites"
 #~ msgstr "Ajouter aux favoris"
-
 #~ msgid "Remove from Startup Programs"
 #~ msgstr "Retirer des programmes au démarrage"
-
 #~ msgid "Add to Startup Programs"
 #~ msgstr "Ajouter aux programmes au démarrage"
-
 #~ msgid "New Spreadsheet"
 #~ msgstr "Nouvelle feuille de calcul"
-
 #~ msgid "New Document"
 #~ msgstr "Nouveau document"
-
 #~ msgid "Documents"
 #~ msgstr "Documents"
-
 #~ msgid "File System"
 #~ msgstr "Système de fichiers"
-
 #~ msgid "Network Servers"
 #~ msgstr "Serveurs réseau"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>Ouvrir</b>"
-
 #~ msgid "Rename..."
 #~ msgstr "Renommer..."
-
 #~ msgid "Send To..."
 #~ msgstr "Envoyer à..."
-
 #~ msgid "Move to Trash"
 #~ msgstr "Mettre à la corbeille"
-
 #~ msgid "Delete"
 #~ msgstr "Effacer"
-
 #~ msgid "Are you sure you want to permanently delete \"%s\"?"
 #~ msgstr "Voulez-vous vraiment supprimer définitivement « %s » ?"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "Si vous supprimez un élément, il sera perdu définitivement."
-
 #~ msgid "Open with \"%s\""
 #~ msgstr "Ouvrir avec « %s »"
-
 #~ msgid "Open with Default Application"
 #~ msgstr "Ouvrir avec l'application par défaut"
-
 #~ msgid "Open in File Manager"
 #~ msgstr "Ouvrir dans le gestionnaire de fichiers"
-
 #~ msgid "?"
 #~ msgstr "?"
-
 #~ msgid "%l:%M %p"
 #~ msgstr "%k:%M"
-
 #~ msgid "Today %l:%M %p"
 #~ msgstr "Aujourd'hui %k:%M"
-
 #~ msgid "Yesterday %l:%M %p"
 #~ msgstr "Hier %k:%M"
-
 #~ msgid "%a %l:%M %p"
 #~ msgstr "%a %k:%M"
-
 #~ msgid "%b %d %l:%M %p"
 #~ msgstr "%d %b %k:%M"
-
 #~ msgid "%b %d %Y"
 #~ msgstr "%d %b %Y"
-
 #~ msgid "Find Now"
 #~ msgstr "Rechercher maintenant"
-
 #~ msgid "<b>Open %s</b>"
 #~ msgstr "<b>Ouvrir %s</b>"
-
 #~ msgid "Remove from System Items"
 #~ msgstr "Supprimer parmi les éléments systèmes"
-
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr ""
 #~ "Identifiant de connexion inconnu. La base de données des utilisateurs est "
 #~ "peut-être corrompue"
-
 #~ msgid "_Desktop Background"
 #~ msgstr "Arrière-plan du _bureau"
+
--- po/it.po
+++ po/it.po
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.28.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 09:43+0000\n"
-"PO-Revision-Date: 2010-04-08 12:18+0100\n"
-"Last-Translator: Lorenzo <lorenzo.gennaro at ptiglobal.net>\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-14 19:06-0800\n"
+"Last-Translator: francesca godani <francesca.godani at ptiglobal.net>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -211,7 +211,7 @@
 
 #: ../capplets/about-me/gnome-about-me.c:746
 #: ../capplets/appearance/appearance-desktop.c:659
-#: ../capplets/appearance/cc-background-page.c:1168
+#: ../capplets/appearance/cc-background-page.c:1171
 msgid "Images"
 msgstr "Immagini"
 
@@ -239,20 +239,12 @@
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplets/about-me/gnome-about-me.c:1018
-#: ../capplets/appearance/appearance-main.c:150
 #: ../capplets/display/xrandr-capplet.c:2436
-#: ../capplets/keyboard/gnome-keyboard-properties.c:243
-#: ../capplets/mouse/gnome-mouse-properties.c:599
-#: ../capplets/network/gnome-network-properties.c:1380
 msgid "ID of the socket to embed in"
 msgstr "ID del socket da incorporare"
 
 #: ../capplets/about-me/gnome-about-me.c:1019
-#: ../capplets/appearance/appearance-main.c:151
 #: ../capplets/display/xrandr-capplet.c:2437
-#: ../capplets/keyboard/gnome-keyboard-properties.c:244
-#: ../capplets/mouse/gnome-mouse-properties.c:600
-#: ../capplets/network/gnome-network-properties.c:1381
 msgid "socket"
 msgstr "socket"
 
@@ -819,12 +811,12 @@
 # (ndt) wallpaper ancora?
 # io metto 'sfondo'
 #: ../capplets/appearance/appearance-desktop.c:628
-#: ../capplets/appearance/cc-background-page.c:1133
+#: ../capplets/appearance/cc-background-page.c:1136
 msgid "Add Wallpaper"
 msgstr "Aggiungi sfondo"
 
 #: ../capplets/appearance/appearance-desktop.c:663
-#: ../capplets/appearance/cc-background-page.c:1173
+#: ../capplets/appearance/cc-background-page.c:1176
 msgid "All files"
 msgstr "Tutti i file"
 
@@ -862,7 +854,7 @@
 msgstr "Usa carattere selezionato"
 
 #: ../capplets/appearance/appearance-main.c:54
-#: ../capplets/appearance/cc-background-page.c:1414
+#: ../capplets/appearance/cc-background-page.c:1417
 #: ../capplets/appearance/cc-font-details-dialog.c:408
 #: ../capplets/appearance/cc-font-page.c:458
 #: ../capplets/appearance/cc-theme-customize-dialog.c:1203
@@ -871,35 +863,35 @@
 #: ../capplets/display/cc-display-minimal-page.c:609
 #: ../capplets/keyboard/cc-keyboard-page.c:129
 #: ../capplets/keyboard/cc-shortcuts-page.c:1844
-#: ../capplets/network/cc-network-proxy-page.c:1287
-#: ../capplets/power/cc-power-panel.c:367
+#: ../capplets/network/cc-network-proxy-page.c:1285
+#: ../capplets/power/cc-power-panel.c:374
 #, c-format
 msgid "Could not load user interface file: %s"
 msgstr "Impossibile caricare il file dell'interfaccia utente: %s"
 
-#: ../capplets/appearance/appearance-main.c:134
+#: ../capplets/appearance/appearance-main.c:133
 msgid "Specify the filename of a theme to install"
 msgstr "Specifica il nome di file di un tema da installare"
 
-#: ../capplets/appearance/appearance-main.c:135
+#: ../capplets/appearance/appearance-main.c:134
 msgid "filename"
 msgstr "NOME_FILE"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:142
+#: ../capplets/appearance/appearance-main.c:141
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "Specifica il nome della pagina da mostrare (theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:143
+#: ../capplets/appearance/appearance-main.c:142
 #: ../capplets/default-applications/gnome-da-capplet.c:962
-#: ../capplets/mouse/gnome-mouse-properties.c:592
+#: ../capplets/mouse/gnome-mouse-properties.c:614
 msgid "page"
 msgstr "PAGINA"
 
 # FIXME
 # (ndt) non dovrebbe essere sparito wallpaper?
 # io metto sfondo
-#: ../capplets/appearance/appearance-main.c:158
+#: ../capplets/appearance/appearance-main.c:149
 msgid "[WALLPAPER...]"
 msgstr "[SFONDO...]"
 
@@ -1056,7 +1048,7 @@
 msgid "No Desktop Background"
 msgstr "Nessuno sfondo per la scrivania"
 
-#: ../capplets/appearance/cc-background-page.c:1575
+#: ../capplets/appearance/cc-background-page.c:1578
 #: ../capplets/appearance/data/appearance.ui.h:2
 msgid "Background"
 msgstr "Sfondo"
@@ -2071,20 +2063,20 @@
 msgid "- GNOME Display Preferences"
 msgstr "- GNOME Preferenze dello schermo"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:219
-#: ../capplets/keyboard/gnome-keyboard-properties.c:224
+#: ../capplets/keyboard/gnome-keyboard-properties.c:205
+#: ../capplets/keyboard/gnome-keyboard-properties.c:210
 msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "Applica le impostazioni ed esce (solo compatibilità; ora gestita dal demone)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:229
+#: ../capplets/keyboard/gnome-keyboard-properties.c:215
 msgid "Start the page with the typing break settings showing"
 msgstr "Avviare mostrando la pagina delle proprietà delle impostazioni per le pause di digitazione"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:234
+#: ../capplets/keyboard/gnome-keyboard-properties.c:220
 msgid "Start the page with the accessibility settings showing"
 msgstr "Avviare mostrando la pagina delle proprietà delle impostazioni di accessibilità"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:250
+#: ../capplets/keyboard/gnome-keyboard-properties.c:225
 msgid "- GNOME Keyboard Preferences"
 msgstr "- Preferenze tastiera di GNOME"
 
@@ -2393,7 +2385,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Opzioni di disposizione tastiera"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -2537,7 +2529,7 @@
 msgid "Set your keyboard preferences"
 msgstr "Imposta le preferenze della tastiera"
 
-#: ../capplets/mouse/cc-pointer-panel.c:95
+#: ../capplets/mouse/cc-pointer-panel.c:102
 msgid "Pointing Devices"
 msgstr "Dispositivi di puntamento"
 
@@ -2572,11 +2564,11 @@
 msgstr "Disabilitato"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/mouse/gnome-mouse-properties.c:591
+#: ../capplets/mouse/gnome-mouse-properties.c:613
 msgid "Specify the name of the page to show (general|accessibility)"
 msgstr "Specifica il nome della pagina da mostrare (general|accessibility)"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:604
+#: ../capplets/mouse/gnome-mouse-properties.c:618
 msgid "- GNOME Mouse Preferences"
 msgstr "- Preferenze mouse di GNOME"
 
@@ -2735,36 +2727,33 @@
 msgid "Set your mouse preferences"
 msgstr "Imposta le preferenze del mouse"
 
-#: ../capplets/network/cc-network-panel.c:139
+#: ../capplets/network/cc-network-panel.c:114
 msgid "Network"
 msgstr "Network"
 
 # (ndt) se non ricordo male si era usato 'postazione'
 # per lo strumento di rete di GNOME
-#: ../capplets/network/cc-network-proxy-page.c:753
-#: ../capplets/network/cc-network-proxy-page.c:919
+#: ../capplets/network/cc-network-proxy-page.c:751
+#: ../capplets/network/cc-network-proxy-page.c:917
 #: ../capplets/network/gnome-network-properties.c:701
 #: ../capplets/network/gnome-network-properties.c:852
 msgid "New Location..."
 msgstr "Nuova postazione..."
 
-#: ../capplets/network/cc-network-proxy-page.c:887
+#: ../capplets/network/cc-network-proxy-page.c:885
 #: ../capplets/network/gnome-network-properties.c:818
 msgid "Location already exists"
 msgstr "La postazione esiste già"
 
-#: ../capplets/network/cc-network-proxy-page.c:1306
+#. Locations
+#: ../capplets/network/cc-network-proxy-page.c:1305
 msgid "Delete Location"
 msgstr "Elimina postazione"
 
-#: ../capplets/network/cc-network-proxy-page.c:1546
+#: ../capplets/network/cc-network-proxy-page.c:1545
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../capplets/network/gnome-network-properties.c:1386
-msgid "- GNOME Network Preferences"
-msgstr "- Preferenzedi rete di GNOME"
-
 #: ../capplets/network/gnome-network-properties.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy di rete"
@@ -2920,28 +2909,27 @@
 msgid "Unknown error"
 msgstr "Erroe sconosciuto"
 
-#: ../capplets/security/cc-security-panel.c:153
+#: ../capplets/security/cc-security-panel.c:154
 msgid "Sorry, the passwords do not match"
 msgstr "Spiacenti, le password non corrispondono"
 
-#: ../capplets/security/cc-security-panel.c:178
+#: ../capplets/security/cc-security-panel.c:179
 msgid "The new password is now saved"
 msgstr "La nuova password è stata dalvata"
 
-#: ../capplets/security/cc-security-panel.c:209
+#: ../capplets/security/cc-security-panel.c:210
 msgid "Sorry, the password could not be changed"
 msgstr "Impossibile cambiare la password"
 
-#: ../capplets/security/cc-security-panel.c:441
+#: ../capplets/security/cc-security-panel.c:445
 msgid "Sorry, that password is incorrect"
 msgstr "Questa password non è corretta"
 
-#: ../capplets/security/cc-security-panel.c:496
+#: ../capplets/security/cc-security-panel.c:500
 msgid "Security"
 msgstr "Protezione"
 
 #: ../capplets/security/security.desktop.in.in.h:1
-#: ../capplets/security/security.ui.h:7
 msgid "Security and passwords"
 msgstr "Protezione e password"
 
@@ -2966,20 +2954,19 @@
 msgstr "Salva nuova password"
 
 #: ../capplets/power/power-properties.desktop.in.in.h:1
-#: ../capplets/power/cc-power-panel.c:442
-#: ../capplets/power/power.ui.h:2
+#: ../capplets/power/cc-power-panel.c:455
 msgid "Power and brightness"
 msgstr "Power e luminosità"
 
 #. TRANSLATORS: texts below idle/sleep scales
-#: ../capplets/power/cc-power-panel.c:98
+#: ../capplets/power/cc-power-panel.c:97
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: ../capplets/power/cc-power-panel.c:103
+#: ../capplets/power/cc-power-panel.c:102
 msgid "Never"
 msgstr "Mai"
 
@@ -2987,31 +2974,31 @@
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: ../capplets/power/power.ui.h:3
+#: ../capplets/power/power.ui.h:2
 msgid "Put computer to sleep when inactive for:"
 msgstr "Metti il computer in stop qualndo è inattivo da:"
 
-#: ../capplets/power/power.ui.h:4
+#: ../capplets/power/power.ui.h:3
 msgid "Set computer as idle when inactive for:"
 msgstr "Metti il computer in stato inattivo quando è fermo da"
 
-#: ../capplets/power/power.ui.h:5
+#: ../capplets/power/power.ui.h:4
 msgid "Sleep"
 msgstr "Stop"
 
-#: ../capplets/power/power.ui.h:6
+#: ../capplets/power/power.ui.h:5
 msgid "This will blank the screen and set your messaging state to 'away'."
 msgstr "Questo renderà lo schermo vuoto e imposterà il tuo messaggio di stato su 'via'."
 
-#: ../capplets/power/power.ui.h:7
+#: ../capplets/power/power.ui.h:6
 msgid "This will suspend everything on your computer. It'll wake up in just the same state as it was before."
 msgstr "Questa operazione sospenderà qualsiasi attività sul computer. Quando si sveglierà, sarà nello stesso stato in cui era prima."
 
-#: ../capplets/power/power.ui.h:8
+#: ../capplets/power/power.ui.h:7
 msgid "To change your brightness, you can use the keys on your computer."
 msgstr "Per modificare la luminosità, puoi utilizzare i tasti sul computer."
 
-#: ../capplets/power/power.ui.h:9
+#: ../capplets/power/power.ui.h:8
 msgid "ldle"
 msgstr "Inattivo"
 
@@ -3413,6 +3400,14 @@
 msgid "Control Center"
 msgstr "Centro di controllo"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Impostazioni del sistema"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Impostazioni"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Posponi pausa"
@@ -3621,8 +3616,11 @@
 msgid "Error parsing arguments: %s\n"
 msgstr "Errore nell'analizzare gli argomenti: %s\n"
 
+#~ msgid "- GNOME Network Preferences"
+#~ msgstr "- Preferenzedi rete di GNOME"
+
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr "Sceglie quali funzioni di accessibilità abilitare all'accesso"
+
 #~ msgid "Edit"
 #~ msgstr "Modifica"
-
--- po/ja.po
+++ po/ja.po
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 21:51+0000\n"
-"PO-Revision-Date: 2010-05-17 16:24-0800\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-14 15:11-0800\n"
 "Last-Translator: \n"
 "Language-Team: Japanese <gnome-translation at gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
@@ -29,15 +29,15 @@
 
 #: ../gnome-control-center.schemas.in.h:2
 msgid "More backgrounds URL"
-msgstr "背景を入手できるURL"
+msgstr "背景を入手できる URL"
 
 #: ../gnome-control-center.schemas.in.h:3
 msgid "More themes URL"
-msgstr "テーマを入手できるURL"
+msgstr "テーマを入手できる URL"
 
 #: ../gnome-control-center.schemas.in.h:4
 msgid "Set this to your current location name. This is used to determine the appropriate network proxy configuration."
-msgstr "これを現在の場所の名前にセットしてください。適切なネットワーク・プロキシの設定を決定するのに使われます。"
+msgstr "これを現在の場所の名前にセットしてください。適切なネットワーク・プロキシーの設定を決定するのに使われます。"
 
 #: ../gnome-control-center.schemas.in.h:5
 msgid "URL for where to get more desktop backgrounds. If set to an empty string the link will not appear."
@@ -225,7 +225,7 @@
 "Evolution Data Server can't handle the protocol"
 msgstr ""
 "アドレス帳の情報を取得する際にエラーが発生しました。\n"
-"Evolution データ・サーバでは扱えないプロトコルです。"
+"Evolution データサーバーでは扱えないプロトコルです。"
 
 #: ../capplets/about-me/gnome-about-me.c:930
 msgid "Unable to open address book"
@@ -253,15 +253,15 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:1
 msgid "A_IM/iChat:"
-msgstr "AIM/iChat(_I):"
+msgstr "AIM/iChat(_I):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:2
 msgid "A_ddress:"
-msgstr "住所(_D):"
+msgstr "住所(_D):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:3
 msgid "A_ssistant:"
-msgstr "アシスタント(_S):"
+msgstr "アシスタント(_S):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:4
 #: ../capplets/about-me/gnome-about-me.desktop.in.in.h:1
@@ -274,15 +274,15 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:6
 msgid "C_ity:"
-msgstr "市(_I):"
+msgstr "市(_I):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:7
 msgid "C_ompany:"
-msgstr "会社(_O):"
+msgstr "会社(_O):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:8
 msgid "Cale_ndar:"
-msgstr "カレンダ(_N):"
+msgstr "カレンダー(_N):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:9
 msgid "Change Passwo_rd..."
@@ -290,11 +290,11 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:10
 msgid "Ci_ty:"
-msgstr "市(_T):"
+msgstr "市(_T):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:11
 msgid "Co_untry:"
-msgstr "国(_U):"
+msgstr "国(_U):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:12
 msgid "Contact"
@@ -302,7 +302,7 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:13
 msgid "Cou_ntry:"
-msgstr "国(_N):"
+msgstr "国(_N):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:14
 msgid "Disable _Fingerprint Login..."
@@ -323,7 +323,7 @@
 #. Home vs Work (phone)
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:19
 msgid "Hom_e:"
-msgstr "自宅(_E):"
+msgstr "自宅(_E):"
 
 #. Home vs Work (address)
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:21
@@ -332,7 +332,7 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:22
 msgid "IC_Q:"
-msgstr "ICQ(_Q):"
+msgstr "ICQ(_Q):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:23
 msgid "Instant Messaging"
@@ -344,15 +344,15 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:25
 msgid "M_SN:"
-msgstr "MSN(_S):"
+msgstr "MSN(_S):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:26
 msgid "P.O. _box:"
-msgstr "郵便番号(_B):"
+msgstr "郵便番号(_B):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:27
 msgid "P._O. box:"
-msgstr "郵便番号(_O):"
+msgstr "郵便番号(_O):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:28
 msgid "Personal Info"
@@ -364,7 +364,7 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:30
 msgid "State/Pro_vince:"
-msgstr "県/州(_V):"
+msgstr "県/州(_V):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:31
 msgid "Telephone"
@@ -372,19 +372,20 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:32
 msgid "User name:"
-msgstr "ユーザ名:"
+msgstr "ユーザー名:"
 
+# should stay in ENU
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:33
 msgid "Web"
-msgstr "ウェブ"
+msgstr "Web"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:34
 msgid "Web _log:"
-msgstr "ブログ(_L):"
+msgstr "ブログ(_L):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:35
 msgid "Wor_k:"
-msgstr "仕事(_K):"
+msgstr "仕事(_K):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:36
 msgid "Work"
@@ -392,68 +393,68 @@
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:37
 msgid "Work _fax:"
-msgstr "仕事の FAX 番号(_F):"
+msgstr "仕事の FAX 番号(_F):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:38
 msgid "Zip/_Postal code:"
-msgstr "郵便番号(_P):"
+msgstr "郵便番号(_P):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:39
 msgid "_Address:"
-msgstr "住所(_A):"
+msgstr "住所(_A):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:40
 msgid "_Department:"
-msgstr "担当部署(_D):"
+msgstr "担当部署(_D):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:41
 msgid "_Groupwise:"
-msgstr "Groupwise(_G):"
+msgstr "Groupwise(_G):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:42
 msgid "_Home page:"
-msgstr "ホームページ(_H):"
+msgstr "ホームページ(_H):"
 
 #. Home vs Work (email)
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:44
 msgid "_Home:"
-msgstr "自宅(_H):"
+msgstr "自宅(_H):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:45
 msgid "_Jabber:"
-msgstr "Jabber(_J):"
+msgstr "Jabber(_J):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:46
 msgid "_Manager:"
-msgstr "マネージャ(_M):"
+msgstr "マネージャ(_M):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:47
 msgid "_Mobile:"
-msgstr "携帯(_M):"
+msgstr "携帯(_M):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:48
 msgid "_Profession:"
-msgstr "職業(_P):"
+msgstr "職業(_P):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:49
 msgid "_State/Province:"
-msgstr "県/州(_S):"
+msgstr "県/州(_S):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:50
 msgid "_Title:"
-msgstr "役職(_T):"
+msgstr "役職(_T):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:51
 msgid "_Work:"
-msgstr "仕事(_W):"
+msgstr "仕事(_W):"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:52
 msgid "_Yahoo:"
-msgstr "Yahoo(_Y):"
+msgstr "_Yahoo:"
 
 #: ../capplets/about-me/gnome-about-me-dialog.ui.h:53
 msgid "_Zip/Postal code:"
-msgstr "郵便番号(_Z):"
+msgstr "郵便番号(_Z):"
 
 #: ../capplets/about-me/gnome-about-me.desktop.in.in.h:2
 msgid "Set your personal information"
@@ -594,12 +595,12 @@
 #: ../capplets/about-me/gnome-about-me-password.c:296
 #, c-format
 msgid "Could not shutdown backend_stdin IO channel: %s"
-msgstr "バックエンドの標準入力 IO チャンネルを終了できませんでした: %s"
+msgstr "バックエンドの標準入力 IO チャンネルを終了できませんでした:%s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:309
 #, c-format
 msgid "Could not shutdown backend_stdout IO channel: %s"
-msgstr "バックエンドの標準出力 IO チャンネルを終了できませんでした: %s"
+msgstr "バックエンドの標準出力 IO チャンネルを終了できませんでした:%s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:408
 msgid "Authenticated!"
@@ -629,7 +630,7 @@
 #: ../capplets/about-me/gnome-about-me-password.c:533
 #, c-format
 msgid "System error: %s."
-msgstr "システム・エラーです: %s"
+msgstr "システムエラーです:%s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:536
 msgid "The password is too short."
@@ -655,7 +656,7 @@
 #: ../capplets/about-me/gnome-about-me-password.c:818
 #, c-format
 msgid "Unable to launch %s: %s"
-msgstr "%s を起動できません: %s"
+msgstr "%s を起動できません:%s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:822
 msgid "Unable to launch backend"
@@ -663,7 +664,7 @@
 
 #: ../capplets/about-me/gnome-about-me-password.c:823
 msgid "A system error has occurred"
-msgstr "システム・エラーが発生しました"
+msgstr "システムエラーが発生しました"
 
 #. Update status message
 #: ../capplets/about-me/gnome-about-me-password.c:843
@@ -676,12 +677,12 @@
 
 #: ../capplets/about-me/gnome-about-me-password.c:933
 msgid "Please type your password in the <b>New password</b> field."
-msgstr "パスワードを<b>新しいパスワード</b>のエントリに入力して下さい。"
+msgstr "パスワードを<b>新しいパスワード</b>のエントリーに入力して下さい。"
 
 #: ../capplets/about-me/gnome-about-me-password.c:936
 #: ../capplets/about-me/gnome-about-me-password.ui.h:5
 msgid "Please type your password again in the <b>Retype new password</b> field."
-msgstr "もう一度パスワードを<b>新しいパスワードの確認</b>エントリに入力して下さい。"
+msgstr "もう一度パスワードを<b>新しいパスワードの確認</b>エントリーに入力して下さい。"
 
 #: ../capplets/about-me/gnome-about-me-password.c:939
 msgid "The two passwords are not equal."
@@ -702,14 +703,14 @@
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:4
 msgid "Current _password:"
-msgstr "現在のパスワード(_P):"
+msgstr "現在のパスワード(_P):"
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:6
 msgid ""
 "To change your password, enter your current password in the field below and click <b>Authenticate</b>.\n"
 "After you have authenticated, enter your new password, retype it for verification and click <b>Change password</b>."
 msgstr ""
-"パスワードを変更する場合は、この下のエントリに現在のパスワードを入力して<b>認証</b>ボタンをクリックして下さい。\n"
+"パスワードを変更する場合は、この下のエントリーに現在のパスワードを入力して<b>認証</b>ボタンをクリックして下さい。\n"
 "認証後に新しいパスワードを入力し、もう一度パスワードを入力して妥当性を検証してから<b>パスワードの変更</b>ボタンをクリックして下さい。"
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:8
@@ -718,15 +719,15 @@
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:9
 msgid "_New password:"
-msgstr "新しいパスワード(_N):"
+msgstr "新しいパスワード(_N):"
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:10
 msgid "_Retype new password:"
-msgstr "パスワードの確認(_R):"
+msgstr "パスワードの確認(_R):"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:1
 msgid "Accessible Lo_gin"
-msgstr "アクセシビリティ対応のログイン(_G)"
+msgstr "アクセシビリティー対応のログイン(_G)"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:2
 msgid "Assistive Technologies"
@@ -750,15 +751,15 @@
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:7
 msgid "Jump to the Accessible Login dialog"
-msgstr "アクセシビリティ対応のログイン・ダイアログを開きます"
+msgstr "アクセシビリティー対応のログインダイアログを開きます"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:8
 msgid "Jump to the Keyboard Accessibility dialog"
-msgstr "キーボードのアクセシビリティを設定します"
+msgstr "キーボードのアクセシビリティーを設定します"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:9
 msgid "Jump to the Mouse Accessibility dialog"
-msgstr "マウスのアクセシビリティを設定します"
+msgstr "マウスのアクセシビリティーを設定します"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:10
 msgid "Preferences"
@@ -770,11 +771,11 @@
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:12
 msgid "_Keyboard Accessibility"
-msgstr "キーボードのアクセシビリティ(_K)"
+msgstr "キーボードのアクセシビリティー(_K)"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:13
 msgid "_Mouse Accessibility"
-msgstr "マウスのアクセシビリティ(_M)"
+msgstr "マウスのアクセシビリティー(_M)"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:14
 msgid "_Preferred Applications"
@@ -843,11 +844,11 @@
 #: ../capplets/power/cc-power-panel.c:374
 #, c-format
 msgid "Could not load user interface file: %s"
-msgstr "ユーザ・インタフェース・ファイルを読み込めませんでした: %s"
+msgstr "ユーザ・インタフェース・ファイルを読み込めませんでした:%s"
 
 #: ../capplets/appearance/appearance-main.c:133
 msgid "Specify the filename of a theme to install"
-msgstr "インストールするテーマ・ファイルを指定する"
+msgstr "インストールするテーマファイルを指定する"
 
 #: ../capplets/appearance/appearance-main.c:134
 msgid "filename"
@@ -887,7 +888,7 @@
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1646
 #, c-format
 msgid "This theme will not look as intended because the required GTK+ theme engine '%s' is not installed."
-msgstr "このテーマを利用するには、別途 '%s' というウィンドウ・マネージャのテーマが必要です。"
+msgstr "このテーマを利用するには、別途 '%s' というウィンドウマネージャのテーマが必要です。"
 
 #: ../capplets/appearance/appearance-themes.c:673
 #: ../capplets/appearance/cc-theme-page.c:779
@@ -988,7 +989,7 @@
 msgstr ""
 "<b>%s</b>\n"
 "%s, %s\n"
-"フォルダ: %s"
+"フォルダー:%s"
 
 #. translators: <b>wallpaper name</b>
 #. * Image missing
@@ -1004,7 +1005,7 @@
 msgstr ""
 "<b>%s</b>\n"
 "%s\n"
-"フォルダ: %s"
+"フォルダー:%s"
 
 #: ../capplets/appearance/cc-background-item.c:259
 #: ../capplets/appearance/gnome-wp-item.c:296
@@ -1076,7 +1077,7 @@
 
 #: ../capplets/appearance/data/appearance.ui.h:5
 msgid "C_olors:"
-msgstr "色(_O):"
+msgstr "色(_O):"
 
 #: ../capplets/appearance/data/appearance.ui.h:6
 msgid "C_ustomize..."
@@ -1088,7 +1089,7 @@
 
 #: ../capplets/appearance/data/appearance.ui.h:8
 msgid "Changing your cursor theme takes effect the next time you log in."
-msgstr "次回ログインするまで変更したカーソル・テーマは提供されません。"
+msgstr "次回ログインするまで変更したカーソルテーマは提供されません。"
 
 #: ../capplets/appearance/data/appearance.ui.h:9
 msgid "Colors"
@@ -1104,7 +1105,7 @@
 
 #: ../capplets/appearance/data/appearance.ui.h:13
 msgid "Des_ktop font:"
-msgstr "デスクトップ(_K):"
+msgstr "デスクトップ(_K):"
 
 #: ../capplets/appearance/data/appearance.ui.h:15
 msgid "Fonts"
@@ -1253,24 +1254,24 @@
 
 #: ../capplets/appearance/data/appearance.ui.h:54
 msgid "_Application font:"
-msgstr "アプリケーション(_A):"
+msgstr "アプリケーション(_A):"
 
 #. pixel order blue, green, red
 #: ../capplets/appearance/data/appearance.ui.h:56
 msgid "_BGR"
-msgstr "BGR(_B)"
+msgstr "_BGR"
 
 #: ../capplets/appearance/data/appearance.ui.h:57
 msgid "_Description:"
-msgstr "説明(_D):"
+msgstr "説明(_D):"
 
 #: ../capplets/appearance/data/appearance.ui.h:58
 msgid "_Document font:"
-msgstr "ドキュメント(_D):"
+msgstr "ドキュメント(_D):"
 
 #: ../capplets/appearance/data/appearance.ui.h:59
 msgid "_Fixed width font:"
-msgstr "固定幅のフォント(_F):"
+msgstr "固定幅のフォント(_F):"
 
 #: ../capplets/appearance/data/appearance.ui.h:60
 msgid "_Full"
@@ -1278,7 +1279,7 @@
 
 #: ../capplets/appearance/data/appearance.ui.h:61
 msgid "_Input boxes:"
-msgstr "入力ボックス(_I):"
+msgstr "入力ボックス(_I):"
 
 #: ../capplets/appearance/data/appearance.ui.h:62
 msgid "_Install..."
@@ -1295,7 +1296,7 @@
 #: ../capplets/appearance/data/appearance.ui.h:65
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:44
 msgid "_Name:"
-msgstr "名前(_N):"
+msgstr "名前(_N):"
 
 #: ../capplets/appearance/data/appearance.ui.h:66
 msgid "_None"
@@ -1304,7 +1305,7 @@
 #. pixel order red, green, blue
 #: ../capplets/appearance/data/appearance.ui.h:68
 msgid "_RGB"
-msgstr "RGB(_R)"
+msgstr "_RGB"
 
 #: ../capplets/appearance/data/appearance.ui.h:69
 msgid "_Reset to Defaults"
@@ -1312,11 +1313,11 @@
 
 #: ../capplets/appearance/data/appearance.ui.h:70
 msgid "_Selected items:"
-msgstr "選択したアイテム(_S):"
+msgstr "選択したアイテム(_S):"
 
 #: ../capplets/appearance/data/appearance.ui.h:71
 msgid "_Size:"
-msgstr "サイズ(_S):"
+msgstr "サイズ(_S):"
 
 #: ../capplets/appearance/data/appearance.ui.h:72
 msgid "_Slight"
@@ -1324,24 +1325,24 @@
 
 #: ../capplets/appearance/data/appearance.ui.h:73
 msgid "_Style:"
-msgstr "スタイル(_S):"
+msgstr "スタイル(_S):"
 
 #: ../capplets/appearance/data/appearance.ui.h:74
 msgid "_Tooltips:"
-msgstr "ツールチップ(_T):"
+msgstr "ツールチップ(_T):"
 
 #. vertical hinting, pixel order red, green, blue
 #: ../capplets/appearance/data/appearance.ui.h:76
 msgid "_VRGB"
-msgstr "VRGB(_V)"
+msgstr "_VRGB"
 
 #: ../capplets/appearance/data/appearance.ui.h:77
 msgid "_Window title font:"
-msgstr "ウィンドウのタイトル(_W):"
+msgstr "ウィンドウのタイトル(_W):"
 
 #: ../capplets/appearance/data/appearance.ui.h:78
 msgid "_Windows:"
-msgstr "ウィンドウ(_W):"
+msgstr "ウィンドゥ(_W):"
 
 #: ../capplets/appearance/data/appearance.ui.h:79
 msgid "dots per inch"
@@ -1353,7 +1354,7 @@
 
 #: ../capplets/appearance/data/gnome-theme-installer.desktop.in.in.h:1
 msgid "Installs themes packages for various parts of the desktop"
-msgstr "デスクトップのさまざまな部分に適用するテーマ・パッケージをインストールします"
+msgstr "デスクトップのさまざまな部分に適用するテーマパッケージをインストールします"
 
 #: ../capplets/appearance/data/gnome-theme-installer.desktop.in.in.h:2
 msgid "Theme Installer"
@@ -1361,7 +1362,7 @@
 
 #: ../capplets/appearance/data/gnome-theme-package.xml.in.h:1
 msgid "Gnome Theme Package"
-msgstr "GNOME のテーマ・パッケージ"
+msgstr "GNOME のテーマパッケージ"
 
 #: ../capplets/appearance/theme-installer.c:178
 #: ../capplets/appearance/theme-installer.c:234
@@ -1371,7 +1372,7 @@
 #: ../capplets/appearance/theme-installer.c:180
 #, c-format
 msgid "The %s utility is not installed."
-msgstr "%s というユーティリティがインストールされていません。"
+msgstr "%s というユーティリティーがインストールされていません。"
 
 #: ../capplets/appearance/theme-installer.c:236
 msgid "There was a problem while extracting the theme."
@@ -1389,7 +1390,7 @@
 #: ../capplets/appearance/theme-installer.c:266
 #, c-format
 msgid "\"%s\" does not appear to be a valid theme. It may be a theme engine which you need to compile."
-msgstr "\"%s\" はテーマとして妥当なファイルではないようです (おそらくコンパイルが必要なテーマ・エンジンと思われます)。"
+msgstr "\"%s\" はテーマとして妥当なファイルではないようです (おそらくコンパイルが必要なテーマエンジンと思われます)。"
 
 #: ../capplets/appearance/theme-installer.c:372
 #, c-format
@@ -1428,7 +1429,7 @@
 
 #: ../capplets/appearance/theme-installer.c:643
 msgid "No theme file location specified to install"
-msgstr "インストールするテーマ・ファイルのパス名が指定されていません"
+msgstr "インストールするテーマファイルのパス名が指定されていません"
 
 #: ../capplets/appearance/theme-installer.c:667
 #, c-format
@@ -1457,7 +1458,7 @@
 
 #: ../capplets/appearance/theme-util.c:258
 msgid "Could not install theme engine"
-msgstr "テーマ・エンジンをインストールできません"
+msgstr "テーマエンジンをインストールできません"
 
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:1
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:17
@@ -1504,7 +1505,7 @@
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:1
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:1
 msgid "Accessibility"
-msgstr "アクセシビリティ"
+msgstr "アクセシビリティー"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:3
 #, no-c-format
@@ -1514,15 +1515,15 @@
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:4
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:5
 msgid "C_ommand:"
-msgstr "コマンド(_O):"
+msgstr "コマンド(_O):"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:5
 msgid "Co_mmand:"
-msgstr "コマンド(_M):"
+msgstr "コマンド(_M):"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:6
 msgid "E_xecute flag:"
-msgstr "起動オプション(_X):"
+msgstr "起動オプション(_X):"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:7
 msgid "Image Viewer"
@@ -1578,15 +1579,15 @@
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:21
 msgid "Terminal Emulator"
-msgstr "端末エミュレータ"
+msgstr "端末エミュレーター"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:22
 msgid "Text Editor"
-msgstr "テキスト・エディタ"
+msgstr "テキストエディター"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:23
 msgid "Video Player"
-msgstr "ビデオ・プレイヤー"
+msgstr "ビデオプレイヤー"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:24
 msgid "Visual"
@@ -1594,7 +1595,7 @@
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:25
 msgid "Web Browser"
-msgstr "ウェブ・ブラウザ"
+msgstr "Web ブラウザー"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.ui.h:26
 msgid "_Run at start"
@@ -2284,7 +2285,7 @@
 msgid "Keyboard Layout Options"
 msgstr "キーボード・レイアウトのオプション"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -3283,6 +3284,15 @@
 msgid "Control Center"
 msgstr "コントロール・センター"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "システム設定"
+
+# translation "all other settings entries" to fit in the UI situation. If it results in truncation, "all settings" 全設定項目(_A) can be used.
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "その他すべての設定項目(_A)"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "中断を延長する(_P)"
--- po/ko.po
+++ po/ko.po
@@ -10,9 +10,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 09:43+0000\n"
-"PO-Revision-Date: 2010-04-08 13:37-0700\n"
-"Last-Translator: KC Lee <kushylee at yahoo.com>\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-15 22:30-0800\n"
+"Last-Translator: GLSKOR_SunKim <sunx.kim at intel.com>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers at lists.kldp.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -218,7 +218,7 @@
 
 #: ../capplets/about-me/gnome-about-me.c:746
 #: ../capplets/appearance/appearance-desktop.c:659
-#: ../capplets/appearance/cc-background-page.c:1168
+#: ../capplets/appearance/cc-background-page.c:1171
 msgid "Images"
 msgstr "그림"
 
@@ -246,20 +246,12 @@
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplets/about-me/gnome-about-me.c:1018
-#: ../capplets/appearance/appearance-main.c:150
 #: ../capplets/display/xrandr-capplet.c:2436
-#: ../capplets/keyboard/gnome-keyboard-properties.c:243
-#: ../capplets/mouse/gnome-mouse-properties.c:599
-#: ../capplets/network/gnome-network-properties.c:1380
 msgid "ID of the socket to embed in"
 msgstr "내장될 소켓 ID"
 
 #: ../capplets/about-me/gnome-about-me.c:1019
-#: ../capplets/appearance/appearance-main.c:151
 #: ../capplets/display/xrandr-capplet.c:2437
-#: ../capplets/keyboard/gnome-keyboard-properties.c:244
-#: ../capplets/mouse/gnome-mouse-properties.c:600
-#: ../capplets/network/gnome-network-properties.c:1381
 msgid "socket"
 msgstr "소켓"
 
@@ -805,12 +797,12 @@
 msgstr "유니버설 액세스"
 
 #: ../capplets/appearance/appearance-desktop.c:628
-#: ../capplets/appearance/cc-background-page.c:1133
+#: ../capplets/appearance/cc-background-page.c:1136
 msgid "Add Wallpaper"
 msgstr "바탕 무늬 추가"
 
 #: ../capplets/appearance/appearance-desktop.c:663
-#: ../capplets/appearance/cc-background-page.c:1173
+#: ../capplets/appearance/cc-background-page.c:1176
 msgid "All files"
 msgstr "모든 파일"
 
@@ -844,7 +836,7 @@
 msgstr "선택한 글꼴 사용"
 
 #: ../capplets/appearance/appearance-main.c:54
-#: ../capplets/appearance/cc-background-page.c:1414
+#: ../capplets/appearance/cc-background-page.c:1417
 #: ../capplets/appearance/cc-font-details-dialog.c:408
 #: ../capplets/appearance/cc-font-page.c:458
 #: ../capplets/appearance/cc-theme-customize-dialog.c:1203
@@ -853,32 +845,32 @@
 #: ../capplets/display/cc-display-minimal-page.c:609
 #: ../capplets/keyboard/cc-keyboard-page.c:129
 #: ../capplets/keyboard/cc-shortcuts-page.c:1844
-#: ../capplets/network/cc-network-proxy-page.c:1287
-#: ../capplets/power/cc-power-panel.c:367
+#: ../capplets/network/cc-network-proxy-page.c:1285
+#: ../capplets/power/cc-power-panel.c:374
 #, c-format
 msgid "Could not load user interface file: %s"
 msgstr "사용자 인터페이스 파일을 읽어들일 수 없습니다: %s"
 
-#: ../capplets/appearance/appearance-main.c:134
+#: ../capplets/appearance/appearance-main.c:133
 msgid "Specify the filename of a theme to install"
 msgstr "설치할 테마 이름을 지정하십시오"
 
-#: ../capplets/appearance/appearance-main.c:135
+#: ../capplets/appearance/appearance-main.c:134
 msgid "filename"
 msgstr "파일 이름"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:142
+#: ../capplets/appearance/appearance-main.c:141
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "보여줄 페이지 이름을 지정합니다 (theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:143
+#: ../capplets/appearance/appearance-main.c:142
 #: ../capplets/default-applications/gnome-da-capplet.c:962
-#: ../capplets/mouse/gnome-mouse-properties.c:592
+#: ../capplets/mouse/gnome-mouse-properties.c:614
 msgid "page"
 msgstr "탭이름"
 
-#: ../capplets/appearance/appearance-main.c:158
+#: ../capplets/appearance/appearance-main.c:149
 msgid "[WALLPAPER...]"
 msgstr "[바탕그림...]"
 
@@ -1029,7 +1021,7 @@
 msgid "No Desktop Background"
 msgstr "바탕 화면 배경 없음"
 
-#: ../capplets/appearance/cc-background-page.c:1575
+#: ../capplets/appearance/cc-background-page.c:1578
 #: ../capplets/appearance/data/appearance.ui.h:2
 msgid "Background"
 msgstr "배경"
@@ -1979,20 +1971,20 @@
 msgid "- GNOME Display Preferences"
 msgstr "- GNOME 디스플레이 사용자 설정"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:219
-#: ../capplets/keyboard/gnome-keyboard-properties.c:224
+#: ../capplets/keyboard/gnome-keyboard-properties.c:205
+#: ../capplets/keyboard/gnome-keyboard-properties.c:210
 msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "설정을 적용하고 마칩니다 (호환성; 이제 데몬이 처리합니다)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:229
+#: ../capplets/keyboard/gnome-keyboard-properties.c:215
 msgid "Start the page with the typing break settings showing"
 msgstr "타이핑 휴식 설정을 보여주는 페이지로 시작합니다"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:234
+#: ../capplets/keyboard/gnome-keyboard-properties.c:220
 msgid "Start the page with the accessibility settings showing"
 msgstr "접근성 설정을 보여주는 페이지로 시작합니다"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:250
+#: ../capplets/keyboard/gnome-keyboard-properties.c:225
 msgid "- GNOME Keyboard Preferences"
 msgstr "- 키보드 설정"
 
@@ -2297,7 +2289,7 @@
 msgid "Keyboard Layout Options"
 msgstr "키보드 배치 옵션"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -2431,7 +2423,7 @@
 msgid "Set your keyboard preferences"
 msgstr "키보드를 설정합니다"
 
-#: ../capplets/mouse/cc-pointer-panel.c:95
+#: ../capplets/mouse/cc-pointer-panel.c:102
 msgid "Pointing Devices"
 msgstr "포인팅 장치"
 
@@ -2466,11 +2458,11 @@
 msgstr "사용 않음"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/mouse/gnome-mouse-properties.c:591
+#: ../capplets/mouse/gnome-mouse-properties.c:613
 msgid "Specify the name of the page to show (general|accessibility)"
 msgstr "보여줄 페이지 이름을 지정합니다 (general|accessibility)"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:604
+#: ../capplets/mouse/gnome-mouse-properties.c:618
 msgid "- GNOME Mouse Preferences"
 msgstr "- 그놈 마우스 기본 설정"
 
@@ -2626,34 +2618,31 @@
 msgid "Set your mouse preferences"
 msgstr "마우스 기본 설정을 설정합니다"
 
-#: ../capplets/network/cc-network-panel.c:139
+#: ../capplets/network/cc-network-panel.c:114
 msgid "Network"
 msgstr "네트워크"
 
-#: ../capplets/network/cc-network-proxy-page.c:753
-#: ../capplets/network/cc-network-proxy-page.c:919
+#: ../capplets/network/cc-network-proxy-page.c:751
+#: ../capplets/network/cc-network-proxy-page.c:917
 #: ../capplets/network/gnome-network-properties.c:701
 #: ../capplets/network/gnome-network-properties.c:852
 msgid "New Location..."
 msgstr "새 위치(_N)..."
 
-#: ../capplets/network/cc-network-proxy-page.c:887
+#: ../capplets/network/cc-network-proxy-page.c:885
 #: ../capplets/network/gnome-network-properties.c:818
 msgid "Location already exists"
 msgstr "위치가 이미 있습니다"
 
-#: ../capplets/network/cc-network-proxy-page.c:1306
+#. Locations
+#: ../capplets/network/cc-network-proxy-page.c:1305
 msgid "Delete Location"
 msgstr "위치 삭제"
 
-#: ../capplets/network/cc-network-proxy-page.c:1546
+#: ../capplets/network/cc-network-proxy-page.c:1545
 msgid "Proxy"
 msgstr "프록시"
 
-#: ../capplets/network/gnome-network-properties.c:1386
-msgid "- GNOME Network Preferences"
-msgstr "- GNOME 네트워크 사용자 설정"
-
 #: ../capplets/network/gnome-network-properties.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "네트워크 프록시"
@@ -2806,28 +2795,27 @@
 msgid "Unknown error"
 msgstr "알 수 없는 오류"
 
-#: ../capplets/security/cc-security-panel.c:153
+#: ../capplets/security/cc-security-panel.c:154
 msgid "Sorry, the passwords do not match"
 msgstr "죄송합니다. 암호가 일치하지 않습니다."
 
-#: ../capplets/security/cc-security-panel.c:178
+#: ../capplets/security/cc-security-panel.c:179
 msgid "The new password is now saved"
 msgstr "새 암호가 저장되었습니다."
 
-#: ../capplets/security/cc-security-panel.c:209
+#: ../capplets/security/cc-security-panel.c:210
 msgid "Sorry, the password could not be changed"
 msgstr "죄송합니다. 암호를 변경하지 못했습니다."
 
-#: ../capplets/security/cc-security-panel.c:441
+#: ../capplets/security/cc-security-panel.c:445
 msgid "Sorry, that password is incorrect"
 msgstr "죄송합니다. 암호가 올바르지 않습니다."
 
-#: ../capplets/security/cc-security-panel.c:496
+#: ../capplets/security/cc-security-panel.c:500
 msgid "Security"
 msgstr "보안"
 
 #: ../capplets/security/security.desktop.in.in.h:1
-#: ../capplets/security/security.ui.h:7
 msgid "Security and passwords"
 msgstr "보안 및 암호"
 
@@ -2852,19 +2840,18 @@
 msgstr "새 암호 저장"
 
 #: ../capplets/power/power-properties.desktop.in.in.h:1
-#: ../capplets/power/cc-power-panel.c:442
-#: ../capplets/power/power.ui.h:2
+#: ../capplets/power/cc-power-panel.c:455
 msgid "Power and brightness"
 msgstr "전원 및 밝기"
 
 #. TRANSLATORS: texts below idle/sleep scales
-#: ../capplets/power/cc-power-panel.c:98
+#: ../capplets/power/cc-power-panel.c:97
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 분"
 
-#: ../capplets/power/cc-power-panel.c:103
+#: ../capplets/power/cc-power-panel.c:102
 msgid "Never"
 msgstr "결코"
 
@@ -2872,31 +2859,31 @@
 msgid "Brightness"
 msgstr "밝기"
 
-#: ../capplets/power/power.ui.h:3
+#: ../capplets/power/power.ui.h:2
 msgid "Put computer to sleep when inactive for:"
 msgstr "컴퓨터를 잠든 상태로 둘 경우:"
 
-#: ../capplets/power/power.ui.h:4
+#: ../capplets/power/power.ui.h:3
 msgid "Set computer as idle when inactive for:"
 msgstr "컴퓨터를 유휴 상태로 둘 경우:"
 
-#: ../capplets/power/power.ui.h:5
+#: ../capplets/power/power.ui.h:4
 msgid "Sleep"
 msgstr "절전 모드"
 
-#: ../capplets/power/power.ui.h:6
+#: ../capplets/power/power.ui.h:5
 msgid "This will blank the screen and set your messaging state to 'away'."
 msgstr "이것은 화면이 꺼지고 메시지 상태를 '자리에 없음'으로 설정합니다."
 
-#: ../capplets/power/power.ui.h:7
+#: ../capplets/power/power.ui.h:6
 msgid "This will suspend everything on your computer. It'll wake up in just the same state as it was before."
 msgstr "이것은 컴퓨터의 모든 것을 중지시킵니다. 전과 똑같은 상태로 깨어납니다."
 
-#: ../capplets/power/power.ui.h:8
+#: ../capplets/power/power.ui.h:7
 msgid "To change your brightness, you can use the keys on your computer."
 msgstr "밝기를 변경하려면 컴퓨터의 키를 사용할 수 있습니다."
 
-#: ../capplets/power/power.ui.h:9
+#: ../capplets/power/power.ui.h:8
 msgid "ldle"
 msgstr "유휴"
 
@@ -3295,6 +3282,14 @@
 msgid "Control Center"
 msgstr "그놈 제어판"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "시스템 설정"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "모든 설정(_A)"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "휴식 시간 미루기(_P)"
@@ -3501,74 +3496,54 @@
 msgid "Error parsing arguments: %s\n"
 msgstr "인자 파싱하는 데 오류: %s\n"
 
+#~ msgid "- GNOME Network Preferences"
+#~ msgstr "- GNOME 네트워크 사용자 설정"
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr "로그인할 때 어느 접근성 기능을 사용할 지 선택"
-
 #~ msgid "Edit"
 #~ msgstr "편집"
-
 #~ msgid "Fill screen"
 #~ msgstr "전체 화면"
-
 #~ msgid "Interface"
 #~ msgstr "모양새"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "메뉴와 도구 모음"
-
 #~ msgid "Preview"
 #~ msgstr "미리 보기"
-
 #~ msgid "Show _icons in menus"
 #~ msgstr "메뉴에 아이콘 보이기(_I)"
-
 #~ msgid "Toolbar _button labels:"
 #~ msgstr "도구모음 단추 레이블(_B):"
-
 #~ msgid "_Desktop Background"
 #~ msgstr "바탕 화면 배경(_D)"
-
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "메뉴 바로 가기 키 편집 가능(_E)"
-
 #~ msgid "_File"
 #~ msgstr "파일(_F)"
-
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "명령어에 단축 키를 지정합니다"
-
 #~ msgid "A_cceleration:"
 #~ msgstr "가속(_C):"
-
 #~ msgid "Layout _Options..."
 #~ msgstr "키 배치 옵션(_O)..."
-
 #~ msgid "_Selected layouts:"
 #~ msgstr "선택한 키 배치(_S):"
-
 #~ msgid "C_ontrol"
 #~ msgstr "C_ontrol"
-
 #~ msgid "key not found [%s]\n"
 #~ msgstr "[%s]키를 찾을 수 없습니다\n"
-
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "시작할 때 감추기 (셸을 미리 읽어들이는데 유용함)"
-
 #~ msgid "Filter"
 #~ msgstr "필터"
-
 #~ msgid "Groups"
 #~ msgstr "모음"
-
 #~ msgid "Common Tasks"
 #~ msgstr "일반 작업"
-
 #~ msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 #~ msgstr ""
 #~ "키스의 고유 조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다. "
 #~ "0123456789"
-
 #~ msgid ""
 #~ "<span size=\"large\"><b>No matches found.</b> </span><span>\n"
 #~ "\n"
@@ -3577,112 +3552,76 @@
 #~ "<span size=\"large\"><b>일치하는 것이 없습니다.</b> </span><span>\n"
 #~ "\n"
 #~ " 필터 \"<b>%s</b>\"(은)는 일치하는 항목이 없습니다.</span>"
-
 #~ msgid "Other"
 #~ msgstr "기타"
-
 #~ msgid "<b>Start %s</b>"
 #~ msgstr "<b>%s 시작</b>"
-
 #~ msgid "Help"
 #~ msgstr "도움말"
-
 #~ msgid "Upgrade"
 #~ msgstr "업그레이드"
-
 #~ msgid "Uninstall"
 #~ msgstr "설치 취소"
-
 #~ msgid "Remove from Favorites"
 #~ msgstr "즐겨찾기에서 제거"
-
 #~ msgid "Add to Favorites"
 #~ msgstr "즐겨찾기에 추가"
-
 #~ msgid "Remove from Startup Programs"
 #~ msgstr "시작 프로그램에서 제거"
-
 #~ msgid "Add to Startup Programs"
 #~ msgstr "시작 프로그램에 추가"
-
 #~ msgid "New Spreadsheet"
 #~ msgstr "새 스프레드시트"
-
 #~ msgid "New Document"
 #~ msgstr "새 문서"
-
 #~ msgid "Documents"
 #~ msgstr "문서"
-
 #~ msgid "File System"
 #~ msgstr "파일 시스템"
-
 #~ msgid "Network Servers"
 #~ msgstr "네트워크 서버"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>열기</b>"
-
 #~ msgid "Rename..."
 #~ msgstr "이름 바꾸기..."
-
 #~ msgid "Send To..."
 #~ msgstr "보내기..."
-
 #~ msgid "Move to Trash"
 #~ msgstr "휴지통에 버리기"
-
 #~ msgid "Delete"
 #~ msgstr "삭제"
-
 #~ msgid "Are you sure you want to permanently delete \"%s\"?"
 #~ msgstr "정말로 \"%s\"을(를) 완전히 삭제하시겠습니까?"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "항목을 삭제하면 영영 잃어버리게 됩니다."
-
 #~ msgid "<b>Open with \"%s\"</b>"
 #~ msgstr "<b>\"%s\"(으)로 열기</b>"
-
 #~ msgid "Open with Default Application"
 #~ msgstr "기본 프로그램으로 열기"
-
 #~ msgid "Open in File Manager"
 #~ msgstr "파일관리자에서 열기"
-
 #~ msgid "?"
 #~ msgstr "?"
-
 #~ msgid "%l:%M %p"
 #~ msgstr "%p %l:%M"
-
 #~ msgid "Today %l:%M %p"
 #~ msgstr "오늘 %p %l:%M"
-
 #~ msgid "Yesterday %l:%M %p"
 #~ msgstr "어제 %p %l:%M"
-
 #~ msgid "%a %l:%M %p"
 #~ msgstr "(%a) %p %l:%M"
-
 #~ msgid "%b %d %l:%M %p"
 #~ msgstr "%b %d일 %p %l:%M"
-
 #~ msgid "%b %d %Y"
 #~ msgstr "%Y년 %b %d일"
-
 #~ msgid "Find Now"
 #~ msgstr "지금 찾기"
-
 #~ msgid "<b>Open %s</b>"
 #~ msgstr "<b>%s(으)로 열기</b>"
-
 #~ msgid "Remove from System Items"
 #~ msgstr "시스템 항목에서 제거"
-
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr "알 수 없는 로그인 ID, 사용자 데이터베이스가 손상되었습니다"
-
 #~ msgid ""
 #~ "Left thumb\n"
 #~ "Left middle finger\n"
@@ -3701,52 +3640,36 @@
 #~ "오른쪽 중지\n"
 #~ "오른쪽 약지\n"
 #~ "오른쪽 새끼 손가락"
-
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>전자 메일</b>"
-
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>집</b>"
-
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>직장</b>"
-
 #~ msgid "<b>Web</b>"
 #~ msgstr "<b>웹</b>"
-
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>직장</b>"
-
 #~ msgid "<span size=\"larger\" weight=\"bold\">Change your password</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">암호 바꾸기</span>"
-
 #~ msgid "<b>Assistive Technologies</b>"
 #~ msgstr "<b>보조 기술</b>"
-
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>기본 설정</b>"
-
 #~ msgid "<b>C_olors</b>"
 #~ msgstr "<b>바탕 화면 색(_O)</b> "
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>미리 보기</b>"
-
 #~ msgid "<b>_Desktop Background</b>"
 #~ msgstr "<b>바탕 화면 배경(_D)</b>"
-
 #~ msgid "C_ut"
 #~ msgstr "잘라내기(_U)"
-
 #~ msgid "New File"
 #~ msgstr "새 파일"
-
 #~ msgid "Open File"
 #~ msgstr "파일 열기"
-
 #~ msgid "Save File"
 #~ msgstr "파일 저장"
-
 #~ msgid ""
 #~ "Solid color\n"
 #~ "Horizontal gradient\n"
@@ -3755,7 +3678,6 @@
 #~ "단색\n"
 #~ "가로 방향 그라데이션\n"
 #~ "세로 방향 그라데이션"
-
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -3766,7 +3688,6 @@
 #~ "아이콘 옆에 텍스트\n"
 #~ "아이콘만\n"
 #~ "텍스트만"
-
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -3779,28 +3700,20 @@
 #~ "가운데\n"
 #~ "확대\n"
 #~ "화면 채우기"
-
 #~ msgid "_Copy"
 #~ msgstr "복사(_C)"
-
 #~ msgid "_New"
 #~ msgstr "새로 만들기(_N)"
-
 #~ msgid "_Open"
 #~ msgstr "열기(_O)"
-
 #~ msgid "_Print"
 #~ msgstr "인쇄(_P)"
-
 #~ msgid "_Quit"
 #~ msgstr "끝내기(_Q)"
-
 #~ msgid "_Save"
 #~ msgstr "저장(_S)"
-
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<b>시각 기술</b>"
-
 #~ msgid ""
 #~ "Normal\n"
 #~ "Left\n"
@@ -3811,275 +3724,192 @@
 #~ "왼쪽\n"
 #~ "오른쪽\n"
 #~ "위-아래\n"
-
 #~ msgid "Could not apply the selected configuration"
 #~ msgstr "선택한 설정을 적용할 수 없습니다"
-
 #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR"
 #~ msgstr "org.gnome.SettingsDaemon.XRANDR 값을 읽어 올 수 없습니다"
-
 #~ msgid "_Command:"
 #~ msgstr "명령(_C):"
-
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>탄력 키</b>"
-
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>일반</b>"
-
 #~ msgid "<b>Slow Keys</b>"
 #~ msgstr "<b>느린 키</b>"
-
 #~ msgid "<b>Sticky Keys</b>"
 #~ msgstr "<b>고정 키</b>"
-
 #~ msgid "<small><i>Fast</i></small>"
 #~ msgstr "<small><i>빠르게</i></small>"
-
 #~ msgid "<small><i>Long</i></small>"
 #~ msgstr "<small><i>길게</i></small>"
-
 #~ msgid "<small><i>Short</i></small>"
 #~ msgstr "<small><i>짧게</i></small>"
-
 #~ msgid "<small><i>Slow</i></small>"
 #~ msgstr "<small><i>느리게</i></small>"
-
 #~ msgid "<b>Locate Pointer</b>"
 #~ msgstr "<b>포인터 찾기</b>"
-
 #~ msgid "<small><i>High</i></small>"
 #~ msgstr "<small><i>높게</i></small>"
-
 #~ msgid "<small><i>Large</i></small>"
 #~ msgstr "<small><i>크게</i></small>"
-
 #~ msgid "<small><i>Low</i></small>"
 #~ msgstr "<small><i>낮게</i></small>"
-
 #~ msgid "<small><i>Small</i></small>"
 #~ msgstr "<small><i>작게</i></small>"
-
 #~ msgid "<b>Ignore Host List</b>"
 #~ msgstr "<b>무시할 호스트 목록</b>"
-
 #~ msgid "/_About"
 #~ msgstr "/정보(_A)"
-
 #~ msgid "<b>_Wallpaper</b>"
 #~ msgstr "<b>바탕 화면 무늬(_W)</b>"
-
 #~ msgid "No Wallpaper"
 #~ msgstr "바탕 무늬 없음"
-
 #~ msgid "Screen Resolution"
 #~ msgstr "화면 해상도"
-
 #~ msgid "Monitor Resolution Settings"
 #~ msgstr "모니터 해상도 설정"
-
 #~ msgid "Retrieve and store legacy settings"
 #~ msgstr "물려받은 설정을 되찾아서 저장합니다"
-
 #~ msgid "Enable sound and associate sounds with events"
 #~ msgstr "사운드를 사용하고 사운드를 이벤트와 연결합니다"
-
 #~ msgid "Unknown Volume Control %d"
 #~ msgstr "알 수 없는 볼륨 컨트롤 %d"
-
 #~ msgid "Failed to construct test pipeline for '%s'"
 #~ msgstr "'%s'에 대한 테스트 파이프라인을 만드는 데 실패했습니다."
-
 #~ msgid "Not connected"
 #~ msgstr "연결되지 않음"
-
 #~ msgid "Autodetect"
 #~ msgstr "자동 인식"
-
 #~ msgid "ALSA - Advanced Linux Sound Architecture"
 #~ msgstr "ALSA - 고급 리눅스 사운드 구조"
-
 #~ msgid "Artsd - ART Sound Daemon"
 #~ msgstr "Artsd - ART 사운드 데몬"
-
 #~ msgid "ESD - Enlightened Sound Daemon"
 #~ msgstr "ESD - Enlightened 사운드 데몬"
-
 #~ msgid "OSS - Open Sound System"
 #~ msgstr "OSS - 오픈 사운드 시스템"
-
 #~ msgid "PulseAudio Sound Server"
 #~ msgstr "PulseAudio 사운드 서버"
-
 #~ msgid "Silence"
 #~ msgstr "조용히"
-
 #~ msgid "- GNOME Sound Preferences"
 #~ msgstr "- 사운드 기본 설정"
-
 #~ msgid "<b>Alerts and Sound Effects</b>"
 #~ msgstr "<b>알림 및 사운드 이벤트</b>"
-
 #~ msgid "<b>Audio Conferencing</b>"
 #~ msgstr "<b>음성 회의</b>"
-
 #~ msgid "<b>Default Mixer Tracks</b>"
 #~ msgstr "<b>기본 믹서 트랙</b>"
-
 #~ msgid "<b>Music and Movies</b>"
 #~ msgstr "<b>음악 및 동영상</b>"
-
 #~ msgid "<b>Sound Events</b>"
 #~ msgstr "<b>사운드 이벤트</b>"
-
 #~ msgid "<b>Sound Theme</b>"
 #~ msgstr "<b>사운드 테마</b>"
-
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Testing...</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">테스트하는 중...</span>"
-
 #~ msgid "Click OK to finish."
 #~ msgstr "마치려면 확인을 누르십시오."
-
 #~ msgid "Play _alert sound"
 #~ msgstr "알림 사운드 재생(_A)"
-
 #~ msgid "Play _sound effects when buttons are clicked"
 #~ msgstr "단추를 누르면 효과음 재생(_S)"
-
 #~ msgid "S_ound playback:"
 #~ msgstr "소리 재생(_O):"
-
 #~ msgid ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
 #~ msgstr ""
 #~ "키보드로 조정할 장치와 트랙을 선택합니다. 여러 트랙을 한꺼번에 조정하려면 "
 #~ "Shift와 Control 키를 사용해 여러 트랙을 선택하십시오."
-
 #~ msgid "So_und playback:"
 #~ msgstr "소리 재생(_U):"
-
 #~ msgid "Sou_nd capture:"
 #~ msgstr "소리 캡쳐(_N):"
-
 #~ msgid "Sound Preferences"
 #~ msgstr "사운드 기본 설정"
-
 #~ msgid "Sounds"
 #~ msgstr "소리"
-
 #~ msgid "Test"
 #~ msgstr "테스트"
-
 #~ msgid "Testing Pipeline"
 #~ msgstr "파이프라인 테스트"
-
 #~ msgid "_Device:"
 #~ msgstr "장치(_D):"
-
 #~ msgid "_Play alerts and sound effects"
 #~ msgstr "알림 및 효과음 재생(_P)"
-
 #~ msgid "_Sound playback:"
 #~ msgstr "소리 재생(_S):"
 #~ msgctxt "Sound event"
-
 #~ msgid "Alert sound"
 #~ msgstr "알림 사운드"
 #~ msgctxt "Sound event"
-
 #~ msgid "Windows and Buttons"
 #~ msgstr "창 및 단추"
 #~ msgctxt "Sound event"
-
 #~ msgid "Button clicked"
 #~ msgstr "단추 누름"
 #~ msgctxt "Sound event"
-
 #~ msgid "Toggle button clicked"
 #~ msgstr "토글 단추 누름"
 #~ msgctxt "Sound event"
-
 #~ msgid "Window maximized"
 #~ msgstr "창 최대화"
 #~ msgctxt "Sound event"
-
 #~ msgid "Window unmaximized"
 #~ msgstr "창 최대화 해제"
 #~ msgctxt "Sound event"
-
 #~ msgid "Window minimised"
 #~ msgstr "창 최소화"
 #~ msgctxt "Sound event"
-
 #~ msgid "Desktop"
 #~ msgstr "바탕 화면"
 #~ msgctxt "Sound event"
-
 #~ msgid "Login"
 #~ msgstr "로그인"
 #~ msgctxt "Sound event"
-
 #~ msgid "Logout"
 #~ msgstr "로그아웃"
 #~ msgctxt "Sound event"
-
 #~ msgid "New e-mail"
 #~ msgstr "새 메일"
 #~ msgctxt "Sound event"
-
 #~ msgid "Empty trash"
 #~ msgstr "휴지통 비우기"
 #~ msgctxt "Sound event"
-
 #~ msgid "Long action completed (download, CD burning, etc.)"
 #~ msgstr "오래 걸리는 동작 완료 (다운로드, CD 굽기 등)"
 #~ msgctxt "Sound event"
-
 #~ msgid "Alerts"
 #~ msgstr "알림"
 #~ msgctxt "Sound event"
-
 #~ msgid "Information or question"
 #~ msgstr "정보 혹은 물음"
 #~ msgctxt "Sound event"
-
 #~ msgid "Warning"
 #~ msgstr "경고"
 #~ msgctxt "Sound event"
-
 #~ msgid "Error"
 #~ msgstr "오류"
 #~ msgctxt "Sound event"
-
 #~ msgid "Battery warning"
 #~ msgstr "배터리 경고"
-
 #~ msgid "Testing event sound"
 #~ msgstr "이벤트 사운드 검사"
-
 #~ msgid "Select Sound File"
 #~ msgstr "사운드 파일 선택"
-
 #~ msgid "Sound files"
 #~ msgstr "사운드 파일"
-
 #~ msgid "Custom..."
 #~ msgstr "사용자 설정..."
-
 #~ msgid "Lock Screen"
 #~ msgstr "화면 잠그기"
-
 #~ msgid "Logout"
 #~ msgstr "로그아웃"
-
 #~ msgid "Shutdown"
 #~ msgstr "끄기"
-
 #~ msgid "Enable support for GNOME assistive technologies at login"
 #~ msgstr "로그인할 때 그놈 보조 기술 기능을 사용합니다."
-
 #~ msgid ""
 #~ "Centered\n"
 #~ "Fill screen\n"
@@ -4092,144 +3922,103 @@
 #~ "크기 조정\n"
 #~ "확대\n"
 #~ "타일"
-
 #~ msgid ""
 #~ "%s is the path where the theme files will be installed. This can not be "
 #~ "selected as the source location"
 #~ msgstr ""
 #~ "%s은(는) 테마 파일이 설치될 경로입니다. 이 경로는 소스 위치로 선택할 수 없"
 #~ "습니다"
-
 #~ msgid "Just apply settings and quit"
 #~ msgstr "설정을 적용하고 마칩니다"
-
 #~ msgid "Connecting..."
 #~ msgstr "연결중..."
-
 #~ msgid "Inverted"
 #~ msgstr "반전"
-
 #~ msgid "Screen %d Settings\n"
 #~ msgstr "화면 %d 설정\n"
-
 #~ msgid "Screen Resolution Preferences"
 #~ msgstr "화면 해상도 설정"
-
 #~ msgid "_Make default for this computer (%s) only"
 #~ msgstr "이 컴퓨터(%s)의 경우에만 기본값으로 만들기(_M)"
-
 #~ msgid ""
 #~ "Testing the new settings. If you don't respond in %d second the previous "
 #~ "settings will be restored."
-
 #~ msgid_plural ""
 #~ "Testing the new settings. If you don't respond in %d seconds the previous "
 #~ "settings will be restored."
 #~ msgstr[0] ""
 #~ "새로운 설정을 테스트합니다. %d초 이내에 응답하지 않으면 이전 설정으로 다"
 #~ "시 돌아갑니다."
-
 #~ msgid "Keep Resolution"
 #~ msgstr "이 해상도 계속 사용"
-
 #~ msgid "Do you want to keep this resolution?"
 #~ msgstr "이 해상도를 계속 사용하시겠습니까?"
-
 #~ msgid "Use _Previous Resolution"
 #~ msgstr "이전 해상도 사용(_P)"
-
 #~ msgid "_Keep Resolution"
 #~ msgstr "이 해상도 계속 사용(_K)"
-
 #~ msgid ""
 #~ "The X server does not support the XRandR extension.  Runtime resolution "
 #~ "changes to the display size are not available."
 #~ msgstr ""
 #~ "X 서버가 XRandR 확장 기능을 지원하지 않습니다.  실행 중에 화면 크기를 바"
 #~ "꿀 수 없습니다."
-
 #~ msgid ""
 #~ "The version of the XRandR extension is incompatible with this program. "
 #~ "Runtime changes to the display size are not available."
 #~ msgstr ""
 #~ "XRandR 확장 기능의 버전이 이 프로그램과 호환되지 않습니다. 실행 중에 해상"
 #~ "도를 바꿀 수 없습니다."
-
 #~ msgid "New accelerator..."
 #~ msgstr "새 바로 가기 키..."
-
 #~ msgid "Error setting new accelerator in configuration database: %s\n"
 #~ msgstr "설정 데이터 베이스에서 새로운 단축키 설정 오류: %s\n"
-
 #~ msgid "Keyboard Accessibility Notifications"
 #~ msgstr "키보드 접근성 알림"
-
 #~ msgid "_Layouts:"
 #~ msgstr "키 배치(_L):"
-
 #~ msgid "Advanced Configuration"
 #~ msgstr "고급 설정"
-
 #~ msgid "E_nable software sound mixing (ESD)"
 #~ msgstr "소프트웨어 사운드 믹서(ESD) 사용(_N)"
-
 #~ msgid "System Beep"
 #~ msgstr "시스템 삑 소리"
-
 #~ msgid "_Enable system beep"
 #~ msgstr "시스템 삑 소리 사용(_E)"
-
 #~ msgid "_Visual system beep"
 #~ msgstr "눈에 보이는 시스템 삑 소리(_V)"
-
 #~ msgid "Unexpected attribute '%s' for element '%s'"
 #~ msgstr "예상치 못한 '%2$s' 요소의 '%1$s'속성"
-
 #~ msgid "Attribute '%s' of element '%s' not found"
 #~ msgstr "'%2$s' 요소의 '%1$s'속성을 찾을 수 없습니다"
-
 #~ msgid "Unexpected tag '%s', tag '%s' expected"
 #~ msgstr "예상치 못한 '%s'태그, '%s'태그여야 합니다"
-
 #~ msgid "Unexpected tag '%s' inside '%s'"
 #~ msgstr "예상치 못한 '%2$s'내에 '%1$s'태그"
-
 #~ msgid "No valid bookmark file found in data dirs"
 #~ msgstr "데이터 디렉터리에 올바른 책갈피 파일을 찾을 수 없습니다"
-
 #~ msgid "A bookmark for URI '%s' already exists"
 #~ msgstr "책갈피 URI '%s'(이)가 이미 있습니다"
-
 #~ msgid "No bookmark found for URI '%s'"
 #~ msgstr "URI '%s'에 대한 책갈피를 찾을 수 없습니다"
-
 #~ msgid "No MIME type defined in the bookmark for URI '%s'"
 #~ msgstr "URI '%s'에 대한 책갈피에 MIME형식이 지정되지 않았습니다"
-
 #~ msgid "No private flag has been defined in bookmark for URI '%s'"
 #~ msgstr "URI '%s'에 대한 책갈피에 개인 플래그가 지정되지 않았습니다"
-
 #~ msgid "No groups set in bookmark for URI '%s'"
 #~ msgstr "URI '%s'에 대한 책갈피에 그룹이 설정되지 않았습니다"
-
 #~ msgid "No application with name '%s' registered a bookmark for '%s'"
 #~ msgstr "'%2$s'에 대한 책갈피에 등록된 프로그램 이름 '%1$s'(이)가 없습니다"
-
 #~ msgid "Siren"
 #~ msgstr "사이렌"
-
 #~ msgid "Clink"
 #~ msgstr "짤랑짤랑"
-
 #~ msgid "Beep"
 #~ msgstr "삑"
-
 #~ msgid "No sound"
 #~ msgstr "소리 없음"
-
 #~ msgid "Sound not set for this event."
 #~ msgstr "상황에 따른 소리."
-
 #~ msgid ""
 #~ "The sound file for this event does not exist.\n"
 #~ "You may want to install the gnome-audio package for a set of default "
@@ -4238,289 +4027,201 @@
 #~ "이 상황에 대한 사운드 파일이 없습니다.\n"
 #~ "기본 사운드 파일은 gnome-audio 꾸러미에\n"
 #~ "있습니다."
-
 #~ msgid "The sound file for this event does not exist."
 #~ msgstr "이 상황에 대한 사운드 파일이 존재하지 않습니다."
-
 #~ msgid "The file %s is not a valid wav file"
 #~ msgstr "%s 파일은 올바른 WAV 파일이 아닙니다"
-
 #~ msgid "Select sound file..."
 #~ msgstr "소리 파일 선택..."
-
-#~ msgid "System Sounds"
-#~ msgstr "시스템 소리"
-
 #~ msgid "Set as Application Font"
 #~ msgstr "프로그램 글꼴로 설정"
-
 #~ msgid "Sets the default application font"
 #~ msgstr "기본 프로그램 글꼴을 설정합니다"
-
 #~ msgid "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
 #~ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">새 글꼴을 적용하시겠습니까?</span>"
-
 #~ msgid "Do _not apply font"
 #~ msgstr "글꼴 적용하지 않음(_N)"
-
 #~ msgid ""
 #~ "The theme you have selected suggests a new font. A preview of the font is "
 #~ "shown below."
 #~ msgstr ""
 #~ "선택하신 테마는 새 글꼴이 들어 있습니다. 아래에서 글꼴을 미리 볼 수 있습니"
 #~ "다."
-
 #~ msgid "_Apply font"
 #~ msgstr "글꼴 적용(_A)"
-
 #~ msgid "Themes"
 #~ msgstr "테마"
-
 #~ msgid "Description"
 #~ msgstr "설명"
-
 #~ msgid "Control theme"
 #~ msgstr "컨트롤 테마"
-
 #~ msgid "Window border theme"
 #~ msgstr "창 가장자리 테마"
-
 #~ msgid "Icon theme"
 #~ msgstr "아이콘 테마"
-
 #~ msgid "If set to true, then installed themes will be thumbnailed."
 #~ msgstr "참이면 설치된 테마의 미리보기를 만듭니다."
-
 #~ msgid "If set to true, then themes will be thumbnailed."
 #~ msgstr "참이면 테마의 미리보기를 만듭니다."
-
 #~ msgid ""
 #~ "Set this key to the command used to create thumbnails for installed "
 #~ "themes."
 #~ msgstr "이 키는 설치된 테마의 미리보기를 만드는데 쓰이는 명령입니다."
-
 #~ msgid "Set this key to the command used to create thumbnails for themes."
 #~ msgstr "이 키는 테마의 미리보기를 만드는데 쓰이는 명령입니다."
-
 #~ msgid "Thumbnail command for installed themes"
 #~ msgstr "설치된 테마의 미리보기 만들기 명령"
-
 #~ msgid "Thumbnail command for themes"
 #~ msgstr "테마의 미리보기 만들기 명령"
-
 #~ msgid "Whether to thumbnail installed themes"
 #~ msgstr "설치된 테마를 미리보기"
-
 #~ msgid "Whether to thumbnail themes"
 #~ msgstr "테마를 미리보기"
-
 #~ msgid "ABCDEFG"
 #~ msgstr "ABC가나다"
-
 #~ msgid "[FILE]"
 #~ msgstr "[파일]"
-
 #~ msgid "Apply theme"
 #~ msgstr "테마 적용"
-
 #~ msgid "Sets the default theme"
 #~ msgstr "기본 테마로 설정"
-
 #~ msgid " "
 #~ msgstr " "
-
 #~ msgid "    "
 #~ msgstr "    "
-
 #~ msgid "There was an error launching the mouse preferences dialog: %s"
 #~ msgstr "마우스 기본 설정을 시작하는 데 오류가 발생했습니다: %s"
-
 #~ msgid "Unable to import AccessX settings from file '%s'"
 #~ msgstr "AccessX 설정사항을 '%s' 파일에서 가져 올 수 없습니다"
-
 #~ msgid "Import Feature Settings File"
 #~ msgstr "기능 설정 파일 가져오기"
-
 #~ msgid "_Import"
 #~ msgstr "가져오기(_I)"
-
 #~ msgid "Set your keyboard accessibility preferences"
 #~ msgstr "키보드 접근성 기능 기본 설정을 설정합니다"
-
 #~ msgid ""
 #~ "This system does not seem to have the XKB extension.  The keyboard "
 #~ "accessibility features will not operate without it."
 #~ msgstr ""
 #~ "시스템에 XKB확장 기능이 없습니다. 키보드 접근성 기능이 동작하지 않을 것입"
 #~ "니다."
-
 #~ msgid "<b>Enable _Mouse Keys</b>"
 #~ msgstr "<b>마우스 키 사용(_M)</b>"
-
 #~ msgid "<b>Enable _Repeat Keys</b>"
 #~ msgstr "<b>반복 키 사용(_R)</b>"
-
 #~ msgid "<b>Features</b>"
 #~ msgstr "<b>기능</b>"
-
 #~ msgid "<b>Toggle Keys</b>"
 #~ msgstr "<b>토글 키</b>"
-
 #~ msgid "Basic"
 #~ msgstr "기본"
-
 #~ msgid "Beep when an LED is turned on and two beeps when one is turned off."
 #~ msgstr "LED가 켜질 때 삑 소리를 내고, LED가 꺼질 때 삑 소리 두번납니다."
-
 #~ msgid "Delay between keypress and pointer mo_vement:"
 #~ msgstr "키 누름과 포인터 움직임 사이의 지연시간(_V):"
-
 #~ msgid "E_nable Toggle Keys"
 #~ msgstr "토글 키 사용(_N)"
-
 #~ msgid "Filters"
 #~ msgstr "필터"
-
 #~ msgid ""
 #~ "Ignore all subsequent presses of the SAME key if they happen within a "
 #~ "user selectable period of time."
 #~ msgstr "지정한 시간 내에 같은 키가 연속해서 눌릴 경우 무시합니다."
-
 #~ msgid "Keyboard Accessibility Preferences (AccessX)"
 #~ msgstr "키보드 접근성 기능 설정 (AccessX)"
-
 #~ msgid "Ma_ximum pointer speed:"
 #~ msgstr "최대 포인터 속도(_X):"
-
 #~ msgid "Mouse _Preferences..."
 #~ msgstr "마우스 기본 설정(_P)..."
-
 #~ msgid ""
 #~ "Only accept keys after they have been pressed and held for a user "
 #~ "adjustable amount of time."
 #~ msgstr ""
 #~ "키를 누른 후에 사용자가 설정한 만큼의 시간동안 누르고 있어야 그 키를 받아"
 #~ "들입니다."
-
 #~ msgid ""
 #~ "Perform multiple simultaneous key press operations by pressing modifier "
 #~ "keys in sequence."
 #~ msgstr ""
 #~ "변경 키를 눌러서 차례대로 누른 키가 동시에 눌려진 것처럼 처리합니다."
-
 #~ msgid "Time to acce_lerate to maximum speed:"
 #~ msgstr "최대 속도로 가속할 시간(_L):"
-
 #~ msgid "Turn the numeric keypad into a mouse control pad."
 #~ msgstr "숫자 키패드를 마우스 컨트롤 패드로 만듭니다."
-
 #~ msgid "_Disable if unused for:"
 #~ msgstr "이 시간동안 쓰지 않으면 끄기(_D):"
-
 #~ msgid "_Enable keyboard accessibility features"
 #~ msgstr "키보드 접근성 기능 사용(_E)"
-
 #~ msgid "_Import Feature Settings..."
 #~ msgstr "기능 설정 가져오기(_I)..."
-
 #~ msgid "_accepted"
 #~ msgstr "받아들일 때 삑 소리(_A)"
-
 #~ msgid "_pressed"
 #~ msgstr "눌러졌을 때 삑 소리(_P)"
-
 #~ msgid "characters/second"
 #~ msgstr "글자/초"
-
 #~ msgid "milliseconds"
 #~ msgstr "밀리초"
-
 #~ msgid "pixels/second"
 #~ msgstr "픽셀/초"
-
 #~ msgid "Go _to Fonts Folder"
 #~ msgstr "글꼴 폴더로 이동(_T)"
-
 #~ msgid "Autostart the preferred AT"
 #~ msgstr "기본 보조 기술 자동시작"
-
 #~ msgid "Simple OnScreen Keyboard"
 #~ msgstr "간단한 화면 키보드"
-
 #~ msgid "There was an error launching the keyboard tool: %s"
 #~ msgstr "키보드 도구를 시작하는 데 오류가 발생했습니다: %s"
-
 #~ msgid "_Accessibility..."
 #~ msgstr "접근성 기능(_A)..."
-
 #~ msgid "%d millisecond"
-
 #~ msgid_plural "%d milliseconds"
 #~ msgstr[0] "%d 밀리초"
-
 #~ msgid "<i>Fast</i>"
 #~ msgstr "<i>빠르게</i>"
-
 #~ msgid "<i>High</i>"
 #~ msgstr "<i>높게</i>"
-
 #~ msgid "<i>Large</i>"
 #~ msgstr "<i>크게</i>"
-
 #~ msgid "<i>Low</i>"
 #~ msgstr "<i>낮게</i>"
-
 #~ msgid "<i>Slow</i>"
 #~ msgstr "<i>느리게</i>"
-
 #~ msgid "<i>Small</i>"
 #~ msgstr "<i>작게</i>"
-
 #~ msgid "Buttons"
 #~ msgstr "단추"
-
 #~ msgid "Motion"
 #~ msgstr "움직임"
-
 #~ msgid "      "
 #~ msgstr "      "
-
 #~ msgid "Volume"
 #~ msgstr "볼륨"
-
 #~ msgid ""
 #~ "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 #~ "the Slow Keys feature, which affects the way your keyboard works."
 #~ msgstr ""
 #~ "<Shift> 키를 8초 동안 누르고 있었습니다.  느린 키 기능을 사용하게 됩니"
 #~ "다.  느린 키를 사용하면 키보드가 동작하는 방식이 달라집니다."
-
 #~ msgid "Do you want to activate Slow Keys?"
 #~ msgstr "느린 키를 사용하시겠습니까?"
-
 #~ msgid "Do you want to deactivate Slow Keys?"
 #~ msgstr "느린 키를 해제하시겠습니까?"
-
 #~ msgid "_Activate"
 #~ msgstr "활성(_A)"
-
 #~ msgid "_Deactivate"
 #~ msgstr "비활성(_D)"
-
 #~ msgid "Do_n't activate"
 #~ msgstr "활성하지 않기(_N)"
-
 #~ msgid "Do_n't deactivate"
 #~ msgstr "비활성하지 않기(_N)"
-
 #~ msgid ""
 #~ "You just pressed the Shift key 5 times in a row.  This is the shortcut "
 #~ "for the Sticky Keys feature, which affects the way your keyboard works."
 #~ msgstr ""
 #~ "<Shift> 키를 5번 연속해서 눌렀습니다.  고정 키 기능을 사용하게 됩니다.  고"
 #~ "정 키를 사용하면 키보드가 동작하는 방식이 달라집니다."
-
 #~ msgid ""
 #~ "You just pressed two keys at once, or pressed the Shift key 5 times in a "
 #~ "row.  This turns off the Sticky Keys feature, which affects the way your "
@@ -4529,49 +4230,38 @@
 #~ "키 두 개를 동시에 눌렀거나, <Shift> 키를 5번 연속해서 눌렀습니다.  고정 "
 #~ "키 기능을 해제하게 됩니다.  고정 키를 해제하면 키보드가 동작하는 방식이 달"
 #~ "라집니다."
-
 #~ msgid "Do you want to activate Sticky Keys?"
 #~ msgstr "고정 키를 사용하시겠습니까?"
-
 #~ msgid "Do you want to deactivate Sticky Keys?"
 #~ msgstr "고정 키를 해제하시겠습니까?"
-
 #~ msgid ""
 #~ "Cannot create the directory \"%s\".\n"
 #~ "This is needed to allow changing the mouse pointer theme."
 #~ msgstr ""
 #~ "\"%s\" 디렉터리를 만들 수 없습니다.\n"
 #~ "마우스 테마를 바꾸려면 이 디렉터리를 만들어야 합니다."
-
 #~ msgid ""
 #~ "Cannot create the directory \"%s\".\n"
 #~ "This is needed to allow changing cursors."
 #~ msgstr ""
 #~ "\"%s\" 디렉터리를 만들 수 없습니다.\n"
 #~ "커서를 바꾸려면 이 디렉터리를 만들어야 합니다."
-
 #~ msgid "Key Binding (%s) has its action defined multiple times\n"
 #~ msgstr "키 바인딩에 (%s) 대한 행동이 여러 번 정의되어 있습니다\n"
-
 #~ msgid "Key Binding (%s) has its binding defined multiple times\n"
 #~ msgstr "키 바인딩에 (%s) 대한 바인딩이 여러 번 정의되어 있습니다\n"
-
 #~ msgid "Key Binding (%s) is incomplete\n"
 #~ msgstr "키 바인딩이 (%s) 불완전합니다\n"
-
 #~ msgid "Key Binding (%s) is invalid\n"
 #~ msgstr "키 바인딩이 (%s) 잘못되었습니다\n"
-
 #~ msgid "It seems that another application already has access to key '%u'."
 #~ msgstr "다른 프로그램이 이미 '%u' 키를 접근하고 있습니다."
-
 #~ msgid ""
 #~ "Error while trying to run (%s)\n"
 #~ "which is linked to the key (%s)"
 #~ msgstr ""
 #~ "실행하는 데 (%s) 오류가 발생했습니다\n"
 #~ "(%s) 키와 연결되어 있습니다"
-
 #~ msgid ""
 #~ "Error activating XKB configuration.\n"
 #~ "It can happen under various circumstances:\n"
@@ -4600,7 +4290,6 @@
 #~ "이 상황을 버그로 보고하시려면, 다음 정보를 포함해 주십시오:\n"
 #~ "- <b>%s</b> 명령의 결과\n"
 #~ "- <b>%s</b> 명령의 결과"
-
 #~ msgid ""
 #~ "You are using XFree 4.3.0.\n"
 #~ "There are known problems with complex XKB configurations.\n"
@@ -4611,28 +4300,24 @@
 #~ "이 버전에는 복잡한 XKB 설정에 관련해 알려진 문제점이 있습니다.\n"
 #~ "좀 더 간단한 설정을 사용하거나 더 최신 버전의 XFree 소프트웨어를 사용하십"
 #~ "시오."
-
 #~ msgid ""
 #~ "Could not get default terminal. Verify that your default terminal command "
 #~ "is set and points to a valid application."
 #~ msgstr ""
 #~ "기본 터미널을 얻을 수 없습니다. 기본 터미널 명령이 설정되어 있고 올바른 프"
 #~ "로그램인지 확인해보시기 바랍니다."
-
 #~ msgid ""
 #~ "Couldn't execute command: %s\n"
 #~ "Verify that this is a valid command."
 #~ msgstr ""
 #~ "명령을 실행할 수 없습니다: %s\n"
 #~ "명령이 있는지 확인해보십시오."
-
 #~ msgid ""
 #~ "Couldn't put the machine to sleep.\n"
 #~ "Verify that the machine is correctly configured."
 #~ msgstr ""
 #~ "컴퓨터를 절전 모드로 바꿀 수 없습니다.\n"
 #~ "컴퓨터가 올바르게 설정되어 있는 지 확인하십시오."
-
 #~ msgid ""
 #~ "There was an error starting up the screensaver:\n"
 #~ "\n"
@@ -4645,235 +4330,160 @@
 #~ "%s\n"
 #~ "\n"
 #~ "이 세션에서는 화면 보호기 기능이 동작하지 않을 것입니다."
-
 #~ msgid "_Do not show this message again"
 #~ msgstr "이 메시지를 다시 표시하지 않기(_D)"
-
 #~ msgid "Couldn't load sound file %s as sample %s"
 #~ msgstr "사운드 파일 %s을(를) 샘플 %s(으)로 읽어들일 수 없습니다"
-
 #~ msgid "Cannot determine user's home directory"
 #~ msgstr "사용자의 홈 디렉터리를 알 수가 없습니다"
-
 #~ msgid "GConf key %s set to type %s but its expected type was %s\n"
 #~ msgstr ""
 #~ "GConf 키 %s이(가) %s 타입으로 지정되었지만 예상되는 타입은 %s입니다\n"
-
 #~ msgid "A_vailable files:"
 #~ msgstr "사용 가능한 파일(_V):"
-
 #~ msgid "Do _not show this warning again."
 #~ msgstr "이 경고를 다시 표시하지 않기(_N)."
-
 #~ msgid "Load modmap files"
 #~ msgstr "modmap 파일 읽어들이기"
-
 #~ msgid "Would you like to load the modmap file(s)?"
 #~ msgstr "modmap 파일을 읽어들이시겠습니까?"
-
 #~ msgid "_Load"
 #~ msgstr "읽어들이기(_L)"
-
 #~ msgid "_Loaded files:"
 #~ msgstr "읽어들인 파일(_L):"
-
 #~ msgid "Error creating signal pipe."
 #~ msgstr "시그날 파이프를 만드는 데 오류."
-
 #~ msgid "Type"
 #~ msgstr "형식"
-
 #~ msgid ""
 #~ "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
 #~ "for preview"
 #~ msgstr ""
 #~ "bg_applier의 형식: 루트 윈도우의 BG_APPLIER_ROOT 혹은 미리 보기의 "
 #~ "BG_APPLIER_PREVIEW"
-
 #~ msgid "Preview Width"
 #~ msgstr "미리 보기 너비"
-
 #~ msgid "Width if applier is a preview: Defaults to 64."
 #~ msgstr "미리 보기의 너비: 기본 값은 64입니다."
-
 #~ msgid "Preview Height"
 #~ msgstr "미리 보기 높이"
-
 #~ msgid "Height if applier is a preview: Defaults to 48."
 #~ msgstr "미리 보기의 높이: 기본 값은 48입니다."
-
 #~ msgid "Screen on which BGApplier is to draw"
 #~ msgstr "BGApplier가 그려지는 화면"
-
 #~ msgid "Edited %m/%d/%Y"
 #~ msgstr "%Y/%m/%d에 고쳐짐"
-
 #~ msgid ""
 #~ "If true, the mime handlers for text/plain and text/* will be kept in sync"
 #~ msgstr "참이면 text/plain과 text/*의 mime처리기가 항상 동기화됨"
-
 #~ msgid "Sync text/plain and text/* handlers"
 #~ msgstr "text/plain과 text/* 처리기 동기화"
-
 #~ msgid "E-mail's shortcut."
 #~ msgstr "전자 메일 바로 가기."
-
 #~ msgid "Eject"
 #~ msgstr "꺼내기"
-
 #~ msgid "Home folder"
 #~ msgstr "홈 폴더"
-
 #~ msgid "Home folder's shortcut."
 #~ msgstr "홈 폴더 바로 가기."
-
 #~ msgid "Launch help browser"
 #~ msgstr "도움말 브라우저 실행"
-
 #~ msgid "Launch help browser's shortcut."
 #~ msgstr "도움말 브라우저 실행 바로 가기."
-
 #~ msgid "Launch web browser"
 #~ msgstr "웹 브라우저 실행"
-
 #~ msgid "Launch web browser's shortcut."
 #~ msgstr "웹 브라우저 실행 바로 가기."
-
 #~ msgid "Lock screen's shortcut."
 #~ msgstr "화면 잠그기 바로 가기."
-
 #~ msgid "Log out"
 #~ msgstr "로그아웃"
-
 #~ msgid "Log out's shortcut."
 #~ msgstr "로그아웃 바로 가기."
-
 #~ msgid "Media player"
 #~ msgstr "미디어 플레이어"
-
 #~ msgid "Media player key's shortcut."
 #~ msgstr "미디어 플레이어 바로 가기."
-
 #~ msgid "Next track key's shortcut."
 #~ msgstr "다음 트랙 바로 가기."
-
 #~ msgid "Pause"
 #~ msgstr "잠시 멈춤"
-
 #~ msgid "Pause key's shortcut."
 #~ msgstr "잠시 멈춤 바로 가기."
-
 #~ msgid "Play (or play/pause)"
 #~ msgstr "연주 (또는 잠시 멈춤)"
-
 #~ msgid "Play (or play/pause) key's shortcut."
 #~ msgstr "연주 (또는 잠시 멈춤) 바로 가기."
-
 #~ msgid "Previous track key's shortcut."
 #~ msgstr "이전 트랙 바로 가기."
-
 #~ msgid "Search's shortcut."
 #~ msgstr "찾기 바로 가기."
-
 #~ msgid "Skip to next track"
 #~ msgstr "다음 트랙 넘어가기"
-
 #~ msgid "Skip to previous track"
 #~ msgstr "이전 트랙 넘어가기"
-
 #~ msgid "Sleep's shortcut."
 #~ msgstr "절전 모드 바로 가기."
-
 #~ msgid "Stop playback key"
 #~ msgstr "연주 멈춤"
-
 #~ msgid "Stop playback key's shortcut."
 #~ msgstr "연주 멈춤 바로 가기."
-
 #~ msgid "Volume down"
 #~ msgstr "소리 낮춤"
-
 #~ msgid "Volume down's shortcut."
 #~ msgstr "소리 낮춤 바로 가기."
-
 #~ msgid "Volume mute"
 #~ msgstr "소리 끔"
-
 #~ msgid "Volume mute's shortcut."
 #~ msgstr "소리 끔 바로 가기."
-
 #~ msgid "Volume step"
 #~ msgstr "소리 단위"
-
 #~ msgid "Volume step as percentage of volume."
 #~ msgstr "소리 단위, 소리 높이의 퍼센트 비율."
-
 #~ msgid "Volume up"
 #~ msgstr "소리 높임"
-
 #~ msgid "Volume up's shortcut."
 #~ msgstr "소리 높임 바로 가기."
-
 #~ msgid "Display a dialog when there are errors running the screensaver"
 #~ msgstr "화면 보호기 실행 중에 오류가 생길 때 대화상자 보임"
-
 #~ msgid "Run screensaver at login"
 #~ msgstr "로그인할 때 화면 보호기 실행"
-
 #~ msgid "Show Startup Errors"
 #~ msgstr "시작 오류 보기"
-
 #~ msgid "Start screensaver"
 #~ msgstr "화면 보호기 시작"
-
 #~ msgid "The theme is an engine. You need to compile it."
 #~ msgstr "이 테마는 엔진입니다. 컴파일해야 합니다."
-
 #~ msgid "The file format is invalid"
 #~ msgstr "파일 포맷이 올바르지 않습니다"
-
 #~ msgid "This theme is not in a supported format."
 #~ msgstr "이 테마는 지원하는 형식이 아닙니다."
-
 #~ msgid "The file format is invalid."
 #~ msgstr "파일 포맷이 올바르지 않습니다."
-
 #~ msgid "Evolution Mail Reader 1.4"
 #~ msgstr "에볼루션 메일 읽기 1.4"
-
 #~ msgid "Evolution Mail Reader 1.5"
 #~ msgstr "에볼루션 메일 읽기 1.5"
-
 #~ msgid "Evolution Mail Reader 1.6"
 #~ msgstr "에볼루션 메일 읽기 1.6"
-
 #~ msgid "Evolution Mail Reader 2.0"
 #~ msgstr "에볼루션 메일 읽기 2.0"
-
 #~ msgid "Evolution Mail Reader 2.2"
 #~ msgstr "에볼루션 메일 읽기 2.2"
-
 #~ msgid "Evolution Mail Reader 2.4"
 #~ msgstr "에볼루션 메일 읽기 2.4"
-
 #~ msgid "Links Text Browser"
 #~ msgstr "Links 텍스트 브라우저"
-
 #~ msgid "Lynx Text Browser"
 #~ msgstr "Lynx 텍스트 브라우저"
-
 #~ msgid "W3M Text Browser"
 #~ msgstr "W3M 텍스트 브라우저"
-
 #~ msgid "Choose..."
 #~ msgstr "고르기..."
-
 #~ msgid "Microsoft Natural Keyboard"
 #~ msgstr "마이크로소프트 내츄럴 키보드"
-
 #~ msgid "Do _not show this warning again"
 #~ msgstr "이 경고를 다시 표시하지 않기(_N)"
-
 #~ msgid ""
 #~ "<b>The X system keyboard settings differ from your current GNOME keyboard "
 #~ "settings.</b>\n"
@@ -4887,6 +4497,6 @@
 #~ "%s 설정이 있어야 하지만, 다음 설정이 있습니다: %s\n"
 #~ "\n"
 #~ "어느 설정을 사용하시겠습니까?"
-
 #~ msgid "Keep GNOME settings"
 #~ msgstr "그놈 설정 유지"
+
--- po/nl.po
+++ po/nl.po
@@ -21,9 +21,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-28 09:39+0000\n"
-"PO-Revision-Date: 2010-04-29 19:05-0800\n"
-"Last-Translator: Thomas <thomas.martens at ptiglobal.net>\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-15 10:11-0800\n"
+"Last-Translator: GLS_NLD <albert.dijkstra at ptiglobal.net>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2329,7 +2329,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Toetsenbordindelingsopties"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -3336,6 +3336,14 @@
 msgid "Control Center"
 msgstr "Configuratiecentrum"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Systeeminstellingen"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Alle instellingen"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Pauze uitstellen"
@@ -3545,7 +3553,7 @@
 
 #: ../font-viewer/font-thumbnailer.c:249
 msgid "FONT-FILE OUTPUT-FILE"
-msgstr "LETTERTYPEBESTAND OUTVOERBESTAND"
+msgstr "LETTERTYPEBESTAND UITVOERBESTAND"
 
 #: ../font-viewer/font-thumbnailer.c:268
 #, c-format
@@ -3554,9 +3562,11 @@
 
 #~ msgid "- GNOME Network Preferences"
 #~ msgstr "- Gnome Netwerk voorkeuren"
+
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr ""
 #~ "Onbekend aanmeldings-ID, de gebruikersdatabase is misschien beschadigd"
+
 #~ msgid ""
 #~ "Left thumb\n"
 #~ "Left middle finger\n"
@@ -3575,14 +3585,18 @@
 #~ "Rechter middelvinger\n"
 #~ "Rechter ringvinger\n"
 #~ "Rechter pink"
+
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>E-mail</b>"
+
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>Thuis</b>"
+
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>Werk</b>"
+
 #~ msgid "<b>Web</b>"
 #~ msgstr "<b>Web</b>"
+
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>Werk</b>"
-
--- po/pl.po
+++ po/pl.po
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 09:36+0000\n"
-"PO-Revision-Date: 2010-04-06 14:29+0100\n"
-"Last-Translator: Romuald Pawlikowski <r.pawlikowski at gmail.com>\n"
+"POT-Creation-Date: 2010-06-08 20:19+0000\n"
+"PO-Revision-Date: 2010-06-09 08:22+0100\n"
+"Last-Translator: Marcin Sołtysiak <marcin.p.soltysiak at gmail.com>\n"
 "Language-Team: Polish <gnomepl at aviary.pl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -206,7 +206,7 @@
 
 #: ../capplets/about-me/gnome-about-me.c:746
 #: ../capplets/appearance/appearance-desktop.c:659
-#: ../capplets/appearance/cc-background-page.c:1168
+#: ../capplets/appearance/cc-background-page.c:1171
 msgid "Images"
 msgstr "Obrazy"
 
@@ -234,20 +234,12 @@
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplets/about-me/gnome-about-me.c:1018
-#: ../capplets/appearance/appearance-main.c:150
 #: ../capplets/display/xrandr-capplet.c:2436
-#: ../capplets/keyboard/gnome-keyboard-properties.c:243
-#: ../capplets/mouse/gnome-mouse-properties.c:599
-#: ../capplets/network/gnome-network-properties.c:1380
 msgid "ID of the socket to embed in"
 msgstr "ID gniazda, w którym należy osadzić"
 
 #: ../capplets/about-me/gnome-about-me.c:1019
-#: ../capplets/appearance/appearance-main.c:151
 #: ../capplets/display/xrandr-capplet.c:2437
-#: ../capplets/keyboard/gnome-keyboard-properties.c:244
-#: ../capplets/mouse/gnome-mouse-properties.c:600
-#: ../capplets/network/gnome-network-properties.c:1381
 msgid "socket"
 msgstr "gniazdo"
 
@@ -793,12 +785,12 @@
 msgstr "Dostęp uniwersalny"
 
 #: ../capplets/appearance/appearance-desktop.c:628
-#: ../capplets/appearance/cc-background-page.c:1133
+#: ../capplets/appearance/cc-background-page.c:1136
 msgid "Add Wallpaper"
 msgstr "Dodawanie tapety"
 
 #: ../capplets/appearance/appearance-desktop.c:663
-#: ../capplets/appearance/cc-background-page.c:1173
+#: ../capplets/appearance/cc-background-page.c:1176
 msgid "All files"
 msgstr "Wszystkie pliki"
 
@@ -836,7 +828,7 @@
 msgstr "Użycie zaznaczonej czcionki"
 
 #: ../capplets/appearance/appearance-main.c:54
-#: ../capplets/appearance/cc-background-page.c:1414
+#: ../capplets/appearance/cc-background-page.c:1417
 #: ../capplets/appearance/cc-font-details-dialog.c:408
 #: ../capplets/appearance/cc-font-page.c:458
 #: ../capplets/appearance/cc-theme-customize-dialog.c:1203
@@ -845,32 +837,32 @@
 #: ../capplets/display/cc-display-minimal-page.c:609
 #: ../capplets/keyboard/cc-keyboard-page.c:129
 #: ../capplets/keyboard/cc-shortcuts-page.c:1844
-#: ../capplets/network/cc-network-proxy-page.c:1287
-#: ../capplets/power/cc-power-panel.c:367
+#: ../capplets/network/cc-network-proxy-page.c:1285
+#: ../capplets/power/cc-power-panel.c:374
 #, c-format
 msgid "Could not load user interface file: %s"
 msgstr "Nie można wczytać pliku interfejsu użytkownika: %s"
 
-#: ../capplets/appearance/appearance-main.c:134
+#: ../capplets/appearance/appearance-main.c:133
 msgid "Specify the filename of a theme to install"
 msgstr "Proszę wprowadzić nazwę pliku motywu do instalacji"
 
-#: ../capplets/appearance/appearance-main.c:135
+#: ../capplets/appearance/appearance-main.c:134
 msgid "filename"
 msgstr "nazwa_pliku"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:142
+#: ../capplets/appearance/appearance-main.c:141
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "Określa nazwę strony do wyświetlenia (theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:143
+#: ../capplets/appearance/appearance-main.c:142
 #: ../capplets/default-applications/gnome-da-capplet.c:962
-#: ../capplets/mouse/gnome-mouse-properties.c:592
+#: ../capplets/mouse/gnome-mouse-properties.c:614
 msgid "page"
 msgstr "strona"
 
-#: ../capplets/appearance/appearance-main.c:158
+#: ../capplets/appearance/appearance-main.c:149
 msgid "[WALLPAPER...]"
 msgstr "[TŁO_PULPITU...]"
 
@@ -1023,7 +1015,7 @@
 msgid "No Desktop Background"
 msgstr "Bez tła pulpitu"
 
-#: ../capplets/appearance/cc-background-page.c:1575
+#: ../capplets/appearance/cc-background-page.c:1578
 #: ../capplets/appearance/data/appearance.ui.h:2
 msgid "Background"
 msgstr "Tło"
@@ -1976,20 +1968,20 @@
 msgid "- GNOME Display Preferences"
 msgstr "- GNOME - Preferencje wyświetlania"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:219
-#: ../capplets/keyboard/gnome-keyboard-properties.c:224
+#: ../capplets/keyboard/gnome-keyboard-properties.c:205
+#: ../capplets/keyboard/gnome-keyboard-properties.c:210
 msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "Wprowadza ustawienia i kończy (tylko dla zgodności, teraz obsługuje to usługa)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:229
+#: ../capplets/keyboard/gnome-keyboard-properties.c:215
 msgid "Start the page with the typing break settings showing"
 msgstr "Otwiera stronę z właściwościami przerwy w pisaniu na klawiaturze"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:234
+#: ../capplets/keyboard/gnome-keyboard-properties.c:220
 msgid "Start the page with the accessibility settings showing"
 msgstr "Otwiera stronę z ustawieniami dostępności"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:250
+#: ../capplets/keyboard/gnome-keyboard-properties.c:225
 msgid "- GNOME Keyboard Preferences"
 msgstr "- Preferencje klawiatury GNOME"
 
@@ -2428,7 +2420,7 @@
 msgid "Set your keyboard preferences"
 msgstr "Ustawianie preferencji klawiatury"
 
-#: ../capplets/mouse/cc-pointer-panel.c:95
+#: ../capplets/mouse/cc-pointer-panel.c:102
 msgid "Pointing Devices"
 msgstr "Urządzenia wskazujące"
 
@@ -2463,11 +2455,11 @@
 msgstr "Wyłączony"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/mouse/gnome-mouse-properties.c:591
+#: ../capplets/mouse/gnome-mouse-properties.c:613
 msgid "Specify the name of the page to show (general|accessibility)"
 msgstr "Proszę określić nazwę strony do wyświetlenia (general|accessibility)"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:604
+#: ../capplets/mouse/gnome-mouse-properties.c:618
 msgid "- GNOME Mouse Preferences"
 msgstr "- Preferencje myszy GNOME"
 
@@ -2623,34 +2615,31 @@
 msgid "Set your mouse preferences"
 msgstr "Ustawianie preferencji myszy"
 
-#: ../capplets/network/cc-network-panel.c:139
+#: ../capplets/network/cc-network-panel.c:114
 msgid "Network"
 msgstr "Sieć"
 
-#: ../capplets/network/cc-network-proxy-page.c:753
-#: ../capplets/network/cc-network-proxy-page.c:919
+#: ../capplets/network/cc-network-proxy-page.c:751
+#: ../capplets/network/cc-network-proxy-page.c:917
 #: ../capplets/network/gnome-network-properties.c:701
 #: ../capplets/network/gnome-network-properties.c:852
 msgid "New Location..."
 msgstr "Nowe położenie..."
 
-#: ../capplets/network/cc-network-proxy-page.c:887
+#: ../capplets/network/cc-network-proxy-page.c:885
 #: ../capplets/network/gnome-network-properties.c:818
 msgid "Location already exists"
 msgstr "Położenie już istnieje"
 
-#: ../capplets/network/cc-network-proxy-page.c:1306
+#. Locations
+#: ../capplets/network/cc-network-proxy-page.c:1305
 msgid "Delete Location"
 msgstr "Usuń położenie"
 
-#: ../capplets/network/cc-network-proxy-page.c:1546
+#: ../capplets/network/cc-network-proxy-page.c:1545
 msgid "Proxy"
 msgstr "Pośrednik"
 
-#: ../capplets/network/gnome-network-properties.c:1386
-msgid "- GNOME Network Preferences"
-msgstr "- Preferencje sieciowe GNOME"
-
 #: ../capplets/network/gnome-network-properties.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Pośrednik sieciowy"
@@ -2803,28 +2792,27 @@
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: ../capplets/security/cc-security-panel.c:153
+#: ../capplets/security/cc-security-panel.c:154
 msgid "Sorry, the passwords do not match"
 msgstr "Przepraszamy, hasła nie są zgodne"
 
-#: ../capplets/security/cc-security-panel.c:178
+#: ../capplets/security/cc-security-panel.c:179
 msgid "The new password is now saved"
 msgstr "Nowe hasło zostanie teraz zapisane."
 
-#: ../capplets/security/cc-security-panel.c:209
+#: ../capplets/security/cc-security-panel.c:210
 msgid "Sorry, the password could not be changed"
 msgstr "Przepraszamy, hasło nie mogło zostać zmienione."
 
-#: ../capplets/security/cc-security-panel.c:441
+#: ../capplets/security/cc-security-panel.c:445
 msgid "Sorry, that password is incorrect"
 msgstr "Przepraszamy, hasło jest nieprawidłowe."
 
-#: ../capplets/security/cc-security-panel.c:496
+#: ../capplets/security/cc-security-panel.c:500
 msgid "Security"
 msgstr "Zabezpieczenia"
 
 #: ../capplets/security/security.desktop.in.in.h:1
-#: ../capplets/security/security.ui.h:7
 msgid "Security and passwords"
 msgstr "Zabezpieczenia i hasła"
 
@@ -2849,13 +2837,12 @@
 msgstr "Zapisz nowe hasło"
 
 #: ../capplets/power/power-properties.desktop.in.in.h:1
-#: ../capplets/power/cc-power-panel.c:442
-#: ../capplets/power/power.ui.h:2
+#: ../capplets/power/cc-power-panel.c:455
 msgid "Power and brightness"
 msgstr "Zasilanie i jasność"
 
 #. TRANSLATORS: texts below idle/sleep scales
-#: ../capplets/power/cc-power-panel.c:98
+#: ../capplets/power/cc-power-panel.c:97
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2863,7 +2850,7 @@
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: ../capplets/power/cc-power-panel.c:103
+#: ../capplets/power/cc-power-panel.c:102
 msgid "Never"
 msgstr "Nigdy"
 
@@ -2871,31 +2858,31 @@
 msgid "Brightness"
 msgstr "Jasność"
 
-#: ../capplets/power/power.ui.h:3
+#: ../capplets/power/power.ui.h:2
 msgid "Put computer to sleep when inactive for:"
 msgstr "Przełącz komputer w tryb uśpienia, gdy jest nieaktywny przez:"
 
-#: ../capplets/power/power.ui.h:4
+#: ../capplets/power/power.ui.h:3
 msgid "Set computer as idle when inactive for:"
 msgstr "Przełącz komputer w tryb bezczynności, gdy jest nieaktywny przez:"
 
-#: ../capplets/power/power.ui.h:5
+#: ../capplets/power/power.ui.h:4
 msgid "Sleep"
 msgstr "Uśpienie"
 
-#: ../capplets/power/power.ui.h:6
+#: ../capplets/power/power.ui.h:5
 msgid "This will blank the screen and set your messaging state to 'away'."
 msgstr "Spowoduje to wygaszenie ekranu i ustawienie stanu komunikatora na „z dala od komputera”."
 
-#: ../capplets/power/power.ui.h:7
+#: ../capplets/power/power.ui.h:6
 msgid "This will suspend everything on your computer. It'll wake up in just the same state as it was before."
 msgstr "Spowoduje to wstrzymanie wszelkich czynności na komputerze. Komputer będzie można obudzić do stanu, w jakim znajdował się wcześniej."
 
-#: ../capplets/power/power.ui.h:8
+#: ../capplets/power/power.ui.h:7
 msgid "To change your brightness, you can use the keys on your computer."
 msgstr "Aby zmienić jasność można użyć klawiszy komputera."
 
-#: ../capplets/power/power.ui.h:9
+#: ../capplets/power/power.ui.h:8
 msgid "ldle"
 msgstr "Bezczynność"
 
@@ -3294,6 +3281,14 @@
 msgid "Control Center"
 msgstr "Centrum sterowania"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Ustawienia"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "Ustawienia"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "O_drocz przerwę"
@@ -3504,5 +3499,8 @@
 msgid "Error parsing arguments: %s\n"
 msgstr "Błąd podczas przetwarzania parametrów: %s\n"
 
+#~ msgid "- GNOME Network Preferences"
+#~ msgstr "- Preferencje sieciowe GNOME"
+
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr "Wybór funkcji dostępności do włączenia podczas logowania się"
--- po/pt_BR.po
+++ po/pt_BR.po
@@ -24,8 +24,8 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-28 09:39+0000\n"
-"PO-Revision-Date: 2010-04-30 16:36-0800\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-14 09:09-0800\n"
 "Last-Translator: GLSPTB_Gabor <bechtg at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -2298,7 +2298,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Opções de disposição do teclado"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -3305,6 +3305,14 @@
 msgid "Control Center"
 msgstr "Centro de Controle"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Configurações do sistema"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Todas as configurações"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Adiar intervalo"
--- po/ru.po
+++ po/ru.po
@@ -14,9 +14,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 09:38+0000\n"
-"PO-Revision-Date: 2010-04-06 14:40+0200\n"
-"Last-Translator: Yuri Nazarenko <yuri.nazarenko at gmail.com>\n"
+"POT-Creation-Date: 2010-06-30 09:23+0000\n"
+"PO-Revision-Date: 2010-06-15 18:34-0800\n"
+"Last-Translator: Bogdan Nosach <bogdan.nosach at ptiglobal.net>\n"
 "Language-Team: Russian <gnome-cyr at lists.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1929,7 +1929,7 @@
 #: ../capplets/display/cc-display-minimal-page.c:652
 #: ../capplets/display/display-minimal.ui.h:1
 msgid "Displays and projectors"
-msgstr "Дисплеи и прожекторы"
+msgstr "Дисплеи и проекторы"
 
 #: ../capplets/display/cc-display-minimal-page.c:672
 #: ../capplets/display/xrandr-capplet.c:2297
@@ -2395,7 +2395,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Параметры раскладки"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -3461,6 +3461,14 @@
 msgid "Control Center"
 msgstr "Центр управления"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "Параметры системы"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Все параметры"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Отложить перерыв"
--- po/sv.po
+++ po/sv.po
@@ -13,9 +13,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 09:43+0000\n"
-"PO-Revision-Date: 2010-04-08 07:02-0500\n"
-"Last-Translator: Annika <AnnikaNbpt at gmail.com>\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-14 21:51-0800\n"
+"Last-Translator: Anna-Lena Schon <anna.schon at live.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -209,7 +209,7 @@
 
 #: ../capplets/about-me/gnome-about-me.c:746
 #: ../capplets/appearance/appearance-desktop.c:659
-#: ../capplets/appearance/cc-background-page.c:1168
+#: ../capplets/appearance/cc-background-page.c:1171
 msgid "Images"
 msgstr "Bilder"
 
@@ -237,20 +237,12 @@
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplets/about-me/gnome-about-me.c:1018
-#: ../capplets/appearance/appearance-main.c:150
 #: ../capplets/display/xrandr-capplet.c:2436
-#: ../capplets/keyboard/gnome-keyboard-properties.c:243
-#: ../capplets/mouse/gnome-mouse-properties.c:599
-#: ../capplets/network/gnome-network-properties.c:1380
 msgid "ID of the socket to embed in"
 msgstr "ID för socket att bädda in i"
 
 #: ../capplets/about-me/gnome-about-me.c:1019
-#: ../capplets/appearance/appearance-main.c:151
 #: ../capplets/display/xrandr-capplet.c:2437
-#: ../capplets/keyboard/gnome-keyboard-properties.c:244
-#: ../capplets/mouse/gnome-mouse-properties.c:600
-#: ../capplets/network/gnome-network-properties.c:1381
 msgid "socket"
 msgstr "socket"
 
@@ -797,12 +789,12 @@
 msgstr "Universal åtkomst"
 
 #: ../capplets/appearance/appearance-desktop.c:628
-#: ../capplets/appearance/cc-background-page.c:1133
+#: ../capplets/appearance/cc-background-page.c:1136
 msgid "Add Wallpaper"
 msgstr "Lägg till bakgrundsbild"
 
 #: ../capplets/appearance/appearance-desktop.c:663
-#: ../capplets/appearance/cc-background-page.c:1173
+#: ../capplets/appearance/cc-background-page.c:1176
 msgid "All files"
 msgstr "Alla filer"
 
@@ -838,7 +830,7 @@
 msgstr "Använd valt typsnitt"
 
 #: ../capplets/appearance/appearance-main.c:54
-#: ../capplets/appearance/cc-background-page.c:1414
+#: ../capplets/appearance/cc-background-page.c:1417
 #: ../capplets/appearance/cc-font-details-dialog.c:408
 #: ../capplets/appearance/cc-font-page.c:458
 #: ../capplets/appearance/cc-theme-customize-dialog.c:1203
@@ -847,32 +839,32 @@
 #: ../capplets/display/cc-display-minimal-page.c:609
 #: ../capplets/keyboard/cc-keyboard-page.c:129
 #: ../capplets/keyboard/cc-shortcuts-page.c:1844
-#: ../capplets/network/cc-network-proxy-page.c:1287
-#: ../capplets/power/cc-power-panel.c:367
+#: ../capplets/network/cc-network-proxy-page.c:1285
+#: ../capplets/power/cc-power-panel.c:374
 #, c-format
 msgid "Could not load user interface file: %s"
 msgstr "Kunde inte läsa in användargränssnittsfilen: %s"
 
-#: ../capplets/appearance/appearance-main.c:134
+#: ../capplets/appearance/appearance-main.c:133
 msgid "Specify the filename of a theme to install"
 msgstr "Ange filnamnet för det tema som ska installeras"
 
-#: ../capplets/appearance/appearance-main.c:135
+#: ../capplets/appearance/appearance-main.c:134
 msgid "filename"
 msgstr "filnamn"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:142
+#: ../capplets/appearance/appearance-main.c:141
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "Ange namnet på sidan som ska visas (theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:143
+#: ../capplets/appearance/appearance-main.c:142
 #: ../capplets/default-applications/gnome-da-capplet.c:962
-#: ../capplets/mouse/gnome-mouse-properties.c:592
+#: ../capplets/mouse/gnome-mouse-properties.c:614
 msgid "page"
 msgstr "sida"
 
-#: ../capplets/appearance/appearance-main.c:158
+#: ../capplets/appearance/appearance-main.c:149
 msgid "[WALLPAPER...]"
 msgstr "[BAKGRUNDSBILD...]"
 
@@ -1024,7 +1016,7 @@
 msgid "No Desktop Background"
 msgstr "Ingen skrivbordsbakgrund"
 
-#: ../capplets/appearance/cc-background-page.c:1575
+#: ../capplets/appearance/cc-background-page.c:1578
 #: ../capplets/appearance/data/appearance.ui.h:2
 msgid "Background"
 msgstr "Bakgrund"
@@ -1974,20 +1966,20 @@
 msgid "- GNOME Display Preferences"
 msgstr "- Skärminställningar för Gnome"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:219
-#: ../capplets/keyboard/gnome-keyboard-properties.c:224
+#: ../capplets/keyboard/gnome-keyboard-properties.c:205
+#: ../capplets/keyboard/gnome-keyboard-properties.c:210
 msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "Verkställ bara ändringar och avsluta (endast för kompatibilitet; hanteras nu av demon)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:229
+#: ../capplets/keyboard/gnome-keyboard-properties.c:215
 msgid "Start the page with the typing break settings showing"
 msgstr "Starta sidan utan att inställningarna för skrivandepaus visas"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:234
+#: ../capplets/keyboard/gnome-keyboard-properties.c:220
 msgid "Start the page with the accessibility settings showing"
 msgstr "Starta sidan med visade hjälpmedelsinställningar"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:250
+#: ../capplets/keyboard/gnome-keyboard-properties.c:225
 msgid "- GNOME Keyboard Preferences"
 msgstr "- Tangentbordsinställningar för GNOME"
 
@@ -2293,7 +2285,7 @@
 msgid "Keyboard Layout Options"
 msgstr "Alternativ för tangentbordslayout"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -2427,7 +2419,7 @@
 msgid "Set your keyboard preferences"
 msgstr "Ställ in dina tangentbordsinställningar"
 
-#: ../capplets/mouse/cc-pointer-panel.c:95
+#: ../capplets/mouse/cc-pointer-panel.c:102
 msgid "Pointing Devices"
 msgstr "Pekdon"
 
@@ -2462,11 +2454,11 @@
 msgstr "Inaktiverad"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/mouse/gnome-mouse-properties.c:591
+#: ../capplets/mouse/gnome-mouse-properties.c:613
 msgid "Specify the name of the page to show (general|accessibility)"
 msgstr "Ange namnet på sidan som ska visas (general|accessibility)"
 
-#: ../capplets/mouse/gnome-mouse-properties.c:604
+#: ../capplets/mouse/gnome-mouse-properties.c:618
 msgid "- GNOME Mouse Preferences"
 msgstr "- Musinställningar för GNOME"
 
@@ -2622,34 +2614,31 @@
 msgid "Set your mouse preferences"
 msgstr "Ställ in dina musinställningar"
 
-#: ../capplets/network/cc-network-panel.c:139
+#: ../capplets/network/cc-network-panel.c:114
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../capplets/network/cc-network-proxy-page.c:753
-#: ../capplets/network/cc-network-proxy-page.c:919
+#: ../capplets/network/cc-network-proxy-page.c:751
+#: ../capplets/network/cc-network-proxy-page.c:917
 #: ../capplets/network/gnome-network-properties.c:701
 #: ../capplets/network/gnome-network-properties.c:852
 msgid "New Location..."
 msgstr "Ny plats..."
 
-#: ../capplets/network/cc-network-proxy-page.c:887
+#: ../capplets/network/cc-network-proxy-page.c:885
 #: ../capplets/network/gnome-network-properties.c:818
 msgid "Location already exists"
 msgstr "Platsen finns redan"
 
-#: ../capplets/network/cc-network-proxy-page.c:1306
+#. Locations
+#: ../capplets/network/cc-network-proxy-page.c:1305
 msgid "Delete Location"
 msgstr "Ta bort plats"
 
-#: ../capplets/network/cc-network-proxy-page.c:1546
+#: ../capplets/network/cc-network-proxy-page.c:1545
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../capplets/network/gnome-network-properties.c:1386
-msgid "- GNOME Network Preferences"
-msgstr "- Nätverksinställningar för GNOME"
-
 #: ../capplets/network/gnome-network-properties.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Nätverksproxyserver"
@@ -2802,28 +2791,27 @@
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../capplets/security/cc-security-panel.c:153
+#: ../capplets/security/cc-security-panel.c:154
 msgid "Sorry, the passwords do not match"
 msgstr "Lösenorden matchar inte"
 
-#: ../capplets/security/cc-security-panel.c:178
+#: ../capplets/security/cc-security-panel.c:179
 msgid "The new password is now saved"
 msgstr "Det nya lösenordet sparas nu"
 
-#: ../capplets/security/cc-security-panel.c:209
+#: ../capplets/security/cc-security-panel.c:210
 msgid "Sorry, the password could not be changed"
 msgstr "Det gick inte att ändra ditt lösenord"
 
-#: ../capplets/security/cc-security-panel.c:441
+#: ../capplets/security/cc-security-panel.c:445
 msgid "Sorry, that password is incorrect"
 msgstr "Lösenord var felaktigt"
 
-#: ../capplets/security/cc-security-panel.c:496
+#: ../capplets/security/cc-security-panel.c:500
 msgid "Security"
 msgstr "Säkerhet"
 
 #: ../capplets/security/security.desktop.in.in.h:1
-#: ../capplets/security/security.ui.h:7
 msgid "Security and passwords"
 msgstr "Säkerhet och lösenord"
 
@@ -2848,20 +2836,19 @@
 msgstr "Spara nytt lösenord"
 
 #: ../capplets/power/power-properties.desktop.in.in.h:1
-#: ../capplets/power/cc-power-panel.c:442
-#: ../capplets/power/power.ui.h:2
+#: ../capplets/power/cc-power-panel.c:455
 msgid "Power and brightness"
 msgstr "Energi och ljusstyrka"
 
 #. TRANSLATORS: texts below idle/sleep scales
-#: ../capplets/power/cc-power-panel.c:98
+#: ../capplets/power/cc-power-panel.c:97
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../capplets/power/cc-power-panel.c:103
+#: ../capplets/power/cc-power-panel.c:102
 msgid "Never"
 msgstr "Aldrig"
 
@@ -2869,31 +2856,31 @@
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
-#: ../capplets/power/power.ui.h:3
+#: ../capplets/power/power.ui.h:2
 msgid "Put computer to sleep when inactive for:"
 msgstr "Sätt datorn i viloläge när den inte varit aktiv under:"
 
-#: ../capplets/power/power.ui.h:4
+#: ../capplets/power/power.ui.h:3
 msgid "Set computer as idle when inactive for:"
 msgstr "Sätt datorn som inaktiv när den inte varit aktiv under:"
 
-#: ../capplets/power/power.ui.h:5
+#: ../capplets/power/power.ui.h:4
 msgid "Sleep"
 msgstr "Sov"
 
-#: ../capplets/power/power.ui.h:6
+#: ../capplets/power/power.ui.h:5
 msgid "This will blank the screen and set your messaging state to 'away'."
 msgstr "Detta tömmer skärmen och ställer in ditt meddelandeläge till \"borta\"."
 
-#: ../capplets/power/power.ui.h:7
+#: ../capplets/power/power.ui.h:6
 msgid "This will suspend everything on your computer. It'll wake up in just the same state as it was before."
 msgstr "Detta gör uppehåll i allt på din dator. Den vaknar i precis samma läge som den var i tidigare."
 
-#: ../capplets/power/power.ui.h:8
+#: ../capplets/power/power.ui.h:7
 msgid "To change your brightness, you can use the keys on your computer."
 msgstr "Använd tangenterna på datorn för att ändra ljusstyrkan."
 
-#: ../capplets/power/power.ui.h:9
+#: ../capplets/power/power.ui.h:8
 msgid "ldle"
 msgstr "Inaktiv"
 
@@ -3292,6 +3279,14 @@
 msgid "Control Center"
 msgstr "Kontrollpanel"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "System Inställningar"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "_Inställningar"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "_Skjut upp pausen"
@@ -3505,6 +3500,9 @@
 msgid "Error parsing arguments: %s\n"
 msgstr "Fel vid tolkning av argument: %s\n"
 
+#~ msgid "- GNOME Network Preferences"
+#~ msgstr "- Nätverksinställningar för GNOME"
+
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr "Välj vilka hjälpmedelsfunktioner som ska aktiveras när du loggar in"
 
--- po/zh_CN.po
+++ po/zh_CN.po
@@ -13,9 +13,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-28 09:39+0000\n"
-"PO-Revision-Date: 2010-04-06 22:55-0800\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-16 10:03-0800\n"
+"Last-Translator: Namfon Thasanon <maewbox at gmail.com>\n"
 "Language-Team: i18n-zh <i18n-zh at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,21 +35,15 @@
 msgstr "更多主题网址"
 
 #: ../gnome-control-center.schemas.in.h:4
-msgid ""
-"Set this to your current location name. This is used to determine the "
-"appropriate network proxy configuration."
+msgid "Set this to your current location name. This is used to determine the appropriate network proxy configuration."
 msgstr "设定这个为您当前的位置名称。这将在检测正确的网络代理配置时有用。"
 
 #: ../gnome-control-center.schemas.in.h:5
-msgid ""
-"URL for where to get more desktop backgrounds. If set to an empty string the "
-"link will not appear."
+msgid "URL for where to get more desktop backgrounds. If set to an empty string the link will not appear."
 msgstr "获得更多桌面背景的网址。如果设定为空字符串,那么链接将不会出现。"
 
 #: ../gnome-control-center.schemas.in.h:6
-msgid ""
-"URL for where to get more desktop themes. If set to an empty string the link "
-"will not appear."
+msgid "URL for where to get more desktop themes. If set to an empty string the link will not appear."
 msgstr "获得更多桌面主题的网址。如果设定为空字符串,那么链接将不会出现。"
 
 #: ../capplets/about-me/eel-alert-dialog.c:114
@@ -465,8 +459,7 @@
 msgstr "设定您的个人信息"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:97
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
+msgid "You are not allowed to access the device. Contact your system administrator."
 msgstr "你未被允许访问该设备。请联系你的系统管理员。"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:99
@@ -486,9 +479,7 @@
 msgstr "删除指纹(_D)"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:228
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
+msgid "Do you want to delete your registered fingerprints so fingerprint login is disabled?"
 msgstr "你想删除已登记的指纹吗?这样做将禁用指纹登录。"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:356
@@ -532,9 +523,7 @@
 #. * 'Digital Persona U.are.U 4000/4000B' device."
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:581
 #, c-format
-msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the '%s' device."
+msgid "To enable fingerprint login, you need to save one of your fingerprints, using the '%s' device."
 msgstr "要启用指纹登录,你需要使用 '%s' 设备来保存你指纹之一。"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.c:590
@@ -594,9 +583,7 @@
 msgstr "选择手指"
 
 #: ../capplets/about-me/gnome-about-me-fingerprint.ui.h:15
-msgid ""
-"Your fingerprint was successfully saved. You should now be able to log in "
-"using your fingerprint reader."
+msgid "Your fingerprint was successfully saved. You should now be able to log in using your fingerprint reader."
 msgstr "你指纹已成功保存。你现在应该可以使用指纹读取器登录了。"
 
 #: ../capplets/about-me/gnome-about-me-password.c:161
@@ -625,9 +612,7 @@
 #. Authentication failure
 #: ../capplets/about-me/gnome-about-me-password.c:474
 #: ../capplets/about-me/gnome-about-me-password.c:550
-msgid ""
-"Your password has been changed since you initially authenticated! Please re-"
-"authenticate."
+msgid "Your password has been changed since you initially authenticated! Please re-authenticate."
 msgstr "您的密自您初始登录以来已经发生了更改。请重新进行身份验证。"
 
 #: ../capplets/about-me/gnome-about-me-password.c:476
@@ -694,8 +679,7 @@
 
 #: ../capplets/about-me/gnome-about-me-password.c:936
 #: ../capplets/about-me/gnome-about-me-password.ui.h:5
-msgid ""
-"Please type your password again in the <b>Retype new password</b> field."
+msgid "Please type your password again in the <b>Retype new password</b> field."
 msgstr "请在<b>重新输入新密码</b>框中再输入一次密码。"
 
 #: ../capplets/about-me/gnome-about-me-password.c:939
@@ -721,14 +705,11 @@
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:6
 msgid ""
-"To change your password, enter your current password in the field below and "
-"click <b>Authenticate</b>.\n"
-"After you have authenticated, enter your new password, retype it for "
-"verification and click <b>Change password</b>."
+"To change your password, enter your current password in the field below and click <b>Authenticate</b>.\n"
+"After you have authenticated, enter your new password, retype it for verification and click <b>Change password</b>."
 msgstr ""
 "要更改您的密码,请在下面的框中输入您目前的密码,然后单击<b>身份验证</b>。\n"
-"在您通过身份验证之后,输入您的新密码,重新输入一次以便进行校验,然后单击<b>更"
-"改密码</b>。"
+"在您通过身份验证之后,输入您的新密码,重新输入一次以便进行校验,然后单击<b>更改密码</b>。"
 
 #: ../capplets/about-me/gnome-about-me-password.ui.h:8
 msgid "_Authenticate"
@@ -755,9 +736,7 @@
 msgstr "辅助技术首选项"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:4
-msgid ""
-"Changes to enable assistive technologies will not take effect until your "
-"next log in."
+msgid "Changes to enable assistive technologies will not take effect until your next log in."
 msgstr "对启用辅助技术的更改直到下次登录后才会生效。"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.ui.h:5
@@ -826,28 +805,15 @@
 #: ../capplets/appearance/appearance-font.c:498
 #: ../capplets/appearance/cc-font-page.c:324
 #, c-format
-msgid ""
-"The font selected is %d point large, and may make it difficult to "
-"effectively use the computer.  It is recommended that you select a size "
-"smaller than %d."
-msgid_plural ""
-"The font selected is %d points large, and may make it difficult to "
-"effectively use the computer. It is recommended that you select a size "
-"smaller than %d."
-msgstr[0] ""
-"选中的字体是 %d 磅大。要想有效的使用计算机,推荐您选择小于 %d 的大小。"
+msgid "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a size smaller than %d."
+msgid_plural "The font selected is %d points large, and may make it difficult to effectively use the computer. It is recommended that you select a size smaller than %d."
+msgstr[0] "选中的字体是 %d 磅大。要想有效的使用计算机,推荐您选择小于 %d 的大小。"
 
 #: ../capplets/appearance/appearance-font.c:511
 #: ../capplets/appearance/cc-font-page.c:337
 #, c-format
-msgid ""
-"The font selected is %d point large, and may make it difficult to "
-"effectively use the computer.  It is recommended that you select a smaller "
-"sized font."
-msgid_plural ""
-"The font selected is %d points large, and may make it difficult to "
-"effectively use the computer. It is recommended that you select a smaller "
-"sized font."
+msgid "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a smaller sized font."
+msgid_plural "The font selected is %d points large, and may make it difficult to effectively use the computer. It is recommended that you select a smaller sized font."
 msgstr[0] "选中的字体是 %d 磅大。要想有效的使用计算机,推荐您选择较小的字体。"
 
 #: ../capplets/appearance/appearance-font.c:534
@@ -917,9 +883,7 @@
 #: ../capplets/appearance/cc-theme-customize-dialog.c:210
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1646
 #, c-format
-msgid ""
-"This theme will not look as intended because the required GTK+ theme engine "
-"'%s' is not installed."
+msgid "This theme will not look as intended because the required GTK+ theme engine '%s' is not installed."
 msgstr "此主题可能与设计之初看起来不同,因为其所需的 GTK+ 主题引擎“%s”未安装。"
 
 #: ../capplets/appearance/appearance-themes.c:673
@@ -939,16 +903,12 @@
 
 #: ../capplets/appearance/appearance-themes.c:711
 #: ../capplets/appearance/cc-theme-page.c:815
-msgid ""
-"The current theme suggests a background and a font. Also, the last applied "
-"font suggestion can be reverted."
+msgid "The current theme suggests a background and a font. Also, the last applied font suggestion can be reverted."
 msgstr "当前主题建议了一个背景和一种字体。同时,上次应用的字体建议可被恢复。"
 
 #: ../capplets/appearance/appearance-themes.c:713
 #: ../capplets/appearance/cc-theme-page.c:818
-msgid ""
-"The current theme suggests a background. Also, the last applied font "
-"suggestion can be reverted."
+msgid "The current theme suggests a background. Also, the last applied font suggestion can be reverted."
 msgstr "当前主题建议了一个背景。同时,上次应用的字体建议可被恢复。"
 
 #: ../capplets/appearance/appearance-themes.c:715
@@ -958,9 +918,7 @@
 
 #: ../capplets/appearance/appearance-themes.c:717
 #: ../capplets/appearance/cc-theme-page.c:824
-msgid ""
-"The current theme suggests a font. Also, the last applied font suggestion "
-"can be reverted."
+msgid "The current theme suggests a font. Also, the last applied font suggestion can be reverted."
 msgstr "当前主题建议了一种字体。同时,上次应用的字体建议可被恢复。"
 
 #: ../capplets/appearance/appearance-themes.c:719
@@ -1426,9 +1384,7 @@
 
 #: ../capplets/appearance/theme-installer.c:266
 #, c-format
-msgid ""
-"\"%s\" does not appear to be a valid theme. It may be a theme engine which "
-"you need to compile."
+msgid "\"%s\" does not appear to be a valid theme. It may be a theme engine which you need to compile."
 msgstr "“%s”似乎不是有效的主题。它可能是需要编译才能使用的主题引擎。"
 
 #: ../capplets/appearance/theme-installer.c:372
@@ -1860,12 +1816,8 @@
 
 #: ../capplets/display/cc-display-minimal-page.c:478
 #: ../capplets/display/cc-display-minimal-page.c:487
-msgid ""
-"You are only showing your desktop on your computer's screen. Plug in another "
-"display to share your view and then turn display sharing on above."
-msgstr ""
-"您只是在当前的电脑屏幕上显示您的桌面。您可以插入另一台显示器以扩大您的视屏,然后打"
-"开上面的显示器共享。"
+msgid "You are only showing your desktop on your computer's screen. Plug in another display to share your view and then turn display sharing on above."
+msgstr "您只是在当前的电脑屏幕上显示您的桌面。您可以插入另一台显示器以扩大您的视屏,然后打开上面的显示器共享。"
 
 #: ../capplets/display/cc-display-minimal-page.c:496
 #: ../capplets/display/display-minimal.ui.h:4
@@ -2011,8 +1963,7 @@
 
 #: ../capplets/keyboard/gnome-keyboard-properties.c:205
 #: ../capplets/keyboard/gnome-keyboard-properties.c:210
-msgid ""
-"Just apply settings and quit (compatibility only; now handled by daemon)"
+msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "应用设置并退出(仅为兼容,现在已由守护进程处理)"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.c:215
@@ -2164,9 +2115,7 @@
 msgstr "布局"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:21
-msgid ""
-"Lock screen after a certain duration to help prevent repetitive keyboard use "
-"injuries"
+msgid "Lock screen after a certain duration to help prevent repetitive keyboard use injuries"
 msgstr "每隔一段时间锁定屏幕,以便重复性的键盘工作使手臂过度劳累"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:22
@@ -2217,9 +2166,7 @@
 msgstr "慢"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:35
-msgid ""
-"To edit a shortcut key, click on the corresponding row and type a new key "
-"combination, or press backspace to clear."
+msgid "To edit a shortcut key, click on the corresponding row and type a new key combination, or press backspace to clear."
 msgstr "要编辑快捷键,请单击相应的行,然后输入新按键组合,或按退格键清除。"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-dialog.ui.h:36
@@ -2332,7 +2279,7 @@
 msgid "Keyboard Layout Options"
 msgstr "键盘布局选项"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -2360,8 +2307,7 @@
 #: ../capplets/keyboard/cc-shortcuts-page.c:1172
 #, c-format
 msgid ""
-"The shortcut \"%s\" cannot be used because it will become impossible to type "
-"using this key.\n"
+"The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
 "Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
 "无法使用快捷键“%s”,原因是使用此键将无法输入。\n"
@@ -2378,8 +2324,7 @@
 
 #: ../capplets/keyboard/cc-shortcuts-page.c:1208
 #, c-format
-msgid ""
-"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
+msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "如果您将快捷键重新指派给“%s”,“%s”的快捷键将被禁用。"
 
 #: ../capplets/keyboard/cc-shortcuts-page.c:1216
@@ -2596,8 +2541,7 @@
 msgstr "阈值(_E):"
 
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:32
-msgid ""
-"To test your double-click settings, try to double-click on the light bulb."
+msgid "To test your double-click settings, try to double-click on the light bulb."
 msgstr "要测试您的双击设置,请试着双击右侧的灯泡。"
 
 #: ../capplets/mouse/gnome-mouse-properties.ui.h:33
@@ -2922,9 +2866,7 @@
 msgstr "电脑屏幕将空白,您的留言状态将为“离开”。"
 
 #: ../capplets/power/power.ui.h:6
-msgid ""
-"This will suspend everything on your computer. It'll wake up in just the "
-"same state as it was before."
+msgid "This will suspend everything on your computer. It'll wake up in just the same state as it was before."
 msgstr "这将暂停您电脑上的一切活动。电脑将以之前的状态被唤醒。"
 
 #: ../capplets/power/power.ui.h:7
@@ -3006,15 +2948,10 @@
 #: ../libgnome-control-center-extension/activate-settings-daemon.c:16
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
-"Without the GNOME settings manager running, some preferences may not take "
-"effect. This could indicate a problem with DBus, or a non-GNOME (e.g. KDE) "
-"settings manager may already be active and conflicting with the GNOME "
-"settings manager."
+"Without the GNOME settings manager running, some preferences may not take effect. This could indicate a problem with DBus, or a non-GNOME (e.g. KDE) settings manager may already be active and conflicting with the GNOME settings manager."
 msgstr ""
 "无法启动设置管理器“gnome-settings-daemon”。\n"
-"如果不运行 GNOME 设置管理器,某些首选项不会生效。这可能表明 DBus 出现问题,或"
-"者某个非 GNOME(如 KDE)设置管理器可能已经处于活动状态,并与 GNOME 设置管理器"
-"发生冲突。"
+"如果不运行 GNOME 设置管理器,某些首选项不会生效。这可能表明 DBus 出现问题,或者某个非 GNOME(如 KDE)设置管理器可能已经处于活动状态,并与 GNOME 设置管理器发生冲突。"
 
 #: ../libgnome-control-center-extension/capplet-stock-icons.c:66
 #, c-format
@@ -3123,8 +3060,7 @@
 msgstr "改动集"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:150
-msgid ""
-"GConf change set containing data to be forwarded to the gconf client on apply"
+msgid "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr "包含应用修改时要传递给 gconf 客户端的数据的 GConf 改动集合"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:155
@@ -3132,8 +3068,7 @@
 msgstr "转换到部件时的回调"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:156
-msgid ""
-"Callback to be issued when data are to be converted from GConf to the widget"
+msgid "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "当数据从 GConf 转换到部件时使用的回调"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:161
@@ -3141,8 +3076,7 @@
 msgstr "从部件转换时的回调"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:162
-msgid ""
-"Callback to be issued when data are to be converted to GConf from the widget"
+msgid "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "当数据从部件转换到 GConf 时使用的回调"
 
 #: ../libgnome-control-center-extension/gconf-property-editor.c:167
@@ -3174,8 +3108,7 @@
 msgid ""
 "Couldn't find the file '%s'.\n"
 "\n"
-"Please make sure it exists and try again, or choose a different background "
-"picture."
+"Please make sure it exists and try again, or choose a different background picture."
 msgstr ""
 "找不到文件“%s”。\n"
 "\n"
@@ -3232,23 +3165,17 @@
 
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1622
 #, c-format
-msgid ""
-"This theme will not look as intended because the required GTK+ theme '%s' is "
-"not installed."
+msgid "This theme will not look as intended because the required GTK+ theme '%s' is not installed."
 msgstr "此主题的外观将与设计之初不同,因为所需的 GTK+ 主题“%s”未安装。"
 
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1630
 #, c-format
-msgid ""
-"This theme will not look as intended because the required window manager "
-"theme '%s' is not installed."
+msgid "This theme will not look as intended because the required window manager theme '%s' is not installed."
 msgstr "此主题的外观将与设计之初不同,因为所需的窗口管理器主题“%s”未安装。"
 
 #: ../libgnome-control-center-extension/gnome-theme-info.c:1637
 #, c-format
-msgid ""
-"This theme will not look as intended because the required icon theme '%s' is "
-"not installed."
+msgid "This theme will not look as intended because the required icon theme '%s' is not installed."
 msgstr "此主题的外观将与设计之初不同,因为所需的图标主题“%s”未安装。"
 
 #: ../libwindow-settings/gnome-wm-manager.c:316
@@ -3309,15 +3236,11 @@
 msgstr "指示在执行启动动作时是否关闭 Shell"
 
 #: ../shell/control-center.schemas.in.h:8
-msgid ""
-"Indicates whether to close the shell when an add or remove action is "
-"performed."
+msgid "Indicates whether to close the shell when an add or remove action is performed."
 msgstr "指示在执行添加或移除动作时是否关闭 Shell"
 
 #: ../shell/control-center.schemas.in.h:9
-msgid ""
-"Indicates whether to close the shell when an upgrade or uninstall action is "
-"performed."
+msgid "Indicates whether to close the shell when an upgrade or uninstall action is performed."
 msgstr "指示在执行升级或卸载动作时是否关闭 Shell"
 
 #: ../shell/control-center.schemas.in.h:10
@@ -3325,26 +3248,16 @@
 msgstr "任务名及相关的 .desktop 文件"
 
 #: ../shell/control-center.schemas.in.h:11
-msgid ""
-"The task name to be displayed in the control-center followed by a \";\" "
-"separator then the filename of an associated .desktop file to launch for "
-"that task."
-msgstr ""
-"在控制中心中显示的任务名称,紧跟着是一个“;”分隔符,然后是该任务启动的相应的 ."
-"desktop 文件的文件名。"
+msgid "The task name to be displayed in the control-center followed by a \";\" separator then the filename of an associated .desktop file to launch for that task."
+msgstr "在控制中心中显示的任务名称,紧跟着是一个“;”分隔符,然后是该任务启动的相应的 .desktop 文件的文件名。"
 
 #. Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a ","
 #: ../shell/control-center.schemas.in.h:13
-msgid ""
-"[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-"
-"applications.desktop,Add Printer;gnome-cups-manager.desktop]"
-msgstr ""
-"[更改主题;gtk-theme-selector.desktop,设定首选应用程序;default-applications."
-"desktop,添加打印机;gnome-cups-manager.desktop]"
+msgid "[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-applications.desktop,Add Printer;gnome-cups-manager.desktop]"
+msgstr "[更改主题;gtk-theme-selector.desktop,设定首选应用程序;default-applications.desktop,添加打印机;gnome-cups-manager.desktop]"
 
 #: ../shell/control-center.schemas.in.h:14
-msgid ""
-"if true, the control-center will close when a \"Common Task\" is activated."
+msgid "if true, the control-center will close when a \"Common Task\" is activated."
 msgstr "如果为 true,在一个“常见任务”激活时,控制中心将关闭。"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:1
@@ -3359,6 +3272,14 @@
 msgid "Control Center"
 msgstr "控制中心"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "系统设置"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "全部设置(_A)"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "推迟间隔(_P)"
@@ -3384,9 +3305,7 @@
 
 #: ../typing-break/drwright.c:526
 #, c-format
-msgid ""
-"Unable to bring up the typing break properties dialog with the following "
-"error: %s"
+msgid "Unable to bring up the typing break properties dialog with the following error: %s"
 msgstr "无法启动打字间隔属性对话框,错误如下:%s"
 
 #: ../typing-break/drwright.c:543
@@ -3421,14 +3340,8 @@
 msgstr "打字显示器"
 
 #: ../typing-break/main.c:105
-msgid ""
-"The typing monitor uses the notification area to display information. You "
-"don't seem to have a notification area on your panel. You can add it by "
-"right-clicking on your panel and choosing 'Add to panel', selecting "
-"'Notification area' and clicking 'Add'."
-msgstr ""
-"打字显示器使用通知区显示信息。似乎您并没有在面板上放置通知区。要想添加通知"
-"区,只需用鼠标邮件点击面板,然后选择“添加到面板 -> 通知区”。"
+msgid "The typing monitor uses the notification area to display information. You don't seem to have a notification area on your panel. You can add it by right-clicking on your panel and choosing 'Add to panel', selecting 'Notification area' and clicking 'Add'."
+msgstr "打字显示器使用通知区显示信息。似乎您并没有在面板上放置通知区。要想添加通知区,只需用鼠标邮件点击面板,然后选择“添加到面板 -> 通知区”。"
 
 #: ../font-viewer/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3447,8 +3360,7 @@
 msgstr "如果设定为 true,将制作 Type1 字体缩略图。"
 
 #: ../font-viewer/fontilus.schemas.in.h:5
-msgid ""
-"Set this key to the command used to create thumbnails for OpenType fonts."
+msgid "Set this key to the command used to create thumbnails for OpenType fonts."
 msgstr "设置该值到用于创建 OpenType 字体缩略图的命令。"
 
 #: ../font-viewer/fontilus.schemas.in.h:6
@@ -3456,8 +3368,7 @@
 msgstr "设置该值到用于创建 PCF 字体缩略图的命令。"
 
 #: ../font-viewer/fontilus.schemas.in.h:7
-msgid ""
-"Set this key to the command used to create thumbnails for TrueType fonts."
+msgid "Set this key to the command used to create thumbnails for TrueType fonts."
 msgstr "设置该值到用于创建 TrueType 字体缩略图的命令。"
 
 #: ../font-viewer/fontilus.schemas.in.h:8
@@ -3512,11 +3423,13 @@
 msgid "Size:"
 msgstr "大小:"
 
-#: ../font-viewer/font-view.c:353 ../font-viewer/font-view.c:366
+#: ../font-viewer/font-view.c:353
+#: ../font-viewer/font-view.c:366
 msgid "Version:"
 msgstr "版本:"
 
-#: ../font-viewer/font-view.c:357 ../font-viewer/font-view.c:368
+#: ../font-viewer/font-view.c:357
+#: ../font-viewer/font-view.c:368
 msgid "Copyright:"
 msgstr "版权:"
 
@@ -3576,181 +3489,122 @@
 
 #~ msgid "- GNOME Network Preferences"
 #~ msgstr "- GNOME 网络首选项"
-
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr "选择您登录时想要启用的辅助特性"
-
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "为命令指定快捷键"
-
 #~ msgid "key not found [%s]\n"
 #~ msgstr "键未找到 [%s]\n"
-
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "启动时隐藏(对于预先启动 shell 非常有用)"
-
 #~ msgid "Filter"
 #~ msgstr "过滤器"
-
 #~ msgid "Groups"
 #~ msgstr "分组"
-
 #~ msgid "Common Tasks"
 #~ msgstr "公共任务"
-
 #~ msgid "Your filter \"%s\" does not match any items."
 #~ msgstr "您的过滤器 \"%s\" 不符合任何条目。"
-
 #~ msgid "No matches found."
 #~ msgstr "没有找到符合的。"
-
 #~ msgid "Other"
 #~ msgstr "其它"
-
 #~ msgid "Start %s"
 #~ msgstr "启动 %s"
-
 #~ msgid "Help"
 #~ msgstr "帮助"
-
 #~ msgid "Upgrade"
 #~ msgstr "升级"
-
 #~ msgid "Uninstall"
 #~ msgstr "卸载"
-
 #~ msgid "Remove from Favorites"
 #~ msgstr "从收藏夹中删除"
-
 #~ msgid "Add to Favorites"
 #~ msgstr "添加到收藏夹"
-
 #~ msgid "Remove from Startup Programs"
 #~ msgstr "从启动程序中删除"
-
 #~ msgid "Add to Startup Programs"
 #~ msgstr "添加到启动程序"
-
 #~ msgid "New Spreadsheet"
 #~ msgstr "新建电子表格"
-
 #~ msgid "New Document"
 #~ msgstr "新建文档"
-
 #~ msgid "Documents"
 #~ msgstr "文档"
-
 #~ msgid "File System"
 #~ msgstr "文件系统"
-
 #~ msgid "Network Servers"
 #~ msgstr "网络服务器"
-
 #~ msgid "Search"
 #~ msgstr "搜索"
-
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>打开</b>"
-
 #~ msgid "Rename..."
 #~ msgstr "重命名..."
-
 #~ msgid "Send To..."
 #~ msgstr "发送至..."
-
 #~ msgid "Move to Trash"
 #~ msgstr "移至回收站"
-
 #~ msgid "Delete"
 #~ msgstr "删除"
-
 #~ msgid "Are you sure you want to permanently delete \"%s\"?"
 #~ msgstr "您确定想要永久删除“%s”吗?"
-
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "如果您删除一项的话,它将永久丢失。"
-
 #~ msgid "Open with \"%s\""
 #~ msgstr "用“%s”打开"
-
 #~ msgid "Open with Default Application"
 #~ msgstr "用默认应用程序打开"
-
 #~ msgid "Open in File Manager"
 #~ msgstr "在文件管理器中打开"
-
 #~ msgid "?"
 #~ msgstr "?"
-
 #~ msgid "%l:%M %p"
 #~ msgstr "%H:%M"
-
 #~ msgid "Today %l:%M %p"
 #~ msgstr "今天 %H:%M"
-
 #~ msgid "Yesterday %l:%M %p"
 #~ msgstr "昨天 %H:%M"
-
 #~ msgid "%a %l:%M %p"
 #~ msgstr "%A%H:%M"
-
 #~ msgid "%b %d %l:%M %p"
 #~ msgstr "%m月%d日%H:%M"
-
 #~ msgid "%b %d %Y"
 #~ msgstr "%Y-%m-%d"
-
 #~ msgid "Find Now"
 #~ msgstr "立即查找"
-
 #~ msgid "<b>Open %s</b>"
 #~ msgstr "<b>打开 %s</b>"
-
 #~ msgid "Remove from System Items"
 #~ msgstr "从系统项目中删除"
-
 #~ msgid "C_ontrol"
 #~ msgstr "C_trl"
-
 #~ msgid "Edit"
 #~ msgstr "编辑"
-
 #~ msgid "Fill screen"
 #~ msgstr "适合屏幕"
-
 #~ msgid "Interface"
 #~ msgstr "界面"
-
 #~ msgid "Menus and Toolbars"
 #~ msgstr "菜单和工具栏"
-
 #~ msgid "Preview"
 #~ msgstr "预览"
-
 #~ msgid "Show _icons in menus"
 #~ msgstr "在菜单中显示图标(_I)"
-
 #~ msgid "Toolbar _button labels:"
 #~ msgstr "工具栏按钮标签(_B):"
-
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "可编辑的菜单快捷键(_E)"
-
 #~ msgid "_File"
 #~ msgstr "文件(_F)"
-
 #~ msgid "A_cceleration:"
 #~ msgstr "加速(_C):"
-
 #~ msgid "Selected _layouts:"
 #~ msgstr "选择布局(_L):"
-
 #~ msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 #~ msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
-
 #~ msgid "Unknown login ID, the user database might be corrupted"
 #~ msgstr "未知的登录 ID,用户数据库可能已经损坏"
-
 #~ msgid ""
 #~ "Left thumb\n"
 #~ "Left middle finger\n"
@@ -3769,52 +3623,36 @@
 #~ "右手中指\n"
 #~ "右手无名指\n"
 #~ "右手小指"
-
 #~ msgid "<b>Email</b>"
 #~ msgstr "<i>电子邮件</i>"
-
 #~ msgid "<b>Home</b>"
 #~ msgstr "<b>家庭</b>"
-
 #~ msgid "<b>Job</b>"
 #~ msgstr "<b>工作</b>"
-
 #~ msgid "<b>Web</b>"
 #~ msgstr "<b>Web</b>"
-
 #~ msgid "<b>Work</b>"
 #~ msgstr "<b>工作</b>"
-
 #~ msgid "<span size=\"larger\" weight=\"bold\">Change your password</span>"
 #~ msgstr "<span size=\"larger\" weight=\"bold\">更改您的密码</span>"
-
 #~ msgid "<b>Assistive Technologies</b>"
 #~ msgstr "<b>辅助技术</b>"
-
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>首选项</b>"
-
 #~ msgid "<b>C_olors</b>"
 #~ msgstr "<b>颜色(_O)</b>"
-
 #~ msgid "<b>Preview</b>"
 #~ msgstr "<b>预览</b>"
-
 #~ msgid "<b>_Desktop Background</b>"
 #~ msgstr "<b>桌面背景(_D)</b>"
-
 #~ msgid "C_ut"
 #~ msgstr "剪切(_U)"
-
 #~ msgid "New File"
 #~ msgstr "新建文件"
-
 #~ msgid "Open File"
 #~ msgstr "打开文件"
-
 #~ msgid "Save File"
 #~ msgstr "保存文件"
-
 #~ msgid ""
 #~ "Solid color\n"
 #~ "Horizontal gradient\n"
@@ -3823,7 +3661,6 @@
 #~ "纯色\n"
 #~ "水平渐变\n"
 #~ "垂直渐变"
-
 #~ msgid ""
 #~ "Text below items\n"
 #~ "Text beside items\n"
@@ -3834,7 +3671,6 @@
 #~ "文本在项目旁\n"
 #~ "只有图标\n"
 #~ "只有文本"
-
 #~ msgid ""
 #~ "Tiled\n"
 #~ "Zoom\n"
@@ -3847,28 +3683,20 @@
 #~ "居中\n"
 #~ "缩小\n"
 #~ "适合屏幕"
-
 #~ msgid "_Copy"
 #~ msgstr "复制(_C)"
-
 #~ msgid "_New"
 #~ msgstr "新建(_N)"
-
 #~ msgid "_Open"
 #~ msgstr "打开(_O)"
-
 #~ msgid "_Print"
 #~ msgstr "打印(_P)"
-
 #~ msgid "_Quit"
 #~ msgstr "退出(_Q)"
-
 #~ msgid "_Save"
 #~ msgstr "保存(_S)"
-
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<i>视觉</i>"
-
 #~ msgid ""
 #~ "Normal\n"
 #~ "Left\n"
@@ -3879,46 +3707,32 @@
 #~ "左转\n"
 #~ "右转\n"
 #~ "颠倒\n"
-
 #~ msgid "Could not apply the selected configuration"
 #~ msgstr "无法应用选定的配置"
-
 #~ msgid "<b>Bounce Keys</b>"
 #~ msgstr "<b>回弹键</b>"
-
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>常规</b>"
-
 #~ msgid "<small><i>Fast</i></small>"
 #~ msgstr "<small><i>快</i></small>"
-
 #~ msgid "<small><i>Long</i></small>"
 #~ msgstr "<small><i>长</i></small>"
-
 #~ msgid "<small><i>Short</i></small>"
 #~ msgstr "<small><i>短</i></small>"
-
 #~ msgid "<small><i>Slow</i></small>"
 #~ msgstr "<small><i>慢</i></small>"
-
 #~ msgid "<b>Locate Pointer</b>"
 #~ msgstr "<b>定位指针</b>"
-
 #~ msgid "<small><i>High</i></small>"
 #~ msgstr "<small><i>高</i></small>"
-
 #~ msgid "<small><i>Large</i></small>"
 #~ msgstr "<small><i>大</i></small>"
-
 #~ msgid "<small><i>Low</i></small>"
 #~ msgstr "<small><i>低</i></small>"
-
 #~ msgid "<small><i>Small</i></small>"
 #~ msgstr "<small><i>小</i></small>"
-
 #~ msgid "<b>Ignore Host List</b>"
 #~ msgstr "<b>忽略主机列表</b>"
-
 #~ msgid ""
 #~ "<span size=\"large\"><b>No matches found.</b> </span><span>\n"
 #~ "\n"
@@ -3927,216 +3741,153 @@
 #~ "<span size=\"large\"><b>无匹配项。</b></span><span>\n"
 #~ "\n"
 #~ "您的过滤器“<b>%s</b>” 不与任何项匹配。</span>"
-
 #~ msgid "/_About"
 #~ msgstr "/关于(_A)"
-
 #~ msgid "<b>_Wallpaper</b>"
 #~ msgstr "<b>壁纸(_W)</b>"
-
 #~ msgid "No Wallpaper"
 #~ msgstr "无壁纸"
-
 #~ msgid "Screen Resolution"
 #~ msgstr "屏幕分辨率"
-
 #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR"
 #~ msgstr "无法得到 org.gnome.SettingsDaemon.XRANDR"
-
 #~ msgid "_Command:"
 #~ msgstr "命令(_C):"
-
 #~ msgid "Monitor Resolution Settings"
 #~ msgstr "显示器分辨率设置"
-
 #~ msgid "Retrieve and store legacy settings"
 #~ msgstr "取得并保存原有的设置"
-
 #~ msgid "Enable sound and associate sounds with events"
 #~ msgstr "启用窗口管理器的事件音效"
-
 #~ msgid "Unknown Volume Control %d"
 #~ msgstr "未知的音量控制 %d"
-
 #~ msgid "Failed to construct test pipeline for '%s'"
 #~ msgstr "为‘%s’创建测试流水线失败"
-
 #~ msgid "Not connected"
 #~ msgstr "未连接"
-
 #~ msgid "Autodetect"
 #~ msgstr "自动检测"
-
 #~ msgid "ALSA - Advanced Linux Sound Architecture"
 #~ msgstr "ALSA - 高级 Linux 声音架构"
-
 #~ msgid "Artsd - ART Sound Daemon"
 #~ msgstr "Artsd - ART 声音守护程序"
-
 #~ msgid "ESD - Enlightened Sound Daemon"
 #~ msgstr "ESD - Enlightened 声音守护程序"
-
 #~ msgid "OSS - Open Sound System"
 #~ msgstr "OSS - 开放声音系统"
-
 #~ msgid "PulseAudio Sound Server"
 #~ msgstr "PulseAudio 声音服务器"
-
 #~ msgid "- GNOME Sound Preferences"
 #~ msgstr "- GNOME 声音首选项"
-
 #~ msgid "<b>Alerts and Sound Effects</b>"
 #~ msgstr "<b>警告和音效</b>"
-
 #~ msgid "<b>Audio Conferencing</b>"
 #~ msgstr "<b>音频会议</b>"
-
 #~ msgid "<b>Default Mixer Tracks</b>"
 #~ msgstr "<b>默认混音器轨道</b>"
-
 #~ msgid "<b>Music and Movies</b>"
 #~ msgstr "<b>音乐和电影</b>"
-
 #~ msgid "<b>Sound Events</b>"
 #~ msgstr "<b>声音事件</b>"
-
 #~ msgid "<b>Sound Theme</b>"
 #~ msgstr "<b>声音主题</b>"
-
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Testing...</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">正在测试...</span>"
-
 #~ msgid "Click OK to finish."
 #~ msgstr "单击确定完成。"
-
 #~ msgid "Play _alert sound"
 #~ msgstr "播放警报声音(_A)"
-
 #~ msgid "Play _sound effects when buttons are clicked"
 #~ msgstr "点击按钮时播放音效(_S)"
-
 #~ msgid "S_ound playback:"
 #~ msgstr "声音回放(_O):"
-
 #~ msgid ""
 #~ "Select the device and tracks to control with the keyboard. Use the Shift "
 #~ "and Control keys to select multiple tracks if required."
 #~ msgstr ""
 #~ "用键盘选择待控制的设备和音轨。如果需要可使用 Shift 和 Control 键来选择多个"
 #~ "音轨。"
-
 #~ msgid "So_und playback:"
 #~ msgstr "声音回放(_U):"
-
 #~ msgid "Sou_nd capture:"
 #~ msgstr "声音抓取(_N):"
-
 #~ msgid "Sound Preferences"
 #~ msgstr "声音首选项"
-
 #~ msgid "Sounds"
 #~ msgstr "音效"
-
 #~ msgid "Test"
 #~ msgstr "测试"
-
 #~ msgid "Testing Pipeline"
 #~ msgstr "正在测试流水线"
-
 #~ msgid "_Device:"
 #~ msgstr "设备(_D):"
-
 #~ msgid "_Play alerts and sound effects"
 #~ msgstr "播放警报和音效(_P)"
-
 #~ msgid "_Sound playback:"
 #~ msgstr "声音回放(_S):"
-
 #~ msgctxt "Sound event"
 #~ msgid "Alert sound"
 #~ msgstr "报警声"
-
 #~ msgctxt "Sound event"
 #~ msgid "Windows and Buttons"
 #~ msgstr "窗口和按钮"
-
 #~ msgctxt "Sound event"
 #~ msgid "Button clicked"
 #~ msgstr "点击按钮"
-
 #~ msgctxt "Sound event"
 #~ msgid "Toggle button clicked"
 #~ msgstr "点击切换按钮"
-
 #~ msgctxt "Sound event"
 #~ msgid "Window maximized"
 #~ msgstr "窗口最大化"
-
 #~ msgctxt "Sound event"
 #~ msgid "Window unmaximized"
 #~ msgstr "窗口还原"
-
 #~ msgctxt "Sound event"
 #~ msgid "Window minimised"
 #~ msgstr "窗口最小化"
-
 #~ msgctxt "Sound event"
 #~ msgid "Desktop"
 #~ msgstr "桌面"
-
 #~ msgctxt "Sound event"
 #~ msgid "Logout"
 #~ msgstr "注销"
-
 #~ msgctxt "Sound event"
 #~ msgid "New e-mail"
 #~ msgstr "新邮件"
-
 #~ msgctxt "Sound event"
 #~ msgid "Empty trash"
 #~ msgstr "清空回收站"
-
 #~ msgctxt "Sound event"
 #~ msgid "Long action completed (download, CD burning, etc.)"
 #~ msgstr "完成长操作(下载、光盘刻录等等)"
-
 #~ msgctxt "Sound event"
 #~ msgid "Alerts"
 #~ msgstr "警报"
-
 #~ msgctxt "Sound event"
 #~ msgid "Information or question"
 #~ msgstr "信息或提问"
-
 #~ msgctxt "Sound event"
 #~ msgid "Warning"
 #~ msgstr "警告"
-
 #~ msgctxt "Sound event"
 #~ msgid "Error"
 #~ msgstr "出错"
-
 #~ msgctxt "Sound event"
 #~ msgid "Battery warning"
 #~ msgstr "电池警告"
-
 #~ msgid "Testing event sound"
 #~ msgstr "测试事件声音"
-
 #~ msgid "Select Sound File"
 #~ msgstr "选择声音文件"
-
 #~ msgid "Sound files"
 #~ msgstr "声音文件"
-
 #~ msgid "Custom..."
 #~ msgstr "自定义..."
-
 #~ msgid "Lock Screen"
 #~ msgstr "锁住屏幕"
-
 #~ msgid "Logout"
 #~ msgstr "注销"
-
 #~ msgid "Shutdown"
 #~ msgstr "关机"
+
--- po/zh_TW.po
+++ po/zh_TW.po
@@ -13,9 +13,9 @@
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.27.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-12 09:40+0000\n"
-"PO-Revision-Date: 2010-05-12 22:52+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
+"POT-Creation-Date: 2010-06-14 09:21+0000\n"
+"PO-Revision-Date: 2010-06-14 11:58-0800\n"
+"Last-Translator: Wen-Hsin Moh <wenhsinm at gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2279,7 +2279,7 @@
 msgid "Keyboard Layout Options"
 msgstr "鍵盤配置選項"
 
-#: ../capplets/keyboard/cc-keyboard-panel.c:163
+#: ../capplets/keyboard/cc-keyboard-panel.c:181
 #: ../capplets/keyboard/cc-keyboard-page.c:203
 #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
@@ -3272,6 +3272,14 @@
 msgid "Control Center"
 msgstr "控制中心"
 
+#: ../shell/shell.ui.h:1
+msgid "System Settings"
+msgstr "系統設定"
+
+#: ../shell/shell.ui.h:2
+msgid "_All Settings"
+msgstr "全部設定(_A)"
+
 #: ../typing-break/drw-break-window.c:194
 msgid "_Postpone Break"
 msgstr "停止休息(_P)"
@@ -3483,120 +3491,178 @@
 
 #~ msgid "- GNOME Network Preferences"
 #~ msgstr " - GNOME 網路偏好設定"
+
 #~ msgid "Choose which accessibility features to enable when you log in"
 #~ msgstr "選擇當您登入時要啟用哪個無障礙功能"
+
 #~ msgid "Edit"
 #~ msgstr "編輯"
+
 #~ msgid "Fill screen"
 #~ msgstr "全螢幕"
+
 #~ msgid "Interface"
 #~ msgstr "介面"
+
 #~ msgid "Menus and Toolbars"
 #~ msgstr "選單及工具列"
+
 #~ msgid "Preview"
 #~ msgstr "預覽"
+
 #~ msgid "Show _icons in menus"
 #~ msgstr "在選單中顯示圖示(_I)"
+
 #~ msgid "Toolbar _button labels:"
 #~ msgstr "工具列按鈕文字(_B):"
+
 #~ msgid "_Editable menu shortcut keys"
 #~ msgstr "可編輯選單捷徑鍵(_E)"
+
 #~ msgid "_File"
 #~ msgstr "檔案(_F)"
+
 #~ msgid "Assign shortcut keys to commands"
 #~ msgstr "為不同的指令分配捷徑鍵"
+
 #~ msgid "A_cceleration:"
 #~ msgstr "加速度(_C):"
+
 #~ msgid "Layout _Options..."
 #~ msgstr "配置選項(_O)..."
+
 #~ msgid "_Selected layouts:"
 #~ msgstr "已選的配置(_S):"
+
 #~ msgid "C_ontrol"
 #~ msgstr "C_ontrol"
+
 #~ msgid "key not found [%s]\n"
 #~ msgstr "找不到按鍵 [%s]\n"
+
 #~ msgid "Hide on start (useful to preload the shell)"
 #~ msgstr "啟動時隱藏 (要預先載入 shell 時很有用)"
+
 #~ msgid "Filter"
 #~ msgstr "篩選"
+
 #~ msgid "Groups"
 #~ msgstr "類別"
+
 #~ msgid "Common Tasks"
 #~ msgstr "一般設定"
+
 #~ msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 #~ msgstr "0123456789 The following is Chinese: '中文測試'"
+
 #~ msgid "Your filter \"%s\" does not match any items."
 #~ msgstr "您的過濾條件「%s」沒有任合項目符合。"
+
 #~ msgid "No matches found."
 #~ msgstr "找不到符合項。"
+
 #~ msgid "Other"
 #~ msgstr "其它"
+
 #~ msgid "Start %s"
 #~ msgstr "啟動 %s"
+
 #~ msgid "Help"
 #~ msgstr "求助"
+
 #~ msgid "Upgrade"
 #~ msgstr "更新"
+
 #~ msgid "Uninstall"
 #~ msgstr "移除"
+
 #~ msgid "Remove from Favorites"
 #~ msgstr "自最愛中移除"
+
 #~ msgid "Add to Favorites"
 #~ msgstr "加入最愛"
+
 #~ msgid "Remove from Startup Programs"
 #~ msgstr "從「初始啟動程式」中移除"
+
 #~ msgid "Add to Startup Programs"
 #~ msgstr "加入「初始啟動程式」"
+
 #~ msgid "New Spreadsheet"
 #~ msgstr "新試算表"
+
 #~ msgid "New Document"
 #~ msgstr "新文件"
+
 #~ msgid "Documents"
 #~ msgstr "文件"
+
 #~ msgid "File System"
 #~ msgstr "檔案系統"
+
 #~ msgid "Network Servers"
 #~ msgstr "網路伺服器"
+
 #~ msgid "<b>Open</b>"
 #~ msgstr "<b>開啟</b>"
+
 #~ msgid "Rename..."
 #~ msgstr "重新命名..."
+
 #~ msgid "Send To..."
 #~ msgstr "傳送至..."
+
 #~ msgid "Move to Trash"
 #~ msgstr "移至回收筒"
+
 #~ msgid "Delete"
 #~ msgstr "刪除"
+
 #~ msgid "Are you sure you want to permanently delete \"%s\"?"
 #~ msgstr "確定要永遠刪除「%s」?"
+
 #~ msgid "If you delete an item, it is permanently lost."
 #~ msgstr "如果將項目刪除,它將會永久失去。"
+
 #~ msgid "Open with \"%s\""
 #~ msgstr "以「%s」開啟"
+
 #~ msgid "Open with Default Application"
 #~ msgstr "以預設的應用程式開啟"
+
 #~ msgid "Open in File Manager"
 #~ msgstr "在檔案管理員中開啟"
+
 #~ msgid "?"
 #~ msgstr "?"
+
 #~ msgid "%l:%M %p"
 #~ msgstr "%l:%M %p"
+
 #~ msgid "Today %l:%M %p"
 #~ msgstr "今天 %l:%M %p"
+
 #~ msgid "Yesterday %l:%M %p"
 #~ msgstr "昨天 %l:%M %p"
+
 #~ msgid "%a %l:%M %p"
 #~ msgstr "%a %l:%M %p"
+
 #~ msgid "%b %d %l:%M %p"
 #~ msgstr "%b %d %l:%M %p"
+
 #~ msgid "%b %d %Y"
 #~ msgstr "%Y %b %d"
+
 #~ msgid "Find Now"
 #~ msgstr "現在尋找"
+
 #~ msgid "<b>Open %s</b>"
 #~ msgstr "<b>以“%s”開啟</b>"
+
 #~ msgid "Remove from System Items"
 #~ msgstr "自系統項目中移除"
+
 #~ msgid "_Desktop Background"
 #~ msgstr "桌面背景(_D)"
 
@@ -3924,53 +3990,74 @@
 #~ msgid ""
 #~ "Testing the new settings. If you don't respond in %d second the previous "
 #~ "settings will be restored."
+
 #~ msgid_plural ""
 #~ "Testing the new settings. If you don't respond in %d seconds the previous "
 #~ "settings will be restored."
 #~ msgstr[0] "正在測試新的設定。如果在 %d 秒內沒有回應,則會回復舊的。"
+
 #~ msgid "Keep Resolution"
 #~ msgstr "保留解析度"
+
 #~ msgid "Do you want to keep this resolution?"
 #~ msgstr "是否保留這個解析度?"
+
 #~ msgid "Use _Previous Resolution"
 #~ msgstr "使用以前的解析度(_P)"
+
 #~ msgid "_Keep Resolution"
 #~ msgstr "保留解析度(_K)"
+
 #~ msgid ""
 #~ "The X server does not support the XRandR extension.  Runtime resolution "
 #~ "changes to the display size are not available."
 #~ msgstr "這個 X 伺服器不支援 XRandR 擴展功能,因此無法即時變更畫面的大小。"
+
 #~ msgid ""
 #~ "The version of the XRandR extension is incompatible with this program. "
 #~ "Runtime changes to the display size are not available."
 #~ msgstr ""
 #~ "系統中的 XRandR 擴展功能和本程式的不相容,因此無法即時變更畫面解析度。"
+
 #~ msgid "Error setting new accelerator in configuration database: %s\n"
 #~ msgstr "在組態資料庫中設定新的捷徑鍵時出現錯誤:%s\n"
+
 #~ msgid "Keyboard Accessibility Notifications"
 #~ msgstr "鍵盤可存取性通知"
+
 #~ msgid "_Layouts:"
 #~ msgstr "配置(_L):"
+
 #~ msgid "Advanced Configuration"
 #~ msgstr "進階設定"
+
 #~ msgid "E_nable software sound mixing (ESD)"
 #~ msgstr "啟用軟體混音[ESD](_N)"
+
 #~ msgid "System Beep"
 #~ msgstr "系統鈴聲"
+
 #~ msgid "_Enable system beep"
 #~ msgstr "啟用系統鈴聲(_E)"
+
 #~ msgid "_Visual system beep"
 #~ msgstr "以畫面閃爍代替鈴聲(_V)"
+
 #~ msgid "Boing"
 #~ msgstr "彈簧"
+
 #~ msgid "Siren"
 #~ msgstr "警報"
+
 #~ msgid "Clink"
 #~ msgstr "叮噹"
+
 #~ msgid "Beep"
 #~ msgstr "鈴聲"
+
 #~ msgid "Sound not set for this event."
 #~ msgstr "此事件沒有設定音效。"
+
 #~ msgid ""
 #~ "The sound file for this event does not exist.\n"
 #~ "You may want to install the gnome-audio package for a set of default "
@@ -3978,62 +4065,85 @@
 #~ msgstr ""
 #~ "代表該事件的音效檔不存在。\n"
 #~ "安裝 gnome-audio 套件可獲得一套預設的音效。"
+
 #~ msgid "The sound file for this event does not exist."
 #~ msgstr "代表該事件的音效檔不存在。"
+
 #~ msgid "The file %s is not a valid wav file"
 #~ msgstr "檔案 %s 不是有效的 wav 檔案"
+
 #~ msgid "Select sound file..."
 #~ msgstr "選取音效檔..."
-#~ msgid "System Sounds"
-#~ msgstr "系統音效"
+
 #~ msgid "Set as Application Font"
 #~ msgstr "指定為應用程式字型"
+
 #~ msgid "Sets the default application font"
 #~ msgstr "設定應用程式的預設字型"
+
 #~ msgid "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">是否套用新的字型?</span>"
+
 #~ msgid "Do _not apply font"
 #~ msgstr "不套用字型(_N)"
+
 #~ msgid ""
 #~ "The theme you have selected suggests a new font. A preview of the font is "
 #~ "shown below."
 #~ msgstr "您選取的佈景主題建議使用一款新的字型。可以在下面的地方預覽該字型。"
+
 #~ msgid "_Apply font"
 #~ msgstr "套用字型(_A)"
+
 #~ msgid "Themes"
 #~ msgstr "佈景主題"
+
 #~ msgid "Description"
 #~ msgstr "描述"
+
 #~ msgid "Control theme"
 #~ msgstr "介面主題"
+
 #~ msgid "Window border theme"
 #~ msgstr "視窗邊框主題"
+
 #~ msgid "Icon theme"
 #~ msgstr "圖示主題"
+
 #~ msgid "If set to true, then installed themes will be thumbnailed."
 #~ msgstr "如設定為‘true’,則會為已安裝的佈景主題製作縮圖。"
+
 #~ msgid "If set to true, then themes will be thumbnailed."
 #~ msgstr "如設定為‘true’,則會為佈景主題製作縮圖。"
+
 #~ msgid ""
 #~ "Set this key to the command used to create thumbnails for installed "
 #~ "themes."
 #~ msgstr "本設定鍵的內容是為已安裝的佈景主題製作縮圖所用的指令。"
+
 #~ msgid "Set this key to the command used to create thumbnails for themes."
 #~ msgstr "本設定鍵的內容是為佈景主題製作縮圖所用的指令。"
+
 #~ msgid "Thumbnail command for installed themes"
 #~ msgstr "為已安裝的佈景主題製作縮圖所用的指令"
+
 #~ msgid "Thumbnail command for themes"
 #~ msgstr "為佈景主題製作縮圖所用的指令"
+
 #~ msgid "Whether to thumbnail installed themes"
 #~ msgstr "是否為已安裝的佈景主題製作縮圖"
+
 #~ msgid "Whether to thumbnail themes"
 #~ msgstr "是否為佈景主題製作縮圖"
+
 #~ msgid "ABCDEFG"
 #~ msgstr "ABC 中文測試"
+
 #~ msgid "[FILE]"
 #~ msgstr "[檔案]"
+
 #~ msgid "Apply theme"
 #~ msgstr "套用佈景主題"
+
 #~ msgid "Sets the default theme"
 #~ msgstr "設定預設的佈景主題"
-


More information about the MeeGo-commits mailing list