[gconf] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [gconf] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Thu, 3 Feb 2011 06:09:18 +0000 (UTC)
commit 0241b014b5558fa28585280c6bb65ae72c900eb5
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Feb 3 14:09:04 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  448 ++++++++++++++++++++++---------------------------
 po/zh_TW.po |  547 +++++++++++++++++++++++++----------------------------------
 2 files changed, 431 insertions(+), 564 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 7571bc3..ba8f882 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,15 +8,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 2.32.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-04 19:47+0800\n"
-"PO-Revision-Date: 2010-12-04 19:47+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gconf&component=general\n";
+"POT-Creation-Date: 2011-01-17 22:08+0000\n"
+"PO-Revision-Date: 2011-02-03 14:08+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: ../backends/evoldap-backend.c:162
 #, c-format
@@ -121,41 +121,45 @@ msgstr ""
 msgid "Unloading text markup backend module."
 msgstr "å?¸è¼?æ¨?è¨?èª?è¨? (XML) å¾?ç«¯æ¨¡çµ?ã??"
 
-#: ../backends/markup-backend.c:226 ../backends/xml-backend.c:288
+#: ../backends/markup-backend.c:226
+#: ../backends/xml-backend.c:288
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "ç?¡æ³?æ?¾å?°å?¨â??%sâ??ä½?å??ç?? XML æ ¹ç?®é??"
 
-#: ../backends/markup-backend.c:283 ../backends/xml-backend.c:343
+#: ../backends/markup-backend.c:283
+#: ../backends/xml-backend.c:343
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
 
-#: ../backends/markup-backend.c:390 ../backends/xml-backend.c:442
+#: ../backends/markup-backend.c:390
+#: ../backends/xml-backend.c:442
 #, c-format
-msgid ""
-"Can't read from or write to the XML root directory in the address \"%s\""
+msgid "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "ç?¡æ³?è®?å??æ??å¯«å?¥â??%sâ??ä½?å??ç?? XML æ ¹ç?®é??"
 
-#: ../backends/markup-backend.c:401 ../backends/xml-backend.c:452
+#: ../backends/markup-backend.c:401
+#: ../backends/xml-backend.c:452
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "å?¨ %s ç?? XML å??å§?æª?ä¹?ç?®é??/æª?æ¡?æ¬?é??è¨å®?ç?ºï¼?%o/%o"
 
-#: ../backends/markup-backend.c:740 ../backends/xml-backend.c:683
+#: ../backends/markup-backend.c:740
+#: ../backends/xml-backend.c:683
 #, c-format
-msgid ""
-"Remove directory operation is no longer supported, just remove all the "
-"values in the directory"
+msgid "Remove directory operation is no longer supported, just remove all the values in the directory"
 msgstr "ç?¾å?¨å·²ä¸?å??æ?¯æ?´ç§»é?¤ç?®é??æ?¬èº«ï¼?å?ªè?½ç§»é?¤ç?®é??ä¸ç??æ??æ??è¨å®?å?¼"
 
 # (Abel) æ??æ??æ?¯ï¼? %s æ??ä¸?å?? lock directoryï¼?é?£å??ç?®é??æ?¯ç?¨å?¨å?æ?¾ lock file ç??
-#: ../backends/markup-backend.c:826 ../backends/xml-backend.c:769
+#: ../backends/markup-backend.c:826
+#: ../backends/xml-backend.c:769
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "ç?¡æ³?é?²å?¥ç?¨ä¾?é??å®? %s ç??æª?æ¡?æ??å?¨ç??ç?®é??ï¼?%s\n"
 
-#: ../backends/markup-backend.c:839 ../backends/xml-backend.c:782
+#: ../backends/markup-backend.c:839
+#: ../backends/xml-backend.c:782
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "ç?¡æ³?ç§»é?¤æª?æ¡? %sï¼?%s\n"
@@ -164,7 +168,8 @@ msgstr "ç?¡æ³?ç§»é?¤æª?æ¡? %sï¼?%s\n"
 msgid "Initializing Markup backend module"
 msgstr "å??å§?å??(XML)æ¨?è¨?å¾?ç«¯æ¨¡çµ?"
 
-#: ../backends/markup-backend.c:918 ../backends/xml-backend.c:880
+#: ../backends/markup-backend.c:918
+#: ../backends/xml-backend.c:880
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "ç?¡æ³?çµ?æ??é??å®? XML ç?®é??â??%sâ??ï¼?%s"
@@ -174,12 +179,14 @@ msgstr "ç?¡æ³?çµ?æ??é??å®? XML ç?®é??â??%sâ??ï¼?%s"
 msgid "Failed to write some configuration data to disk\n"
 msgstr "ç?¡æ³?å°?æ??äº?è¨å®?è³?æ??å¯«å?¥ç£?ç¢?\n"
 
-#: ../backends/markup-tree.c:960 ../backends/xml-dir.c:1267
+#: ../backends/markup-tree.c:960
+#: ../backends/xml-dir.c:1267
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
 
-#: ../backends/markup-tree.c:1000 ../backends/markup-tree.c:1007
+#: ../backends/markup-tree.c:1000
+#: ../backends/markup-tree.c:1007
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "ç?¡æ³?ç§»é?¤â??%sâ??ï¼?%s\n"
@@ -199,27 +206,32 @@ msgstr "ç?¡æ³?è¼?å?¥æª?æ¡? â??%sâ??ï¼?%s"
 msgid "Line %d character %d: %s"
 msgstr "ç¬¬ %d å??ç¬¬ %d å?ï¼?%s"
 
-#: ../backends/markup-tree.c:2234 ../backends/markup-tree.c:2255
+#: ../backends/markup-tree.c:2234
+#: ../backends/markup-tree.c:2255
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "å?¨æ¤é??è?¯é?¸å?®ä¸ï¼?å±¬æ?§ã??%sã??å?¨ <%s> å??ç´ ä¸æ?¯ç?¡æ??ç??"
 
-#: ../backends/markup-tree.c:2280 ../gconf/gconf-value.c:111
+#: ../backends/markup-tree.c:2280
+#: ../gconf/gconf-value.c:111
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯æ?´æ?¸ï¼?"
 
-#: ../backends/markup-tree.c:2287 ../gconf/gconf-value.c:121
+#: ../backends/markup-tree.c:2287
+#: ../gconf/gconf-value.c:121
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "æ?´æ?¸â??%sâ??å¤ªå¤§æ??å¤ªå°?"
 
-#: ../backends/markup-tree.c:2319 ../gconf/gconf-value.c:186
+#: ../backends/markup-tree.c:2319
+#: ../gconf/gconf-value.c:186
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯ true æ?? falseï¼?"
 
-#: ../backends/markup-tree.c:2343 ../gconf/gconf-value.c:142
+#: ../backends/markup-tree.c:2343
+#: ../gconf/gconf-value.c:142
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯å¯¦æ?¸ï¼?"
@@ -229,11 +241,16 @@ msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯å¯¦æ?¸ï¼?"
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "å??ç´  <%3$s> ä¸ç??â??%2$sâ??å±¬æ?§å?ºç?¾ä¸?æ??ç??å±¬æ?§å?¼â??%1$sâ??"
 
-#: ../backends/markup-tree.c:2443 ../backends/markup-tree.c:2483
-#: ../backends/markup-tree.c:2507 ../backends/markup-tree.c:2515
-#: ../backends/markup-tree.c:2570 ../backends/markup-tree.c:2635
-#: ../backends/markup-tree.c:2747 ../backends/markup-tree.c:2815
-#: ../backends/markup-tree.c:2873 ../backends/markup-tree.c:3023
+#: ../backends/markup-tree.c:2443
+#: ../backends/markup-tree.c:2483
+#: ../backends/markup-tree.c:2507
+#: ../backends/markup-tree.c:2515
+#: ../backends/markup-tree.c:2570
+#: ../backends/markup-tree.c:2635
+#: ../backends/markup-tree.c:2747
+#: ../backends/markup-tree.c:2815
+#: ../backends/markup-tree.c:2873
+#: ../backends/markup-tree.c:3023
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%2$s> å??ç´ ä¸ç¼ºå°?äº?â??%1$sâ??å±¬æ?§"
@@ -271,8 +288,10 @@ msgstr "ä¸?å?? <local_schema> ä¸å?«æ??å?©å?? <longdesc> å??ç´ "
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "å??ç´  <%s> ä¸?å??è¨±å?¨ <%s> ä¹?ä¸?"
 
-#: ../backends/markup-tree.c:3001 ../backends/markup-tree.c:3106
-#: ../backends/markup-tree.c:3160 ../backends/markup-tree.c:3211
+#: ../backends/markup-tree.c:3001
+#: ../backends/markup-tree.c:3106
+#: ../backends/markup-tree.c:3160
+#: ../backends/markup-tree.c:3211
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "å·²å?å?¨ <%s> ä½?ç?®å??å??ç´ ä¸¦ä¸?å?«æ??é¡?å?? %s"
@@ -295,8 +314,10 @@ msgstr "<li> å?«æ??é?¯èª¤ç??é¡?å?? %s"
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "å·²å?å?¨ <%s> ä½?æ¯?å??ç´  <entry> ä¸¦æ²?æ??çµ¦å®?å?¼"
 
-#: ../backends/markup-tree.c:3224 ../backends/markup-tree.c:3247
-#: ../backends/markup-tree.c:3269 ../backends/markup-tree.c:3286
+#: ../backends/markup-tree.c:3224
+#: ../backends/markup-tree.c:3247
+#: ../backends/markup-tree.c:3269
+#: ../backends/markup-tree.c:3286
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "ç?®å??ç??å??ç´ ä¸ä¸?å??è¨±æ??å??ç´  <%s>"
@@ -306,7 +327,8 @@ msgstr "ç?®å??ç??å??ç´ ä¸ä¸?å??è¨±æ??å??ç´  <%s>"
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "é?¸å?®æª?ç??æ??å¤?å±¤å??ç´ å¿?ç?º <gconf> è??é?? <%s>"
 
-#: ../backends/markup-tree.c:3338 ../backends/markup-tree.c:3360
+#: ../backends/markup-tree.c:3338
+#: ../backends/markup-tree.c:3360
 #: ../backends/markup-tree.c:3365
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
@@ -317,7 +339,8 @@ msgstr "<%s> å??ç´ ä¸?å?¯å?ºç?¾å?¨ <%s> å??ç´ å?§"
 msgid "No text is allowed inside element <%s>"
 msgstr "<%s> å??ç´ å?§ä¸?å?¯å?ºç?¾ä»»ä½?æ??å?"
 
-#: ../backends/markup-tree.c:3625 ../backends/markup-tree.c:4391
+#: ../backends/markup-tree.c:3625
+#: ../backends/markup-tree.c:4391
 #: ../backends/markup-tree.c:4410
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
@@ -362,9 +385,7 @@ msgstr "ç?¡æ³?å°? XML å¿«å??å?§å®¹å¯«å?¥è?³ç£?ç¢?"
 
 #: ../backends/xml-cache.c:318
 #, c-format
-msgid ""
-"Unable to remove directory `%s' from the XML backend cache, because it has "
-"not been successfully synced to disk"
+msgid "Unable to remove directory `%s' from the XML backend cache, because it has not been successfully synced to disk"
 msgstr "ç?¡æ³?å¾? XML ç??å¾?ç«¯å¿«å??ç§»é?¤â??%sâ??ç?®é??ï¼? å? ç?ºæ²?æ??å°?å®?æ??å??å¯«å?¥è?³ç£?ç¢?"
 
 #: ../backends/xml-dir.c:170
@@ -377,7 +398,8 @@ msgstr "ç?¡æ³? statâ??%sâ??ï¼?%s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML æª?å??â??%sâ??æ?¯ä¸?å??ç?®é??"
 
-#: ../backends/xml-dir.c:417 ../backends/xml-dir.c:426
+#: ../backends/xml-dir.c:417
+#: ../backends/xml-dir.c:426
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "ç?¡æ³?å?ªé?¤â??%sâ??ï¼?%s"
@@ -388,7 +410,8 @@ msgid "Failed to write file `%s': %s"
 msgstr "ç?¡æ³?å¯«å?¥â??%sâ??æª?æ¡?ï¼?%s"
 
 # set mode = chmod -- Abel
-#: ../backends/xml-dir.c:486 ../backends/xml-dir.c:522
+#: ../backends/xml-dir.c:486
+#: ../backends/xml-dir.c:522
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "ç?¡æ³?è¨å®?â??%sâ??ç??æ¬?é??ï¼?%s"
@@ -398,12 +421,14 @@ msgstr "ç?¡æ³?è¨å®?â??%sâ??ç??æ¬?é??ï¼?%s"
 msgid "Failed to write XML data to `%s': %s"
 msgstr "ç?¡æ³?å°? XML è³?æ??å¯«å?¥â??%sâ??ï¼?%s"
 
-#: ../backends/xml-dir.c:507 ../backends/xml-dir.c:1291
+#: ../backends/xml-dir.c:507
+#: ../backends/xml-dir.c:1291
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "ç?¡æ³?é??é??æª?æ¡?â??%sâ??ï¼?%s"
 
-#: ../backends/xml-dir.c:537 ../backends/xml-dir.c:547
+#: ../backends/xml-dir.c:537
+#: ../backends/xml-dir.c:547
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "ç?¡æ³?å°?â??%sâ??é??æ?°å?½å??ç?ºâ??%sâ??ï¼?%s"
@@ -485,7 +510,8 @@ msgstr "ä¸?å??ç¯?é»?æ??ä¸?æ??ç?? â??typeâ?? å±¬æ?§ â??%sâ??ï¼?ç?¥é??"
 msgid "No \"value\" attribute for node"
 msgstr "ç¯?é»?æ²?æ?? â??valueâ?? å±¬æ?§"
 
-#: ../backends/xml-entry.c:1027 ../backends/xml-entry.c:1103
+#: ../backends/xml-entry.c:1027
+#: ../backends/xml-entry.c:1103
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "ä¸?äº?è§£ XML æ¸?å?®ç¯?é»?ä¸ç?? XML ç¯?é»? <%s>"
@@ -509,7 +535,8 @@ msgstr "æ¸?å?®ä¸å?«æ??ä¸?å??é?¯èª¤é¡?å??ç??ç¯?é»? (%sï¼?æ??ç?º %s)"
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "ç?¥é?? XML é??å°?(pair)ä¸ä¸?ç?¶ç?? carï¼?%s"
 
-#: ../backends/xml-entry.c:1153 ../backends/xml-entry.c:1176
+#: ../backends/xml-entry.c:1153
+#: ../backends/xml-entry.c:1176
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "å??æ?? XML æª?æ¡?ï¼?æ¸?å?®è??é??å°?(pair)ä¸?å?¯ä»¥æ?¾å?¨å??ä¸?é??å°?(pair)ä¸"
 
@@ -609,7 +636,8 @@ msgstr "æ?¾ä¸?å?° â??%sâ?? ç??å¾?ç«¯æ¨¡çµ?"
 msgid "Failed to shut down backend"
 msgstr "é??é??å¾?ç«¯å¤±æ??"
 
-#: ../gconf/gconf-client.c:353 ../gconf/gconf-client.c:371
+#: ../gconf/gconf-client.c:353
+#: ../gconf/gconf-client.c:371
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "GConf ç?¼ç??é?¯èª¤ï¼?%s\n"
@@ -652,17 +680,12 @@ msgstr "ç?¡æ³?å??æ¥ä¸?å??æ??æ?´å¤?ç??è³?æ??ä¾?æº?ï¼?%s"
 
 #: ../gconf/gconf-database.c:1047
 #, c-format
-msgid ""
-"Error obtaining new value for `%s' after change notification from backend `"
-"%s': %s"
+msgid "Error obtaining new value for `%s' after change notification from backend `%s': %s"
 msgstr "å?¨å¾?ç«¯æ¨¡çµ?â??%sâ??ç?¼å?ºè¨å®?æ?´æ?¹ç??é??ç?¥ä¹?å¾?ï¼?æ?·å??â??%sâ??ç??æ?°è¨å®?å?¼æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../gconf/gconf-database.c:1120
 #, c-format
-msgid ""
-"Failed to log addition of listener %s (%s); will not be able to restore this "
-"listener on gconfd restart, resulting in unreliable notification of "
-"configuration changes."
+msgid "Failed to log addition of listener %s (%s); will not be able to restore this listener on gconfd restart, resulting in unreliable notification of configuration changes."
 msgstr "ç?¡æ³?å°?å? å?¥ listener %s (%s) ç??æ??ä½?å¯«å?¥è?³ç´?é??ä¹?å?§ï¼?é??å°?å°?è?´ç?¡æ³?å?¨ gconfd é??æ?°å??å??å¾?å??å¾©é??å?? listenerï¼?å°?è?´çµ?æ??è¨å®?æ?´æ?¹é??ç?¥ä¸?å??å?¯é? ã??"
 
 #: ../gconf/gconf-database.c:1154
@@ -672,12 +695,11 @@ msgstr "Listener ID %lu ä¸?å?å?¨"
 
 #: ../gconf/gconf-database.c:1168
 #, c-format
-msgid ""
-"Failed to log removal of listener to logfile (most likely harmless, may "
-"result in a notification weirdly reappearing): %s"
+msgid "Failed to log removal of listener to logfile (most likely harmless, may result in a notification weirdly reappearing): %s"
 msgstr "ç?¡æ³?å?¨ç´?é??æª?è¨?é??ç§»é?¤ listener ç??äº?ä»¶ï¼?é??æ?¯ç?¡å®³ç??ï¼?ä½?ä¹?è¨±æ??å°?è?´å¥?æ?ªç??é??ç?¥å??åº¦å?ºç?¾ï¼?ï¼?%s"
 
-#: ../gconf/gconf-database.c:1301 ../gconf/gconf-sources.c:1737
+#: ../gconf/gconf-database.c:1301
+#: ../gconf/gconf-sources.c:1737
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "æ?·å?? â??%sâ?? ç??è¨å®?å?¼ç?¼ç??é?¯èª¤ï¼?%s"
@@ -856,9 +878,12 @@ msgstr "å? å?¥ä¾?æº? â??%sâ??\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "è®?å?? â??%sâ?? æª?æ¡?ç?¼ç??é?¯èª¤ï¼?%s\n"
 
-#: ../gconf/gconf-internals.c:1188 ../gconf/gconf-internals.c:1254
-#: ../gconf/gconf-value.c:155 ../gconf/gconf-value.c:254
-#: ../gconf/gconf-value.c:396 ../gconf/gconf-value.c:1706
+#: ../gconf/gconf-internals.c:1188
+#: ../gconf/gconf-internals.c:1254
+#: ../gconf/gconf-value.c:155
+#: ../gconf/gconf-value.c:254
+#: ../gconf/gconf-value.c:396
+#: ../gconf/gconf-value.c:1706
 #, c-format
 msgid "Text contains invalid UTF-8"
 msgstr "æ??å?å??å?«ç?¡æ??ç?? UTF-8 å?ä¸²"
@@ -917,9 +942,7 @@ msgstr "ç?¡æ³?å»ºç«?æ??é??å?? â??%sâ??"
 
 #: ../gconf/gconf-internals.c:2391
 #, c-format
-msgid ""
-"Failed to lock '%s': probably another process has the lock, or your "
-"operating system has NFS file locking misconfigured (%s)"
+msgid "Failed to lock '%s': probably another process has the lock, or your operating system has NFS file locking misconfigured (%s)"
 msgstr "ç?¡æ³?é??å®? â??%sâ??ï¼?ä¹?è¨±å?¦ä¸?å??ç¨?åº?å·²ç¶?é??å®?äº?å®?ï¼?æ??ä½?æ¥ç³»çµ±ç?? NFS æª?æ¡?é??å®?å??è?½è¨å®?é?¯èª¤ (%s)"
 
 #: ../gconf/gconf-internals.c:2411
@@ -995,10 +1018,7 @@ msgstr "ping ä¼ºæ??ç¨?å¼?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../gconf/gconf-internals.c:2877
 #, c-format
-msgid ""
-"Failed to contact configuration server; the most common cause is a missing "
-"or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/";
-"gconf/ for information. (Details - %s)"
+msgid "Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - %s)"
 msgstr "ç?¡æ³?è?¯ç¹«è¨å®?ä¼ºæ??å?¨ï¼?æ??å?¯è?½ç??å??å? æ?¯ç¼ºå°?æ??é?¯èª¤è¨å®? D-Bus ä½?æ¥é??æ®µä¼ºæ??ç¨?å¼?ã??è«?å??è?? http://projects.gnome.org/gconf/ ä»¥å??å¾?æ?´å¤?è³?è¨?ã??ï¼?è©³æ?? - %sï¼?"
 
 #: ../gconf/gconf-internals.c:2878
@@ -1009,7 +1029,8 @@ msgstr "æ²?æ??"
 msgid "- Sanity checks for GConf"
 msgstr "- GConf ç??å?¥å?¨æ?§æª¢æ?¥"
 
-#: ../gconf/gconf-sanity-check.c:58 ../gconf/gconftool.c:639
+#: ../gconf/gconf-sanity-check.c:58
+#: ../gconf/gconftool.c:639
 #, c-format
 msgid ""
 "Error while parsing options: %s.\n"
@@ -1018,13 +1039,12 @@ msgstr ""
 "å??æ??é?¸é ?æ??ç?¼ç??é?¯èª¤ï¼?%sã??\n"
 "å?·è¡?â??%s --helpâ??å?¯å??å?ºå®?æ?´ç??é?¸é ?ã??\n"
 
-#: ../gconf/gconf-sanity-check.c:143 ../gconf/gconf-sanity-check.c:168
+#: ../gconf/gconf-sanity-check.c:143
+#: ../gconf/gconf-sanity-check.c:168
 #, c-format
 msgid ""
 "Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
+"Could not open or create the file \"%s\"; this indicates that there may be a problem with your configuration, as many programs will need to create files in your home directory. The error was \"%s\" (errno = %d)."
 msgstr ""
 "è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡ä»¥è§£æ±ºä¸?å??ç??å??é¡?ï¼?\n"
 "ç?¡æ³?é??å??æ??å»ºç«?æª?æ¡?â??%sâ??ï¼?é??è¡¨ç¤ºä½ ç??çµ?æ??æ??å??é¡?ï¼?å? ç?ºè¨±å¤?ç¨?å¼?é?½é??è¦?å?¨ä½ ç??å??äººç?®é??å»ºç«?æª?æ¡?ã??é??å??é?¯èª¤æ?¯â??%sâ??(errno = %d)ã??"
@@ -1033,12 +1053,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
+"Could not lock the file \"%s\"; this indicates that there may be a problem with your operating system configuration. If you have an NFS-mounted home directory, either the client or the server may be set up incorrectly. See the rpc.statd and rpc.lockd documentation. A common cause of this error is that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = %d)."
 msgstr ""
 "è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡ä»¥è§£æ±ºä¸?å??ç??å??é¡?ï¼?\n"
 "ç?¡æ³?é??å®?æª?æ¡?â??%sâ??ï¼?é??è¡¨ç¤ºä½?æ¥ç³»çµ±è¨å®?å?¯è?½æ??å??é¡?ã??å??å¦?ä½ æ??ä¸?å??ç¶? NFS æ??è¼?ç??å??äººç?®é??ï¼?å??æ?¯ç?¨æ?¶ç«¯æ??ä¼ºæ??ç«¯ç??è¨å®?ä¸?æ£ç¢ºã?? è«?å??è?? rpc.statd è?? rpc.lockd ç??èªªæ??æ??ä»¶ã??å??ç?¨â??nfslockâ??æ??å??æ?¯å°?è?´é??å??é?¯èª¤ç??å¸¸è¦?å??å? ã??é??å??é?¯èª¤æ?¯ â??%sâ?? (errno = %d)ã??"
@@ -1052,8 +1067,7 @@ msgstr "ç?¡æ³?ç§»é?¤æª?æ¡? %sï¼?%s\n"
 #, c-format
 msgid ""
 "Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
+"No configuration sources in the configuration file \"%s\"; this means that preferences and other settings can't be saved. %s%s"
 msgstr ""
 "è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡ä»¥è§£æ±ºä¸?å??ç??å??é¡?ï¼?\n"
 "å?¨è¨å®?æª?â??%sâ??ä¸æ²?æ??æ??å®?è¨å®?ä¾?æº?ï¼?é??è¡¨ç¤ºç?¡æ³?å?²å?é?¸é ?è??å?¶å®?è¨å®?ã??%s%s"
@@ -1075,11 +1089,9 @@ msgstr ""
 msgid ""
 "The files that contain your preference settings are currently in use.\n"
 "\n"
-"You might be logged in to a session from another computer, and the other "
-"login session is using your preference settings files.\n"
+"You might be logged in to a session from another computer, and the other login session is using your preference settings files.\n"
 "\n"
-"You can continue to use the current session, but this might cause temporary "
-"problems with the preference settings in the other session.\n"
+"You can continue to use the current session, but this might cause temporary problems with the preference settings in the other session.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -1104,23 +1116,22 @@ msgstr "ç¹¼çº?(_C)"
 msgid "%s Continue (y/n)?"
 msgstr "%s ç¹¼çº?(y/n)ï¼?"
 
-#: ../gconf/gconf-schema.c:211 ../gconf/gconf-schema.c:219
-#: ../gconf/gconf-schema.c:227 ../gconf/gconf-schema.c:235
+#: ../gconf/gconf-schema.c:211
+#: ../gconf/gconf-schema.c:219
+#: ../gconf/gconf-schema.c:227
+#: ../gconf/gconf-schema.c:235
 #, c-format
 msgid "Schema contains invalid UTF-8"
 msgstr "schema å??å?«ç?¡æ??ç?? UTF-8 å?ä¸²"
 
 #: ../gconf/gconf-schema.c:244
 #, c-format
-msgid ""
-"Schema specifies type list but doesn't specify the type of the list elements"
+msgid "Schema specifies type list but doesn't specify the type of the list elements"
 msgstr "schema æ??å®?äº?é¡?å??ç?ºæ¸?å?®ä½?æ?ªæ??å®?æ¸?å?®å?®å??ç??é¡?å??"
 
 #: ../gconf/gconf-schema.c:254
 #, c-format
-msgid ""
-"Schema specifies type pair but doesn't specify the type of the car/cdr "
-"elements"
+msgid "Schema specifies type pair but doesn't specify the type of the car/cdr elements"
 msgstr "schema æ??å®?äº?é¡?å??ç?ºé??å°?ä½?æ?ªæ??å®? car/cdr å??ç´ ç??é¡?å??"
 
 #: ../gconf/gconf-sources.c:374
@@ -1130,27 +1141,21 @@ msgstr "ç?¡æ³?è¼?å?¥ä¾?æº?â??%sâ??ï¼?%s"
 
 #: ../gconf/gconf-sources.c:414
 #, c-format
-msgid ""
-"Resolved address \"%s\" to a writable configuration source at position %d"
+msgid "Resolved address \"%s\" to a writable configuration source at position %d"
 msgstr "ç¬¬ %2$d å??ä½?ç½®ç??ä½?å??â??%1$sâ??å·²è§£æ??ç?ºä¸?å??å?¯å¯«å?¥ç??è¨å®?ä¾?æº?"
 
 #: ../gconf/gconf-sources.c:420
 #, c-format
-msgid ""
-"Resolved address \"%s\" to a read-only configuration source at position %d"
+msgid "Resolved address \"%s\" to a read-only configuration source at position %d"
 msgstr "ç¬¬ %2$d å??ä½?ç½®ç??ä½?å??â??%1$sâ??å·²è§£æ??ç?ºä¸?å??å?¯è®?ç??è¨å®?ä¾?æº?"
 
 #: ../gconf/gconf-sources.c:427
 #, c-format
-msgid ""
-"Resolved address \"%s\" to a partially writable configuration source at "
-"position %d"
+msgid "Resolved address \"%s\" to a partially writable configuration source at position %d"
 msgstr "ç¬¬ %2$d å??ä½?ç½®ç??ä½?å??â??%1$sâ??å·²è§£æ??ç?ºä¸?å??å?¯å¯«å?¥é?¨ä»½è³?æ??ç??è¨å®?ä¾?æº?"
 
 #: ../gconf/gconf-sources.c:436
-msgid ""
-"None of the resolved addresses are writable; saving configuration settings "
-"will not be possible"
+msgid "None of the resolved addresses are writable; saving configuration settings will not be possible"
 msgstr "æ??æ??å·²è§£æ??ç??ä½?å??é?½ç?¡æ³?å¯«å?¥ï¼?å°?ç?¡æ³?å?²å?çµ?æ??è¨å®?"
 
 #: ../gconf/gconf-sources.c:690
@@ -1164,30 +1169,12 @@ msgstr "â??/â?? å?ªå?¯è?½æ?¯ä¸?å??ç?®é??è??ä¸?æ?¯è¨å®?é?µ"
 
 #: ../gconf/gconf-sources.c:794
 #, c-format
-msgid ""
-"Value for `%s' set in a read-only source at the front of your configuration "
-"path"
+msgid "Value for `%s' set in a read-only source at the front of your configuration path"
 msgstr "è¨å®?è·¯å¾?ä¸æ??å??ç??ä¸?å??å?¯è®?çµ?æ??ä¾?æº?å·²ç¶?å®?ç¾©äº?â??%sâ??ç??å?¼"
 
 #: ../gconf/gconf-sources.c:806
 #, c-format
-msgid ""
-"Unable to store a value at key '%s', as the configuration server has no "
-"writable databases. There are some common causes of this problem: 1) your "
-"configuration path file %s/path doesn't contain any databases or wasn't "
-"found 2) somehow we mistakenly created two gconfd processes 3) your "
-"operating system is misconfigured so NFS file locking doesn't work in your "
-"home directory or 4) your NFS client machine crashed and didn't properly "
-"notify the server on reboot that file locks should be dropped. If you have "
-"two gconfd processes (or had two at the time the second was launched), "
-"logging out, killing all copies of gconfd, and logging back in may help. If "
-"you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that "
-"you attempted to use GConf from two machines at once, and ORBit still has "
-"its default configuration that prevents remote CORBA connections - put "
-"\"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for "
-"details on problems gconfd encountered. There can only be one gconfd per "
-"home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
-"in individual storage locations such as ~/.gconf"
+msgid "Unable to store a value at key '%s', as the configuration server has no writable databases. There are some common causes of this problem: 1) your configuration path file %s/path doesn't contain any databases or wasn't found 2) somehow we mistakenly created two gconfd processes 3) your operating system is misconfigured so NFS file locking doesn't work in your home directory or 4) your NFS client machine crashed and didn't properly notify the server on reboot that file locks should be dropped. If you have two gconfd processes (or had two at the time the second was launched), logging out, killing all copies of gconfd, and logging back in may help. If you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that you attempted to use GConf from two machines at once, and ORBit still has its default configuration that prevents remote CORBA connections - put \"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for details on problems gconfd encoun
 tered. There can only be one gconfd per home directory, and it must own a lockfile in ~/.gconfd and also lockfiles in individual storage locations such as ~/.gconf"
 msgstr ""
 "ç?¡æ³?å?²å?è¨å®?é?µâ??%sâ??ç??æ??å??å?¼ï¼?å? ç?ºçµ?æ??ä¼ºæ??ç¨?å¼?æ²?æ??å?¯å¯«å?¥ç??è³?æ??åº«ã??é??å??å??é¡?ç??èµ·å? æ??å¹¾ç¨®ï¼?\n"
 "1) çµ?æ??è¨å®?è·¯å¾?æª?æ¡? %s/path æ²?æ??å??å?«ä»»ä½?ç??è³?æ??åº«æ??æ ¹æ?¬æ?¾ä¸?å?°\n"
@@ -1229,7 +1216,8 @@ msgstr "ç?¡æ³?äº?è§£ â??%sâ??ï¼?æ¸?å?®æ??è©²ä»¥â??]â??ç?ºçµ?å°¾ï¼?"
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?å?¨æ¸?å?®ä¸ç?¼ç?¾å¤?é¤?ç??â??]â??ï¼?"
 
-#: ../gconf/gconf-value.c:357 ../gconf/gconf-value.c:518
+#: ../gconf/gconf-value.c:357
+#: ../gconf/gconf-value.c:518
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?çµ?æ??é?¨ä»½å?ºç?¾å¤?é¤?ç??å?ç¬¦ï¼?"
@@ -1244,7 +1232,8 @@ msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é??å°?(pair)æ??è©²ä»¥â??(â??ç?ºé¦?ï¼?"
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é??å°?(pair)æ??è©²ä»¥â??)â??çµ?å°¾ï¼?"
 
-#: ../gconf/gconf-value.c:447 ../gconf/gconf-value.c:533
+#: ../gconf/gconf-value.c:447
+#: ../gconf/gconf-value.c:533
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?å??ç´ æ?¸é??é?¯èª¤ï¼?"
@@ -1343,16 +1332,12 @@ msgid "Shutdown request received"
 msgstr "æ?¥æ?¶å?°é??é??è«?æ±?"
 
 #: ../gconf/gconfd.c:368
-msgid ""
-"gconfd compiled with debugging; trying to load gconf.path from the source "
-"directory"
+msgid "gconfd compiled with debugging; trying to load gconf.path from the source directory"
 msgstr "ä»¥é?¤é?¯æ¨¡å¼?ç·¨è¯ gconfdï¼?å??è©¦å¾?ä¾?æº?ç?®é??ä¸è¼?å?¥ gconf.path"
 
 #: ../gconf/gconfd.c:388
 #, c-format
-msgid ""
-"No configuration files found. Trying to use the default configuration source "
-"`%s'"
+msgid "No configuration files found. Trying to use the default configuration source `%s'"
 msgstr "æ?¾ä¸?å?°è¨å®?æª?ã??å??è©¦ä½¿ç?¨é ?è¨ç??è¨å®?ä¾?æº?â??%sâ??"
 
 #. We want to stay alive but do nothing, because otherwise every
@@ -1360,9 +1345,7 @@ msgstr "æ?¾ä¸?å?°è¨å®?æª?ã??å??è©¦ä½¿ç?¨é ?è¨ç??è¨å®?ä¾?æº?â??%sâ??"
 #.
 #: ../gconf/gconfd.c:396
 #, c-format
-msgid ""
-"No configuration sources in the source path. Configuration won't be saved; "
-"edit %s%s"
+msgid "No configuration sources in the source path. Configuration won't be saved; edit %s%s"
 msgstr "å?¨ä¾?æº?è·¯å¾?ä¸æ²?æ??è¨å®?ä¾?æº?ã??ä¸?æ??å?²å?è¨å®?ï¼?è«?ç·¨è¼¯ %s%s"
 
 #: ../gconf/gconfd.c:409
@@ -1371,15 +1354,11 @@ msgid "Error loading some configuration sources: %s"
 msgstr "è¼?å?¥ä¸?é?¨ä»½è¨å®?ä¾?æº?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../gconf/gconfd.c:421
-msgid ""
-"No configuration source addresses successfully resolved. Can't load or store "
-"configuration data"
+msgid "No configuration source addresses successfully resolved. Can't load or store configuration data"
 msgstr "æ²?æ??æ??å??å?°è¾¨æ??è¨å®?ä¾?æº?ç??ä½?å??ã??ç?¡æ³?è¼?å?¥æ??å?²å?è¨å®?è³?æ??"
 
 #: ../gconf/gconfd.c:438
-msgid ""
-"No writable configuration sources successfully resolved. May be unable to "
-"save some configuration changes"
+msgid "No writable configuration sources successfully resolved. May be unable to save some configuration changes"
 msgstr "æ²?æ??æ??å??å?°è¾¨æ??å?¯å¯«å?¥ç??è¨å®?ä¾?æº?ã??ä¹?è¨±ç?¡æ³?å?²å?ä¸?é?¨ä»½è¨å®?"
 
 #: ../gconf/gconfd.c:603
@@ -1408,9 +1387,7 @@ msgstr "ç?¡æ³?æ?·å?? ConfigServer ç?? object reference"
 
 #: ../gconf/gconfd.c:919
 #, c-format
-msgid ""
-"Failed to write byte to pipe file descriptor %d so client program may hang: "
-"%s"
+msgid "Failed to write byte to pipe file descriptor %d so client program may hang: %s"
 msgstr "ç?¡æ³?å¯«å?¥ä½?å??çµ?å?° pipe fd %dï¼?æ??ä»¥å®¢æ?¶ç«¯ç¨?å¼?ä¹?è¨±æ??ç?¶æ??ï¼?%s"
 
 #: ../gconf/gconfd.c:965
@@ -1442,15 +1419,12 @@ msgstr "å?³å?? exceptionï¼?%s"
 
 #: ../gconf/gconfd.c:1584
 #, c-format
-msgid ""
-"Failed to open gconfd logfile; won't be able to restore listeners after "
-"gconfd shutdown (%s)"
+msgid "Failed to open gconfd logfile; won't be able to restore listeners after gconfd shutdown (%s)"
 msgstr "ç?¡æ³?é??å?? gconfd ç´?é??æª?; å?¨ gconfd é??é??å¾?ï¼?å°?ç?¡æ³?å??å¾© listeners (%s)"
 
 #: ../gconf/gconfd.c:1619
 #, c-format
-msgid ""
-"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgid "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr "ç?¡æ³?é??é?? gconfd ç´?é??æª?; è³?æ??ä¹?è¨±æ²?æ??é?©ç?¶å?°å?²å? (%s)"
 
 #: ../gconf/gconfd.c:1681
@@ -1485,14 +1459,12 @@ msgstr "ç?¡æ³?ç§»å??æ?°å?²å?ç??ç??æ??æª?å?°æ??å®?å?°æ?¹ï¼?%s"
 
 #: ../gconf/gconfd.c:1744
 #, c-format
-msgid ""
-"Failed to restore original saved state file that had been moved to '%s': %s"
+msgid "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "ç?¡æ³?å??å¾©å??å??å?²å?ç??ç??æ??æª?ï¼?è©²æª?å·²è¢«ç§»è?³â??%sâ??ï¼?%s"
 
 #: ../gconf/gconfd.c:2223
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr "ç?¡æ³?å??å¾©å?¨â??%sâ??ä½?å??ä¸?ç?? listenerï¼?ç?¡æ³?è¾¨æ??è³?æ??åº«"
 
 #: ../gconf/gconfd.c:2259
@@ -1507,19 +1479,16 @@ msgstr "ç?¡æ³?é??å??å·²å?²å?ç??ç??æ??æª?â??%sâ??ï¼?%s"
 
 #: ../gconf/gconfd.c:2428
 #, c-format
-msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-"
-"add the listener if gconfd exits or shuts down (%s)"
+msgid "Failed to log addition of listener to gconfd logfile; won't be able to re-add the listener if gconfd exits or shuts down (%s)"
 msgstr "ç?¡æ³?ç´?é?? listener ç??å¢?å? è?³ gconfd ç´?é??æª?ï¼?å¦?æ?? gconfd é?¢é??æ??é??é??ï¼?å°?ç?¡æ³?é??æ?°å? å?¥æ¤ listener (%s)"
 
 #: ../gconf/gconfd.c:2433
 #, c-format
-msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-"
-"add the listener if gconfd exits or shuts down (%s)"
+msgid "Failed to log removal of listener to gconfd logfile; might erroneously re-add the listener if gconfd exits or shuts down (%s)"
 msgstr "ç?¡æ³?ç´?é?? listener ç??ç§»é?¤è?³ gconfd ç´?é??æª?ï¼?ç?¶ gconfd é?¢é??æ??é??é??æ??ï¼?ä¹?è¨±æ??é?¯èª¤å?°é??æ?°å? å?¥æ¤ listener (%s)"
 
-#: ../gconf/gconfd.c:2456 ../gconf/gconfd.c:2630
+#: ../gconf/gconfd.c:2456
+#: ../gconf/gconfd.c:2630
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "ç?¡æ³?æ?·å?? IOR çµ¦å®¢æ?¶ç«¯ï¼?%s"
@@ -1540,8 +1509,7 @@ msgid "Failed to flush client add to saved state file: %s"
 msgstr "ç?¡æ³?æ¸?é?¤å®¢æ?¶ç«¯ç??å¢?å? è?³å·²å?²å?ç??ç??æ??æª?ï¼?%s"
 
 #: ../gconf/gconfd.c:2591
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+msgid "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "æ??äº?å®¢æ?¶ç«¯å?¨é??æ²?æ??è¢«å? å?¥å??ï¼?ä¾¿å·²å°?è?ªå·±å¾? GConf ä¼ºæ??å?¨ç§»é?¤ã??"
 
 #: ../gconf/gconftool.c:93
@@ -1558,9 +1526,7 @@ msgid "Unset the keys on the command line"
 msgstr "å?¨å?½ä»¤å??å?ªé?¤é??å??è¨å®?é?µ"
 
 #: ../gconf/gconftool.c:121
-msgid ""
-"Recursively unset all keys at or below the key/directory names on the "
-"command line"
+msgid "Recursively unset all keys at or below the key/directory names on the command line"
 msgstr "å?¨å?½ä»¤å??å?ªé?¤è¨å®?é?µï¼?å??æ??å?ªé?¤å?¨è©²è¨å®?é?µ/ç?®é??å??ç¨±ä¸?ç??æ??æ??è¨å®?é?µ"
 
 #: ../gconf/gconftool.c:130
@@ -1579,7 +1545,8 @@ msgstr "å??å?ºå?¨é??å??ç?®é??ä¸?ç??æ??æ??å?ç?®é??ã??"
 msgid "Print all subdirectories and entries under a directory, recursively."
 msgstr "å??å?ºæ??å??ç?®é??å??ä»¥ä¸?ç??æ??æ??å?ç?®é??ç??è¨å®?é?µ/å?¼ã??"
 
-#: ../gconf/gconftool.c:166 ../gconf/gconftool.c:175
+#: ../gconf/gconftool.c:166
+#: ../gconf/gconftool.c:175
 msgid "Search for a key, recursively."
 msgstr "é??å»»æ?¥å°?è¨å®?é?µã??"
 
@@ -1600,15 +1567,11 @@ msgid "Ignore schema defaults when reading values."
 msgstr "ç?¶è®?å??æ?¸å?¼æ??ç?¥é?? schema é ?è¨å?¼ã??"
 
 #: ../gconf/gconftool.c:226
-msgid ""
-"Dump to standard output an XML description of all entries under a directory, "
-"recursively."
+msgid "Dump to standard output an XML description of all entries under a directory, recursively."
 msgstr "å°?ä¸?å??ç?®é??ï¼?å??æ?¬ä»¥ä¸?æ??æ??ç??å?ç?®é??å??è¨å®?ï¼?ä»¥ XML ç??å½¢å¼?å?¾å?°è?³æ¨?æº?è¼¸å?ºã??"
 
 #: ../gconf/gconftool.c:235
-msgid ""
-"Load from the specified file an XML description of values and set them "
-"relative to a directory."
+msgid "Load from the specified file an XML description of values and set them relative to a directory."
 msgstr "è?ªæ??å®?ç?? XML æª?æ¡?è®?å??è¨å®?ï¼?ä¸¦å°?å®?å??å? å?¥è?³æ??å??ç?®é??ä¹?ä¸?ã??"
 
 #: ../gconf/gconftool.c:244
@@ -1628,15 +1591,11 @@ msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "å¦?æ?? gconfd æ£å?¨å?·è¡?ï¼?å?³å?? 0; å¦?æ??æ²?æ??ï¼?å?³å?? 2ã??"
 
 #: ../gconf/gconftool.c:286
-msgid ""
-"Launch the configuration server (gconfd). (Normally happens automatically "
-"when needed.)"
+msgid "Launch the configuration server (gconfd). (Normally happens automatically when needed.)"
 msgstr "å??å??çµ?æ??ä¼ºæ??å?¨ (gconfd)ã??ï¼?é??å¸¸å?¨é??è¦?æ??æ??è?ªå??å??å??ã??ï¼?"
 
 #: ../gconf/gconftool.c:301
-msgid ""
-"Specify the type of the value being set, or the type of the value a schema "
-"describes. Unique abbreviations OK."
+msgid "Specify the type of the value being set, or the type of the value a schema describes. Unique abbreviations OK."
 msgstr "æ??å®?è¨å®?å?¼ç??é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??è¨å®?å?¼é¡?å??ã??ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«å?³å?¯ã??"
 
 #: ../gconf/gconftool.c:302
@@ -1656,25 +1615,21 @@ msgid "Get a specific element from a list key, numerically indexed."
 msgstr "è?ªè¨å®?é?µæ¸?å?®ä¸æ?·å??ä¸?å??ç?¹å®?å??ç´ ï¼?ä»¥æ?¸å?ç?ºç´¢å¼?ï¼?ã??"
 
 #: ../gconf/gconftool.c:337
-msgid ""
-"Specify the type of the list value being set, or the type of the value a "
-"schema describes. Unique abbreviations OK."
+msgid "Specify the type of the list value being set, or the type of the value a schema describes. Unique abbreviations OK."
 msgstr "æ??å®?è¦?è¨å®?ç??æ¸?å?®é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??è¨å®?å?¼é¡?å??ã??ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«å?³å?¯ã??"
 
-#: ../gconf/gconftool.c:338 ../gconf/gconftool.c:347 ../gconf/gconftool.c:356
+#: ../gconf/gconftool.c:338
+#: ../gconf/gconftool.c:347
+#: ../gconf/gconftool.c:356
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
 #: ../gconf/gconftool.c:346
-msgid ""
-"Specify the type of the car pair value being set, or the type of the value a "
-"schema describes. Unique abbreviations OK."
+msgid "Specify the type of the car pair value being set, or the type of the value a schema describes. Unique abbreviations OK."
 msgstr "æ??å®?è¦?è¨å®?ç?? car pair ç??æ?¸å?¼é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??æ?¸å?¼é¡?å??ã??äº¦å?¯ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«ã??"
 
 #: ../gconf/gconftool.c:355
-msgid ""
-"Specify the type of the cdr pair value being set, or the type of the value a "
-"schema describes. Unique abbreviations OK."
+msgid "Specify the type of the cdr pair value being set, or the type of the value a schema describes. Unique abbreviations OK."
 msgstr "æ??å®?å·²è¨å®?ç?? cdr pair ç??æ?¸å?¼é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??æ?¸å?¼é¡?å??ã??äº¦å?¯ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«ã??"
 
 #: ../gconf/gconftool.c:370
@@ -1694,51 +1649,37 @@ msgid "SOURCE"
 msgstr "ä¾?æº?"
 
 #: ../gconf/gconftool.c:388
-msgid ""
-"Bypass server, and access the configuration database directly. Requires that "
-"gconfd is not running."
+msgid "Bypass server, and access the configuration database directly. Requires that gconfd is not running."
 msgstr "è·³é??ä¼ºæ??å?¨ç?´æ?¥å?å??çµ?æ??è³?æ??åº«ã??gconfd å¿?é ?æ²?æ??å?·è¡?ã??"
 
 #: ../gconf/gconftool.c:397
-msgid ""
-"Properly installs schema files on the command line into the database. "
-"Specify a custom configuration source in the GCONF_CONFIG_SOURCE environment "
-"variable, or set set the variable to an empty string to use the default "
-"configuration source."
+msgid "Properly installs schema files on the command line into the database. Specify a custom configuration source in the GCONF_CONFIG_SOURCE environment variable, or set set the variable to an empty string to use the default configuration source."
 msgstr "é?©ç?¶å?°å®?è£?å?½ä»¤å??ä¸æ??å®?ç?? schema æª?å?°è³?æ??åº«ä¸ã??ç?°å¢?è®?æ?¸ GCONF_CONFIG_SOURCE å¿?é ?è¨å®?ç?ºè?ªé?¸ç??è¨å®?ä¾?æº?ï¼?æ??è¨å®?ç?ºç©ºç?½å?ä¸²è¡¨ç¤ºé ?è¨å?¼ã??"
 
 #: ../gconf/gconftool.c:406
-msgid ""
-"Properly uninstalls schema files on the command line from the database. "
-"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
-"configuration source or set to the empty string to use the default."
+msgid "Properly uninstalls schema files on the command line from the database. GCONF_CONFIG_SOURCE environment variable should be set to a non-default configuration source or set to the empty string to use the default."
 msgstr "é?©ç?¶å?°å¾?è³?æ??åº«è§£é?¤å®?è£?å?½ä»¤å??ä¸æ??å®?ç?? schema æª?ã??ç?°å¢?è®?æ?¸ GCONF_CONFIG_SOURCE å¿?é ?è¨å®?ç?ºé??é ?è¨ç??è¨å®?ä¾?æº?ï¼?æ??è¨å®?ç?ºç©ºç?½å?ä¸²è¡¨ç¤ºé ?è¨å?¼ã??"
 
 # seems the torture test is for breaking gconf itself, not for breaking
 # other applications?  -- Abel
 #: ../gconf/gconftool.c:421
-msgid ""
-"Torture-test an application by setting and unsetting a bunch of values of "
-"different types for keys on the command line."
+msgid "Torture-test an application by setting and unsetting a bunch of values of different types for keys on the command line."
 msgstr "ç?ºå?½ä»¤å??ä¸æ??å®?ç??è¨å®?é?µé?²è¡?æ¶?è??æ¸¬è©¦(Torture-test)ï¼?å¯«å?¥å??å?ªé?¤ä¸?å??é¡?å??ç??è¨å®?å?¼ã??"
 
 #: ../gconf/gconftool.c:430
-msgid ""
-"Torture-test an application by setting and unsetting a bunch of keys inside "
-"the directories on the command line."
+msgid "Torture-test an application by setting and unsetting a bunch of keys inside the directories on the command line."
 msgstr "å?¨å?½ä»¤å??æ??å®?ç??ç?®é??ä¸é?²è¡?æ¶?è??æ¸¬è©¦(Torture-test)ï¼?å?¨å?¶ä¸å¯«å?¥å??å?ªé?¤ä¸?å??é¡?å??ç??è¨å®?é?µã??"
 
 #: ../gconf/gconftool.c:445
-msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
-"type."
+msgid "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --type."
 msgstr "è¨å®?ä¸?å?? schema ç?¶å¾?å??æ¥å??ã??å?? --short-descã??--long-descã??--owner è?? --type ä¸?èµ·ä½¿ç?¨ã??"
 
 #: ../gconf/gconftool.c:454
 msgid "Specify a short half-line description to go in a schema."
 msgstr "æ??å®?æº?å??å? å?¥ schema ç??ç°¡è¦?æ??è¿°ã??"
 
-#: ../gconf/gconftool.c:455 ../gconf/gconftool.c:464
+#: ../gconf/gconftool.c:455
+#: ../gconf/gconftool.c:464
 msgid "DESCRIPTION"
 msgstr "æ??è¿°"
 
@@ -1878,16 +1819,12 @@ msgstr "ç?¡æ³?å?¨ä½¿ç?¨ --all-dirs æ??å? ä¸? --get æ?? --set\n"
 
 #: ../gconf/gconftool.c:718
 #, c-format
-msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-"
-"entries, --all-dirs, or --search-key\n"
+msgid "--recursive-list should not be used with --get, --set, --unset, --all-entries, --all-dirs, or --search-key\n"
 msgstr "--recursive-list ä¸?è?½è?? --get, --set, --unset, --all-entries --all-dirs, æ?? --search-key ä¸?èµ·ä½¿ç?¨\n"
 
 #: ../gconf/gconftool.c:732
 #, c-format
-msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
-"all-dirs, or --search-key\n"
+msgid "--set_schema should not be used with --get, --set, --unset, --all-entries, --all-dirs, or --search-key\n"
 msgstr "--set_schema ä¸?è?½è?? --get, --set, --unset, --all-entries, --all-dirs, æ?? --search-key ä¸?èµ·ä½¿ç?¨\n"
 
 #: ../gconf/gconftool.c:738
@@ -1902,14 +1839,16 @@ msgstr "å¯«å?¥è¨å®?å?¼æ??å¿?é ?æ??å®?é¡?å??\n"
 
 #: ../gconf/gconftool.c:752
 #, c-format
-msgid ""
-"--ignore-schema-defaults is only relevant with --get, --all-entries, --dump, "
-"--recursive-list, --get-list-size or --get-list-element\n"
+msgid "--ignore-schema-defaults is only relevant with --get, --all-entries, --dump, --recursive-list, --get-list-size or --get-list-element\n"
 msgstr "ä½¿ç?¨ --ignore-schema-defaults æ??å¿?é ?é??å?? --get, --all-entries, --dump, --recursive-list, --get-list-size æ?? --get-list-element ä¸?èµ·ä½¿ç?¨æ??æ??æ??ç¾©\n"
 
 # used by itself = can't be used with any other option -- Abel
-#: ../gconf/gconftool.c:764 ../gconf/gconftool.c:777 ../gconf/gconftool.c:790
-#: ../gconf/gconftool.c:804 ../gconf/gconftool.c:817 ../gconf/gconftool.c:830
+#: ../gconf/gconftool.c:764
+#: ../gconf/gconftool.c:777
+#: ../gconf/gconftool.c:790
+#: ../gconf/gconftool.c:804
+#: ../gconf/gconftool.c:817
+#: ../gconf/gconftool.c:830
 #: ../gconf/gconftool.c:844
 #, c-format
 msgid "%s option must be used by itself.\n"
@@ -1917,9 +1856,7 @@ msgstr "%s é?¸é ?å¿?é ?å?®ç?¨ä½¿ç?¨ã??\n"
 
 #: ../gconf/gconftool.c:853
 #, c-format
-msgid ""
-"You must specify a configuration source with --config-source when using --"
-"direct\n"
+msgid "You must specify a configuration source with --config-source when using --direct\n"
 msgstr "ç?¶ä½ ä½¿ç?¨ --direct æ??ï¼?ä½ å¿?é ?ç?¨ --config-source é?¸é ?æ??å®?ä¸?å??çµ?æ??ä¾?æº?\n"
 
 #: ../gconf/gconftool.c:859
@@ -1934,8 +1871,7 @@ msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL å·²è¨å®?ï¼?ä¸?å®?è£? schema \n"
 
 #: ../gconf/gconftool.c:894
 #, c-format
-msgid ""
-"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
 msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL å·²è¨å®?ï¼?ä¸?è§£é?¤å®?è£? schema \n"
 
 #: ../gconf/gconftool.c:907
@@ -1958,13 +1894,15 @@ msgstr "é??é??æ??ç?¼ç??é?¯èª¤ï¼?%s\n"
 msgid "Must specify one or more directories to recursively list.\n"
 msgstr "å¿?é ?æ??å®?ä¸?å??æ??å¤?å??ç?®é??æ??è?½é??è¿´å??å?ºã??\n"
 
-#: ../gconf/gconftool.c:1355 ../gconf/gconftool.c:1549
+#: ../gconf/gconftool.c:1355
+#: ../gconf/gconftool.c:1549
 #: ../gconf/gconftool.c:1815
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "ç?¡æ³?å??å?ºå?¨â??%sâ??ä¸ç??é ?ç?®ï¼?%s\n"
 
-#: ../gconf/gconftool.c:1375 ../gconf/gconftool.c:1568
+#: ../gconf/gconftool.c:1375
+#: ../gconf/gconftool.c:1568
 msgid "(no value set)"
 msgstr "ï¼?æ²?æ??æ??å®?è¨å®?å?¼ï¼?"
 
@@ -2023,8 +1961,10 @@ msgstr "Cdr é¡?å??ï¼?%s\n"
 msgid "Default Value: %s\n"
 msgstr "é ?è¨å?¼ï¼?%s\n"
 
-#: ../gconf/gconftool.c:1946 ../gconf/gconftool.c:1948
-#: ../gconf/gconftool.c:1949 ../gconf/gconftool.c:1950
+#: ../gconf/gconftool.c:1946
+#: ../gconf/gconftool.c:1948
+#: ../gconf/gconftool.c:1949
+#: ../gconf/gconftool.c:1950
 msgid "Unset"
 msgstr "ä¸?è¨å®?"
 
@@ -2043,21 +1983,26 @@ msgstr "ç°¡ç?èªªæ??ï¼?%s\n"
 msgid "Long Desc: %s\n"
 msgstr "è©³ç´°èªªæ??ï¼?%s\n"
 
-#: ../gconf/gconftool.c:1959 ../gconf/gconftool.c:2236
-#: ../gconf/gconftool.c:2270 ../gconf/gconftool.c:2315
+#: ../gconf/gconftool.c:1959
+#: ../gconf/gconftool.c:2236
+#: ../gconf/gconftool.c:2270
+#: ../gconf/gconftool.c:2315
 #: ../gconf/gconftool.c:2460
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "æ²?æ??è¨å®?å?¼çµ¦â??%sâ??\n"
 
-#: ../gconf/gconftool.c:1963 ../gconf/gconftool.c:2240
-#: ../gconf/gconftool.c:2274 ../gconf/gconftool.c:2319
+#: ../gconf/gconftool.c:1963
+#: ../gconf/gconftool.c:2240
+#: ../gconf/gconftool.c:2274
+#: ../gconf/gconftool.c:2319
 #: ../gconf/gconftool.c:2464
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "ç?¡æ³?æ?·å??â??%sâ??ç??å?¼ï¼?%s\n"
 
-#: ../gconf/gconftool.c:2006 ../gconf/gconftool.c:2018
+#: ../gconf/gconftool.c:2006
+#: ../gconf/gconftool.c:2018
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "ä¸?äº?è§£é¡?å??â??%sâ??\n"
@@ -2084,8 +2029,7 @@ msgstr "ç?¶è¨å®?æ¸?å?®æ??ï¼?ä½ å¿?é ?æ??å®?ä¸?å??å??å§?ç??æ¸?å?®é¡?å??\n"
 
 #: ../gconf/gconftool.c:2102
 #, c-format
-msgid ""
-"When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "ç?¶è¨å®?é??å°? (pair) æ??ï¼?ä½ å¿?é ?æ??å®?ä¸?å??å??å§?ç?? car-type è?? cdr-type\n"
 
 #: ../gconf/gconftool.c:2117
@@ -2093,7 +2037,8 @@ msgstr "ç?¶è¨å®?é??å°? (pair) æ??ï¼?ä½ å¿?é ?æ??å®?ä¸?å??å??å§?ç?? car-type è??
 msgid "Error: %s\n"
 msgstr "é?¯èª¤ï¼?%s\n"
 
-#: ../gconf/gconftool.c:2130 ../gconf/gconftool.c:2195
+#: ../gconf/gconftool.c:2130
+#: ../gconf/gconftool.c:2195
 #: ../gconf/gconftool.c:3215
 #, c-format
 msgid "Error setting value: %s\n"
@@ -2129,7 +2074,8 @@ msgstr "å¿?é ?è?³å°?æ??å®?ä¸?å??è¨å®?é?µä»¥æ?·å??é¡?å??\n"
 msgid "Must specify a key to lookup size of.\n"
 msgstr "å¿?é ?æ??å®?è¦?æª¢è¦?å¤§å°?ç??è¨å®?é?µã??\n"
 
-#: ../gconf/gconftool.c:2285 ../gconf/gconftool.c:2330
+#: ../gconf/gconftool.c:2285
+#: ../gconf/gconftool.c:2330
 #, c-format
 msgid "Key %s is not a list.\n"
 msgstr "è¨å®?é?µ %s ä¸?æ?¯ä¸?å??æ¸?å?®ã??\n"
@@ -2309,7 +2255,8 @@ msgstr "è¦å??ï¼?ç?¡æ³?è§£æ??å?ä¸²å?¼â??%sâ??\n"
 msgid "WARNING: Failed to parse boolean value `%s'\n"
 msgstr "è¦å??ï¼?ç?¡æ³?è§£æ??é??è¼¯å?¼â??%sâ??\n"
 
-#: ../gconf/gconftool.c:3194 ../gconf/gconftool.c:3736
+#: ../gconf/gconftool.c:3194
+#: ../gconf/gconftool.c:3736
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "è¦å??ï¼?ç?¡æ³?ä½¿ schema â??%sâ??è??è¨å®?é?µâ??%sâ??ç?¢ç??é??è?¯ï¼?%s\n"
@@ -2324,7 +2271,8 @@ msgstr "è¦å??ï¼? schema (%s) æ??ç?¡æ??æ??é?ºå¤±ç??é¡?å??\n"
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "è¦å??ï¼? schema (%s) æ??ç?¡æ??æ??é?ºå¤±ç?? list_type\n"
 
-#: ../gconf/gconftool.c:3329 ../gconf/gconftool.c:3359
+#: ../gconf/gconftool.c:3329
+#: ../gconf/gconftool.c:3359
 #: ../gconf/gconftool.c:3388
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
@@ -2345,16 +2293,17 @@ msgstr "è¦å??ï¼?ä½ ä¸?è?½æ?´æ?¹ schema ç??é ?è¨å?¼\n"
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "è¦å??ï¼?gconftool å?§é?¨é?¯èª¤ï¼?æ??æ?ªç?¥ç?? GConfValueType\n"
 
-#: ../gconf/gconftool.c:3449 ../gconf/gconftool.c:3470
-#: ../gconf/gconftool.c:3491 ../gconf/gconftool.c:3512
+#: ../gconf/gconftool.c:3449
+#: ../gconf/gconftool.c:3470
+#: ../gconf/gconftool.c:3491
+#: ../gconf/gconftool.c:3512
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "è¦å??ï¼?ç?¡æ³?è§£æ??é¡?å??å??ç¨±â??%sâ??\n"
 
 #: ../gconf/gconftool.c:3466
 #, c-format
-msgid ""
-"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr "è¦å??ï¼?list_type å?ªè?½æ?¯ int, float, string æ?? bool è??ä¸?æ?¯â??%sâ??\n"
 
 #: ../gconf/gconftool.c:3487
@@ -2372,7 +2321,8 @@ msgstr "è¦å??ï¼?cdr_type å?ªè?½æ?¯ int, float, string æ?? bool è??ä¸?æ?¯â??%s
 msgid "WARNING: empty <applyto> node"
 msgstr "è¦å??ï¼?ç©ºç?½ç?? <applyto> ç¯?é»?"
 
-#: ../gconf/gconftool.c:3551 ../gconf/gconftool.c:3809
+#: ../gconf/gconftool.c:3551
+#: ../gconf/gconftool.c:3809
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "è¦å??ï¼?ç¯?é»? <%s> å?¨ <schema> ä»¥ä¸?ç?¡æ³?ç??è§£\n"
@@ -2400,8 +2350,7 @@ msgstr "è¦å??ï¼?<locale> ç¯?é»?æ²?æ??â??name=\"locale\"â??å±¬æ?§ï¼?ç?¥é??\n"
 
 #: ../gconf/gconftool.c:3609
 #, c-format
-msgid ""
-"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgid "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr "è¦å??ï¼?èª?è¨?â??%sâ??å?ºç?¾å¤?æ¬¡ <locale> ç¯?é»?ï¼?ç?¥é??ç¬¬ä¸?å??ä»¥å¾?ç??æ??æ??ç¯?é»?\n"
 
 #: ../gconf/gconftool.c:3707
@@ -2522,13 +2471,20 @@ msgstr "å¿?é ?æ??å®?ä¸?äº?ç?®é??ä½?ç?ºæ¸¬è©¦ä½¿ç?¨\n"
 #: ../gconf/gconftool.c:4290
 #, c-format
 msgid ""
-"Trying to break your application by setting bad values for keys in "
-"directory:\n"
+"Trying to break your application by setting bad values for keys in directory:\n"
 "  %s\n"
 msgstr ""
 "å??è©¦å?¨ä¸?å??ç?®é??å?§å¯«å?¥ä¸?ç?¶ç??è¨å®?å?¼ä¾?æ¸¬è©¦æ??ç?¨ç¨?å¼?ï¼?\n"
 "  %s\n"
 
+#: ../gsettings/gsettings-data-convert.desktop.in.h:1
+msgid "GSettings Data Conversion"
+msgstr "GSettings è³?æ??è½?æ??"
+
+#: ../gsettings/gsettings-data-convert.desktop.in.h:2
+msgid "Migrates user settings from GConf to dconf"
+msgstr "å°?ä½¿ç?¨è??è¨å®?å?¼å¾? GConf è½?ç§»å?° dconf"
+
 #~ msgid "Could not send message to GConf daemon: %s"
 #~ msgstr "ç?¡æ³?å?³é??è¨?æ?¯è?³ GConf ä¼ºæ??ç¨?å¼?ï¼?%s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3240022..19285a8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,15 +8,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 2.32.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-04 19:47+0800\n"
-"PO-Revision-Date: 2010-12-03 20:19+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gconf&component=general\n";
+"POT-Creation-Date: 2011-01-17 22:08+0000\n"
+"PO-Revision-Date: 2011-02-02 14:05+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: ../backends/evoldap-backend.c:162
 #, c-format
@@ -121,41 +121,45 @@ msgstr ""
 msgid "Unloading text markup backend module."
 msgstr "å?¸è¼?æ¨?è¨?èª?è¨? (XML) å¾?ç«¯æ¨¡çµ?ã??"
 
-#: ../backends/markup-backend.c:226 ../backends/xml-backend.c:288
+#: ../backends/markup-backend.c:226
+#: ../backends/xml-backend.c:288
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "ç?¡æ³?æ?¾å?°å?¨â??%sâ??ä½?å??ç?? XML æ ¹ç?®é??"
 
-#: ../backends/markup-backend.c:283 ../backends/xml-backend.c:343
+#: ../backends/markup-backend.c:283
+#: ../backends/xml-backend.c:343
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
 
-#: ../backends/markup-backend.c:390 ../backends/xml-backend.c:442
+#: ../backends/markup-backend.c:390
+#: ../backends/xml-backend.c:442
 #, c-format
-msgid ""
-"Can't read from or write to the XML root directory in the address \"%s\""
+msgid "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "ç?¡æ³?è®?å??æ??å¯«å?¥â??%sâ??ä½?å??ç?? XML æ ¹ç?®é??"
 
-#: ../backends/markup-backend.c:401 ../backends/xml-backend.c:452
+#: ../backends/markup-backend.c:401
+#: ../backends/xml-backend.c:452
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "å?¨ %s ç?? XML å??å§?æª?ä¹?ç?®é??/æª?æ¡?æ¬?é??è¨å®?ç?ºï¼?%o/%o"
 
-#: ../backends/markup-backend.c:740 ../backends/xml-backend.c:683
+#: ../backends/markup-backend.c:740
+#: ../backends/xml-backend.c:683
 #, c-format
-msgid ""
-"Remove directory operation is no longer supported, just remove all the "
-"values in the directory"
+msgid "Remove directory operation is no longer supported, just remove all the values in the directory"
 msgstr "ç?¾å?¨å·²ä¸?å??æ?¯æ?´ç§»é?¤ç?®é??æ?¬èº«ï¼?å?ªè?½ç§»é?¤ç?®é??ä¸ç??æ??æ??è¨å®?å?¼"
 
 # (Abel) æ??æ??æ?¯ï¼? %s æ??ä¸?å?? lock directoryï¼?é?£å??ç?®é??æ?¯ç?¨å?¨å?æ?¾ lock file ç??
-#: ../backends/markup-backend.c:826 ../backends/xml-backend.c:769
+#: ../backends/markup-backend.c:826
+#: ../backends/xml-backend.c:769
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "ç?¡æ³?é?²å?¥ç?¨ä¾?é??å®? %s ç??æª?æ¡?æ??å?¨ç??ç?®é??ï¼?%s\n"
 
-#: ../backends/markup-backend.c:839 ../backends/xml-backend.c:782
+#: ../backends/markup-backend.c:839
+#: ../backends/xml-backend.c:782
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "ç?¡æ³?ç§»é?¤æª?æ¡? %sï¼?%s\n"
@@ -164,7 +168,8 @@ msgstr "ç?¡æ³?ç§»é?¤æª?æ¡? %sï¼?%s\n"
 msgid "Initializing Markup backend module"
 msgstr "å??å§?å??(XML)æ¨?è¨?å¾?ç«¯æ¨¡çµ?"
 
-#: ../backends/markup-backend.c:918 ../backends/xml-backend.c:880
+#: ../backends/markup-backend.c:918
+#: ../backends/xml-backend.c:880
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "ç?¡æ³?çµ?æ??é??å®? XML ç?®é??â??%sâ??ï¼?%s"
@@ -174,12 +179,14 @@ msgstr "ç?¡æ³?çµ?æ??é??å®? XML ç?®é??â??%sâ??ï¼?%s"
 msgid "Failed to write some configuration data to disk\n"
 msgstr "ç?¡æ³?å°?æ??äº?è¨å®?è³?æ??å¯«å?¥ç£?ç¢?\n"
 
-#: ../backends/markup-tree.c:960 ../backends/xml-dir.c:1267
+#: ../backends/markup-tree.c:960
+#: ../backends/xml-dir.c:1267
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
 
-#: ../backends/markup-tree.c:1000 ../backends/markup-tree.c:1007
+#: ../backends/markup-tree.c:1000
+#: ../backends/markup-tree.c:1007
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "ç?¡æ³?ç§»é?¤â??%sâ??ï¼?%s\n"
@@ -199,27 +206,32 @@ msgstr "ç?¡æ³?è¼?å?¥æª?æ¡? â??%sâ??ï¼?%s"
 msgid "Line %d character %d: %s"
 msgstr "ç¬¬ %d å??ç¬¬ %d å?ï¼?%s"
 
-#: ../backends/markup-tree.c:2234 ../backends/markup-tree.c:2255
+#: ../backends/markup-tree.c:2234
+#: ../backends/markup-tree.c:2255
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "å?¨æ¤é??è?¯é?¸å?®ä¸ï¼?å±¬æ?§ã??%sã??å?¨ <%s> å??ç´ ä¸æ?¯ç?¡æ??ç??"
 
-#: ../backends/markup-tree.c:2280 ../gconf/gconf-value.c:111
+#: ../backends/markup-tree.c:2280
+#: ../gconf/gconf-value.c:111
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯æ?´æ?¸ï¼?"
 
-#: ../backends/markup-tree.c:2287 ../gconf/gconf-value.c:121
+#: ../backends/markup-tree.c:2287
+#: ../gconf/gconf-value.c:121
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "æ?´æ?¸â??%sâ??å¤ªå¤§æ??å¤ªå°?"
 
-#: ../backends/markup-tree.c:2319 ../gconf/gconf-value.c:186
+#: ../backends/markup-tree.c:2319
+#: ../gconf/gconf-value.c:186
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯ true æ?? falseï¼?"
 
-#: ../backends/markup-tree.c:2343 ../gconf/gconf-value.c:142
+#: ../backends/markup-tree.c:2343
+#: ../gconf/gconf-value.c:142
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯å¯¦æ?¸ï¼?"
@@ -229,11 +241,16 @@ msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é ?æ??æ?¯å¯¦æ?¸ï¼?"
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "å??ç´  <%3$s> ä¸ç??â??%2$sâ??å±¬æ?§å?ºç?¾ä¸?æ??ç??å±¬æ?§å?¼â??%1$sâ??"
 
-#: ../backends/markup-tree.c:2443 ../backends/markup-tree.c:2483
-#: ../backends/markup-tree.c:2507 ../backends/markup-tree.c:2515
-#: ../backends/markup-tree.c:2570 ../backends/markup-tree.c:2635
-#: ../backends/markup-tree.c:2747 ../backends/markup-tree.c:2815
-#: ../backends/markup-tree.c:2873 ../backends/markup-tree.c:3023
+#: ../backends/markup-tree.c:2443
+#: ../backends/markup-tree.c:2483
+#: ../backends/markup-tree.c:2507
+#: ../backends/markup-tree.c:2515
+#: ../backends/markup-tree.c:2570
+#: ../backends/markup-tree.c:2635
+#: ../backends/markup-tree.c:2747
+#: ../backends/markup-tree.c:2815
+#: ../backends/markup-tree.c:2873
+#: ../backends/markup-tree.c:3023
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%2$s> å??ç´ ä¸ç¼ºå°?äº?â??%1$sâ??å±¬æ?§"
@@ -271,8 +288,10 @@ msgstr "ä¸?å?? <local_schema> ä¸å?«æ??å?©å?? <longdesc> å??ç´ "
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "å??ç´  <%s> ä¸?å??è¨±å?¨ <%s> ä¹?ä¸?"
 
-#: ../backends/markup-tree.c:3001 ../backends/markup-tree.c:3106
-#: ../backends/markup-tree.c:3160 ../backends/markup-tree.c:3211
+#: ../backends/markup-tree.c:3001
+#: ../backends/markup-tree.c:3106
+#: ../backends/markup-tree.c:3160
+#: ../backends/markup-tree.c:3211
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "å·²å?å?¨ <%s> ä½?ç?®å??å??ç´ ä¸¦ä¸?å?«æ??é¡?å?? %s"
@@ -295,8 +314,10 @@ msgstr "<li> å?«æ??é?¯èª¤ç??é¡?å?? %s"
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "å·²å?å?¨ <%s> ä½?æ¯?å??ç´  <entry> ä¸¦æ²?æ??çµ¦å®?å?¼"
 
-#: ../backends/markup-tree.c:3224 ../backends/markup-tree.c:3247
-#: ../backends/markup-tree.c:3269 ../backends/markup-tree.c:3286
+#: ../backends/markup-tree.c:3224
+#: ../backends/markup-tree.c:3247
+#: ../backends/markup-tree.c:3269
+#: ../backends/markup-tree.c:3286
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "ç?®å??ç??å??ç´ ä¸ä¸?å??è¨±æ??å??ç´  <%s>"
@@ -306,7 +327,8 @@ msgstr "ç?®å??ç??å??ç´ ä¸ä¸?å??è¨±æ??å??ç´  <%s>"
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "é?¸å?®æª?ç??æ??å¤?å±¤å??ç´ å¿?ç?º <gconf> è??é?? <%s>"
 
-#: ../backends/markup-tree.c:3338 ../backends/markup-tree.c:3360
+#: ../backends/markup-tree.c:3338
+#: ../backends/markup-tree.c:3360
 #: ../backends/markup-tree.c:3365
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
@@ -317,7 +339,8 @@ msgstr "<%s> å??ç´ ä¸?å?¯å?ºç?¾å?¨ <%s> å??ç´ å?§"
 msgid "No text is allowed inside element <%s>"
 msgstr "<%s> å??ç´ å?§ä¸?å?¯å?ºç?¾ä»»ä½?æ??å?"
 
-#: ../backends/markup-tree.c:3625 ../backends/markup-tree.c:4391
+#: ../backends/markup-tree.c:3625
+#: ../backends/markup-tree.c:4391
 #: ../backends/markup-tree.c:4410
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
@@ -362,9 +385,7 @@ msgstr "ç?¡æ³?å°? XML å¿«å??å?§å®¹å¯«å?¥è?³ç£?ç¢?"
 
 #: ../backends/xml-cache.c:318
 #, c-format
-msgid ""
-"Unable to remove directory `%s' from the XML backend cache, because it has "
-"not been successfully synced to disk"
+msgid "Unable to remove directory `%s' from the XML backend cache, because it has not been successfully synced to disk"
 msgstr "ç?¡æ³?å¾? XML ç??å¾?ç«¯å¿«å??ç§»é?¤â??%sâ??ç?®é??ï¼? å? ç?ºæ²?æ??å°?å®?æ??å??å¯«å?¥è?³ç£?ç¢?"
 
 #: ../backends/xml-dir.c:170
@@ -377,7 +398,8 @@ msgstr "ç?¡æ³? statâ??%sâ??ï¼?%s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML æª?å??â??%sâ??æ?¯ä¸?å??ç?®é??"
 
-#: ../backends/xml-dir.c:417 ../backends/xml-dir.c:426
+#: ../backends/xml-dir.c:417
+#: ../backends/xml-dir.c:426
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "ç?¡æ³?å?ªé?¤â??%sâ??ï¼?%s"
@@ -388,7 +410,8 @@ msgid "Failed to write file `%s': %s"
 msgstr "ç?¡æ³?å¯«å?¥â??%sâ??æª?æ¡?ï¼?%s"
 
 # set mode = chmod -- Abel
-#: ../backends/xml-dir.c:486 ../backends/xml-dir.c:522
+#: ../backends/xml-dir.c:486
+#: ../backends/xml-dir.c:522
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "ç?¡æ³?è¨å®?â??%sâ??ç??æ¬?é??ï¼?%s"
@@ -398,12 +421,14 @@ msgstr "ç?¡æ³?è¨å®?â??%sâ??ç??æ¬?é??ï¼?%s"
 msgid "Failed to write XML data to `%s': %s"
 msgstr "ç?¡æ³?å°? XML è³?æ??å¯«å?¥â??%sâ??ï¼?%s"
 
-#: ../backends/xml-dir.c:507 ../backends/xml-dir.c:1291
+#: ../backends/xml-dir.c:507
+#: ../backends/xml-dir.c:1291
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "ç?¡æ³?é??é??æª?æ¡?â??%sâ??ï¼?%s"
 
-#: ../backends/xml-dir.c:537 ../backends/xml-dir.c:547
+#: ../backends/xml-dir.c:537
+#: ../backends/xml-dir.c:547
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "ç?¡æ³?å°?â??%sâ??é??æ?°å?½å??ç?ºâ??%sâ??ï¼?%s"
@@ -485,7 +510,8 @@ msgstr "ä¸?å??ç¯?é»?æ??ä¸?æ??ç?? â??typeâ?? å±¬æ?§ â??%sâ??ï¼?ç?¥é??"
 msgid "No \"value\" attribute for node"
 msgstr "ç¯?é»?æ²?æ?? â??valueâ?? å±¬æ?§"
 
-#: ../backends/xml-entry.c:1027 ../backends/xml-entry.c:1103
+#: ../backends/xml-entry.c:1027
+#: ../backends/xml-entry.c:1103
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "ä¸?äº?è§£ XML æ¸?å?®ç¯?é»?ä¸ç?? XML ç¯?é»? <%s>"
@@ -509,7 +535,8 @@ msgstr "æ¸?å?®ä¸å?«æ??ä¸?å??é?¯èª¤é¡?å??ç??ç¯?é»? (%sï¼?æ??ç?º %s)"
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "ç?¥é?? XML é??å°?(pair)ä¸ä¸?ç?¶ç?? carï¼?%s"
 
-#: ../backends/xml-entry.c:1153 ../backends/xml-entry.c:1176
+#: ../backends/xml-entry.c:1153
+#: ../backends/xml-entry.c:1176
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "å??æ?? XML æª?æ¡?ï¼?æ¸?å?®è??é??å°?(pair)ä¸?å?¯ä»¥æ?¾å?¨å??ä¸?é??å°?(pair)ä¸"
 
@@ -609,7 +636,8 @@ msgstr "æ?¾ä¸?å?° â??%sâ?? ç??å¾?ç«¯æ¨¡çµ?"
 msgid "Failed to shut down backend"
 msgstr "é??é??å¾?ç«¯å¤±æ??"
 
-#: ../gconf/gconf-client.c:353 ../gconf/gconf-client.c:371
+#: ../gconf/gconf-client.c:353
+#: ../gconf/gconf-client.c:371
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "GConf ç?¼ç??é?¯èª¤ï¼?%s\n"
@@ -652,20 +680,13 @@ msgstr "ç?¡æ³?å??æ¥ä¸?å??æ??æ?´å¤?ç??è³?æ??ä¾?æº?ï¼?%s"
 
 #: ../gconf/gconf-database.c:1047
 #, c-format
-msgid ""
-"Error obtaining new value for `%s' after change notification from backend `"
-"%s': %s"
+msgid "Error obtaining new value for `%s' after change notification from backend `%s': %s"
 msgstr "å?¨å¾?ç«¯æ¨¡çµ?â??%sâ??ç?¼å?ºè¨å®?è®?æ?´ç??é??ç?¥ä¹?å¾?ï¼?æ?·å??â??%sâ??ç??æ?°è¨å®?å?¼æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../gconf/gconf-database.c:1120
 #, c-format
-msgid ""
-"Failed to log addition of listener %s (%s); will not be able to restore this "
-"listener on gconfd restart, resulting in unreliable notification of "
-"configuration changes."
-msgstr ""
-"ç?¡æ³?å°?å? å?¥ listener %s (%s) ç??æ??ä½?å¯«å?¥è?³ç´?é??ä¹?å?§ï¼?é??å°?å°?è?´ç?¡æ³?å?¨ gconfd é??æ?°"
-"å??å??å¾?å??å¾©é??å?? listenerï¼?å°?è?´çµ?æ??è¨å®?è®?æ?´é??ç?¥ä¸?å??å?¯é? ã??"
+msgid "Failed to log addition of listener %s (%s); will not be able to restore this listener on gconfd restart, resulting in unreliable notification of configuration changes."
+msgstr "ç?¡æ³?å°?å? å?¥ listener %s (%s) ç??æ??ä½?å¯«å?¥è?³ç´?é??ä¹?å?§ï¼?é??å°?å°?è?´ç?¡æ³?å?¨ gconfd é??æ?°å??å??å¾?å??å¾©é??å?? listenerï¼?å°?è?´çµ?æ??è¨å®?è®?æ?´é??ç?¥ä¸?å??å?¯é? ã??"
 
 #: ../gconf/gconf-database.c:1154
 #, c-format
@@ -674,14 +695,11 @@ msgstr "Listener ID %lu ä¸?å?å?¨"
 
 #: ../gconf/gconf-database.c:1168
 #, c-format
-msgid ""
-"Failed to log removal of listener to logfile (most likely harmless, may "
-"result in a notification weirdly reappearing): %s"
-msgstr ""
-"ç?¡æ³?å?¨ç´?é??æª?è¨?é??ç§»é?¤ listener ç??äº?ä»¶ï¼?é??æ?¯ç?¡å®³ç??ï¼?ä½?ä¹?è¨±æ??å°?è?´å¥?æ?ªç??é??ç?¥å??åº¦"
-"å?ºç?¾ï¼?ï¼?%s"
+msgid "Failed to log removal of listener to logfile (most likely harmless, may result in a notification weirdly reappearing): %s"
+msgstr "ç?¡æ³?å?¨ç´?é??æª?è¨?é??ç§»é?¤ listener ç??äº?ä»¶ï¼?é??æ?¯ç?¡å®³ç??ï¼?ä½?ä¹?è¨±æ??å°?è?´å¥?æ?ªç??é??ç?¥å??åº¦å?ºç?¾ï¼?ï¼?%s"
 
-#: ../gconf/gconf-database.c:1301 ../gconf/gconf-sources.c:1737
+#: ../gconf/gconf-database.c:1301
+#: ../gconf/gconf-sources.c:1737
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "æ?·å?? â??%sâ?? ç??è¨å®?å?¼ç?¼ç??é?¯èª¤ï¼?%s"
@@ -860,9 +878,12 @@ msgstr "å? å?¥ä¾?æº? â??%sâ??\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "è®?å?? â??%sâ?? æª?æ¡?ç?¼ç??é?¯èª¤ï¼?%s\n"
 
-#: ../gconf/gconf-internals.c:1188 ../gconf/gconf-internals.c:1254
-#: ../gconf/gconf-value.c:155 ../gconf/gconf-value.c:254
-#: ../gconf/gconf-value.c:396 ../gconf/gconf-value.c:1706
+#: ../gconf/gconf-internals.c:1188
+#: ../gconf/gconf-internals.c:1254
+#: ../gconf/gconf-value.c:155
+#: ../gconf/gconf-value.c:254
+#: ../gconf/gconf-value.c:396
+#: ../gconf/gconf-value.c:1706
 #, c-format
 msgid "Text contains invalid UTF-8"
 msgstr "æ??å?å??å?«ç?¡æ??ç?? UTF-8 å?ä¸²"
@@ -885,8 +906,7 @@ msgstr "é ?æ??ä¸æ??è©²æ?¯é??å°? (pair)ï¼?ä½?å¯¦é??ä¸?æ?¯ %s"
 #: ../gconf/gconf-internals.c:1491
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr ""
-"é ?æ??ä¸æ??è©²æ?¯ (%s,%s) é??å°? (pair)ï¼?ä½?å¯¦é??ä¸?é??å°?ä¸ç??ä¸?å??æ??å?©å??è¨å®?å?¼é?½é?ºå¤±äº?"
+msgstr "é ?æ??ä¸æ??è©²æ?¯ (%s,%s) é??å°? (pair)ï¼?ä½?å¯¦é??ä¸?é??å°?ä¸ç??ä¸?å??æ??å?©å??è¨å®?å?¼é?½é?ºå¤±äº?"
 
 #: ../gconf/gconf-internals.c:1507
 #, c-format
@@ -922,12 +942,8 @@ msgstr "ç?¡æ³?å»ºç«?æ??é??å?? â??%sâ??"
 
 #: ../gconf/gconf-internals.c:2391
 #, c-format
-msgid ""
-"Failed to lock '%s': probably another process has the lock, or your "
-"operating system has NFS file locking misconfigured (%s)"
-msgstr ""
-"ç?¡æ³?é??å®? â??%sâ??ï¼?ä¹?è¨±å?¦ä¸?å??ç¨?åº?å·²ç¶?é??å®?äº?å®?ï¼?æ??ä½?æ¥ç³»çµ±ç?? NFS æª?æ¡?é??å®?å??è?½è¨å®?"
-"é?¯èª¤ (%s)"
+msgid "Failed to lock '%s': probably another process has the lock, or your operating system has NFS file locking misconfigured (%s)"
+msgstr "ç?¡æ³?é??å®? â??%sâ??ï¼?ä¹?è¨±å?¦ä¸?å??ç¨?åº?å·²ç¶?é??å®?äº?å®?ï¼?æ??ä½?æ¥ç³»çµ±ç?? NFS æª?æ¡?é??å®?å??è?½è¨å®?é?¯èª¤ (%s)"
 
 #: ../gconf/gconf-internals.c:2411
 #, c-format
@@ -1002,13 +1018,8 @@ msgstr "ping ä¼ºæ??ç¨?å¼?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../gconf/gconf-internals.c:2877
 #, c-format
-msgid ""
-"Failed to contact configuration server; the most common cause is a missing "
-"or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/";
-"gconf/ for information. (Details - %s)"
-msgstr ""
-"ç?¡æ³?é?£ç¹«è¨å®?ä¼ºæ??å?¨ï¼?æ??å?¯è?½ç??å??å? æ?¯ç¼ºå°?æ??é?¯èª¤è¨å®? D-Bus ä½?æ¥é??æ®µä¼ºæ??ç¨?å¼?ã??è«?å??"
-"è?? http://projects.gnome.org/gconf/ ä»¥å??å¾?æ?´å¤?è³?è¨?ã??ï¼?è©³æ?? - %sï¼?"
+msgid "Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - %s)"
+msgstr "ç?¡æ³?é?£ç¹«è¨å®?ä¼ºæ??å?¨ï¼?æ??å?¯è?½ç??å??å? æ?¯ç¼ºå°?æ??é?¯èª¤è¨å®? D-Bus ä½?æ¥é??æ®µä¼ºæ??ç¨?å¼?ã??è«?å??è?? http://projects.gnome.org/gconf/ ä»¥å??å¾?æ?´å¤?è³?è¨?ã??ï¼?è©³æ?? - %sï¼?"
 
 #: ../gconf/gconf-internals.c:2878
 msgid "none"
@@ -1018,7 +1029,8 @@ msgstr "æ²?æ??"
 msgid "- Sanity checks for GConf"
 msgstr "- GConf ç??å?¥å?¨æ?§æª¢æ?¥"
 
-#: ../gconf/gconf-sanity-check.c:58 ../gconf/gconftool.c:639
+#: ../gconf/gconf-sanity-check.c:58
+#: ../gconf/gconftool.c:639
 #, c-format
 msgid ""
 "Error while parsing options: %s.\n"
@@ -1027,33 +1039,24 @@ msgstr ""
 "å??æ??é?¸é ?æ??ç?¼ç??é?¯èª¤ï¼?%sã??\n"
 "å?·è¡?â??%s --helpâ??å?¯å??å?ºå®?æ?´ç??é?¸é ?ã??\n"
 
-#: ../gconf/gconf-sanity-check.c:143 ../gconf/gconf-sanity-check.c:168
+#: ../gconf/gconf-sanity-check.c:143
+#: ../gconf/gconf-sanity-check.c:168
 #, c-format
 msgid ""
 "Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
+"Could not open or create the file \"%s\"; this indicates that there may be a problem with your configuration, as many programs will need to create files in your home directory. The error was \"%s\" (errno = %d)."
 msgstr ""
 "è«?é?£çµ¡ç³»çµ±ç®¡ç??å?¡ä»¥è§£æ±ºä¸?å??ç??å??é¡?ï¼?\n"
-"ç?¡æ³?é??å??æ??å»ºç«?æª?æ¡?â??%sâ??ï¼?é??è¡¨ç¤ºæ?¨ç??çµ?æ??æ??å??é¡?ï¼?å? ç?ºè¨±å¤?ç¨?å¼?é?½é??è¦?å?¨æ?¨ç??å??äººç?®"
-"é??å»ºç«?æª?æ¡?ã??é??å??é?¯èª¤æ?¯â??%sâ??(errno = %d)ã??"
+"ç?¡æ³?é??å??æ??å»ºç«?æª?æ¡?â??%sâ??ï¼?é??è¡¨ç¤ºæ?¨ç??çµ?æ??æ??å??é¡?ï¼?å? ç?ºè¨±å¤?ç¨?å¼?é?½é??è¦?å?¨æ?¨ç??å??äººç?®é??å»ºç«?æª?æ¡?ã??é??å??é?¯èª¤æ?¯â??%sâ??(errno = %d)ã??"
 
 #: ../gconf/gconf-sanity-check.c:182
 #, c-format
 msgid ""
 "Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
+"Could not lock the file \"%s\"; this indicates that there may be a problem with your operating system configuration. If you have an NFS-mounted home directory, either the client or the server may be set up incorrectly. See the rpc.statd and rpc.lockd documentation. A common cause of this error is that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = %d)."
 msgstr ""
 "è«?é?£çµ¡ç³»çµ±ç®¡ç??å?¡ä»¥è§£æ±ºä¸?å??ç??å??é¡?ï¼?\n"
-"ç?¡æ³?é??å®?æª?æ¡?â??%sâ??ï¼?é??è¡¨ç¤ºä½?æ¥ç³»çµ±è¨å®?å?¯è?½æ??å??é¡?ã??å??å¦?æ?¨æ??ä¸?å??ç¶? NFS æ??è¼?ç??å??äºº"
-"ç?®é??ï¼?å??æ?¯ç?¨æ?¶ç«¯æ??ä¼ºæ??ç«¯ç??è¨å®?ä¸?æ£ç¢ºã?? è«?å??è?? rpc.statd è?? rpc.lockd ç??èªªæ??æ??"
-"ä»¶ã??å??ç?¨â??nfslockâ??æ??å??æ?¯å°?è?´é??å??é?¯èª¤ç??å¸¸è¦?å??å? ã??é??å??é?¯èª¤æ?¯ â??%sâ?? (errno = %d)ã??"
+"ç?¡æ³?é??å®?æª?æ¡?â??%sâ??ï¼?é??è¡¨ç¤ºä½?æ¥ç³»çµ±è¨å®?å?¯è?½æ??å??é¡?ã??å??å¦?æ?¨æ??ä¸?å??ç¶? NFS æ??è¼?ç??å??äººç?®é??ï¼?å??æ?¯ç?¨æ?¶ç«¯æ??ä¼ºæ??ç«¯ç??è¨å®?ä¸?æ£ç¢ºã?? è«?å??è?? rpc.statd è?? rpc.lockd ç??èªªæ??æ??ä»¶ã??å??ç?¨â??nfslockâ??æ??å??æ?¯å°?è?´é??å??é?¯èª¤ç??å¸¸è¦?å??å? ã??é??å??é?¯èª¤æ?¯ â??%sâ?? (errno = %d)ã??"
 
 #: ../gconf/gconf-sanity-check.c:199
 #, c-format
@@ -1064,8 +1067,7 @@ msgstr "ç?¡æ³?ç§»é?¤æª?æ¡? %sï¼?%s\n"
 #, c-format
 msgid ""
 "Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
+"No configuration sources in the configuration file \"%s\"; this means that preferences and other settings can't be saved. %s%s"
 msgstr ""
 "è«?é?£çµ¡ç³»çµ±ç®¡ç??å?¡ä»¥è§£æ±ºä¸?å??ç??å??é¡?ï¼?\n"
 "å?¨è¨å®?æª?â??%sâ??ä¸æ²?æ??æ??å®?è¨å®?ä¾?æº?ï¼?é??è¡¨ç¤ºç?¡æ³?å?²å?é?¸é ?è??å?¶å®?è¨å®?ã??%s%s"
@@ -1087,21 +1089,17 @@ msgstr ""
 msgid ""
 "The files that contain your preference settings are currently in use.\n"
 "\n"
-"You might be logged in to a session from another computer, and the other "
-"login session is using your preference settings files.\n"
+"You might be logged in to a session from another computer, and the other login session is using your preference settings files.\n"
 "\n"
-"You can continue to use the current session, but this might cause temporary "
-"problems with the preference settings in the other session.\n"
+"You can continue to use the current session, but this might cause temporary problems with the preference settings in the other session.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 "è¼?æ??ç?®å??ç??å??å¥½è¨å®?ç??æª?æ¡?æ£å?¨ä½¿ç?¨ä¸ã??\n"
 "\n"
-"æ?¨ä¹?è¨±æ?¯è?ªå?¶ä»?ä¸»æ©?ç?»å?¥ sessionï¼?è??å?¶ä»?ç??ç?»å?¥ session æ£å?¨ä½¿ç?¨æ?¨ç??å??å¥½è¨å®?"
-"æª?ã??\n"
+"æ?¨ä¹?è¨±æ?¯è?ªå?¶ä»?ä¸»æ©?ç?»å?¥ sessionï¼?è??å?¶ä»?ç??ç?»å?¥ session æ£å?¨ä½¿ç?¨æ?¨ç??å??å¥½è¨å®?æª?ã??\n"
 "\n"
-"æ?¨å?¯ä»¥ç¹¼çº?ä½¿ç?¨ç?®å?? sessionï¼?ä½?é??æ¨£å?¯è?½æ?«æ??å°?è?´å?¶ä»? session ç??å??å¥½è¨å®?ç?¼ç??å??"
-"é¡?\n"
+"æ?¨å?¯ä»¥ç¹¼çº?ä½¿ç?¨ç?®å?? sessionï¼?ä½?é??æ¨£å?¯è?½æ?«æ??å°?è?´å?¶ä»? session ç??å??å¥½è¨å®?ç?¼ç??å??é¡?\n"
 "\n"
 "æ?¯å?¦ç¹¼çº?ï¼?"
 
@@ -1118,23 +1116,22 @@ msgstr "ç¹¼çº?(_C)"
 msgid "%s Continue (y/n)?"
 msgstr "%s ç¹¼çº?(y/n)ï¼?"
 
-#: ../gconf/gconf-schema.c:211 ../gconf/gconf-schema.c:219
-#: ../gconf/gconf-schema.c:227 ../gconf/gconf-schema.c:235
+#: ../gconf/gconf-schema.c:211
+#: ../gconf/gconf-schema.c:219
+#: ../gconf/gconf-schema.c:227
+#: ../gconf/gconf-schema.c:235
 #, c-format
 msgid "Schema contains invalid UTF-8"
 msgstr "schema å??å?«ç?¡æ??ç?? UTF-8 å?ä¸²"
 
 #: ../gconf/gconf-schema.c:244
 #, c-format
-msgid ""
-"Schema specifies type list but doesn't specify the type of the list elements"
+msgid "Schema specifies type list but doesn't specify the type of the list elements"
 msgstr "schema æ??å®?äº?é¡?å??ç?ºæ¸?å?®ä½?æ?ªæ??å®?æ¸?å?®å?®å??ç??é¡?å??"
 
 #: ../gconf/gconf-schema.c:254
 #, c-format
-msgid ""
-"Schema specifies type pair but doesn't specify the type of the car/cdr "
-"elements"
+msgid "Schema specifies type pair but doesn't specify the type of the car/cdr elements"
 msgstr "schema æ??å®?äº?é¡?å??ç?ºé??å°?ä½?æ?ªæ??å®? car/cdr å??ç´ ç??é¡?å??"
 
 #: ../gconf/gconf-sources.c:374
@@ -1144,27 +1141,21 @@ msgstr "ç?¡æ³?è¼?å?¥ä¾?æº?â??%sâ??ï¼?%s"
 
 #: ../gconf/gconf-sources.c:414
 #, c-format
-msgid ""
-"Resolved address \"%s\" to a writable configuration source at position %d"
+msgid "Resolved address \"%s\" to a writable configuration source at position %d"
 msgstr "ç¬¬ %2$d å??ä½?ç½®ç??ä½?å??â??%1$sâ??å·²è§£æ??ç?ºä¸?å??å?¯å¯«å?¥ç??è¨å®?ä¾?æº?"
 
 #: ../gconf/gconf-sources.c:420
 #, c-format
-msgid ""
-"Resolved address \"%s\" to a read-only configuration source at position %d"
+msgid "Resolved address \"%s\" to a read-only configuration source at position %d"
 msgstr "ç¬¬ %2$d å??ä½?ç½®ç??ä½?å??â??%1$sâ??å·²è§£æ??ç?ºä¸?å??å?¯è®?ç??è¨å®?ä¾?æº?"
 
 #: ../gconf/gconf-sources.c:427
 #, c-format
-msgid ""
-"Resolved address \"%s\" to a partially writable configuration source at "
-"position %d"
+msgid "Resolved address \"%s\" to a partially writable configuration source at position %d"
 msgstr "ç¬¬ %2$d å??ä½?ç½®ç??ä½?å??â??%1$sâ??å·²è§£æ??ç?ºä¸?å??å?¯å¯«å?¥é?¨ä»½è³?æ??ç??è¨å®?ä¾?æº?"
 
 #: ../gconf/gconf-sources.c:436
-msgid ""
-"None of the resolved addresses are writable; saving configuration settings "
-"will not be possible"
+msgid "None of the resolved addresses are writable; saving configuration settings will not be possible"
 msgstr "æ??æ??å·²è§£æ??ç??ä½?å??é?½ç?¡æ³?å¯«å?¥ï¼?å°?ç?¡æ³?å?²å?çµ?æ??è¨å®?"
 
 #: ../gconf/gconf-sources.c:690
@@ -1178,45 +1169,22 @@ msgstr "â??/â?? å?ªå?¯è?½æ?¯ä¸?å??ç?®é??è??ä¸?æ?¯è¨å®?é?µ"
 
 #: ../gconf/gconf-sources.c:794
 #, c-format
-msgid ""
-"Value for `%s' set in a read-only source at the front of your configuration "
-"path"
+msgid "Value for `%s' set in a read-only source at the front of your configuration path"
 msgstr "è¨å®?è·¯å¾?ä¸æ??å??ç??ä¸?å??å?¯è®?çµ?æ??ä¾?æº?å·²ç¶?å®?ç¾©äº?â??%sâ??ç??å?¼"
 
 #: ../gconf/gconf-sources.c:806
 #, c-format
-msgid ""
-"Unable to store a value at key '%s', as the configuration server has no "
-"writable databases. There are some common causes of this problem: 1) your "
-"configuration path file %s/path doesn't contain any databases or wasn't "
-"found 2) somehow we mistakenly created two gconfd processes 3) your "
-"operating system is misconfigured so NFS file locking doesn't work in your "
-"home directory or 4) your NFS client machine crashed and didn't properly "
-"notify the server on reboot that file locks should be dropped. If you have "
-"two gconfd processes (or had two at the time the second was launched), "
-"logging out, killing all copies of gconfd, and logging back in may help. If "
-"you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that "
-"you attempted to use GConf from two machines at once, and ORBit still has "
-"its default configuration that prevents remote CORBA connections - put "
-"\"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for "
-"details on problems gconfd encountered. There can only be one gconfd per "
-"home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
-"in individual storage locations such as ~/.gconf"
+msgid "Unable to store a value at key '%s', as the configuration server has no writable databases. There are some common causes of this problem: 1) your configuration path file %s/path doesn't contain any databases or wasn't found 2) somehow we mistakenly created two gconfd processes 3) your operating system is misconfigured so NFS file locking doesn't work in your home directory or 4) your NFS client machine crashed and didn't properly notify the server on reboot that file locks should be dropped. If you have two gconfd processes (or had two at the time the second was launched), logging out, killing all copies of gconfd, and logging back in may help. If you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that you attempted to use GConf from two machines at once, and ORBit still has its default configuration that prevents remote CORBA connections - put \"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for details on problems gconfd encoun
 tered. There can only be one gconfd per home directory, and it must own a lockfile in ~/.gconfd and also lockfiles in individual storage locations such as ~/.gconf"
 msgstr ""
-"ç?¡æ³?å?²å?è¨å®?é?µâ??%sâ??ç??æ??å??å?¼ï¼?å? ç?ºçµ?æ??ä¼ºæ??ç¨?å¼?æ²?æ??å?¯å¯«å?¥ç??è³?æ??åº«ã??é??å??å??é¡?ç??èµ·"
-"å? æ??å¹¾ç¨®ï¼?\n"
+"ç?¡æ³?å?²å?è¨å®?é?µâ??%sâ??ç??æ??å??å?¼ï¼?å? ç?ºçµ?æ??ä¼ºæ??ç¨?å¼?æ²?æ??å?¯å¯«å?¥ç??è³?æ??åº«ã??é??å??å??é¡?ç??èµ·å? æ??å¹¾ç¨®ï¼?\n"
 "1) çµ?æ??è¨å®?è·¯å¾?æª?æ¡? %s/path æ²?æ??å??å?«ä»»ä½?ç??è³?æ??åº«æ??æ ¹æ?¬æ?¾ä¸?å?°\n"
 "2) å? æ??ç¨®å? ç´ ä¸?å°?å¿?å??å??äº?å?©å?? gconfd ç¨?åº?\n"
 "3) ä½?æ¥ç³»çµ±çµ?æ??è¨å®?é?¯èª¤ï¼?å°?è?´ NFS æª?æ¡?é??å®?å??è?½ç?¡æ³?å?¨æ?¨ç??å??äººç?®é??ä½¿ç?¨ï¼?æ??\n"
 "4) NFS ç?¨æ?¶ç«¯æ©?å?¨å·²ç?¶æ©?ï¼?è??ä¸?ä¸¦æ²?æ??å?¨é??æ?°é??æ©?å¾?é??ç?¥ä¼ºæ??å?¨æ??è©²å??æ¢æª?æ¡?é??å®?ã??\n"
-"å??å¦?æ??å?©å?? gconfd ç¨?åº?ï¼?å?¨ç¬¬äº?å??å??å??å¾?æ??å?©å??ï¼?ï¼?è«?ç?»å?ºå¾?ï¼?çµ?æ¢æ??æ??ç?? gconfd "
-"ç¨?åº?ä¸¦é??æ?°ç?»å?¥ã??\n"
+"å??å¦?æ??å?©å?? gconfd ç¨?åº?ï¼?å?¨ç¬¬äº?å??å??å??å¾?æ??å?©å??ï¼?ï¼?è«?ç?»å?ºå¾?ï¼?çµ?æ¢æ??æ??ç?? gconfd ç¨?åº?ä¸¦é??æ?°ç?»å?¥ã??\n"
 "å??å¦?æ??æ®?é¤?ç??é??å®?æª?ï¼?è«?ç§»é?¤ ~/.gconf*/*lockã??æ??è¨±å??é¡?æ?¯ç?±æ?¼æ?¨æ?³å?¨å?©é?¨æ©?å?¨ä¸?\n"
-"å??æ??ä½¿ç?¨ GConfï¼? è?? ORBit ä»?ä½¿ç?¨é ?è¨ç??çµ?æ??è¨å®?ä»¥é?²æ¢é? ç«¯ç?? CORBA é?£ç·?ï¼?è«?å?¨ /"
-"etc/orbitrc æª?æ¡?ä¸å? å?¥ \"ORBIIOPIPv4=1\"ã??\n"
-"å?¨ gconfd ç?¼ç??å??é¡?æ??ï¼?é??å¸¸é?½æ??è©²æª¢æ?¥ user.* syslog ç??è©³ç´°æ??æ³?ã??æ¯?ä¸?å??å??äººç?®é??"
-"å?ªè?½æ??ä¸?å?? gconfdï¼?è??ä¸?å®?å¿?é ?æ??æ??ä¸?å??é??å®?æª?å?¨ ~/.gconfdï¼?ä»¥å??å?¨æ¯?ä¸?å??å?æ?¾è¨å®?"
-"ç??ä½?ç½®ï¼?ä¾?å¦? ~/.gconfï¼?é?½æ??é??å®?æª?"
+"å??æ??ä½¿ç?¨ GConfï¼? è?? ORBit ä»?ä½¿ç?¨é ?è¨ç??çµ?æ??è¨å®?ä»¥é?²æ¢é? ç«¯ç?? CORBA é?£ç·?ï¼?è«?å?¨ /etc/orbitrc æª?æ¡?ä¸å? å?¥ \"ORBIIOPIPv4=1\"ã??\n"
+"å?¨ gconfd ç?¼ç??å??é¡?æ??ï¼?é??å¸¸é?½æ??è©²æª¢æ?¥ user.* syslog ç??è©³ç´°æ??æ³?ã??æ¯?ä¸?å??å??äººç?®é??å?ªè?½æ??ä¸?å?? gconfdï¼?è??ä¸?å®?å¿?é ?æ??æ??ä¸?å??é??å®?æª?å?¨ ~/.gconfdï¼?ä»¥å??å?¨æ¯?ä¸?å??å?æ?¾è¨å®?ç??ä½?ç½®ï¼?ä¾?å¦? ~/.gconfï¼?é?½æ??é??å®?æª?"
 
 #: ../gconf/gconf-sources.c:1610
 #, c-format
@@ -1248,7 +1216,8 @@ msgstr "ç?¡æ³?äº?è§£ â??%sâ??ï¼?æ¸?å?®æ??è©²ä»¥â??]â??ç?ºçµ?å°¾ï¼?"
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?å?¨æ¸?å?®ä¸ç?¼ç?¾å¤?é¤?ç??â??]â??ï¼?"
 
-#: ../gconf/gconf-value.c:357 ../gconf/gconf-value.c:518
+#: ../gconf/gconf-value.c:357
+#: ../gconf/gconf-value.c:518
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?çµ?æ??é?¨ä»½å?ºç?¾å¤?é¤?ç??å?å??ï¼?"
@@ -1263,7 +1232,8 @@ msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é??å°?(pair)æ??è©²ä»¥â??(â??ç?ºé¦?ï¼?"
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?é??å°?(pair)æ??è©²ä»¥â??)â??çµ?å°¾ï¼?"
 
-#: ../gconf/gconf-value.c:447 ../gconf/gconf-value.c:533
+#: ../gconf/gconf-value.c:447
+#: ../gconf/gconf-value.c:533
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "ç?¡æ³?äº?è§£â??%sâ??ï¼?å??ç´ æ?¸é??é?¯èª¤ï¼?"
@@ -1362,16 +1332,12 @@ msgid "Shutdown request received"
 msgstr "æ?¥æ?¶å?°é??é??è«?æ±?"
 
 #: ../gconf/gconfd.c:368
-msgid ""
-"gconfd compiled with debugging; trying to load gconf.path from the source "
-"directory"
+msgid "gconfd compiled with debugging; trying to load gconf.path from the source directory"
 msgstr "ä»¥é?¤é?¯æ¨¡å¼?ç·¨è¯ gconfdï¼?å??è©¦å¾?ä¾?æº?ç?®é??ä¸è¼?å?¥ gconf.path"
 
 #: ../gconf/gconfd.c:388
 #, c-format
-msgid ""
-"No configuration files found. Trying to use the default configuration source "
-"`%s'"
+msgid "No configuration files found. Trying to use the default configuration source `%s'"
 msgstr "æ?¾ä¸?å?°è¨å®?æª?ã??å??è©¦ä½¿ç?¨é ?è¨ç??è¨å®?ä¾?æº?â??%sâ??"
 
 #. We want to stay alive but do nothing, because otherwise every
@@ -1379,9 +1345,7 @@ msgstr "æ?¾ä¸?å?°è¨å®?æª?ã??å??è©¦ä½¿ç?¨é ?è¨ç??è¨å®?ä¾?æº?â??%sâ??"
 #.
 #: ../gconf/gconfd.c:396
 #, c-format
-msgid ""
-"No configuration sources in the source path. Configuration won't be saved; "
-"edit %s%s"
+msgid "No configuration sources in the source path. Configuration won't be saved; edit %s%s"
 msgstr "å?¨ä¾?æº?è·¯å¾?ä¸æ²?æ??è¨å®?ä¾?æº?ã??ä¸?æ??å?²å?è¨å®?ï¼?è«?ç·¨è¼¯ %s%s"
 
 #: ../gconf/gconfd.c:409
@@ -1390,15 +1354,11 @@ msgid "Error loading some configuration sources: %s"
 msgstr "è¼?å?¥ä¸?é?¨ä»½è¨å®?ä¾?æº?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../gconf/gconfd.c:421
-msgid ""
-"No configuration source addresses successfully resolved. Can't load or store "
-"configuration data"
+msgid "No configuration source addresses successfully resolved. Can't load or store configuration data"
 msgstr "æ²?æ??æ??å??å?°è¾¨æ??è¨å®?ä¾?æº?ç??ä½?å??ã??ç?¡æ³?è¼?å?¥æ??å?²å?è¨å®?è³?æ??"
 
 #: ../gconf/gconfd.c:438
-msgid ""
-"No writable configuration sources successfully resolved. May be unable to "
-"save some configuration changes"
+msgid "No writable configuration sources successfully resolved. May be unable to save some configuration changes"
 msgstr "æ²?æ??æ??å??å?°è¾¨æ??å?¯å¯«å?¥ç??è¨å®?ä¾?æº?ã??ä¹?è¨±ç?¡æ³?å?²å?ä¸?é?¨ä»½è¨å®?"
 
 #: ../gconf/gconfd.c:603
@@ -1427,9 +1387,7 @@ msgstr "ç?¡æ³?æ?·å?? ConfigServer ç?? object reference"
 
 #: ../gconf/gconfd.c:919
 #, c-format
-msgid ""
-"Failed to write byte to pipe file descriptor %d so client program may hang: "
-"%s"
+msgid "Failed to write byte to pipe file descriptor %d so client program may hang: %s"
 msgstr "ç?¡æ³?å¯«å?¥ä½?å??çµ?å?° pipe fd %dï¼?æ??ä»¥å®¢æ?¶ç«¯ç¨?å¼?ä¹?è¨±æ??ç?¶æ??ï¼?%s"
 
 #: ../gconf/gconfd.c:965
@@ -1461,15 +1419,12 @@ msgstr "å?³å?? exceptionï¼?%s"
 
 #: ../gconf/gconfd.c:1584
 #, c-format
-msgid ""
-"Failed to open gconfd logfile; won't be able to restore listeners after "
-"gconfd shutdown (%s)"
+msgid "Failed to open gconfd logfile; won't be able to restore listeners after gconfd shutdown (%s)"
 msgstr "ç?¡æ³?é??å?? gconfd ç´?é??æª?; å?¨ gconfd é??é??å¾?ï¼?å°?ç?¡æ³?å??å¾© listeners (%s)"
 
 #: ../gconf/gconfd.c:1619
 #, c-format
-msgid ""
-"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgid "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr "ç?¡æ³?é??é?? gconfd ç´?é??æª?; è³?æ??ä¹?è¨±æ²?æ??é?©ç?¶å?°å?²å? (%s)"
 
 #: ../gconf/gconfd.c:1681
@@ -1504,14 +1459,12 @@ msgstr "ç?¡æ³?ç§»å??æ?°å?²å?ç??ç??æ??æª?å?°æ??å®?å?°æ?¹ï¼?%s"
 
 #: ../gconf/gconfd.c:1744
 #, c-format
-msgid ""
-"Failed to restore original saved state file that had been moved to '%s': %s"
+msgid "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "ç?¡æ³?å??å¾©å??å??å?²å?ç??ç??æ??æª?ï¼?è©²æª?å·²è¢«ç§»è?³â??%sâ??ï¼?%s"
 
 #: ../gconf/gconfd.c:2223
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr "ç?¡æ³?å??å¾©å?¨â??%sâ??ä½?å??ä¸?ç?? listenerï¼?ç?¡æ³?è¾¨æ??è³?æ??åº«"
 
 #: ../gconf/gconfd.c:2259
@@ -1526,23 +1479,16 @@ msgstr "ç?¡æ³?é??å??å·²å?²å?ç??ç??æ??æª?â??%sâ??ï¼?%s"
 
 #: ../gconf/gconfd.c:2428
 #, c-format
-msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-"
-"add the listener if gconfd exits or shuts down (%s)"
-msgstr ""
-"ç?¡æ³?ç´?é?? listener ç??å¢?å? è?³ gconfd ç´?é??æª?ï¼?å¦?æ?? gconfd é?¢é??æ??é??é??ï¼?å°?ç?¡æ³?é??æ?°"
-"å? å?¥æ¤ listener (%s)"
+msgid "Failed to log addition of listener to gconfd logfile; won't be able to re-add the listener if gconfd exits or shuts down (%s)"
+msgstr "ç?¡æ³?ç´?é?? listener ç??å¢?å? è?³ gconfd ç´?é??æª?ï¼?å¦?æ?? gconfd é?¢é??æ??é??é??ï¼?å°?ç?¡æ³?é??æ?°å? å?¥æ¤ listener (%s)"
 
 #: ../gconf/gconfd.c:2433
 #, c-format
-msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-"
-"add the listener if gconfd exits or shuts down (%s)"
-msgstr ""
-"ç?¡æ³?ç´?é?? listener ç??ç§»é?¤è?³ gconfd ç´?é??æª?ï¼?ç?¶ gconfd é?¢é??æ??é??é??æ??ï¼?ä¹?è¨±æ??é?¯èª¤"
-"å?°é??æ?°å? å?¥æ¤ listener (%s)"
+msgid "Failed to log removal of listener to gconfd logfile; might erroneously re-add the listener if gconfd exits or shuts down (%s)"
+msgstr "ç?¡æ³?ç´?é?? listener ç??ç§»é?¤è?³ gconfd ç´?é??æª?ï¼?ç?¶ gconfd é?¢é??æ??é??é??æ??ï¼?ä¹?è¨±æ??é?¯èª¤å?°é??æ?°å? å?¥æ¤ listener (%s)"
 
-#: ../gconf/gconfd.c:2456 ../gconf/gconfd.c:2630
+#: ../gconf/gconfd.c:2456
+#: ../gconf/gconfd.c:2630
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "ç?¡æ³?æ?·å?? IOR çµ¦å®¢æ?¶ç«¯ï¼?%s"
@@ -1563,8 +1509,7 @@ msgid "Failed to flush client add to saved state file: %s"
 msgstr "ç?¡æ³?æ¸?é?¤å®¢æ?¶ç«¯ç??å¢?å? è?³å·²å?²å?ç??ç??æ??æª?ï¼?%s"
 
 #: ../gconf/gconfd.c:2591
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+msgid "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "æ??äº?å®¢æ?¶ç«¯å?¨é??æ²?æ??è¢«å? å?¥å??ï¼?ä¾¿å·²å°?è?ªå·±å¾? GConf ä¼ºæ??å?¨ç§»é?¤ã??"
 
 #: ../gconf/gconftool.c:93
@@ -1581,9 +1526,7 @@ msgid "Unset the keys on the command line"
 msgstr "å?¨å?½ä»¤å??å?ªé?¤é??å??è¨å®?é?µ"
 
 #: ../gconf/gconftool.c:121
-msgid ""
-"Recursively unset all keys at or below the key/directory names on the "
-"command line"
+msgid "Recursively unset all keys at or below the key/directory names on the command line"
 msgstr "å?¨å?½ä»¤å??å?ªé?¤è¨å®?é?µï¼?å??æ??å?ªé?¤å?¨è©²è¨å®?é?µ/ç?®é??å??ç¨±ä¸?ç??æ??æ??è¨å®?é?µ"
 
 #: ../gconf/gconftool.c:130
@@ -1602,7 +1545,8 @@ msgstr "å??å?ºå?¨é??å??ç?®é??ä¸?ç??æ??æ??å?ç?®é??ã??"
 msgid "Print all subdirectories and entries under a directory, recursively."
 msgstr "å??å?ºæ??å??ç?®é??å??ä»¥ä¸?ç??æ??æ??å?ç?®é??ç??è¨å®?é?µ/å?¼ã??"
 
-#: ../gconf/gconftool.c:166 ../gconf/gconftool.c:175
+#: ../gconf/gconftool.c:166
+#: ../gconf/gconftool.c:175
 msgid "Search for a key, recursively."
 msgstr "é??å»»æ?¥å°?è¨å®?é?µã??"
 
@@ -1623,15 +1567,11 @@ msgid "Ignore schema defaults when reading values."
 msgstr "ç?¶è®?å??æ?¸å?¼æ??ç?¥é?? schema é ?è¨å?¼ã??"
 
 #: ../gconf/gconftool.c:226
-msgid ""
-"Dump to standard output an XML description of all entries under a directory, "
-"recursively."
+msgid "Dump to standard output an XML description of all entries under a directory, recursively."
 msgstr "å°?ä¸?å??ç?®é??ï¼?å??æ?¬ä»¥ä¸?æ??æ??ç??å?ç?®é??å??è¨å®?ï¼?ä»¥ XML ç??å½¢å¼?å?¾å?°è?³æ¨?æº?è¼¸å?ºã??"
 
 #: ../gconf/gconftool.c:235
-msgid ""
-"Load from the specified file an XML description of values and set them "
-"relative to a directory."
+msgid "Load from the specified file an XML description of values and set them relative to a directory."
 msgstr "è?ªæ??å®?ç?? XML æª?æ¡?è®?å??è¨å®?ï¼?ä¸¦å°?å®?å??å? å?¥è?³æ??å??ç?®é??ä¹?ä¸?ã??"
 
 #: ../gconf/gconftool.c:244
@@ -1651,17 +1591,12 @@ msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "å¦?æ?? gconfd æ£å?¨å?·è¡?ï¼?å?³å?? 0; å¦?æ??æ²?æ??ï¼?å?³å?? 2ã??"
 
 #: ../gconf/gconftool.c:286
-msgid ""
-"Launch the configuration server (gconfd). (Normally happens automatically "
-"when needed.)"
+msgid "Launch the configuration server (gconfd). (Normally happens automatically when needed.)"
 msgstr "å??å??çµ?æ??ä¼ºæ??å?¨ (gconfd)ã??ï¼?é??å¸¸å?¨é??è¦?æ??æ??è?ªå??å??å??ã??ï¼?"
 
 #: ../gconf/gconftool.c:301
-msgid ""
-"Specify the type of the value being set, or the type of the value a schema "
-"describes. Unique abbreviations OK."
-msgstr ""
-"æ??å®?è¨å®?å?¼ç??é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??è¨å®?å?¼é¡?å??ã??ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«å?³å?¯ã??"
+msgid "Specify the type of the value being set, or the type of the value a schema describes. Unique abbreviations OK."
+msgstr "æ??å®?è¨å®?å?¼ç??é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??è¨å®?å?¼é¡?å??ã??ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«å?³å?¯ã??"
 
 #: ../gconf/gconftool.c:302
 msgid "int|bool|float|string|list|pair"
@@ -1680,31 +1615,22 @@ msgid "Get a specific element from a list key, numerically indexed."
 msgstr "è?ªè¨å®?é?µæ¸?å?®ä¸æ?·å??ä¸?å??ç?¹å®?å??ç´ ï¼?ä»¥æ?¸å?ç?ºç´¢å¼?ï¼?ã??"
 
 #: ../gconf/gconftool.c:337
-msgid ""
-"Specify the type of the list value being set, or the type of the value a "
-"schema describes. Unique abbreviations OK."
-msgstr ""
-"æ??å®?è¦?è¨å®?ç??æ¸?å?®é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??è¨å®?å?¼é¡?å??ã??ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«å?³å?¯ã??"
+msgid "Specify the type of the list value being set, or the type of the value a schema describes. Unique abbreviations OK."
+msgstr "æ??å®?è¦?è¨å®?ç??æ¸?å?®é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??è¨å®?å?¼é¡?å??ã??ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«å?³å?¯ã??"
 
-#: ../gconf/gconftool.c:338 ../gconf/gconftool.c:347 ../gconf/gconftool.c:356
+#: ../gconf/gconftool.c:338
+#: ../gconf/gconftool.c:347
+#: ../gconf/gconftool.c:356
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
 #: ../gconf/gconftool.c:346
-msgid ""
-"Specify the type of the car pair value being set, or the type of the value a "
-"schema describes. Unique abbreviations OK."
-msgstr ""
-"æ??å®?è¦?è¨å®?ç?? car pair ç??æ?¸å?¼é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??æ?¸å?¼é¡?å??ã??äº¦å?¯ä½¿ç?¨è?½å¤ è¾¨"
-"èª?ç??ç¸®å¯«ã??"
+msgid "Specify the type of the car pair value being set, or the type of the value a schema describes. Unique abbreviations OK."
+msgstr "æ??å®?è¦?è¨å®?ç?? car pair ç??æ?¸å?¼é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??æ?¸å?¼é¡?å??ã??äº¦å?¯ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«ã??"
 
 #: ../gconf/gconftool.c:355
-msgid ""
-"Specify the type of the cdr pair value being set, or the type of the value a "
-"schema describes. Unique abbreviations OK."
-msgstr ""
-"æ??å®?å·²è¨å®?ç?? cdr pair ç??æ?¸å?¼é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??æ?¸å?¼é¡?å??ã??äº¦å?¯ä½¿ç?¨è?½å¤ è¾¨"
-"èª?ç??ç¸®å¯«ã??"
+msgid "Specify the type of the cdr pair value being set, or the type of the value a schema describes. Unique abbreviations OK."
+msgstr "æ??å®?å·²è¨å®?ç?? cdr pair ç??æ?¸å?¼é¡?å??ï¼?æ?? schema æ??æ??è¿°ç??æ?¸å?¼é¡?å??ã??äº¦å?¯ä½¿ç?¨è?½å¤ è¾¨èª?ç??ç¸®å¯«ã??"
 
 #: ../gconf/gconftool.c:370
 msgid "Specify a schema file to be installed"
@@ -1723,61 +1649,37 @@ msgid "SOURCE"
 msgstr "ä¾?æº?"
 
 #: ../gconf/gconftool.c:388
-msgid ""
-"Bypass server, and access the configuration database directly. Requires that "
-"gconfd is not running."
+msgid "Bypass server, and access the configuration database directly. Requires that gconfd is not running."
 msgstr "è·³é??ä¼ºæ??å?¨ç?´æ?¥å?å??çµ?æ??è³?æ??åº«ã??gconfd å¿?é ?æ²?æ??å?·è¡?ã??"
 
 #: ../gconf/gconftool.c:397
-msgid ""
-"Properly installs schema files on the command line into the database. "
-"Specify a custom configuration source in the GCONF_CONFIG_SOURCE environment "
-"variable, or set set the variable to an empty string to use the default "
-"configuration source."
-msgstr ""
-"é?©ç?¶å?°å®?è£?å?½ä»¤å??ä¸æ??å®?ç?? schema æª?å?°è³?æ??åº«ä¸ã??ç?°å¢?è®?æ?¸ GCONF_CONFIG_SOURCE å¿?"
-"é ?è¨å®?ç?ºè?ªè¨?ç??è¨å®?ä¾?æº?ï¼?æ??è¨å®?ç?ºç©ºç?½å?ä¸²è¡¨ç¤ºé ?è¨å?¼ã??"
+msgid "Properly installs schema files on the command line into the database. Specify a custom configuration source in the GCONF_CONFIG_SOURCE environment variable, or set set the variable to an empty string to use the default configuration source."
+msgstr "é?©ç?¶å?°å®?è£?å?½ä»¤å??ä¸æ??å®?ç?? schema æª?å?°è³?æ??åº«ä¸ã??ç?°å¢?è®?æ?¸ GCONF_CONFIG_SOURCE å¿?é ?è¨å®?ç?ºè?ªè¨?ç??è¨å®?ä¾?æº?ï¼?æ??è¨å®?ç?ºç©ºç?½å?ä¸²è¡¨ç¤ºé ?è¨å?¼ã??"
 
 #: ../gconf/gconftool.c:406
-msgid ""
-"Properly uninstalls schema files on the command line from the database. "
-"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
-"configuration source or set to the empty string to use the default."
-msgstr ""
-"é?©ç?¶å?°å¾?è³?æ??åº«è§£é?¤å®?è£?å?½ä»¤å??ä¸æ??å®?ç?? schema æª?ã??ç?°å¢?è®?æ?¸ GCONF_CONFIG_SOURCE "
-"å¿?é ?è¨å®?ç?ºé??é ?è¨ç??è¨å®?ä¾?æº?ï¼?æ??è¨å®?ç?ºç©ºç?½å?ä¸²è¡¨ç¤ºé ?è¨å?¼ã??"
+msgid "Properly uninstalls schema files on the command line from the database. GCONF_CONFIG_SOURCE environment variable should be set to a non-default configuration source or set to the empty string to use the default."
+msgstr "é?©ç?¶å?°å¾?è³?æ??åº«è§£é?¤å®?è£?å?½ä»¤å??ä¸æ??å®?ç?? schema æª?ã??ç?°å¢?è®?æ?¸ GCONF_CONFIG_SOURCE å¿?é ?è¨å®?ç?ºé??é ?è¨ç??è¨å®?ä¾?æº?ï¼?æ??è¨å®?ç?ºç©ºç?½å?ä¸²è¡¨ç¤ºé ?è¨å?¼ã??"
 
 # seems the torture test is for breaking gconf itself, not for breaking
 # other applications?  -- Abel
 #: ../gconf/gconftool.c:421
-msgid ""
-"Torture-test an application by setting and unsetting a bunch of values of "
-"different types for keys on the command line."
-msgstr ""
-"ç?ºå?½ä»¤å??ä¸æ??å®?ç??è¨å®?é?µé?²è¡?æ¶?è??æ¸¬è©¦(Torture-test)ï¼?å¯«å?¥å??å?ªé?¤ä¸?å??é¡?å??ç??è¨å®?"
-"å?¼ã??"
+msgid "Torture-test an application by setting and unsetting a bunch of values of different types for keys on the command line."
+msgstr "ç?ºå?½ä»¤å??ä¸æ??å®?ç??è¨å®?é?µé?²è¡?æ¶?è??æ¸¬è©¦(Torture-test)ï¼?å¯«å?¥å??å?ªé?¤ä¸?å??é¡?å??ç??è¨å®?å?¼ã??"
 
 #: ../gconf/gconftool.c:430
-msgid ""
-"Torture-test an application by setting and unsetting a bunch of keys inside "
-"the directories on the command line."
-msgstr ""
-"å?¨å?½ä»¤å??æ??å®?ç??ç?®é??ä¸é?²è¡?æ¶?è??æ¸¬è©¦(Torture-test)ï¼?å?¨å?¶ä¸å¯«å?¥å??å?ªé?¤ä¸?å??é¡?å??ç??è¨"
-"å®?é?µã??"
+msgid "Torture-test an application by setting and unsetting a bunch of keys inside the directories on the command line."
+msgstr "å?¨å?½ä»¤å??æ??å®?ç??ç?®é??ä¸é?²è¡?æ¶?è??æ¸¬è©¦(Torture-test)ï¼?å?¨å?¶ä¸å¯«å?¥å??å?ªé?¤ä¸?å??é¡?å??ç??è¨å®?é?µã??"
 
 #: ../gconf/gconftool.c:445
-msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
-"type."
-msgstr ""
-"è¨å®?ä¸?å?? schema ç?¶å¾?å??æ¥å??ã??å?? --short-descã??--long-descã??--owner è?? --type "
-"ä¸?èµ·ä½¿ç?¨ã??"
+msgid "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --type."
+msgstr "è¨å®?ä¸?å?? schema ç?¶å¾?å??æ¥å??ã??å?? --short-descã??--long-descã??--owner è?? --type ä¸?èµ·ä½¿ç?¨ã??"
 
 #: ../gconf/gconftool.c:454
 msgid "Specify a short half-line description to go in a schema."
 msgstr "æ??å®?æº?å??å? å?¥ schema ç??ç°¡è¦?æ??è¿°ã??"
 
-#: ../gconf/gconftool.c:455 ../gconf/gconftool.c:464
+#: ../gconf/gconftool.c:455
+#: ../gconf/gconftool.c:464
 msgid "DESCRIPTION"
 msgstr "æ??è¿°"
 
@@ -1917,21 +1819,13 @@ msgstr "ç?¡æ³?å?¨ä½¿ç?¨ --all-dirs æ??å? ä¸? --get æ?? --set\n"
 
 #: ../gconf/gconftool.c:718
 #, c-format
-msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-"
-"entries, --all-dirs, or --search-key\n"
-msgstr ""
-"--recursive-list ä¸?è?½è?? --get, --set, --unset, --all-entries --all-dirs, æ?? "
-"--search-key ä¸?èµ·ä½¿ç?¨\n"
+msgid "--recursive-list should not be used with --get, --set, --unset, --all-entries, --all-dirs, or --search-key\n"
+msgstr "--recursive-list ä¸?è?½è?? --get, --set, --unset, --all-entries --all-dirs, æ?? --search-key ä¸?èµ·ä½¿ç?¨\n"
 
 #: ../gconf/gconftool.c:732
 #, c-format
-msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
-"all-dirs, or --search-key\n"
-msgstr ""
-"--set_schema ä¸?è?½è?? --get, --set, --unset, --all-entries, --all-dirs, æ?? --"
-"search-key ä¸?èµ·ä½¿ç?¨\n"
+msgid "--set_schema should not be used with --get, --set, --unset, --all-entries, --all-dirs, or --search-key\n"
+msgstr "--set_schema ä¸?è?½è?? --get, --set, --unset, --all-entries, --all-dirs, æ?? --search-key ä¸?èµ·ä½¿ç?¨\n"
 
 #: ../gconf/gconftool.c:738
 #, c-format
@@ -1945,16 +1839,16 @@ msgstr "å¯«å?¥è¨å®?å?¼æ??å¿?é ?æ??å®?é¡?å??\n"
 
 #: ../gconf/gconftool.c:752
 #, c-format
-msgid ""
-"--ignore-schema-defaults is only relevant with --get, --all-entries, --dump, "
-"--recursive-list, --get-list-size or --get-list-element\n"
-msgstr ""
-"ä½¿ç?¨ --ignore-schema-defaults æ??å¿?é ?é??å?? --get, --all-entries, --dump, --"
-"recursive-list, --get-list-size æ?? --get-list-element ä¸?èµ·ä½¿ç?¨æ??æ??æ??ç¾©\n"
+msgid "--ignore-schema-defaults is only relevant with --get, --all-entries, --dump, --recursive-list, --get-list-size or --get-list-element\n"
+msgstr "ä½¿ç?¨ --ignore-schema-defaults æ??å¿?é ?é??å?? --get, --all-entries, --dump, --recursive-list, --get-list-size æ?? --get-list-element ä¸?èµ·ä½¿ç?¨æ??æ??æ??ç¾©\n"
 
 # used by itself = can't be used with any other option -- Abel
-#: ../gconf/gconftool.c:764 ../gconf/gconftool.c:777 ../gconf/gconftool.c:790
-#: ../gconf/gconftool.c:804 ../gconf/gconftool.c:817 ../gconf/gconftool.c:830
+#: ../gconf/gconftool.c:764
+#: ../gconf/gconftool.c:777
+#: ../gconf/gconftool.c:790
+#: ../gconf/gconftool.c:804
+#: ../gconf/gconftool.c:817
+#: ../gconf/gconftool.c:830
 #: ../gconf/gconftool.c:844
 #, c-format
 msgid "%s option must be used by itself.\n"
@@ -1962,9 +1856,7 @@ msgstr "%s é?¸é ?å¿?é ?å?®ç?¨ä½¿ç?¨ã??\n"
 
 #: ../gconf/gconftool.c:853
 #, c-format
-msgid ""
-"You must specify a configuration source with --config-source when using --"
-"direct\n"
+msgid "You must specify a configuration source with --config-source when using --direct\n"
 msgstr "ç?¶æ?¨ä½¿ç?¨ --direct æ??ï¼?æ?¨å¿?é ?ç?¨ --config-source é?¸é ?æ??å®?ä¸?å??çµ?æ??ä¾?æº?\n"
 
 #: ../gconf/gconftool.c:859
@@ -1979,8 +1871,7 @@ msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL å·²è¨å®?ï¼?ä¸?å®?è£? schema \n"
 
 #: ../gconf/gconftool.c:894
 #, c-format
-msgid ""
-"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
 msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL å·²è¨å®?ï¼?ä¸?è§£é?¤å®?è£? schema \n"
 
 #: ../gconf/gconftool.c:907
@@ -2003,13 +1894,15 @@ msgstr "é??é??æ??ç?¼ç??é?¯èª¤ï¼?%s\n"
 msgid "Must specify one or more directories to recursively list.\n"
 msgstr "å¿?é ?æ??å®?ä¸?å??æ??å¤?å??ç?®é??æ??è?½é??è¿´å??å?ºã??\n"
 
-#: ../gconf/gconftool.c:1355 ../gconf/gconftool.c:1549
+#: ../gconf/gconftool.c:1355
+#: ../gconf/gconftool.c:1549
 #: ../gconf/gconftool.c:1815
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "ç?¡æ³?å??å?ºå?¨â??%sâ??ä¸ç??é ?ç?®ï¼?%s\n"
 
-#: ../gconf/gconftool.c:1375 ../gconf/gconftool.c:1568
+#: ../gconf/gconftool.c:1375
+#: ../gconf/gconftool.c:1568
 msgid "(no value set)"
 msgstr "ï¼?æ²?æ??æ??å®?è¨å®?å?¼ï¼?"
 
@@ -2068,8 +1961,10 @@ msgstr "Cdr é¡?å??ï¼?%s\n"
 msgid "Default Value: %s\n"
 msgstr "é ?è¨å?¼ï¼?%s\n"
 
-#: ../gconf/gconftool.c:1946 ../gconf/gconftool.c:1948
-#: ../gconf/gconftool.c:1949 ../gconf/gconftool.c:1950
+#: ../gconf/gconftool.c:1946
+#: ../gconf/gconftool.c:1948
+#: ../gconf/gconftool.c:1949
+#: ../gconf/gconftool.c:1950
 msgid "Unset"
 msgstr "ä¸?è¨å®?"
 
@@ -2088,21 +1983,26 @@ msgstr "ç°¡ç?èªªæ??ï¼?%s\n"
 msgid "Long Desc: %s\n"
 msgstr "è©³ç´°èªªæ??ï¼?%s\n"
 
-#: ../gconf/gconftool.c:1959 ../gconf/gconftool.c:2236
-#: ../gconf/gconftool.c:2270 ../gconf/gconftool.c:2315
+#: ../gconf/gconftool.c:1959
+#: ../gconf/gconftool.c:2236
+#: ../gconf/gconftool.c:2270
+#: ../gconf/gconftool.c:2315
 #: ../gconf/gconftool.c:2460
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "æ²?æ??è¨å®?å?¼çµ¦â??%sâ??\n"
 
-#: ../gconf/gconftool.c:1963 ../gconf/gconftool.c:2240
-#: ../gconf/gconftool.c:2274 ../gconf/gconftool.c:2319
+#: ../gconf/gconftool.c:1963
+#: ../gconf/gconftool.c:2240
+#: ../gconf/gconftool.c:2274
+#: ../gconf/gconftool.c:2319
 #: ../gconf/gconftool.c:2464
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "ç?¡æ³?æ?·å??â??%sâ??ç??å?¼ï¼?%s\n"
 
-#: ../gconf/gconftool.c:2006 ../gconf/gconftool.c:2018
+#: ../gconf/gconftool.c:2006
+#: ../gconf/gconftool.c:2018
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "ä¸?äº?è§£é¡?å??â??%sâ??\n"
@@ -2129,8 +2029,7 @@ msgstr "ç?¶è¨å®?æ¸?å?®æ??ï¼?æ?¨å¿?é ?æ??å®?ä¸?å??å??å§?ç??æ¸?å?®é¡?å??\n"
 
 #: ../gconf/gconftool.c:2102
 #, c-format
-msgid ""
-"When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "ç?¶è¨å®?é??å°? (pair) æ??ï¼?æ?¨å¿?é ?æ??å®?ä¸?å??å??å§?ç?? car-type è?? cdr-type\n"
 
 #: ../gconf/gconftool.c:2117
@@ -2138,7 +2037,8 @@ msgstr "ç?¶è¨å®?é??å°? (pair) æ??ï¼?æ?¨å¿?é ?æ??å®?ä¸?å??å??å§?ç?? car-type è??
 msgid "Error: %s\n"
 msgstr "é?¯èª¤ï¼?%s\n"
 
-#: ../gconf/gconftool.c:2130 ../gconf/gconftool.c:2195
+#: ../gconf/gconftool.c:2130
+#: ../gconf/gconftool.c:2195
 #: ../gconf/gconftool.c:3215
 #, c-format
 msgid "Error setting value: %s\n"
@@ -2174,7 +2074,8 @@ msgstr "å¿?é ?è?³å°?æ??å®?ä¸?å??è¨å®?é?µä»¥æ?·å??é¡?å??\n"
 msgid "Must specify a key to lookup size of.\n"
 msgstr "å¿?é ?æ??å®?è¦?æª¢è¦?å¤§å°?ç??è¨å®?é?µã??\n"
 
-#: ../gconf/gconftool.c:2285 ../gconf/gconftool.c:2330
+#: ../gconf/gconftool.c:2285
+#: ../gconf/gconftool.c:2330
 #, c-format
 msgid "Key %s is not a list.\n"
 msgstr "è¨å®?é?µ %s ä¸?æ?¯ä¸?å??æ¸?å?®ã??\n"
@@ -2354,7 +2255,8 @@ msgstr "è¦å??ï¼?ç?¡æ³?è§£æ??å?ä¸²å?¼â??%sâ??\n"
 msgid "WARNING: Failed to parse boolean value `%s'\n"
 msgstr "è¦å??ï¼?ç?¡æ³?è§£æ??é??è¼¯å?¼â??%sâ??\n"
 
-#: ../gconf/gconftool.c:3194 ../gconf/gconftool.c:3736
+#: ../gconf/gconftool.c:3194
+#: ../gconf/gconftool.c:3736
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "è¦å??ï¼?ç?¡æ³?ä½¿ schema â??%sâ??è??è¨å®?é?µâ??%sâ??ç?¢ç??é??è?¯ï¼?%s\n"
@@ -2369,7 +2271,8 @@ msgstr "è¦å??ï¼? schema (%s) æ??ç?¡æ??æ??é?ºå¤±ç??é¡?å??\n"
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "è¦å??ï¼? schema (%s) æ??ç?¡æ??æ??é?ºå¤±ç?? list_type\n"
 
-#: ../gconf/gconftool.c:3329 ../gconf/gconftool.c:3359
+#: ../gconf/gconftool.c:3329
+#: ../gconf/gconftool.c:3359
 #: ../gconf/gconftool.c:3388
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
@@ -2390,16 +2293,17 @@ msgstr "è¦å??ï¼?æ?¨ä¸?è?½æ?´æ?¹ schema ç??é ?è¨å?¼\n"
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "è¦å??ï¼?gconftool å?§é?¨é?¯èª¤ï¼?æ??æ?ªç?¥ç?? GConfValueType\n"
 
-#: ../gconf/gconftool.c:3449 ../gconf/gconftool.c:3470
-#: ../gconf/gconftool.c:3491 ../gconf/gconftool.c:3512
+#: ../gconf/gconftool.c:3449
+#: ../gconf/gconftool.c:3470
+#: ../gconf/gconftool.c:3491
+#: ../gconf/gconftool.c:3512
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "è¦å??ï¼?ç?¡æ³?è§£æ??é¡?å??å??ç¨±â??%sâ??\n"
 
 #: ../gconf/gconftool.c:3466
 #, c-format
-msgid ""
-"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr "è¦å??ï¼?list_type å?ªè?½æ?¯ int, float, string æ?? bool è??ä¸?æ?¯â??%sâ??\n"
 
 #: ../gconf/gconftool.c:3487
@@ -2417,7 +2321,8 @@ msgstr "è¦å??ï¼?cdr_type å?ªè?½æ?¯ int, float, string æ?? bool è??ä¸?æ?¯â??%s
 msgid "WARNING: empty <applyto> node"
 msgstr "è¦å??ï¼?ç©ºç?½ç?? <applyto> ç¯?é»?"
 
-#: ../gconf/gconftool.c:3551 ../gconf/gconftool.c:3809
+#: ../gconf/gconftool.c:3551
+#: ../gconf/gconftool.c:3809
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "è¦å??ï¼?ç¯?é»? <%s> å?¨ <schema> ä»¥ä¸?ç?¡æ³?ç??è§£\n"
@@ -2445,8 +2350,7 @@ msgstr "è¦å??ï¼?<locale> ç¯?é»?æ²?æ??â??name=\"locale\"â??å±¬æ?§ï¼?ç?¥é??\n"
 
 #: ../gconf/gconftool.c:3609
 #, c-format
-msgid ""
-"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgid "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr "è¦å??ï¼?èª?è¨?â??%sâ??å?ºç?¾å¤?æ¬¡ <locale> ç¯?é»?ï¼?ç?¥é??ç¬¬ä¸?å??ä»¥å¾?ç??æ??æ??ç¯?é»?\n"
 
 #: ../gconf/gconftool.c:3707
@@ -2567,13 +2471,20 @@ msgstr "å¿?é ?æ??å®?ä¸?äº?ç?®é??ä½?ç?ºæ¸¬è©¦ä½¿ç?¨\n"
 #: ../gconf/gconftool.c:4290
 #, c-format
 msgid ""
-"Trying to break your application by setting bad values for keys in "
-"directory:\n"
+"Trying to break your application by setting bad values for keys in directory:\n"
 "  %s\n"
 msgstr ""
 "å??è©¦å?¨ä¸?å??ç?®é??å?§å¯«å?¥ä¸?ç?¶ç??è¨å®?å?¼ä¾?æ¸¬è©¦æ??ç?¨ç¨?å¼?ï¼?\n"
 "  %s\n"
 
+#: ../gsettings/gsettings-data-convert.desktop.in.h:1
+msgid "GSettings Data Conversion"
+msgstr "GSettings è³?æ??è½?æ??"
+
+#: ../gsettings/gsettings-data-convert.desktop.in.h:2
+msgid "Migrates user settings from GConf to dconf"
+msgstr "å°?ä½¿ç?¨è??è¨å®?å?¼å¾? GConf è½?ç§»å?° dconf"
+
 #~ msgid "Could not send message to GConf daemon: %s"
 #~ msgstr "ç?¡æ³?å?³é??è¨?æ?¯è?³ GConf ä¼ºæ??ç¨?å¼?ï¼?%s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]