[tomboy] Update Chinese (China) help translation.

[Aron Xu <aronxu src gnome org>]

commit b728c8bc12343c272899909c5fee301d47c31b45
Author: Teliute <teliute 163 com>
Date:   Tue Dec 28 17:36:21 2010 +0800

    Update Chinese (China) help translation.

 help/zh_CN/zh_CN.po |  332 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 256 insertions(+), 76 deletions(-)
---
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index 875f386..b72d329 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -7,39 +7,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy master\n"
-"POT-Creation-Date: 2010-09-14 15:45+0000\n"
-"PO-Revision-Date: 2010-09-16 16:16+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"POT-Creation-Date: 2010-12-06 00:33+0000\n"
+"PO-Revision-Date: 2010-12-13 12:26+0800\n"
+"Last-Translator: TeliuTe <teliute 163 com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-
-#: C/legal.xml:3(p)
-msgid ""
-"This work is licensed under a <link href=\"http://creativecommons.org/";
-"licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported "
-"License</link>."
-msgstr ""
-"æ?¬æ??é??ç?¨ <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\";>ç?¥è¯?å?±"
-"享署å??-ç?¸å??æ?¹å¼?å?±äº« 3.0 Unported 许å?¯å??è®®</link>ã??"
-
-#: C/legal.xml:6(p)
-msgid ""
-"As a special exception, the copyright holders give you permission to copy, "
-"modify, and distribute the example code contained in this document under the "
-"terms of your choosing, without restriction."
-msgstr ""
-"ä½?为ä¸?个ç?¹æ®?ç??ä¾?å¤?ï¼?è??ä½?æ??人å??许æ?¨ä½¿ç?¨è?ªå·±ç??许å?¯å??è®®å¤?å?¶ã??ä¿®æ?¹å??å??å??å??å?«å?¨æ?¬"
-"æ??档中ç??è??ä¾?代ç ?ï¼?ä¸?å??约æ??ã??"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
 
 #: C/whatsnew.page:9(desc)
 msgid "What's new in <app>Tomboy Notes</app>."
 msgstr "<app>é?¿å¸?便笺</app>ç??æ?°å??è?½ã??"
 
-#: C/whatsnew.page:13(name) C/sync.page:11(name) C/search.page:12(name)
-#: C/problems.page:11(name) C/prefs.page:9(name)
+#: C/whatsnew.page:13(name) C/sync-setup.page:11(name) C/sync.page:11(name)
+#: C/search.page:12(name) C/problems.page:11(name) C/prefs.page:9(name)
 #: C/note-edit-prefs.page:11(name) C/introduction.page:12(name)
 #: C/index.page:9(name) C/hotkeys.page:11(name) C/edit-note.page:13(name)
 #: C/delete-notes.page:13(name) C/create-note.page:13(name)
@@ -50,8 +34,8 @@ msgstr "<app>é?¿å¸?便笺</app>ç??æ?°å??è?½ã??"
 msgid "Paul Cutler"
 msgstr "Paul Cutler"
 
-#: C/whatsnew.page:14(email) C/sync.page:12(email) C/search.page:13(email)
-#: C/problems.page:12(email) C/prefs.page:10(email)
+#: C/whatsnew.page:14(email) C/sync-setup.page:12(email) C/sync.page:12(email)
+#: C/search.page:13(email) C/problems.page:12(email) C/prefs.page:10(email)
 #: C/note-edit-prefs.page:12(email) C/introduction.page:13(email)
 #: C/index.page:10(email) C/hotkeys.page:12(email) C/edit-note.page:14(email)
 #: C/delete-notes.page:14(email) C/create-note.page:14(email)
@@ -80,14 +64,14 @@ msgid ""
 "support formatting into other applications that can understand HTML, such as "
 "Evolution, OpenOffice.org and other applications."
 msgstr ""
-"ä»?é?¿å¸?便笺å¤?å?¶å??ç²?è´´å?°å?¶ä»?åº?ç?¨ç¨?åº?ç??å??è?½å¾?å?°æ?¹è¿?ï¼?æ?¯æ??å°?æ??æ?¬æ ¼å¼?ä¹?å¤?å?¶å?°å?¶ä»?"
-"æ?¯æ?? HTML ç??ç¨?åº?ï¼?æ¯?å¦? Evolutionã??OpenOffice.org ç­?å?¶ä»?åº?ç?¨ç¨?åº?ã??"
+"ä»?é?¿å¸?便笺å¤?å?¶å??ç²?è´´å?°å?¶ä»?åº?ç?¨ç¨?åº?ç??å??è?½å¾?å?°æ?¹è¿?ï¼?æ?¯æ??å°?æ??æ?¬ç??æ ¼å¼?ä¹?å¤?å?¶å?°å?¶"
+"ä»?æ?¯æ?? HTML ç??ç¨?åº?ï¼?æ¯?å¦? Evolutionã??OpenOffice.org ç­?å?¶ä»?åº?ç?¨ç¨?åº?ã??"
 
 #: C/whatsnew.page:36(p)
 msgid ""
 "<app>Tomboy</app> can now synchronize your notes automatically for you when "
 "you when you have sync enabled."
-msgstr "å¦?æ??æ?¨å?¯ç?¨äº?å??æ­¥å??è?½ï¼?<app>é?¿å¸?便笺</app>ç?°å?¨å?¯ä»¥è?ªå?¨å??æ­¥æ?¨ç??便笺ã??"
+msgstr "å¦?æ??æ?¨å?¯ç?¨äº?å??æ­¥å??è?½ï¼?<app>é?¿å¸?便笺</app>å?¯ä»¥ç«?å?³è?ªå?¨å??æ­¥æ?¨ç??便笺ã??"
 
 #: C/whatsnew.page:41(p)
 msgid ""
@@ -98,6 +82,200 @@ msgstr ""
 "æ·»å? äº?æ?¯æ?? Microsoft Windows 7 跳转å??表ï¼?帮å?©æ?¨è®¿é?®ä¾¿ç¬ºï¼?ç?´æ?¥å?¨çª?å?£ä»»å?¡æ ?ä¸?å¿«"
 "é??æ?¥æ?¾å??å??建便笺ã??"
 
+#: C/sync-setup.page:8(desc)
+msgid "Configure Tomboy to synchronize your notes."
+msgstr "é??置便笺å??æ­¥"
+
+#: C/sync-setup.page:23(title)
+msgid "Configure and Setup Sync"
+msgstr "é??ç½®å??æ­¥é??项"
+
+#: C/sync-setup.page:27(title)
+msgid "Enable Sync"
+msgstr "å?¯ç?¨å??æ­¥"
+
+#: C/sync-setup.page:29(p)
+msgid ""
+"<app>Tomboy</app> can synchronize your notes between multiple computers. "
+"This allows you to have a backup of your notes on another computer of share "
+"your notes between computers so you always have access to your notes."
+msgstr ""
+"<app>é?¿å¸?便笺</app>è?½å¤?å?¨å¤?å?°è®¡ç®?æ?ºä¹?é?´å??æ­¥ä½ ç??便笺ï¼?è¿?æ ·æ?¨å°±è?½å¤?å?¨å?¶ä»?计ç®?æ?º"
+"ä¸?å¤?份æ??å??享æ?¨ç??便笺ï¼?让æ?¨æ?»æ?¯å?¯ä»¥è®¿é?®å?°æ?¨ç??便笺ã?? "
+
+#: C/sync-setup.page:35(p) C/sync.page:54(p)
+msgid ""
+"You can enable sync by opening <gui>Tomboy Preferences</gui> by using your "
+"mouse to right click on the Tomboy icon in your panel, taskbar or dock and "
+"choose <gui>Preferences</gui> and then select the <gui>Synchronization</gui> "
+"tab. You can also open <gui> Tomboy Preferences</gui> from the <gui>Search "
+"All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq>."
+msgstr ""
+"æ?¨å?¯ä»¥é??è¿?å?¨é?¢æ?¿ã??ä»»å?¡æ ?ã??æµ®å?¨é?¢æ?¿ç??é?¿å¸?便笺å?¾æ ?ä¸?ç?¹å?³é?®ï¼?ç?¶å??é?? <gui>é¦?é??项"
+"</gui> æ?¥æ??å¼? <gui>é?¿å¸?便笺é¦?é??项</gui>ï¼?å??é?? <gui>å??步便笺</gui> æ ?ç­¾ã??ä¹?å?¯"
+"以å?¨ <gui>æ??ç´¢å?¨é?¨ä¾¿ç¬º</gui> 对è¯?æ¡?é??ï¼?æ??å¼? <gui>é¦?é??项</gui>ï¼?ç?¹è??å?? "
+"<guiseq><gui>ç¼?è¾?</gui><gui>é¦?é??项</gui></guiseq>ã??"
+
+#: C/sync-setup.page:48(title)
+msgid "Managing Note Conflict"
+msgstr "管ç??便笺å?²çª?"
+
+#: C/sync-setup.page:50(p)
+msgid ""
+"You can set the default behavior for Tomboy when a note is discovered to be "
+"a conflict. This can occur when notes are not synced on a regular basis."
+msgstr ""
+"æ?¨å?¯ä»¥è®¾ç½®å?ºç?°ä¾¿ç¬ºå?²çª?æ?¶ï¼?é?¿å¸?便笺é»?认ç??æ??ä½?ï¼?è¿?ä¸?è?¬ç?¨äº?便笺é??è¦?å®?æ??å??æ­¥ç??æ??"
+"å?µä¸?ã??"
+
+#: C/sync-setup.page:55(p)
+msgid ""
+"In the <gui>Preferences</gui> dialog press the <gui>Advanced</gui> button. "
+"You can select from three choices as the default behavior in managing "
+"conflicts:"
+msgstr ""
+"æ?¨å?¯ä»¥å?¨ <gui>é¦?é??项</gui> 对è¯?æ¡?中ï¼?ç?¹ <gui>é«?级</gui> æ??é?®ï¼?ä»?ä¸?个é??项中é??"
+"æ?©ä¸?个é»?认ç??å?²çª?å¤?ç??é??项ã??"
+
+#: C/sync-setup.page:61(p)
+msgid ""
+"<gui>Always ask me what to do.</gui> This is the default choice and when "
+"Tomboy encounters a conflict Tomboy will always prompt you to ask you if you "
+"want to rename the local note or replace your local note with the note the "
+"server has stored."
+msgstr ""
+"<gui>æ?»æ?¯è¯¢é?®è¯¥æ??ä¹?å??ã??</gui>è¿?æ?¯é»?认ç??é??项ï¼?å½?é?¿å¸?便笺å??ç?°å?²çª?æ?¶ï¼?æ?»æ?¯æ??示æ?¨"
+"æ?¯å?¦é??å?½å??æ?¬å?°ä¾¿ç¬ºï¼?æ??è??ç?¨æ??å?¡å?¨ä¸?ç??便笺æ?¿æ?¢æ?¬å?°ä¾¿ç¬ºã??"
+
+#: C/sync-setup.page:66(p)
+msgid ""
+"<gui>Rename my local note.</gui> If this option is selected, Tomboy will "
+"automatically replace the note with a copy from the remote computer and "
+"rename the note on your computer so you don't lose your information in your "
+"note."
+msgstr ""
+"<gui>é??å?½å??æ??ç??æ?¬å?°ä¾¿ç¬ºã??</gui>é??中此项ï¼?便笺å°?è?ªå?¨ä»?è¿?ç¨?计ç®?æ?ºå¤?å?¶ä¸?份便笺æ?¿"
+"æ?¢æ?¬å?°ç??ï¼?è??å°?æ?¬å?°ä¾¿ç¬ºé??å?½å??ï¼?è¿?æ ·æ?¨å°±ä¸?ä¼?丢失æ?¨ç??便笺信æ?¯ã??"
+
+#: C/sync-setup.page:72(p)
+msgid ""
+"<gui>Replace my local note with the server's update. </gui>. If you have "
+"selected this option, when you sync Tomboy will overwrite and replace your "
+"note stored on your computer with a copy from the remote computer."
+msgstr ""
+"<gui>ç?¨æ??å?¡å?¨ä¸?ç??便笺æ?´æ?°æ??ç??æ?¬å?°ä¾¿ç¬ºã??</gui>é??中此项ï¼?å½?æ?¨å??步便笺æ?¶ï¼?æ?»æ?¯ä»?"
+"è¿?ç¨?计ç®?æ?ºä¸?ç??便笺æ?¿æ?¢æ?¬å?°ä¾¿ç¬ºã??"
+
+#: C/sync-setup.page:78(p)
+msgid ""
+"Automatically overwriting the note is permanent. Your local note will be "
+"replaced by the copy on the remote computer and you will lose your "
+"information that was stored prior to syncing."
+msgstr ""
+"便笺ç??æ?¿æ?¢æ?¯æ°¸ä¹?æ?§ç??ï¼?æ?¨æ?¬å?°ç??便笺å°?ä¼?被è¿?ç¨?计ç®?æ?ºç??便笺æ??æ?¿æ?¢ï¼?å??æ­¥å??该便笺"
+"中å­?æ?¾ç??ä¿¡æ?¯å°?ä¼?丢失ã??"
+
+#: C/sync-setup.page:91(title)
+msgid "Configure Sync using WebDav"
+msgstr "é??ç½® WebDav å??æ­¥"
+
+#: C/sync-setup.page:93(p)
+msgid ""
+"In order to synchronize your notes with a WebDAV server, you will need the "
+"wdfs FUSE file system installed. Follow the documentation for your operating "
+"system to set up FUSE for your user. You will also need the GNOME Keyring "
+"installed."
+msgstr ""
+"è¦?æ?³ä½¿ç?¨ WebDAV å??步便签ï¼?æ?¨é??è¦?å?¨ç³»ç»?中å®?è£? wdfs FUSE æ??件系ç»?ï¼?å?¨å®?è£?è¿?ç¨?"
+"中ï¼?ç³»ç»?å°?ä¼?为ç?¨æ?·è®¾ç½® FUSEï¼?æ?¨è¿?é??è¦?å®?è£? GNOME Keyring å¯?é?¥ç¨?åº?ã??"
+
+#: C/sync-setup.page:99(p)
+msgid ""
+"Choose <gui>WebDAV</gui> from the <gui>Service</gui> drop-down list. Fill in "
+"the connection information for your server, and then select the <gui>Save</"
+"gui> button. You are now ready to synchronize your notes."
+msgstr ""
+"å?¨ <gui>æ??å?¡</gui> ä¸?æ??å??表中é??æ?© <gui>WebDAV</gui>ï¼?è¾?å?¥æ??å?¡å?¨ç??è¿?æ?¥ä¿¡æ?¯ï¼?ç?¶"
+"å??ç?¹ <gui>ä¿?å­?</gui> æ??é?®ï¼?ç?¶å??å°±å?¯ä»¥ä½¿ç?¨ä¾¿ç¬ºå??æ­¥å??è?½äº?ã??"
+
+#: C/sync-setup.page:108(title)
+msgid "Configure Sync using SSH"
+msgstr "é??ç½® SSH å??æ­¥"
+
+#: C/sync-setup.page:110(p)
+msgid ""
+"In order to synchronize your notes with an SSH server, you will need the "
+"FUSE file system, also called <app>sshfs</app> installed. Follow the "
+"documentation for your operating system to set up FUSE for your user. You "
+"will also need an SSH key for your SSH server account, whi<app>GNOME "
+"Seahorse</app> application, which is also known as <app>Passwords and "
+"Encryption Keys</app>."
+msgstr ""
+"è¦?使ç?¨ SSH æ??å?¡æ?¥å??步便笺ï¼?æ?¨é??è¦?å®?è£? FUSE æ??件系ç»?ï¼?ä¹?å?« <app>ssfs</app>ã??å?¨"
+"å®?è£?è¿?ç¨?中ï¼?ç³»ç»?å°?ä¼?为ç?¨æ?·è®¾ç½® FUSEï¼?æ?¨è¿?é??è¦? SSH æ??å?¡å?¨ç?? SSH å¯?é?¥ï¼?å®?è£? "
+"<app>GNOME Seahorse</app>ï¼?ä¹?称为<app>å¯?ç ?å??å? å¯?å¯?é?¥</app>ç¨?åº?ã??"
+
+#: C/sync-setup.page:118(p)
+msgid ""
+"It is recommended to use a third computer or server as the remote computer "
+"to store the syncronized notes that are to be synced between multiple "
+"computers."
+msgstr ""
+"æ?¨è??使ç?¨ç¬¬ä¸?æ?¹è®¡ç®?æ?ºæ??æ??å?¡å?¨ä½?为è¿?ç¨?计ç®?æ?ºæ?¥å­?æ?¾å??步便笺ï¼?è¿?æ ·å?¯ä»¥å?¨å¤?å?°è®¡ç®?"
+"æ?ºä¹?é?´å??步便笺ã??"
+
+#: C/sync-setup.page:122(p)
+msgid ""
+"Open <app>Passwords and Encryption Keys</app> by choosing "
+"<guiseq><gui>Applications</gui><gui>Accessories</gui><gui>Passwords and "
+"Encryption Keys</gui></guiseq>. Click on your key, and from the menu choose "
+"<guiseq><gui>Remote</gui><gui>Configure Key for Secure Shell</gui></guiseq> "
+"and enter the domain name or IP address of the computer you want to sync to "
+"in <gui>Computer Name</gui>. Enter the username of the remote computer in "
+"<gui>Login Name:</gui> and press <gui>Set Up</gui>. When prompted, enter the "
+"password and setting up your key will be completed."
+msgstr ""
+"ç?¹è??å?? <guiseq><gui>åº?ç?¨ç¨?åº?</gui><gui>é??件</gui><gui>å¯?ç ?å??å? å¯?å¯?é?¥ </gui></"
+"guiseq>ï¼?æ??å¼?<app>å¯?ç ?å??å? å¯?å¯?é?¥</app>ç¨?åº?ï¼?ç?¹å?»æ?¨ç??å¯?é?¥ï¼?ç?¶å??ç?¹è??å?? "
+"<guiseq><gui>è¿?ç¨?</gui><gui>为 SSH é??ç½®å¯?é?¥</gui></guiseq>ï¼?ç?¶å??å?¨<gui>计ç®?æ?º"
+"å??</gui>中è¾?å?¥æ?¨æ?³å??æ­¥ç??计ç®?æ?ºå??å??æ?? IP å?°å??ï¼?å?¨<gui>ç?»å½?å??:</gui>中è¾?å?¥è®¿é?®"
+"è¿?ç¨?计ç®?æ?ºç??ç?¨æ?·å??ï¼?ç?¶å?? ç?¹<gui>设å®?</gui>ï¼?å?ºæ?¥æ??示æ?¶ï¼?è¾?å?¥å¯?ç ?ç?¶å??å®?æ??å¯?é?¥"
+"ç??设置ã??"
+
+#: C/sync-setup.page:134(p)
+msgid ""
+"In Tomboy, choose <gui>SSH</gui> from the <gui>Service</gui> drop-down list. "
+"Fill in the connection information for your server, and select the "
+"<gui>Save</gui> button. The <gui>Folder Path</gui>, while optional, should "
+"point at an empty folder. You are now ready to synchronize your notes."
+msgstr ""
+"å?¨é?¿å¸?便笺中ï¼?å?¨<gui>æ??å?¡</gui>ä¸?æ??å??表中ï¼?é??æ?©<gui>SSH</gui>ï¼?è¾?å?¥æ??å?¡å?¨ç??è¿?"
+"æ?¥ä¿¡æ?¯ï¼?ç?¶å??ç?¹<gui>ä¿?å­?</gui>æ??é?®ã??å¦?æ??è¦?设置 <gui>æ??件夹路å¾?</gui>ï¼?åº?该é??æ?©"
+"ä¸?个空æ??件夹ï¼?ç?¶å??å°±å?¯ä»¥ä½¿ç?¨ä¾¿ç¬ºå??æ­¥å??è?½äº?ã??"
+
+#: C/sync-setup.page:144(title)
+msgid "Configure Sync to a local folder"
+msgstr "é??置便笺å??æ­¥å?°æ?¬å?°æ??件夹"
+
+#: C/sync-setup.page:146(p)
+msgid ""
+"You may want to synchronize your notes to a local folder if that folder is "
+"available to your other systems, or if that folder represents a local mount "
+"of a remote server."
+msgstr ""
+"å¦?æ??æ?¨ç??ä¸?个æ??件夹å?¨æ?¨å?¶ä»?ç³»ç»?中ä¹?å?¯ä»¥ä½¿ç?¨ï¼?æ??è??è¿?个æ??件夹æ?¯æ??è½½å?°äº?ä¸?个è¿?ç¨?"
+"æ??å?¡å?¨ä¸?ï¼?å?¯è?½æ?¨æ?³æ??便笺å??æ­¥å?°è¿?个æ??件夹中ã??"
+
+#: C/sync-setup.page:151(p)
+msgid ""
+"Choose Local Folder from the <gui>Service</gui> drop-down list. Choose the "
+"desired synchronization <gui>Folder Path</gui> and then click the <gui>Save</"
+"gui> button. You are now ready to synchronize your notes."
+msgstr ""
+"å?¨<gui>æ??å?¡</gui>ä¸?æ??å??表中ï¼?é??æ?©æ?¬å?°æ??件夹é??项ï¼?å?¨<gui>æ??件夹路å¾?</gui>中é??"
+"æ?©æ?³è¦?ç??æ??件夹ï¼?ç?¶å??ç?¹<gui>ä¿?å­?</gui>æ??é?®ï¼?ç?¶å??å°±å?¯ä»¥ä½¿ç?¨ä¾¿ç¬ºå??æ­¥å??è?½äº?ã??"
+
 #: C/sync.page:8(desc)
 msgid "Sync your Tomboy notes with other computers."
 msgstr "ä¸?å?¶ä»?计ç®?æ?ºå??步便笺ã??"
@@ -145,26 +323,12 @@ msgid ""
 "Tomboy can automatically sync your notes for you in the background. It is "
 "recommended that you configure how you handle note conflicts before enabling "
 "syncing automatically. You can learn about handling note conflicts in the "
-"<link xref=\"sync-setup#conflicts\"/> Configure and Setup Sync page."
+"<link xref=\"sync-setup#conflict\"/> page."
 msgstr ""
 "é?¿å¸?便笺å?¯ä»¥å?¨å??å?°è?ªå?¨å??步便笺ï¼?建议æ?¨å?¨å?¯ç?¨è?ªå?¨å??æ­¥å??ï¼?é??置好å¦?ä½?å¤?ç??便笺å?²"
 "çª?ã??æ?¨å?¯ä»¥å?¨ <link xref=\"sync-setup#conflicts\"/> 页ï¼?å­¦ä¹ é??ç½®å??设置å??步便"
 "笺ã??"
 
-#: C/sync.page:54(p)
-msgid ""
-"You can enable sync by opening <gui>Tomboy Preferences</gui> by using your "
-"mouse to right click on the Tomboy icon in your panel, taskbar or dock and "
-"choose <gui>Preferences</gui> and then select the <gui>Synchronization</gui> "
-"tab. You can also open <gui> Tomboy Preferences</gui> from the <gui>Search "
-"All Notes</gui> dialog. From the menu choose <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq>."
-msgstr ""
-"æ?¨å?¯ä»¥é??è¿?å?¨é?¢æ?¿ã??ä»»å?¡æ ?ã??æµ®å?¨é?¢æ?¿ç??é?¿å¸?便笺å?¾æ ?ä¸?ç?¹å?³é?®ï¼?ç?¶å??é?? <gui>é¦?é??项"
-"</gui> æ?¥æ??å¼? <gui>é?¿å¸?便笺é¦?é??项</gui>ï¼?å??é?? <gui>å??步便笺</gui> æ ?ç­¾ã??ä¹?å?¯"
-"以å?¨ <gui>æ??ç´¢å?¨é?¨ä¾¿ç¬º</gui> 对è¯?æ¡?é??ï¼?æ??å¼? <gui>é¦?é??项</gui>ï¼?ç?¹è??å?? "
-"<guiseq><gui>ç¼?è¾?</gui><gui>é¦?é??项</gui></guiseq>ã??"
-
 #: C/sync.page:63(p)
 msgid ""
 "To enable autosync, check the <gui>Automatically Sync in Background Every x "
@@ -270,7 +434,7 @@ msgstr ""
 "å?¨é?¢æ?¿ç??é?¿å¸?便笺å?¾æ ?ä¸?ç?¹å?³é?®ï¼?ç?¶å??é?? <gui>é¦?é??项</gui>æ??å¼? <gui>é?¿å¸?便笺é¦?é??"
 "项</gui>ï¼?å??é?? <gui>ç?­é?®</gui> æ ?ç­¾ã??æ?¨ä¹?å?¯ä»¥å?¨ <gui>æ??ç´¢å?¨é?¨ä¾¿ç¬º</gui> 对è¯?"
 "æ¡?æ??å¼? <gui>é?¿å¸?便笺é¦?é??项</gui>ã??å?¨è¿?é??ç??è??å??中ï¼?é??æ?© <guiseq><gui>ç¼?è¾?</"
-"gui><gui>é¦?é??项</gui></guiseq>"
+"gui><gui>é¦?é??项</gui></guiseq>ã??"
 
 #: C/note-edit-prefs.page:37(title)
 msgid "Spell Check"
@@ -358,9 +522,8 @@ msgstr ""
 
 #: C/note-edit-prefs.page:85(p)
 msgid ""
-"To enable a different font, use your mouse or the spacebar to uncheck "
-"<gui>Use custom font</gui> in the <gui>Editing</gui> tab of Tomboy's "
-"Preferences."
+"To enable a different font, use your mouse or the spacebar to check <gui>Use "
+"custom font</gui> in the <gui>Editing</gui> tab of Tomboy's Preferences."
 msgstr ""
 "è¦?å?¯ç?¨è?ªå®?ä¹?å­?ä½?æ ·å¼?ï¼?å?¨é?¿å¸?便笺é¦?é??项ç?? <gui>ç¼?è¾?</gui> æ ?签中ï¼?ç?¨é¼ æ ?æ??ç©ºæ ¼"
 "é?®å?¾é?? <gui>使ç?¨è?ªå®?ä¹?å­?ä½?</gui> å¤?é??æ¡?ã??"
@@ -478,7 +641,7 @@ msgstr ""
 msgid ""
 "You can also sync your notes across multiple computers, making it easy to "
 "take your notes with you wherever you are."
-msgstr "æ?¨ä¹?å?¯ä»¥å?¨å¤?å?°è®¡ç®?æ?ºä¸?å??æ­¥æ?¨ç??便笺ï¼?æ? 论å?¨å?ªé?½è?½å¾?æ?¹ä¾¿ä½¿ç?¨ä¾¿ç¬ºã??"
+msgstr "æ?¨ä¹?å?¯ä»¥å?¨å¤?å?°è®¡ç®?æ?ºä¸?å??æ­¥æ?¨ç??便笺ï¼?æ? 论å?¨å?ªé?½è?½å¾?æ?¹ä¾¿å?°ä½¿ç?¨ä¾¿ç¬ºã??"
 
 #: C/introduction.page:42(title)
 msgid "<gui>Tomboy Notes</gui> window"
@@ -486,7 +649,7 @@ msgstr "<app>��便笺</app> ��"
 
 #: C/introduction.page:43(desc)
 msgid "<app>Tomboy Notes</app> main window"
-msgstr "��便笺</app> 主��"
+msgstr "<app>��便笺</app> 主��"
 
 #: C/introduction.page:45(p)
 msgid "<app>Tomboy</app> default note."
@@ -564,13 +727,20 @@ msgstr ""
 "<gui>æ??å¼?â??ä»?è¿?é??å¼?å§?â??便笺</gui>: <keyseq><key>Alt</key><key>F11 </key></"
 "keyseq>"
 
-#: C/hotkeys.page:47(p) C/hotkeys.page:49(p)
+#: C/hotkeys.page:47(p)
 msgid ""
-"<gui>Show notes menu</gui>: Disabled by default. You can enter a key "
+"<gui>Create new note</gui>: Disabled by default. You can enter a key "
 "sequence in this field to create a hotkey."
 msgstr ""
-"<gui>æ?¾ç¤ºä¾¿ç¬ºè??å??</gui>: é»?认被ç¦?ç?¨ï¼?æ?¨å?¯ä»¥å?¨æ­¤æ??æ?¬æ¡?å??顺åº?è¾?å?¥æ??é?®æ?¥å??建ç?­"
-"é?®ã??"
+"<gui>å??建æ?°ä¾¿ç¬º</gui>: é»?认被ç¦?ç?¨ï¼?æ?¨å?¯ä»¥å?¨æ­¤æ??æ?¬æ¡?å??顺åº?è¾?å?¥æ??é?®æ?¥å??建ç?­é?®ã??"
+
+#: C/hotkeys.page:49(p)
+msgid ""
+"<gui>Open \"Search All Notes\"</gui>: Disabled by default. You can enter a "
+"key sequence in this field to create a hotkey."
+msgstr ""
+"<gui>æ??å¼?â??æ??ç´¢å?¨é?¨ä¾¿ç¬ºâ??</gui>: é»?认被ç¦?ç?¨ï¼?æ?¨å?¯ä»¥å?¨æ­¤æ??æ?¬æ¡?å??顺åº?è¾?å?¥æ??é?®æ?¥å??"
+"建ç?­é?®ã??"
 
 #: C/edit-note.page:10(desc)
 msgid "Edit and format your notes."
@@ -732,9 +902,9 @@ msgid ""
 "format the text within a note, and more. For more information, see <link "
 "xref=\"edit-notes\"/>."
 msgstr ""
-"æ?°ä¾¿ç¬ºå°?æ?¾ç¤ºä¸?个æ?°çª?å?£ï¼?æ ?é¢?æ?¯ æ?°ä¾¿ç¬º <em>æ?°å­?</em>ã??便笺å??å?«ä¸?个工å?·æ ?ï¼?å?¯ä»¥"
-"ç?¨æ?¥æ??索便笺ã??é?¾æ?¥ä¾¿ç¬ºå??ç??æ??æ?¬ï¼?以å??设置æ??æ?¬ç??æ ¼å¼?å??æ?´å¤?å??è?½ã??è¦?è?·å??æ?´å¤?ä¿¡"
-"æ?¯ï¼?å??è?? <link xref=\"edit-notes\"/>ã??"
+"æ?°ä¾¿ç¬ºå°?æ?¾ç¤ºä¸?个æ?°çª?å?£ï¼?æ ?é¢?æ?¯ï¼?æ?°ä¾¿ç¬º <em>æ?°å­?</em>ã??便笺å??å?«ä¸?个工å?·æ ?ï¼?å?¯"
+"以ç?¨æ?¥æ??索便笺ã??é?¾æ?¥ä¾¿ç¬ºå??ç??æ??æ?¬ï¼?以å??设置æ??æ?¬ç??æ ¼å¼?å??æ?´å¤?å??è?½ã??è¦?è?·å??æ?´å¤?ä¿¡"
+"æ?¯ï¼?请å??é?? <link xref=\"edit-notes\"/>ã??"
 
 #: C/create-notebook.page:10(desc)
 msgid "Create a new notebook in Tomboy."
@@ -824,15 +994,15 @@ msgstr "å?¯ç?¨é¢?å¤?ç??便笺å??è?½ã??"
 msgid "Tomboy Tools Addins"
 msgstr "��便笺工���"
 
-#: C/addins-tools.page:25(title)
+#: C/addins-tools.page:24(p)
 msgid "Tools addins add additional functionality to your Tomboy notes."
 msgstr "å·¥å?·æ?©å±?为æ?¨ç??é?¿å¸?便笺å¢?å? é¢?å¤?ç??å??è?½ã??"
 
-#: C/addins-tools.page:29(title)
+#: C/addins-tools.page:27(title)
 msgid "Backlinks"
 msgstr "å??å??é?¾æ?¥"
 
-#: C/addins-tools.page:30(p)
+#: C/addins-tools.page:28(p)
 msgid ""
 "The <gui>Backlinks</gui> addin is enabled by default and allows you to see "
 "which notes link to the note you are currently viewing."
@@ -840,18 +1010,18 @@ msgstr ""
 "<gui>å??å??é?¾æ?¥</gui> æ?©å±?é»?认æ?¯å?¯ç?¨ç??ï¼?å??许æ?¨æ?¥ç??å?ªäº?便笺é?¾æ?¥å?°æ?¨å½?å??æ?¥ç??ç??便"
 "笺ã??"
 
-#: C/addins-tools.page:35(title)
+#: C/addins-tools.page:33(title)
 msgid "Export to HTML"
 msgstr "导�为 HTML"
 
-#: C/addins-tools.page:36(p)
+#: C/addins-tools.page:34(p)
 msgid ""
 "The <gui>Export to HTML</gui> addin is enabled by default and will export an "
 "individual note to HTML."
 msgstr ""
 "<gui>导å?ºä¸º HTML</gui> æ?©å±?é»?认æ?¯å?¯ç?¨ç??ï¼?å?¯ä»¥æ??æ??å®?ç??便笺导å?ºä¸º HTML ç½?页ã??"
 
-#: C/addins-tools.page:38(p)
+#: C/addins-tools.page:36(p)
 msgid ""
 "To export a note to HTML, press the <gui>Tools</gui> icon in the note "
 "toolbar and choose <gui>Export to HTML</gui>. You will immediately be "
@@ -864,11 +1034,11 @@ msgstr ""
 "HTML</gui>ï¼?å?ºæ?¥ä¸?个ä¿?å­?便笺ç??对è¯?æ¡?ã??é??æ?©ä¿?å­?便笺ç??æ??件夹ï¼?è¿?å?¯ä»¥ç»?导å?ºç?? "
 "HTML æ??件æ?¢ä¸?个æ??件å??ã??ä¿?å­?ç?? HTML æ??件ä¼?ç«?å?»è?ªå?¨æ?¾ç¤ºå?¨æµ?è§?å?¨ä¸­ã??"
 
-#: C/addins-tools.page:47(title)
+#: C/addins-tools.page:45(title)
 msgid "Insert Timestamp"
 msgstr "æ??å?¥æ?¶é?´æ?³"
 
-#: C/addins-tools.page:48(p)
+#: C/addins-tools.page:46(p)
 msgid ""
 "The <gui>Insert Timestamp</gui> addin is disabled by default. To enable it, "
 "choose the <gui>Insert Timestamp</gui> addin and then press <gui>Enable</"
@@ -877,7 +1047,7 @@ msgstr ""
 "<gui>æ??å?¥æ?¶é?´æ?³</gui> æ?©å±?é»?认æ?¯ç¦?ç?¨ç??ï¼?è¦?å?¯ç?¨å®?ï¼?å?¨é¦?é??项é??中 <gui>æ??å?¥æ?¶é?´"
 "æ?³</gui> æ?©å±?ï¼?ç?¶å??ç?¹ <gui>å?¯ç?¨</gui>ã??"
 
-#: C/addins-tools.page:51(p)
+#: C/addins-tools.page:49(p)
 msgid ""
 "To add a timestamp to your notes, press the <gui>Tools</gui> icon in the "
 "note toolbar and choose <gui>Insert Timestamp</gui> or press <key>Ctrl + D</"
@@ -886,11 +1056,11 @@ msgstr ""
 "è¦?å?¨ä¾¿ç¬ºä¸­æ·»å? æ?¶é?´æ?³ï¼?ç?¹å·¥å?·æ ?ä¸?ç?? <gui>å·¥å?·</gui> å?¾æ ?ï¼?ç?¶å??é?? <gui>æ??å?¥æ?¶é?´"
 "æ?³</gui>ï¼?æ??è??æ??  <key>Ctrl + D</key>ã??"
 
-#: C/addins-tools.page:57(title)
+#: C/addins-tools.page:55(title)
 msgid "Note of the Day"
 msgstr "�记"
 
-#: C/addins-tools.page:58(p)
+#: C/addins-tools.page:56(p)
 msgid ""
 "The <gui>Note of the Day</gui> addin is disabled by default. To enable, "
 "choose the <gui>Note of the Day</gui> addin and then press <gui>Enable</gui> "
@@ -899,7 +1069,7 @@ msgstr ""
 "<gui>æ?¥è®°</gui> æ?©å±?é»?认æ?¯ç¦?ç?¨ç??ï¼?è¦?å?¯ç?¨å®?ï¼?å?¨é¦?é??项é??中 <gui>æ?¥è®°</gui> æ?©"
 "å±?ï¼?ç?¶å??ç?¹ <gui>å?¯ç?¨</gui>ã?? "
 
-#: C/addins-tools.page:61(p)
+#: C/addins-tools.page:59(p)
 msgid ""
 "<gui>Note of the Day</gui> addin will create a new note daily with the title "
 "<em>Today: Thursday, January 21 2010</em> for example. The note will also "
@@ -908,11 +1078,11 @@ msgstr ""
 "<gui>æ?¥è®°</gui> æ?©å±?æ¯?天å??建ä¸?个æ?°ä¾¿ç¬ºï¼?ä¾?å¦?æ ?é¢?æ?¯ <em>ä»?天: 2010å¹´1æ??21æ?¥ æ??"
 "æ??äº?</em>ã??便笺ä¼?è?ªå?¨æ·»å?  <em>ä»»å?¡</em> å?? <em>约ä¼?</em> 两è¡?ã??"
 
-#: C/addins-tools.page:67(title)
+#: C/addins-tools.page:65(title)
 msgid "Note Directory Watcher"
 msgstr "便笺æ??件夹ç??è§?å?¨"
 
-#: C/addins-tools.page:68(p)
+#: C/addins-tools.page:66(p)
 msgid ""
 "The Note Directory Watcher addin monitors the directory your Tomboy notes "
 "are saved in. If the addin detects changes to your notes, it will apply "
@@ -1113,6 +1283,22 @@ msgstr ""
 "TeliuTe <teliute 163 com>, 2010"
 
 #~ msgid ""
+#~ "This work is licensed under a <link href=\"http://creativecommons.org/";
+#~ "licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 "
+#~ "Unported License</link>."
+#~ msgstr ""
+#~ "æ?¬æ??é??ç?¨ <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\";>ç?¥"
+#~ "è¯?å?±äº«ç½²å??-ç?¸å??æ?¹å¼?å?±äº« 3.0 Unported 许å?¯å??è®®</link>ã??"
+
+#~ msgid ""
+#~ "As a special exception, the copyright holders give you permission to "
+#~ "copy, modify, and distribute the example code contained in this document "
+#~ "under the terms of your choosing, without restriction."
+#~ msgstr ""
+#~ "ä½?为ä¸?个ç?¹æ®?ç??ä¾?å¤?ï¼?è??ä½?æ??人å??许æ?¨ä½¿ç?¨è?ªå·±ç??许å?¯å??è®®å¤?å?¶ã??ä¿®æ?¹å??å??å??å??å?«å?¨"
+#~ "æ?¬æ??档中ç??è??ä¾?代ç ?ï¼?ä¸?å??约æ??ã??"
+
+#~ msgid ""
 #~ "Permission is granted to copy, distribute and/or modify this document "
 #~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 "
 #~ "or any later version published by the Free Software Foundation with no "
@@ -1598,9 +1784,6 @@ msgstr ""
 #~ msgid "Note Synchronization"
 #~ msgstr "å??步便笺"
 
-#~ msgid "Configure note synchronization"
-#~ msgstr "é??置便笺å??æ­¥"
-
 #~ msgid "Tomboy Synchronization Preferences"
 #~ msgstr "é?¿å¸?便笺å??æ­¥é¦?é??项"
 
@@ -1610,9 +1793,6 @@ msgstr ""
 #~ msgid "Configure note synchronization service (SSH)"
 #~ msgstr "é??置便笺å??æ­¥æ??å?¡(SSH)"
 
-#~ msgid "Configure note synchronization service (Local Folder)"
-#~ msgstr "é??置便笺å??æ­¥æ??å?¡(æ?¬å?°æ??件夹)"
-
 #~ msgid "Editing"
 #~ msgstr "ç¼?è¾?"