[gnome-control-center] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] Update Simplified Chinese translation.
Date: Fri, 14 Jan 2011 07:22:06 +0000 (UTC)
commit e815eaed5dbc60dd85835a5eb1820437a87b5149
Author: Aron Xu <aronxu gnome org>
Date:   Fri Jan 14 07:21:32 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1220 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 688 insertions(+), 532 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1a824ea..ce786e7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,7 @@
 # Simplified Chinese translation for gnome-control-center.
-# Copyright (C) 2002, 2003, 2006, 2009, 2010 Free Software Foundation, Inc.
-# some translations stolen from tranditional chinese translation
+# Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as gnome-control-center package.
+# Some translations are taken from tranditional chinese translation
 # by Abel Cheung <maddog linuxhall org>, 2001
 # He Qiangqiang <carton linux net cn>, 2002
 # Sun G11n <gnome_int_l10n ireland sun com>, 2002
@@ -11,15 +12,17 @@
 # Tao Wei <weitao1979 gmail com>, 2009, 2010.
 # Xhacker Liu <liu dongyuan gmail com>, 2010.
 # æ?±æ¶? <bill_zt sina com>, 2010.
-# Aron Xu <happyaron xu gmail com>, 2010.
 # zhang ping <zhangping159 gmail com>, 2010.
+# Aron Xu <happyaron xu gmail com>, 2010, 2011.
+# æ??å?·ç??ç¬?å¯? (dhyang) <dhyang555 gmail com>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&component=general\n"
-"POT-Creation-Date: 2010-12-10 11:04+0000\n"
-"PO-Revision-Date: 2010-12-12 16:28+0800\n"
+"POT-Creation-Date: 2011-01-12 00:12+0000\n"
+"PO-Revision-Date: 2011-01-14 15:11+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -38,13 +41,13 @@ msgstr "æ?´å¤?ç??è??æ?¯ç½?å??"
 
 #: ../gnome-control-center.schemas.in.h:3
 msgid "More themes URL"
-msgstr "æ?´å¤?ç??ä¸»é¢?ç½?å??"
+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."
-msgstr "è®¾å®?è¿?ä¸ªä¸ºæ?¨å½?å??ç??ä½?ç½®å??ç§°ã??è¿?å°?å?¨æ£?æµ?æ£ç¡®ç??ç½?ç»?ä»£ç??é??ç½®æ?¶æ??ç?¨ã??"
+msgstr "è®¾å®?æ¤å¤?ä¸ºä½ å½?å??ä½?ç½®ç??å??ç§°ï¼?è¿?è¢«ç?¨äº?ç¡®å®?å??é??ç??ç½?ç»?ä»£ç??é??ç½®"
 
 #: ../gnome-control-center.schemas.in.h:5
 msgid ""
@@ -175,237 +178,164 @@ msgstr "å£?çº¸;å±?å¹?;"
 msgid "Center"
 msgstr "å±?ä¸"
 
-#: ../panels/background/background.ui.h:2
+#. This refers to a slideshow background
+#: ../panels/background/background.ui.h:3
+msgid "Changes throughout the day"
+msgstr "ä¸?å¤©å??ä¸?æ?æ?¹å??"
+
+#: ../panels/background/background.ui.h:4
 msgid "Fill"
 msgstr "å¡«å??"
 
-#: ../panels/background/background.ui.h:3
+#: ../panels/background/background.ui.h:5
 msgid "Scale"
 msgstr "æ¯?ä¾?æ?¾å¤§"
 
-#: ../panels/background/background.ui.h:4
+#: ../panels/background/background.ui.h:6
 msgid "Span"
 msgstr "é??å??å®½åº¦"
 
-#: ../panels/background/background.ui.h:5
+#: ../panels/background/background.ui.h:7
 msgid "Tile"
 msgstr "å¹³é?º"
 
-#: ../panels/background/background.ui.h:6
+#: ../panels/background/background.ui.h:8
 #: ../panels/universal-access/uap.ui.h:93
 msgid "Zoom"
 msgstr "ç¼©æ?¾"
 
-#: ../panels/background/bg-colors-source.c:57
-msgid "Butter"
-msgstr ""
-
-#: ../panels/background/bg-colors-source.c:58
-msgid "Orange"
-msgstr "æ©?è?²"
-
-#: ../panels/background/bg-colors-source.c:59
-msgid "Chocolate"
-msgstr "èµè?²"
+#: ../panels/background/bg-colors-source.c:44
+msgid "Horizontal Gradient"
+msgstr "æ°´å¹³æ??åº¦"
 
-#: ../panels/background/bg-colors-source.c:60
-msgid "Chameleon"
-msgstr ""
+#: ../panels/background/bg-colors-source.c:45
+msgid "Vertical Gradient"
+msgstr "ç«?ç?´æ??åº¦"
 
-#: ../panels/background/bg-colors-source.c:61
-msgid "Blue"
-msgstr "è??è?²"
+#: ../panels/background/bg-colors-source.c:46
+msgid "Solid Color"
+msgstr "çº¯è?²"
 
-# ä¸?ç§?é¢?è?²ï¼?å¾?è¯?
-#: ../panels/background/bg-colors-source.c:62
-#, fuzzy
-msgid "Plum"
-msgstr "æ??å?"
-
-#: ../panels/background/bg-colors-source.c:63
-msgid "Red"
-msgstr "çº¢è?²"
-
-# å¾?è¯?
-#: ../panels/background/bg-colors-source.c:64
-msgid "Aluminium"
-msgstr "é??ç?½"
-
-#: ../panels/background/bg-colors-source.c:65
-msgid "Gray"
-msgstr "ç?°è?²"
-
-#: ../panels/background/bg-colors-source.c:66
-msgid "Black"
-msgstr "é»?è?²"
-
-#: ../panels/background/cc-background-panel.c:622
+#: ../panels/background/cc-background-panel.c:747
 msgid "Wallpapers"
 msgstr "å£?çº¸"
 
-#: ../panels/background/cc-background-panel.c:630
+#: ../panels/background/cc-background-panel.c:755
 msgid "Pictures Folder"
 msgstr "å?¾ç??æ??ä»¶å¤¹"
 
-#: ../panels/background/cc-background-panel.c:638
-msgid "Colors"
-msgstr "é¢?è?²"
+#: ../panels/background/cc-background-panel.c:763
+msgid "Colors & Gradients"
+msgstr "é¢?è?²å??æ¸?å??"
 
-#: ../panels/background/cc-background-panel.c:647
+#: ../panels/background/cc-background-panel.c:772
 msgid "Flickr"
 msgstr "Flickr"
 
-#: ../panels/background/gnome-wp-info.c:50
+#: ../panels/background/cc-background-panel.c:833
+msgid "Current background"
+msgstr "å½?å??è??æ?¯"
+
+#: ../panels/background/gnome-wp-info.c:59
 msgid "No Desktop Background"
 msgstr "æ? æ¡?é?¢è??æ?¯"
 
-#: ../panels/background/gnome-wp-item.c:294
-msgid "Slide Show"
-msgstr "å¹»ç?¯ç??æ¼?ç¤º"
-
-#: ../panels/background/gnome-wp-item.c:296
-msgid "Image"
-msgstr "å?¾å??"
-
-#: ../panels/background/gnome-wp-item.c:302
+#: ../panels/background/gnome-wp-item.c:277
 msgid "multiple sizes"
 msgstr "å¤?é??å°ºå¯¸"
 
-#. translators: x pixel(s) by y pixel(s)
-#: ../panels/background/gnome-wp-item.c:305
-#, c-format
-msgid "%d %s by %d %s"
-msgstr "%d %s * %d %s"
-
-#: ../panels/background/gnome-wp-item.c:307
-#: ../panels/background/gnome-wp-item.c:309
-msgid "pixel"
-msgid_plural "pixels"
-msgstr[0] "å??ç´ "
-
-#. translators: <b>wallpaper name</b>
-#. * mime type, size
-#. * Folder: /path/to/file
-#.
-#: ../panels/background/gnome-wp-item.c:317
-#, c-format
-msgid ""
-"<b>%s</b>\n"
-"%s, %s\n"
-"Folder: %s"
-msgstr ""
-"<b>%s</b>\n"
-"%sï¼?%s\n"
-"æ??ä»¶å¤¹ï¼?%s"
-
-#. translators: <b>wallpaper name</b>
-#. * Image missing
-#. * Folder: /path/to/file
-#.
-#: ../panels/background/gnome-wp-item.c:329
+#. translators: 100 Ã? 100px
+#. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
+#: ../panels/background/gnome-wp-item.c:285
 #, c-format
-msgid ""
-"<b>%s</b>\n"
-"%s\n"
-"Folder: %s"
-msgstr ""
-"<b>%s</b>\n"
-"%s\n"
-"æ??ä»¶å¤¹ï¼?%s"
-
-#: ../panels/background/gnome-wp-item.c:333
-msgid "Image missing"
-msgstr "å?¾å??ä¸¢å¤±"
+msgid "%d Ã? %d"
+msgstr "%d x %d"
 
 #: ../panels/datetime/datetime.ui.h:1
-msgid "12 hour format"
-msgstr "12 å°?æ?¶æ ¼å¼?"
-
-#: ../panels/datetime/datetime.ui.h:2
 msgid "16"
 msgstr "16"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: ../panels/datetime/datetime.ui.h:2
 msgid "2010"
 msgstr "2010"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: ../panels/datetime/datetime.ui.h:3
 msgid "22"
 msgstr "22"
 
-#: ../panels/datetime/datetime.ui.h:5
-msgid "24 hour format"
+#: ../panels/datetime/datetime.ui.h:4
+msgid "24-Hour Time"
 msgstr "24 å°?æ?¶æ ¼å¼?"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: ../panels/datetime/datetime.ui.h:5
 msgid "45"
 msgstr "45"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: ../panels/datetime/datetime.ui.h:6
 msgid ":"
 msgstr ":"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: ../panels/datetime/datetime.ui.h:7
 msgid "AM"
 msgstr "ä¸?å??"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: ../panels/datetime/datetime.ui.h:8
 msgid "April"
 msgstr "å??æ??"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: ../panels/datetime/datetime.ui.h:9
 msgid "August"
 msgstr "å?«æ??"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: ../panels/datetime/datetime.ui.h:10
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: ../panels/datetime/datetime.ui.h:11
 msgid "December"
 msgstr "å??äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:13
+#: ../panels/datetime/datetime.ui.h:12
 msgid "February"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: ../panels/datetime/datetime.ui.h:13
 msgid "January"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:15
+#: ../panels/datetime/datetime.ui.h:14
 msgid "July"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:16
+#: ../panels/datetime/datetime.ui.h:15
 msgid "June"
 msgstr "å?æ??"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: ../panels/datetime/datetime.ui.h:16
 msgid "March"
 msgstr "ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: ../panels/datetime/datetime.ui.h:17
 msgid "May"
 msgstr "äº?æ??"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: ../panels/datetime/datetime.ui.h:18
 msgid "Network Time"
 msgstr "ç½?ç»?æ?¶é?´"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: ../panels/datetime/datetime.ui.h:19
 msgid "November"
 msgstr "å??ä¸?æ??"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: ../panels/datetime/datetime.ui.h:20
 msgid "October"
 msgstr "å??æ??"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: ../panels/datetime/datetime.ui.h:21
 msgid "Region:"
 msgstr "å?°å?ºï¼?"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: ../panels/datetime/datetime.ui.h:22
 msgid "September"
 msgstr "ä¹?æ??"
 
@@ -415,221 +345,13 @@ msgid "Clock;Timezone;Location;"
 msgstr "æ?¶é??;æ?¶å?º;ä½?ç½®;"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
-msgid "Date And Time"
+msgid "Date and Time"
 msgstr "æ?¥æ??å??æ?¶é?´"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
 msgid "Date and Time preferences panel"
 msgstr "æ?¥æ??å??æ?¶é?´é¦?é??é¡¹é?¢æ?¿"
 
-#: ../panels/default-applications/gnome-default-applications-panel.desktop.in.in.h:1
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:11
-msgid "Preferred Applications"
-msgstr "é¦?é??åº?ç?¨ç¨?åº?"
-
-#: ../panels/default-applications/gnome-default-applications-panel.desktop.in.in.h:2
-msgid "Select your default applications"
-msgstr "é??æ?©é»?è®¤ç??åº?ç?¨ç¨?åº?"
-
-#: ../panels/default-applications/gnome-at-session.desktop.in.in.h:1
-msgid "Start the preferred visual assistive technology"
-msgstr "å?¯å?¨é¦?é??ç??è§?è§?è¾?å?©æ??æ?¯"
-
-#: ../panels/default-applications/gnome-at-session.desktop.in.in.h:2
-msgid "Visual Assistance"
-msgstr "è§?è§?è¾?å?©"
-
-#: ../panels/default-applications/gnome-da-capplet.c:83
-#, c-format
-msgid "Error setting default browser: %s"
-msgstr "è®¾ç½®é»?è®¤æµ?è§?å?¨å?ºé??ï¼?%s"
-
-#: ../panels/default-applications/gnome-da-capplet.c:106
-#, c-format
-msgid "Error setting default mailer: %s"
-msgstr "è®¾ç½®é»?è®¤ç?µå?é?®ä»¶ç¨?åº?å?ºé??ï¼?%s"
-
-#: ../panels/default-applications/gnome-da-capplet.c:321
-#: ../panels/sound/sound-theme-file-utils.c:292
-msgid "Custom"
-msgstr "è?ªå®?ä¹?"
-
-#: ../panels/default-applications/gnome-da-capplet.c:352
-msgid "Could not load the main interface"
-msgstr "æ? æ³?è£?å?¥ä¸»ç??é?¢"
-
-#: ../panels/default-applications/gnome-da-capplet.c:354
-msgid "Please make sure that the applet is properly installed"
-msgstr "è¯·ç¡®å®?å°?ç¨?åº?å·²ç»?æ£ç¡®å®?è£?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:1
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
-msgid "Accessibility"
-msgstr "è¾?å?©å??è?½"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:3
-#, no-c-format
-msgid "All %s occurrences will be replaced with actual link"
-msgstr "å?ºç?°ç??å?¨é?¨ %s é?½å°?è¢«æ?¿æ?¢ä¸ºå®?é??é?¾æ?¥"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:4
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-msgid "C_ommand:"
-msgstr "å?½ä»¤(_O)ï¼?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:5
-msgid "Co_mmand:"
-msgstr "å?½ä»¤(_M)ï¼?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:6
-msgid "E_xecute flag:"
-msgstr "æ?§è¡?æ ?å¿?(_X)ï¼?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:7
-msgid "Instant Messenger"
-msgstr "å?³æ?¶é??è®¯å·¥å?·"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:8
-msgid "Internet"
-msgstr "äº?è??ç½?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:9
-msgid "Mail Reader"
-msgstr "é?®ä»¶é??è¯»å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:10
-msgid "Mobility"
-msgstr "ç§»å?¨æ?§ "
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:12
-msgid "Run at st_art"
-msgstr "å?¯å?¨æ?¶è¿?è¡?(_A)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:13
-msgid "Run in t_erminal"
-msgstr "å?¨ç»?ç«¯ä¸è¿?è¡?(_E)"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:14
-msgid "System"
-msgstr "ç³»ç»?"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:15
-msgid "Terminal Emulator"
-msgstr "ç»?ç«¯æ¨¡æ??å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:16
-msgid "Text Editor"
-msgstr "æ??æ?¬ç¼?è¾?å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:17
-msgid "Visual"
-msgstr "è§?è§?æ??æ??"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:18
-msgid "Web Browser"
-msgstr "ç½?ç»?æµ?è§?å?¨"
-
-#: ../panels/default-applications/gnome-default-applications-properties.ui.h:19
-msgid "_Run at start"
-msgstr "å?¯å?¨æ?¶è¿?è¡?(_R)"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:1
-msgid "Banshee Music Player"
-msgstr "Banshee é?³ä¹?æ?æ?¾å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:2
-#: ../panels/universal-access/uap.ui.h:30
-msgid "Dasher"
-msgstr "Dasher"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:3
-msgid "Debian Terminal Emulator"
-msgstr "Debian ç»?ç«¯æ¨¡æ??å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:4
-msgid "ETerm"
-msgstr "ETerm"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:5
-msgid "GNOME Magnifier without Screen Reader"
-msgstr "ä¸?å¸¦å±?å¹?é??è¯»å?¨ç?? GNOME æ?¾å¤§é??"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:6
-msgid "GNOME OnScreen Keyboard"
-msgstr "GNOME å±?å¹?é?®ç??"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:7
-msgid "GNOME Terminal"
-msgstr "GNOME ç»?ç«¯"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:8
-msgid "Gnopernicus"
-msgstr "Gnopernicus"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:9
-msgid "Gnopernicus with Magnifier"
-msgstr "å¸¦æ?¾å¤§é??ç?? Gnopernicus"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:10
-msgid "KDE Magnifier without Screen Reader"
-msgstr "ä¸?å¸¦å±?å¹?é??è¯»å?¨ç?? KDE æ?¾å¤§é??"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:11
-msgid "Konsole"
-msgstr "Konsole"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:12
-msgid "Linux Screen Reader"
-msgstr "Linux å±?å¹?é??è¯»å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:13
-msgid "Linux Screen Reader with Magnifier"
-msgstr "å¸¦æ?¾å¤§é??ç?? Linux å±?å¹?é??è¯»å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:14
-msgid "Listen"
-msgstr "æ?¥å?¬"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:15
-msgid "Muine Music Player"
-msgstr "Muine é?³ä¹?æ?æ?¾å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:16
-msgid "NXterm"
-msgstr "NXterm"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:17
-msgid "Orca"
-msgstr "Orca"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:18
-msgid "Orca with Magnifier"
-msgstr "å¸¦æ?¾å¤§é??ç?? Orca"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:19
-msgid "RXVT"
-msgstr "RXVT"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:20
-msgid "Rhythmbox Music Player"
-msgstr "Rhythmbox é?³ä¹?æ?æ?¾å?¨"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:21
-msgid "Standard XTerminal"
-msgstr "æ ?å?? X ç»?ç«¯"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:22
-msgid "Terminator"
-msgstr "Terminator"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:23
-msgid "Totem Movie Player"
-msgstr "Totem ç?µå½±æ?æ?¾æ?º"
-
-#: ../panels/default-applications/gnome-default-applications.xml.in.h:24
-msgid "aterm"
-msgstr "aterm"
-
 #: ../panels/display/display-capplet.ui.h:1
 msgid "<i>Note: may limit resolution options</i>"
 msgstr "<i>æ??é??ï¼?å?¯è?½ä¼?é??å?¶å??è¾¨ç??é??é¡¹</i>"
@@ -665,13 +387,13 @@ msgid "Upside-down"
 msgstr "ä¸?ä¸?é¢ å??"
 
 #: ../panels/display/display-capplet.ui.h:8
-msgid "_Detect Monitors"
-msgstr "æ£?æµ?æ?¾ç¤ºå?¨(_D)"
+msgid "_Detect Displays"
+msgstr "æ£?æµ?æ?¾ç¤º(_D)"
 
 #. Note that mirror is a verb in this string
 #: ../panels/display/display-capplet.ui.h:10
 msgid "_Mirror displays"
-msgstr "é??å??æ?¾ç¤º(_N)"
+msgstr "é??å??æ?¾ç¤º(_M)"
 
 #: ../panels/display/display-capplet.ui.h:11
 msgid "_Resolution:"
@@ -713,40 +435,62 @@ msgstr "%d x %d (%s)"
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../panels/display/xrandr-capplet.c:1485
+#: ../panels/display/xrandr-capplet.c:1492
 msgid "Drag to change primary display."
 msgstr "æ??æ?½ä»¥æ?´æ?¹å?ºç¡?æ?¾ç¤ºè®¾å¤?ã??"
 
-#: ../panels/display/xrandr-capplet.c:1543
+#: ../panels/display/xrandr-capplet.c:1550
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
 msgstr "é??æ?©ä¸?ä¸ªæ?¾ç¤ºå?¨æ?¥æ?´æ?¹å®?ç??å±?æ?§ï¼?æ??å?¨å®?æ?¥æ??å??ä½?ç½®ã??"
 
-#: ../panels/display/xrandr-capplet.c:1942
+#: ../panels/display/xrandr-capplet.c:1935
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/xrandr-capplet.c:1944
+#: ../panels/display/xrandr-capplet.c:1937
 msgid "%a %l:%M %p"
 msgstr "%A %H%M"
 
-#: ../panels/display/xrandr-capplet.c:2229
+#: ../panels/display/xrandr-capplet.c:2222
 msgid "Could not save the monitor configuration"
 msgstr "æ? æ³?ä¿?å?æ?¾ç¤ºå?¨é??ç½®"
 
-#: ../panels/display/xrandr-capplet.c:2252
+#: ../panels/display/xrandr-capplet.c:2245
 msgid "Could not get session bus while applying display configuration"
 msgstr "åº?ç?¨æ?¾ç¤ºé??ç½®æ?¶æ? æ³?è?·å¾?ä¼?è¯?æ?»çº¿"
 
-#: ../panels/display/xrandr-capplet.c:2297
+#: ../panels/display/xrandr-capplet.c:2290
 msgid "Could not detect displays"
 msgstr "æ? æ³?æ?¢æµ?æ?¾ç¤ºå?¨"
 
-#: ../panels/display/xrandr-capplet.c:2504
+#: ../panels/display/xrandr-capplet.c:2494
 msgid "Could not get screen information"
 msgstr "æ? æ³?è?·å¾?å±?å¹?ä¿¡æ?¯"
 
+#: ../panels/info/cc-info-panel.c:242
+#, c-format
+msgid "%d-bit"
+msgstr "%d ä½?"
+
+#: ../panels/info/cc-info-panel.c:290
+msgid "Unknown model"
+msgstr "æ?ªç?¥å??å?·"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:1
+msgid "System Info"
+msgstr "ç³»ç»?ä¿¡æ?¯"
+
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
+msgid "System Information"
+msgstr "ç³»ç»?ä¿¡æ?¯"
+
+#. Translators: those are keywords for the System Information panel
+#: ../panels/info/gnome-info-panel.desktop.in.in.h:4
+msgid "device;system;information;memory;processor;version;"
+msgstr "è®¾å¤?;ç³»ç»?;ä¿¡æ?¯;ä¸»å?;å¤?ç??å?¨;ç??æ?¬;"
+
 #: ../panels/keyboard/00-multimedia-key.xml.in.h:1
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
 msgid "Sound"
@@ -786,6 +530,7 @@ msgstr "å? é??é?®ç±»å??ã??"
 #. translators:
 #. * The device has been disabled
 #: ../panels/keyboard/eggcellrendererkeys.c:243
+#: ../panels/keyboard/keyboard-shortcuts.c:1140
 #: ../panels/sound/gvc-mixer-control.c:1091
 #: ../panels/user-accounts/um-fingerprint-dialog.c:177
 #: ../panels/user-accounts/um-fingerprint-dialog.c:178
@@ -805,7 +550,75 @@ msgstr "é?®ç??"
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
 msgid "Shortcut;Repeat;Blink;"
+msgstr "å¿«æ?·é?®;é??å??;é?ªç??;"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:659
+#: ../panels/keyboard/keyboard-shortcuts.c:1544
+#: ../panels/keyboard/keyboard-shortcuts.c:1548
+msgid "Custom Shortcuts"
+msgstr "è?ªå®?ä¹?å¿«æ?·é?®"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:767
+msgid "<Unknown Action>"
+msgstr "<æ?ªç?¥å?¨ä½?>"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1166
+msgid "Error saving the new shortcut"
+msgstr "ä¿?å?æ?°å¿«æ?·é?®å?ºé??"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1276
+#, c-format
+msgid ""
+"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"
+"è¯·ç»?å?? Controlã??Alt æ?? Shift é?®å??è¯?ä¸?æ¬¡"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1306
+#, c-format
+msgid ""
+"The shortcut \"%s\" is already used for\n"
+"\"%s\""
 msgstr ""
+"å¿«æ?·é?® %s å·²è¢«ç?¨äº?\n"
+"%s"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1312
+#, c-format
+msgid ""
+"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
+msgstr "å¦?æ??ä½ é??æ?°è®¾å®?å¿«æ?·é?® %sï¼?å??å¿«æ?·é?® %s å°?è¢«ç¦?ç?¨"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1320
+msgid "_Reassign"
+msgstr "é??è®¾(_R)"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1440
+#, c-format
+msgid "Error unsetting accelerator in configuration database: %s"
+msgstr "å?¨é??ç½®æ?°æ?®åº? %s ä¸è§£é?¤è®¾å®?æ?¶å?ºé??"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1498
+msgid "Too many custom shortcuts"
+msgstr "è?ªå®?ä¹?å¿«æ?·é?®è¿?å¤?"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1706
+msgid "Section"
+msgstr "è??"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1737
+msgid "Action"
+msgstr "å?¨ä½?"
+
+#: ../panels/keyboard/keyboard-shortcuts.c:1759
+msgid "Shortcut"
+msgstr "å¿«æ?·é?®"
+
+#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
+msgid "C_ommand:"
+msgstr "å?½ä»¤(_O)ï¼?"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
 msgid "Cursor Blinking"
@@ -813,7 +626,7 @@ msgstr "å??æ ?é?ªç??"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
 msgid "Cursor _blinks in text fields"
-msgstr "æ??æ?¬å??ä¸ç??å??æ ?ä¼?é?ªç??(_B)"
+msgstr "æ??æ?¬å??ä¸å??æ ?é?ªç??(_B)"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 #: ../panels/mouse/gnome-mouse-properties.ui.h:4
@@ -1106,7 +919,10 @@ msgstr "å?¶é? å??(_V)ï¼?"
 msgid "Keyboard Layout Options"
 msgstr "é?®ç??å¸?å±?é??é¡¹"
 
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
 #: ../panels/region/gnome-region-panel-xkb.c:70
+#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
@@ -1123,7 +939,6 @@ msgid "Models"
 msgstr "å??å?·"
 
 #: ../panels/region/gnome-region-panel-xkbot.c:227
-#: ../panels/proxy/gnome-proxy-properties.c:554
 #: ../panels/sound/gvc-sound-theme-chooser.c:589
 msgid "Default"
 msgstr "é»?è®¤"
@@ -1137,6 +952,10 @@ msgstr "æ?´æ?¹æ?¨ç??å?ºå??å??è¯è¨?è®¾ç½®"
 msgid "Language;Layout;"
 msgstr "è¯è¨?;å¸?å±?;"
 
+#: ../panels/mouse/gnome-mouse-properties.ui.h:1
+msgid "Accessibility"
+msgstr "è¾?å?©å??è?½"
+
 #: ../panels/mouse/gnome-mouse-properties.ui.h:2
 msgid "Choose type of click _beforehand"
 msgstr "é??æ?©é¢?è®¾ç??ç?¹å?»ç±»å??(_B)"
@@ -1320,226 +1139,238 @@ msgstr "è®¾ç½®æ?¨ç??é¼ æ ?å??è§¦æ?¸æ?¿é¦?é??é¡¹"
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;"
 msgstr "è§¦æ?¸æ?¿;æ??é??;ç?¹å?»;å??å?»;å??å?»;æ??é?®;è½¨è¿¹ç??;"
 
-#: ../panels/proxy/gnome-proxy-properties.c:672
-msgid "New Location..."
-msgstr "æ?°å»ºä½?ç½®..."
-
-#: ../panels/proxy/gnome-proxy-properties.c:789
-msgid "Location already exists"
-msgstr "ä½?ç½®å·²å?å?¨"
-
-#: ../panels/proxy/gnome-proxy-panel.desktop.in.in.h:1
-msgid "Network Proxy"
-msgstr "ç½?ç»?ä»£ç??"
-
-#: ../panels/proxy/gnome-proxy-panel.desktop.in.in.h:2
-msgid "Set your network proxy preferences"
-msgstr "è®¾ç½®æ?¨ç??ç½?ç»?ä»£ç??é¦?é??é¡¹"
-
-#. Translators: those are keywords for the proxy control-center panel
-#: ../panels/proxy/gnome-proxy-panel.desktop.in.in.h:4
-msgid "Web;Location;"
-msgstr "Web;ä½?ç½®;"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:1
-msgid "<b>Di_rect internet connection</b>"
-msgstr "<b>ç?´æ?¥è¿?æ?¥å?°äº?è??ç½?(_R)</b>"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:2
-msgid "<b>_Automatic proxy configuration</b>"
-msgstr "<b>è?ªå?¨é??ç½®ä»£ç??(_A)</b>"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:3
-msgid "<b>_Manual proxy configuration</b>"
-msgstr "<b>æ??å?¨é??ç½®ä»£ç??(_M)</b>"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:4
-msgid "<b>_Use authentication</b>"
-msgstr "<b>é??è¦?èº«ä»½éª?è¯?(_U)</b>"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:5
-msgid "Autoconfiguration _URL:"
-msgstr "è?ªå?¨é??ç½® URL(_U)ï¼?"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:6
-msgid "C_reate"
-msgstr "å??å»º(_R)"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:7
-msgid "Create New Location"
-msgstr "å??å»ºæ?°ä½?ç½®"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:8
-msgid "HTTP Proxy Details"
-msgstr "HTTP ä»£ç??ç»?è??"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:9
-msgid "H_TTP proxy:"
-msgstr "H_TTP ä»£ç??ï¼?"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:10
-msgid "Ignore Host List"
-msgstr "å¿½ç?¥ä¸»æ?ºå??è¡¨"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:11
-msgid "Ignored Hosts"
-msgstr "å¿½ç?¥ç??ä¸»æ?º"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
-msgid "Location:"
-msgstr "ä½?ç½®ï¼?"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:13
-msgid "Network Proxy Preferences"
-msgstr "ç½?ç»?ä»£ç??é¦?é??é¡¹"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:14
-msgid "Port:"
-msgstr "ç«¯å?£ï¼?"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:15
-msgid "Proxy Configuration"
-msgstr "ä»£ç??æ??å?¡å?¨é??ç½®"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:16
-msgid "S_ocks host:"
-msgstr "S_OCKS ä¸»æ?ºï¼?"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:17
-msgid "The location already exists."
-msgstr "è¯¥ä½?ç½®å·²å?å?¨ã??"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:18
-msgid "U_sername:"
-msgstr "ç?¨æ?·å??(_S)ï¼?"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:19
-msgid "_Delete Location"
-msgstr "å? é?¤ä½?ç½®(_D)"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:20
-msgid "_Details"
-msgstr "ç»?è??(_D)"
-
-#: ../panels/proxy/gnome-proxy-properties.ui.h:21
-msgid "_FTP proxy:"
-msgstr "_FTP ä»£ç??ï¼?"
+#: ../panels/network/cc-network-panel.c:1062
+#: ../panels/network/cc-network-panel.c:1084
+#, c-format
+msgid "%i Mb/s"
+msgstr "%i Mb/ç§?"
 
-#: ../panels/proxy/gnome-proxy-properties.ui.h:22
-msgid "_Location name:"
-msgstr "ä½?ç½®å??(_L)ï¼?"
+#: ../panels/network/cc-network-panel.c:1064
+#, c-format
+msgid "%i Gb/s"
+msgstr "%i Gb/ç§?"
 
-#: ../panels/proxy/gnome-proxy-properties.ui.h:23
-msgid "_Password:"
-msgstr "å¯?ç ?(_P)ï¼?"
+#: ../panels/network/cc-network-panel.c:1082
+#, c-format
+msgid "%i kb/s"
+msgstr "%i kb/ç§?"
 
-#: ../panels/proxy/gnome-proxy-properties.ui.h:24
-msgid "_Secure HTTP proxy:"
-msgstr "å®?å?¨ HTTP ä»£ç??(_S)ï¼?"
+#: ../panels/network/cc-network-panel.c:1739
+msgid "Network proxy"
+msgstr "ç½?ç»?ä»£ç??"
 
-#: ../panels/proxy/gnome-proxy-properties.ui.h:25
-msgid "_Use the same proxy for all protocols"
-msgstr "ä¸ºæ??æ??å??è®®ä½¿ç?¨ç?¸å??ç??ä»£ç??(_U)"
+#: ../panels/network/cc-network-panel.c:1748
+msgid "Set the system proxy settings"
+msgstr "ç³»ç»?ä»£ç??è®¾ç½®"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:69
+msgid "Wired"
+msgstr "æ??çº¿"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:73
+msgid "Wireless"
+msgstr "æ? çº¿"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:78
+msgid "Mobile broadband"
+msgstr "ç§»å?¨å®½å¸¦"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:82
+msgid "Bluetooth"
+msgstr "è??ç??"
+
+#. TRANSLATORS: device type
+#: ../panels/network/panel-common.c:86
+#| msgid "Models"
+msgid "Mesh"
+msgstr "ç½?æ ¼"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:142
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:146
+msgid "Infrastructure"
+msgstr "æ?¶æ??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:164
+msgid "Status unknown"
+msgstr "æ?ªç?¥ç?¶æ??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:168
+msgid "Unmanaged"
+msgstr "æ?ªæ??ç®¡"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:172
+msgid "Unavailable"
+msgstr "ä¸?å?¯ç?¨"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:176
+msgid "Disconnected"
+msgstr "å·²æ?å¼?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:180
+msgid "Preparing connection"
+msgstr "å??å¤?è¿?æ?¥"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:184
+msgid "Configuring connection"
+msgstr "é??ç½®è¿?æ?¥"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:188
+msgid "Authenticating"
+msgstr "æ£å?¨è®¤è¯?"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:192
+msgid "Getting network address"
+msgstr "æ£å?¨è?·å¾?ç½?ç»?å?°å??"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:196
+msgid "Connected"
+msgstr "å·²è¿?æ?¥"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:200
+msgid "Failed to connect"
+msgstr "è¿?æ?¥å¤±è´¥"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+msgid "Network"
+msgstr "ç½?ç»?"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Network settings"
+msgstr "ç½?ç»?è®¾ç½®"
+
+#. Translators: those are keywords for the network control-center panel
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+msgid "Network;Wireless;IP;LAN;"
+msgstr "ç½?ç»?;æ? çº¿;IP;LAN;"
 
 #: ../panels/network/network.ui.h:1
-msgid "Configuration URL:"
-msgstr "è?ªå?¨é??ç½® URLï¼?"
+msgid "Airplane Mode"
+msgstr "é£?è¡?æ¨¡å¼?"
 
 #: ../panels/network/network.ui.h:2
-msgid "FTP Proxy:"
-msgstr "FTP ä»£ç??ï¼?"
+msgid "Configuration URL:"
+msgstr "é??ç½® URLï¼?"
 
 #: ../panels/network/network.ui.h:3
-msgid "Flight Mode"
-msgstr "é£?è¡?æ¨¡å¼?"
+msgid "DNS:"
+msgstr "DNSï¼?"
 
 #: ../panels/network/network.ui.h:4
+msgid "Default Route:"
+msgstr "é»?è®¤è·¯ç?±"
+
+#: ../panels/network/network.ui.h:5
+msgid "FTP Proxy:"
+msgstr "FTP ä»£ç??ï¼?"
+
+#: ../panels/network/network.ui.h:6
 msgid "Gateway:"
 msgstr "ç½?å?³ï¼?"
 
-#: ../panels/network/network.ui.h:5
+#: ../panels/network/network.ui.h:7
 msgid "Group Name:"
 msgstr "ç»?å??ç§°ï¼?"
 
-#: ../panels/network/network.ui.h:6
+#: ../panels/network/network.ui.h:8
 msgid "Group Password:"
 msgstr "ç»?å¯?ç ?ï¼?"
 
-#: ../panels/network/network.ui.h:7
+#: ../panels/network/network.ui.h:9
 msgid "HTTP Proxy:"
 msgstr "HTTP ä»£ç??ï¼?"
 
-#: ../panels/network/network.ui.h:8
+#: ../panels/network/network.ui.h:10
 msgid "Hardware Address:"
 msgstr "ç¡¬ä»¶å?°å??ï¼?"
 
-#: ../panels/network/network.ui.h:9
+#: ../panels/network/network.ui.h:11
+msgid "IMEI:"
+msgstr "IMEIï¼?"
+
+#: ../panels/network/network.ui.h:12
 msgid "IP Address:"
 msgstr "IP å?°å??ï¼?"
 
-#: ../panels/network/network.ui.h:10
+#: ../panels/network/network.ui.h:13
+msgid "IPv4 Address:"
+msgstr "IPv4 å?°å??ï¼?"
+
+#: ../panels/network/network.ui.h:14
+msgid "IPv6 Address:"
+msgstr "IPv6å?°å??ï¼?"
+
+#: ../panels/network/network.ui.h:15
 msgid "Method:"
 msgstr "æ?¹æ³?ï¼?"
 
-#: ../panels/network/network.ui.h:11
+#: ../panels/network/network.ui.h:16
 msgid "Network Name:"
 msgstr "ç½?ç»?å??ç§°ï¼?"
 
-#: ../panels/network/network.ui.h:12
+#: ../panels/network/network.ui.h:17
 msgid "Provider:"
 msgstr "æ??ä¾?è??ï¼?"
 
-#: ../panels/network/network.ui.h:13
+#: ../panels/network/network.ui.h:18
 msgid "Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??ï¼?"
 
-#: ../panels/network/network.ui.h:14
+#: ../panels/network/network.ui.h:19
 msgid "Security:"
 msgstr "å®?å?¨æ?§ï¼?"
 
-#: ../panels/network/network.ui.h:15
+#: ../panels/network/network.ui.h:20
 msgid "Socks Host:"
 msgstr "Socks ä¸»æ?ºï¼?"
 
-#: ../panels/network/network.ui.h:16
+#: ../panels/network/network.ui.h:21
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
-#: ../panels/network/network.ui.h:17
+#: ../panels/network/network.ui.h:22
+msgid "Subnet Mask:"
+msgstr "å?ç½?æ?©ç ?"
+
+#: ../panels/network/network.ui.h:23
 #: ../panels/user-accounts/um-lockbutton.c:364
 msgid "Unlock"
 msgstr "è§£é??"
 
-#: ../panels/network/network.ui.h:18
+#: ../panels/network/network.ui.h:24
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-msgid "Brightness;Lock;Dim;Blank;"
-msgstr "äº®åº¦;é??å®?;æ¸?æ??;ç©ºç?½;"
-
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
-msgid "Screen"
-msgstr "å±?å¹?"
-
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Screen brightness and lock settings"
-msgstr "é??ç½®å±?å¹?äº®åº¦å??é??å®?"
-
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "ç?µæº?"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
 msgid "Power management settings"
-msgstr "é??ç½®ç?µæº?ç®¡ç??"
+msgstr "ç?µæº?ç®¡ç??è®¾ç½®"
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
 msgid "Power;Sleep;Suspend;Hibernate;"
-msgstr "ç?µæº?;ç?¡ç? ;æ??èµ·;ä¼?ç? ;"
+msgstr "å? ç?µ;ç?¡ç? ;æ??èµ·;ä¼?ç? ;"
 
 #: ../panels/power/cc-power-panel.c:151
 msgid "Unknown time"
@@ -1609,6 +1440,19 @@ msgstr "è¿?æ?? %s è??å°½(%.0lf%%)"
 msgid "%.0lf%% charged"
 msgstr "å·²å??ç?µ %.0lf%%"
 
+#. Translators: those are keywords for the brightness and lock control-center panel
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
+msgid "Brightness;Lock;Dim;Blank;"
+msgstr "äº®åº¦;é??å®?;æ¸?æ??;ç©ºç?½;"
+
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:3
+msgid "Screen"
+msgstr "å±?å¹?"
+
+#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
+msgid "Screen brightness and lock settings"
+msgstr "é??ç½®å±?å¹?äº®åº¦å??é??å®?"
+
 #: ../panels/sound/applet-main.c:49
 msgid "Enable debugging code"
 msgstr "å?¯ç?¨è°?è¯?ä»£ç ?"
@@ -1619,7 +1463,7 @@ msgstr "æ¤åº?ç?¨ç¨?åº?ç??ç??æ?¬"
 
 #: ../panels/sound/applet-main.c:62
 msgid " â?? GNOME Volume Control Applet"
-msgstr " - GNOME å£°é?³æ?§å?¶å°?ç¨?åº?"
+msgstr " - GNOME é?³é??æ?§å?¶å°?ç¨?åº?"
 
 #: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1921
 msgid "Output"
@@ -1650,7 +1494,7 @@ msgstr "å?³"
 #: ../panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Rear"
-msgstr ""
+msgstr "å??"
 
 #: ../panels/sound/gvc-balance-bar.c:116
 msgctxt "balance"
@@ -1667,29 +1511,29 @@ msgctxt "balance"
 msgid "Maximum"
 msgstr "æ??å¤§"
 
-#: ../panels/sound/gvc-balance-bar.c:296
+#: ../panels/sound/gvc-balance-bar.c:295
 msgid "_Balance:"
 msgstr "å??è¡¡(_B)ï¼?"
 
-#: ../panels/sound/gvc-balance-bar.c:299
+#: ../panels/sound/gvc-balance-bar.c:298
 msgid "_Fade:"
 msgstr "æ·¡å?¥æ·¡å?º(_F)ï¼?"
 
-#: ../panels/sound/gvc-balance-bar.c:302
+#: ../panels/sound/gvc-balance-bar.c:301
 msgid "_Subwoofer:"
-msgstr ""
+msgstr "é??ä½?é?³(_S):"
 
-#: ../panels/sound/gvc-channel-bar.c:603 ../panels/sound/gvc-channel-bar.c:612
+#: ../panels/sound/gvc-channel-bar.c:602 ../panels/sound/gvc-channel-bar.c:611
 msgctxt "volume"
 msgid "100%"
 msgstr "100%"
 
-#: ../panels/sound/gvc-channel-bar.c:607
+#: ../panels/sound/gvc-channel-bar.c:606
 msgctxt "volume"
 msgid "Unamplified"
-msgstr ""
+msgstr "å??å¼±"
 
-#: ../panels/sound/gvc-channel-bar.c:901
+#: ../panels/sound/gvc-channel-bar.c:900
 msgid "Mute"
 msgstr "é??é?³"
 
@@ -1805,22 +1649,22 @@ msgstr "æµ?è¯?"
 
 #: ../panels/sound/gvc-speaker-test.c:229
 msgid "Subwoofer"
-msgstr ""
+msgstr "è¶?ä½?é?³"
 
-#: ../panels/sound/gvc-stream-status-icon.c:233
+#: ../panels/sound/gvc-stream-status-icon.c:236
 #, c-format
 msgid "Failed to start Sound Preferences: %s"
-msgstr "å?¯å?¨å£°é?³é¦?é??é¡¹å¤±è´¥ï¼?%s"
+msgstr "å£°é?³é¦?é??é¡¹å?¯å?¨å¤±è´¥ï¼?%s"
 
-#: ../panels/sound/gvc-stream-status-icon.c:256
+#: ../panels/sound/gvc-stream-status-icon.c:262
 msgid "_Mute"
 msgstr "é??é?³(_M)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:265
+#: ../panels/sound/gvc-stream-status-icon.c:271
 msgid "_Sound Preferences"
 msgstr "å£°é?³é¦?é??é¡¹(_S)"
 
-#: ../panels/sound/gvc-stream-status-icon.c:449
+#: ../panels/sound/gvc-stream-status-icon.c:455
 msgid "Muted"
 msgstr "å·²é??é?³"
 
@@ -1848,6 +1692,10 @@ msgstr "æ?¥è?ªä¸»é¢?"
 msgid "C_hoose an alert sound:"
 msgstr "é??æ?©è¦å??å£°é?³(_H)ï¼?"
 
+#: ../panels/sound/sound-theme-file-utils.c:292
+msgid "Custom"
+msgstr "è?ªå®?ä¹?"
+
 #: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
 msgid "Show desktop volume control"
 msgstr "æ?¾ç¤ºæ¡?é?¢é?³é??æ?§å?¶"
@@ -1979,7 +1827,7 @@ msgstr "ä½¿ç?¨å°?é?®ç??æ?§å?¶é¼ æ ?æ??é??ã??"
 
 #: ../panels/universal-access/uap.ui.h:22
 msgid "Control the pointer using the video camera."
-msgstr "ä½¿ç?¨æ??å??æ?ºæ?§å?¶é¼ æ ?æ??é??"
+msgstr "ä½¿ç?¨æ??å??å¤´æ?§å?¶é¼ æ ?æ??é??"
 
 #: ../panels/universal-access/uap.ui.h:23
 msgid "Ctrl+Alt+-"
@@ -2001,6 +1849,10 @@ msgstr "Ctrl+Alt+8"
 msgid "Ctrl+Alt+="
 msgstr "Ctrl+Alt+="
 
+#: ../panels/universal-access/uap.ui.h:30
+msgid "Dasher"
+msgstr "Dasher"
+
 #: ../panels/universal-access/uap.ui.h:31
 msgid "Decrease size:"
 msgstr "å??å°?å¤§å°?ï¼?"
@@ -2405,6 +2257,8 @@ msgid ""
 "Enrolling fingerprints for\n"
 "<b><big>%s</big></b>"
 msgstr ""
+"ä¸º <b><big>%s</big></b>\n"
+"å? å?¥æ??çº¹è¯?å?«"
 
 #: ../panels/user-accounts/um-language-dialog.c:328
 msgid "Other..."
@@ -2570,8 +2424,7 @@ msgstr "%s å·²ç»?ç?»å½?"
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
-msgstr ""
-"å?¨ç?¨æ?·å·²ç?»å½?æ?¶å? é?¤å¸?å?·å?¯è?½å¯¼è?´ç³»ç»?å¤?äº?ä¸?å?¯ç?¨ç?¶æ??ã??"
+msgstr "å?¨ç?¨æ?·å·²ç?»å½?æ?¶å? é?¤å¸?å?·å?¯è?½å¯¼è?´ç³»ç»?å¤?äº?ä¸?å?¯ç?¨ç?¶æ??ã??"
 
 #: ../panels/user-accounts/um-user-panel.c:434
 #, c-format
@@ -2812,6 +2665,10 @@ msgid ""
 "<b>When the guest user logs out, all files and data associated with the "
 "account will be deleted.</b>"
 msgstr ""
+"å?¶ç?¨æ?¥å®¾å¸?æ?·å°?å??è®¸ä»»ä½?äººä¸?ä½¿ç?¨å¯?ç ?ä¸´æ?¶ç?»å½?æ¤è®¡ç®?æ?ºã??å? å®?å?¨èµ·è§?ï¼?ä¸?å??è®¸è¿?ç¨?"
+"ç?»å½?è?³æ¤è®¡ç®?æ?ºã??\n"
+"\n"
+"<b>å½?æ?¥å®¾å¸?æ?·ç?»å?ºæ?¶ï¼?æ??æ??ä¸?æ¤å¸?æ?·æ??å?³ç??æ??ä»¶å??æ?°æ?®é?½å°?è¢«å? é?¤ã??</b>"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
 msgid "Account Information"
@@ -2831,7 +2688,7 @@ msgstr "å?°å??ç°¿å?¡ç??ï¼?"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
 msgid "Allow guests to log in to this computer"
-msgstr "å??è®¸è®¿å®¢ç?»å½?æ¬¡è®¡ç®?æ?º"
+msgstr "å??è®¸æ?¥å®¾ç?»å½?æ¤è®¡ç®?æ?º"
 
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
 msgid "Automatic Login:"
@@ -2849,6 +2706,10 @@ msgstr "æ??çº¹ç?»å½?ï¼?"
 msgid "Language:"
 msgstr "è¯è¨?ï¼?"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:18
+msgid "Location:"
+msgstr "ä½?ç½®ï¼?"
+
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:19
 msgid "Login Options"
 msgstr "ç?»å½?é??é¡¹"
@@ -2972,3 +2833,298 @@ msgstr "Foo;Bar;Baz;"
 #: ../shell/shell.ui.h:2
 msgid "_All Settings"
 msgstr "å?¨é?¨è®¾ç½®(_A)"
+
+#~ msgid "12 hour format"
+#~ msgstr "12 å°?æ?¶æ ¼å¼?"
+
+#~ msgid "24 hour format"
+#~ msgstr "24 å°?æ?¶æ ¼å¼?"
+
+#~ msgid "Preferred Applications"
+#~ msgstr "é¦?é??åº?ç?¨ç¨?åº?"
+
+#~ msgid "Select your default applications"
+#~ msgstr "é??æ?©é»?è®¤ç??åº?ç?¨ç¨?åº?"
+
+#~ msgid "Start the preferred visual assistive technology"
+#~ msgstr "å?¯å?¨é¦?é??ç??è§?è§?è¾?å?©æ??æ?¯"
+
+#~ msgid "Visual Assistance"
+#~ msgstr "è§?è§?è¾?å?©"
+
+#~ msgid "Error setting default browser: %s"
+#~ msgstr "è®¾ç½®é»?è®¤æµ?è§?å?¨å?ºé??ï¼?%s"
+
+#~ msgid "Error setting default mailer: %s"
+#~ msgstr "è®¾ç½®é»?è®¤ç?µå?é?®ä»¶ç¨?åº?å?ºé??ï¼?%s"
+
+#~ msgid "Could not load the main interface"
+#~ msgstr "æ? æ³?è£?å?¥ä¸»ç??é?¢"
+
+#~ msgid "Please make sure that the applet is properly installed"
+#~ msgstr "è¯·ç¡®å®?å°?ç¨?åº?å·²ç»?æ£ç¡®å®?è£?"
+
+#~ msgid "All %s occurrences will be replaced with actual link"
+#~ msgstr "å?ºç?°ç??å?¨é?¨ %s é?½å°?è¢«æ?¿æ?¢ä¸ºå®?é??é?¾æ?¥"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "å?½ä»¤(_M)ï¼?"
+
+#~ msgid "E_xecute flag:"
+#~ msgstr "æ?§è¡?æ ?å¿?(_X)ï¼?"
+
+#~ msgid "Instant Messenger"
+#~ msgstr "å?³æ?¶é??è®¯å·¥å?·"
+
+#~ msgid "Internet"
+#~ msgstr "äº?è??ç½?"
+
+#~ msgid "Mail Reader"
+#~ msgstr "é?®ä»¶é??è¯»å?¨"
+
+#~ msgid "Mobility"
+#~ msgstr "ç§»å?¨æ?§ "
+
+#~ msgid "Run at st_art"
+#~ msgstr "å?¯å?¨æ?¶è¿?è¡?(_A)"
+
+#~ msgid "Run in t_erminal"
+#~ msgstr "å?¨ç»?ç«¯ä¸è¿?è¡?(_E)"
+
+#~ msgid "System"
+#~ msgstr "ç³»ç»?"
+
+#~ msgid "Terminal Emulator"
+#~ msgstr "ç»?ç«¯æ¨¡æ??å?¨"
+
+#~ msgid "Text Editor"
+#~ msgstr "æ??æ?¬ç¼?è¾?å?¨"
+
+#~ msgid "Visual"
+#~ msgstr "è§?è§?æ??æ??"
+
+#~ msgid "Web Browser"
+#~ msgstr "ç½?ç»?æµ?è§?å?¨"
+
+#~ msgid "_Run at start"
+#~ msgstr "å?¯å?¨æ?¶è¿?è¡?(_R)"
+
+#~ msgid "Banshee Music Player"
+#~ msgstr "Banshee é?³ä¹?æ?æ?¾å?¨"
+
+#~ msgid "Debian Terminal Emulator"
+#~ msgstr "Debian ç»?ç«¯æ¨¡æ??å?¨"
+
+#~ msgid "ETerm"
+#~ msgstr "ETerm"
+
+#~ msgid "GNOME Magnifier without Screen Reader"
+#~ msgstr "ä¸?å¸¦å±?å¹?é??è¯»å?¨ç?? GNOME æ?¾å¤§é??"
+
+#~ msgid "GNOME OnScreen Keyboard"
+#~ msgstr "GNOME å±?å¹?é?®ç??"
+
+#~ msgid "GNOME Terminal"
+#~ msgstr "GNOME ç»?ç«¯"
+
+#~ msgid "Gnopernicus"
+#~ msgstr "Gnopernicus"
+
+#~ msgid "Gnopernicus with Magnifier"
+#~ msgstr "å¸¦æ?¾å¤§é??ç?? Gnopernicus"
+
+#~ msgid "KDE Magnifier without Screen Reader"
+#~ msgstr "ä¸?å¸¦å±?å¹?é??è¯»å?¨ç?? KDE æ?¾å¤§é??"
+
+#~ msgid "Konsole"
+#~ msgstr "Konsole"
+
+#~ msgid "Linux Screen Reader"
+#~ msgstr "Linux å±?å¹?é??è¯»å?¨"
+
+#~ msgid "Linux Screen Reader with Magnifier"
+#~ msgstr "å¸¦æ?¾å¤§é??ç?? Linux å±?å¹?é??è¯»å?¨"
+
+#~ msgid "Listen"
+#~ msgstr "æ?¥å?¬"
+
+#~ msgid "Muine Music Player"
+#~ msgstr "Muine é?³ä¹?æ?æ?¾å?¨"
+
+#~ msgid "NXterm"
+#~ msgstr "NXterm"
+
+#~ msgid "Orca"
+#~ msgstr "Orca"
+
+#~ msgid "Orca with Magnifier"
+#~ msgstr "å¸¦æ?¾å¤§é??ç?? Orca"
+
+#~ msgid "RXVT"
+#~ msgstr "RXVT"
+
+#~ msgid "Rhythmbox Music Player"
+#~ msgstr "Rhythmbox é?³ä¹?æ?æ?¾å?¨"
+
+#~ msgid "Standard XTerminal"
+#~ msgstr "æ ?å?? X ç»?ç«¯"
+
+#~ msgid "Terminator"
+#~ msgstr "Terminator"
+
+#~ msgid "Totem Movie Player"
+#~ msgstr "Totem ç?µå½±æ?æ?¾æ?º"
+
+#~ msgid "aterm"
+#~ msgstr "aterm"
+
+#~ msgid "Orange"
+#~ msgstr "æ©?è?²"
+
+#~ msgid "Chocolate"
+#~ msgstr "èµè?²"
+
+# ä¸?ç§?é¢?è?²ï¼?å¾?è¯?
+#, fuzzy
+#~ msgid "Plum"
+#~ msgstr "æ??å?"
+
+#~ msgid "Red"
+#~ msgstr "çº¢è?²"
+
+# å¾?è¯?
+#~ msgid "Aluminium"
+#~ msgstr "é??ç?½"
+
+#~ msgid "Gray"
+#~ msgstr "ç?°è?²"
+
+#~ msgid "Black"
+#~ msgstr "é»?è?²"
+
+#~ msgid "Colors"
+#~ msgstr "é¢?è?²"
+
+#~ msgid "Slide Show"
+#~ msgstr "å¹»ç?¯ç??æ¼?ç¤º"
+
+#~ msgid "Image"
+#~ msgstr "å?¾å??"
+
+#~ msgid "%d %s by %d %s"
+#~ msgstr "%d %s * %d %s"
+
+#~ msgid "pixel"
+#~ msgid_plural "pixels"
+#~ msgstr[0] "å??ç´ "
+
+#~ msgid ""
+#~ "<b>%s</b>\n"
+#~ "%s, %s\n"
+#~ "Folder: %s"
+#~ msgstr ""
+#~ "<b>%s</b>\n"
+#~ "%sï¼?%s\n"
+#~ "æ??ä»¶å¤¹ï¼?%s"
+
+#~ msgid ""
+#~ "<b>%s</b>\n"
+#~ "%s\n"
+#~ "Folder: %s"
+#~ msgstr ""
+#~ "<b>%s</b>\n"
+#~ "%s\n"
+#~ "æ??ä»¶å¤¹ï¼?%s"
+
+#~ msgid "Image missing"
+#~ msgstr "å?¾å??ä¸¢å¤±"
+
+#~ msgid "_Detect Monitors"
+#~ msgstr "æ£?æµ?æ?¾ç¤ºå?¨(_D)"
+
+#~ msgid "New Location..."
+#~ msgstr "æ?°å»ºä½?ç½®..."
+
+#~ msgid "Location already exists"
+#~ msgstr "ä½?ç½®å·²å?å?¨"
+
+#~ msgid "Set your network proxy preferences"
+#~ msgstr "è®¾ç½®æ?¨ç??ç½?ç»?ä»£ç??é¦?é??é¡¹"
+
+#~ msgid "Web;Location;"
+#~ msgstr "Web;ä½?ç½®;"
+
+#~ msgid "<b>Di_rect internet connection</b>"
+#~ msgstr "<b>ç?´æ?¥è¿?æ?¥å?°äº?è??ç½?(_R)</b>"
+
+#~ msgid "<b>_Automatic proxy configuration</b>"
+#~ msgstr "<b>è?ªå?¨é??ç½®ä»£ç??(_A)</b>"
+
+#~ msgid "<b>_Manual proxy configuration</b>"
+#~ msgstr "<b>æ??å?¨é??ç½®ä»£ç??(_M)</b>"
+
+#~ msgid "<b>_Use authentication</b>"
+#~ msgstr "<b>é??è¦?èº«ä»½éª?è¯?(_U)</b>"
+
+#~ msgid "Autoconfiguration _URL:"
+#~ msgstr "è?ªå?¨é??ç½® URL(_U)ï¼?"
+
+#~ msgid "C_reate"
+#~ msgstr "å??å»º(_R)"
+
+#~ msgid "Create New Location"
+#~ msgstr "å??å»ºæ?°ä½?ç½®"
+
+#~ msgid "HTTP Proxy Details"
+#~ msgstr "HTTP ä»£ç??ç»?è??"
+
+#~ msgid "H_TTP proxy:"
+#~ msgstr "H_TTP ä»£ç??ï¼?"
+
+#~ msgid "Ignore Host List"
+#~ msgstr "å¿½ç?¥ä¸»æ?ºå??è¡¨"
+
+#~ msgid "Ignored Hosts"
+#~ msgstr "å¿½ç?¥ç??ä¸»æ?º"
+
+#~ msgid "Network Proxy Preferences"
+#~ msgstr "ç½?ç»?ä»£ç??é¦?é??é¡¹"
+
+#~ msgid "Port:"
+#~ msgstr "ç«¯å?£ï¼?"
+
+#~ msgid "Proxy Configuration"
+#~ msgstr "ä»£ç??æ??å?¡å?¨é??ç½®"
+
+#~ msgid "S_ocks host:"
+#~ msgstr "S_OCKS ä¸»æ?ºï¼?"
+
+#~ msgid "The location already exists."
+#~ msgstr "è¯¥ä½?ç½®å·²å?å?¨ã??"
+
+#~ msgid "U_sername:"
+#~ msgstr "ç?¨æ?·å??(_S)ï¼?"
+
+#~ msgid "_Delete Location"
+#~ msgstr "å? é?¤ä½?ç½®(_D)"
+
+#~ msgid "_Details"
+#~ msgstr "ç»?è??(_D)"
+
+#~ msgid "_FTP proxy:"
+#~ msgstr "_FTP ä»£ç??ï¼?"
+
+#~ msgid "_Location name:"
+#~ msgstr "ä½?ç½®å??(_L)ï¼?"
+
+#~ msgid "_Password:"
+#~ msgstr "å¯?ç ?(_P)ï¼?"
+
+#~ msgid "_Secure HTTP proxy:"
+#~ msgstr "å®?å?¨ HTTP ä»£ç??(_S)ï¼?"
+
+#~ msgid "_Use the same proxy for all protocols"
+#~ msgstr "ä¸ºæ??æ??å??è®®ä½¿ç?¨ç?¸å??ç??ä»£ç??(_U)"
+
+#~ msgid "Flight Mode"
+#~ msgstr "é£?è¡?æ¨¡å¼?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]