[tomboy] Updated Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 67b3a5efd87229a017a38798cfc6f334e4b0a48d
Author: Aron Xu <aronxu gnome org>
Date:   Thu May 28 17:45:11 2009 +0800

    Updated Simplified Chinese translation.
---
 po/zh_CN.po |  325 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 172 insertions(+), 153 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index adf1650..3df8a55 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,15 +5,16 @@
 # Ray Wang <wanglei1123 gmail com>, 2009.
 #
 #
+# Aron Xu <aronmalache 163 com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=tomboy&component=general\n"
-"POT-Creation-Date: 2009-03-14 15:24+0000\n"
-"PO-Revision-Date: 2009-03-15 14:45+0800\n"
-"Last-Translator: Ray Wang <wanglei1123 gmail com>\n"
-"Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
+"POT-Creation-Date: 2009-05-25 17:24+0000\n"
+"PO-Revision-Date: 2009-05-28 17:44+0800\n"
+"Last-Translator: Aron Xu <aronmalache 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"
@@ -159,8 +160,7 @@ msgstr "HTML 导å?ºé?¾æ?¥ç??便笺"
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
-msgstr ""
-"è?¥ enable_custom_font 为 trueï¼?å?¨æ­¤è®¾å®?ç??å­?ä½?å??称å°?ç?¨ä½?æ?¾ç¤ºä¾¿ç¬ºæ?¶ç??å­?ä½?ã??"
+msgstr "è?¥ enable_custom_font 为ç??ï¼?å?¨æ­¤è®¾å®?ç??å­?ä½?å??称å°?ç?¨ä½?æ?¾ç¤ºä¾¿ç¬ºæ?¶ç??å­?ä½?ã??"
 
 #: ../data/tomboy.schemas.in.h:24
 msgid ""
@@ -177,7 +177,7 @@ msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 msgstr ""
-"è?¥ä¸º trueï¼?å??æ?¼é??ç??å??è¯?å°?被å? 红è?²ä¸?å??线ï¼?è??正确ç??æ?¼å??建议å°?æ?¾ç¤ºå?¨å?³é?®å??å?»è??å??"
+"è?¥ä¸ºç??ï¼?å??æ?¼é??ç??å??è¯?å°?被å? 红è?²ä¸?å??线ï¼?è??正确ç??æ?¼å??建议å°?æ?¾ç¤ºå?¨å?³é?®å??å?»è??å??"
 "中ã??"
 
 #: ../data/tomboy.schemas.in.h:27
@@ -186,16 +186,16 @@ msgid ""
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
 "available from any application."
 msgstr ""
-"è?¥ä¸º trueï¼?å°?å?¯ç?¨ /apps/tomboy/global_keybindings 中设å®?ç??æ¡?é?¢å?¨å±?æ??é?®ç»?å??ï¼?"
-"以便å??许å?¨ä»»ä½?åº?ç?¨ç¨?åº?中æ?§è¡?é?¿å¸?æ??ä½?ã??"
+"è?¥ä¸ºç??ï¼?å°?å?¯ç?¨ /apps/tomboy/global_keybindings 中设å®?ç??æ¡?é?¢å?¨å±?æ??é?®ç»?å??ï¼?以便"
+"å??许å?¨ä»»ä½?åº?ç?¨ç¨?åº?中æ?§è¡?é?¿å¸?æ??ä½?ã??"
 
 #: ../data/tomboy.schemas.in.h:28
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
 msgstr ""
-"è?¥ä¸º trueï¼?å??å°?使ç?¨ custom_font_face 中设å®?ç??å­?ä½?å??称æ?¾ç¤ºä¾¿ç¬ºã??å?¦å??å°?使ç?¨é»?认"
-"ç??æ¡?é?¢å­?ä½?æ?¾ç¤ºä¾¿ç¬ºã??"
+"è?¥ä¸ºç??ï¼?å??å°?使ç?¨ custom_font_face 中设å®?ç??å­?ä½?å??称æ?¾ç¤ºä¾¿ç¬ºã??å?¦å??å°?使ç?¨é»?认ç??"
+"æ¡?é?¢å­?ä½?æ?¾ç¤ºä¾¿ç¬ºã??"
 
 #: ../data/tomboy.schemas.in.h:29
 msgid ""
@@ -257,7 +257,7 @@ msgstr "使ç?¨æ??件系ç»?å??æ­¥æ??å?¡æ??件æ?¶ç??å??æ­¥æ??å?¡å?¨è·¯å¾?ã??"
 
 #: ../data/tomboy.schemas.in.h:40
 msgid "SSHFS Remote Synchronization Folder"
-msgstr "SSHFD è¿?ç¨?å??æ­¥æ??件夹"
+msgstr "SSHFS è¿?ç¨?å??æ­¥æ??件夹"
 
 #: ../data/tomboy.schemas.in.h:41
 msgid "SSHFS Remote Synchronization User Name"
@@ -269,7 +269,7 @@ msgstr "SSHFS å??æ­¥æ??å?¡å?¨ç«¯å?£"
 
 #: ../data/tomboy.schemas.in.h:43
 msgid "SSHFS Synchronization Server URL"
-msgstr "SSHFD å??æ­¥æ??å?¡å?¨ URL"
+msgstr "SSHFS å??æ­¥æ??å?¡å?¨ URL"
 
 #: ../data/tomboy.schemas.in.h:44
 msgid "Saved height of Search window"
@@ -391,7 +391,7 @@ msgstr ""
 
 #: ../data/tomboy.schemas.in.h:61
 msgid "The handler for \"note://\" URLs"
-msgstr "â??note://â?? URL ç??å¤?ç??ç¨?åº?"
+msgstr "â??note://â?? ç±»å?? URL ç??å¤?ç??ç¨?åº?"
 
 #: ../data/tomboy.schemas.in.h:62
 msgid ""
@@ -498,7 +498,7 @@ msgstr "å? é?¤(_D)"
 msgid "Delete the selected note"
 msgstr "å? é?¤é??中便笺"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:416
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
 msgid "_Close"
 msgstr "��(_C)"
 
@@ -542,7 +542,7 @@ msgstr "æ??ç??å?¾æ ?"
 msgid "Create _New Note"
 msgstr "å??建æ?°ä¾¿ç¬º(_N)"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:359
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
 msgid "_Search All Notes"
 msgstr "æ??ç´¢å?¨é?¨ä¾¿ç¬º(_S)"
 
@@ -682,9 +682,9 @@ msgstr "ç?¹æ®?æ??件夹路å¾?ä¸?å­?å?¨ï¼?é?¿å¸?æ? æ³?å??建å®?ã??"
 msgid "Local Folder"
 msgstr "æ?¬å?°æ??件夹"
 
-#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:14
-msgid "_Fixed Width"
-msgstr "��宽度(_F)"
+#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
+msgid "Fixed Wid_th"
+msgstr "��宽度(_T)"
 
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
 #, csharp-format
@@ -702,9 +702,9 @@ msgstr "æ??å?¥æ?¶é?´æ?³"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:132
+#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:133
 msgid "dddd, MMMM d, h:mm tt"
-msgstr "Mæ??ddæ?¥dddd h:mm tt"
+msgstr "M æ?? dd æ?¥ dddd h:mm tt"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
 msgid "Choose one of the predefined formats or use your own."
@@ -729,7 +729,7 @@ msgstr "�天�"
 #. Format: "Today: Friday, July 01 2005"
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
 msgid "dddd, MMMM d yyyy"
-msgstr "yyyyå¹´Mæ??dæ?¥ï¼?dddd"
+msgstr "yyyy å¹´ M æ?? d æ?¥ï¼?dddd"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
 msgid "Tasks"
@@ -750,35 +750,37 @@ msgstr ""
 msgid "_Open Today: Template"
 msgstr "æ??å¼?ä»?天ï¼?模æ?¿(_O)"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:51
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
 msgid "Print"
 msgstr "æ??å?°"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:79
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
 msgid "Error printing note"
 msgstr "æ??å?°ä¾¿ç¬ºæ?¶å?ºé??"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:205
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:219
 #, csharp-format
 msgid "Page {0} of {1}"
 msgstr "第 {0} 页�� {1} 页"
 
 #. Translators: Explanation of the date and time format specifications can be found here:
 #. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:224
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:238
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "yyyyå¹´MMæ??ddæ?¥dddd hh:mm:ss tt"
+msgstr "yyyy å¹´ MM æ?? dd æ?¥ dddd hh:mm:ss tt"
 
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "æ·»å? è??å?¾"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:43
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:101
 msgid "Se_rver:"
 msgstr "æ??å?¡å?¨(_R)ï¼?"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:60
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:102
 msgid "User_name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
@@ -849,7 +851,7 @@ msgstr "Tasque"
 #. will be used to create the new task.
 #: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:86
 msgid "All"
-msgstr "All"
+msgstr "��"
 
 #: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
 msgid "--- Tasque is not running ---"
@@ -860,6 +862,7 @@ msgid "_URL:"
 msgstr "_URLï¼?"
 
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:69
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:103
 msgid "_Password:"
 msgstr "å¯?ç ?(_P)ï¼?"
 
@@ -887,10 +890,15 @@ msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "å°?é??ç½®ä¿?å­?å?° GNOME å¯?é?¥ç?¯æ?¶å¤±è´¥ï¼?å?ºé??ä¿¡æ?¯å¦?ä¸?ï¼?"
 
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:63
+#| msgid "Tomboy Help"
+msgid "Tomboy Web"
+msgstr "����"
+
 #. Translators: This is the name of "Window" menu in the Mac menubar
 #: ../Tomboy/MacApplication.cs:160
 msgid "_Window"
-msgstr "��(_F)�"
+msgstr "��(_W)"
 
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
@@ -974,7 +982,7 @@ msgid "Delete the selected notebook"
 msgstr "å? é?¤é??中ç¬?è®°æ?¬"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:251
+#: ../Tomboy/RecentChanges.cs:253
 msgid "Notebooks"
 msgstr "�记�"
 
@@ -1014,25 +1022,25 @@ msgstr "�记�"
 msgid "_New notebook..."
 msgstr "�建�记�(_N)..."
 
-#: ../Tomboy/Note.cs:1427
+#: ../Tomboy/Note.cs:1449
 msgid "Really delete this note?"
 msgstr "ç??ç??è¦?å? é?¤æ­¤ä¾¿ç¬ºå??ï¼?"
 
-#: ../Tomboy/Note.cs:1430
+#: ../Tomboy/Note.cs:1452
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
-msgstr[0] "ç??ç??è¦?å? é?¤ {0} 便笺å??ï¼?"
+msgstr[0] "ç??ç??è¦?å? é?¤ {0} 个便笺å??ï¼?"
 
-#: ../Tomboy/Note.cs:1441
+#: ../Tomboy/Note.cs:1463
 msgid "If you delete a note it is permanently lost."
 msgstr "å¦?æ??æ?¨å? é?¤äº?便笺ï¼?å?¶å??容å°?æ°¸ä¹?丢失ã??"
 
-#: ../Tomboy/Note.cs:1475
+#: ../Tomboy/Note.cs:1497
 msgid "Error saving note data."
 msgstr "ä¿?å­?便笺æ?°æ?®æ?¶å?ºé??ã??"
 
-#: ../Tomboy/Note.cs:1476
+#: ../Tomboy/Note.cs:1498
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
 "sufficient disk space, and that you have appropriate rights on ~/.tomboy. "
@@ -1110,7 +1118,7 @@ msgstr ""
 "</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:169 ../Tomboy/NoteManager.cs:236
+#: ../Tomboy/NoteManager.cs:169 ../Tomboy/NoteManager.cs:237
 msgid "Start Here"
 msgstr "ä»?è¿?é??å¼?å§?"
 
@@ -1118,14 +1126,14 @@ msgstr "ä»?è¿?é??å¼?å§?"
 msgid "Using Links in Tomboy"
 msgstr "���中使���"
 
-#: ../Tomboy/NoteManager.cs:313
+#: ../Tomboy/NoteManager.cs:314
 #, csharp-format
 msgid "New Note {0}"
 msgstr "�便笺 {0}"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:386 ../Tomboy/NoteManager.cs:478
+#: ../Tomboy/NoteManager.cs:387 ../Tomboy/NoteManager.cs:479
 msgid "Describe your new note here."
 msgstr "å?¨æ­¤æ??è¿°æ?¨ç??æ?°ä¾¿ç¬ºã??"
 
@@ -1133,123 +1141,127 @@ msgstr "å?¨æ­¤æ??è¿°æ?¨ç??æ?°ä¾¿ç¬ºã??"
 msgid "Find in This Note"
 msgstr "�此便笺中��"
 
-#: ../Tomboy/NoteWindow.cs:371
+#: ../Tomboy/NoteWindow.cs:361
 msgid "_Link to New Note"
 msgstr "����便笺(_L)"
 
-#: ../Tomboy/NoteWindow.cs:383
+#: ../Tomboy/NoteWindow.cs:373
 msgid "Te_xt"
 msgstr "æ??æ?¬(_X)"
 
-#: ../Tomboy/NoteWindow.cs:391
+#: ../Tomboy/NoteWindow.cs:381
 msgid "_Find in This Note"
 msgstr "�此便笺中��(_F)"
 
-#: ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/NoteWindow.cs:396
 msgid "Clos_e All Notes"
 msgstr "����便笺(_E)"
 
-#: ../Tomboy/NoteWindow.cs:446
+#: ../Tomboy/NoteWindow.cs:436
 msgid "Search"
 msgstr "æ??ç´¢"
 
-#: ../Tomboy/NoteWindow.cs:449
+#: ../Tomboy/NoteWindow.cs:439
 msgid "Search your notes (Ctrl-Shift-F)"
 msgstr "æ??ç´¢æ?¨ç??便笺(Ctrl-Shift-F)"
 
-#: ../Tomboy/NoteWindow.cs:461
+#: ../Tomboy/NoteWindow.cs:451
 msgid "Link"
 msgstr "��"
 
-#: ../Tomboy/NoteWindow.cs:467
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link selected text to a new note (Ctrl-L)"
 msgstr "å°?é??中æ??æ?¬é?¾æ?¥å?°æ?°ä¾¿ç¬º(Ctrl-L)"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:470
 msgid "_Text"
 msgstr "æ??æ?¬(_T)"
 
-#: ../Tomboy/NoteWindow.cs:485
+#: ../Tomboy/NoteWindow.cs:475
 msgid "Set properties of text"
 msgstr "设置æ??æ?¬å±?æ?§"
 
-#: ../Tomboy/NoteWindow.cs:490
+#: ../Tomboy/NoteWindow.cs:480
 msgid "T_ools"
 msgstr "工�(_O)"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:484
 msgid "Use tools on this note"
 msgstr "�此便笺�使�工�"
 
-#: ../Tomboy/NoteWindow.cs:502
+#: ../Tomboy/NoteWindow.cs:492
 msgid "Delete this note"
 msgstr "å? é?¤æ­¤ä¾¿ç¬º"
 
-#: ../Tomboy/NoteWindow.cs:511 ../Tomboy/Synchronization/SyncManager.cs:161
+#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "Synchronize Notes"
 msgstr "å??步便笺"
 
-#: ../Tomboy/NoteWindow.cs:554
+#: ../Tomboy/NoteWindow.cs:562
 msgid "_Find..."
 msgstr "��(_F)..."
 
-#: ../Tomboy/NoteWindow.cs:565 ../Tomboy/NoteWindow.cs:767
+#: ../Tomboy/NoteWindow.cs:573
 msgid "Find _Next"
 msgstr "����个(_N)"
 
-#: ../Tomboy/NoteWindow.cs:578
+#: ../Tomboy/NoteWindow.cs:586
 msgid "Find _Previous"
 msgstr "����个(_P)"
 
-#: ../Tomboy/NoteWindow.cs:666
+#: ../Tomboy/NoteWindow.cs:674
 msgid "Cannot create note"
 msgstr "æ? æ³?å??建便笺"
 
-#: ../Tomboy/NoteWindow.cs:747
+#: ../Tomboy/NoteWindow.cs:755
 msgid "_Find:"
 msgstr "��(_F)�"
 
-#: ../Tomboy/NoteWindow.cs:758
+#: ../Tomboy/NoteWindow.cs:766
 msgid "_Previous"
 msgstr "��个(_P)"
 
-#: ../Tomboy/NoteWindow.cs:1242
+#: ../Tomboy/NoteWindow.cs:775
+msgid "_Next"
+msgstr "��个(_N)"
+
+#: ../Tomboy/NoteWindow.cs:1256
 msgid "_Bold"
 msgstr "ç²?ä½?(_B)"
 
-#: ../Tomboy/NoteWindow.cs:1254
+#: ../Tomboy/NoteWindow.cs:1268
 msgid "_Italic"
 msgstr "æ??ä½?(_I)"
 
-#: ../Tomboy/NoteWindow.cs:1266
+#: ../Tomboy/NoteWindow.cs:1280
 msgid "_Strikeout"
 msgstr "å? é?¤çº¿(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1278
+#: ../Tomboy/NoteWindow.cs:1292
 msgid "_Highlight"
 msgstr "�亮�示(_H)"
 
-#: ../Tomboy/NoteWindow.cs:1291
+#: ../Tomboy/NoteWindow.cs:1305
 msgid "Font Size"
 msgstr "��大�"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1308
 msgid "_Normal"
 msgstr "æ?®é??(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1301
+#: ../Tomboy/NoteWindow.cs:1315
 msgid "Hu_ge"
 msgstr "巨大(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1323
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1317
+#: ../Tomboy/NoteWindow.cs:1331
 msgid "S_mall"
 msgstr "å°?(_M)"
 
-#: ../Tomboy/NoteWindow.cs:1328
+#: ../Tomboy/NoteWindow.cs:1342
 msgid "Bullets"
 msgstr "项�符�"
 
@@ -1307,16 +1319,16 @@ msgid ""
 "creating a new note."
 msgstr "å??建æ?°ç??便笺æ?¶ä½¿ç?¨æ?°ç??便笺模æ?¿æ?¥è®¾å®?åº?使ç?¨ç??æ??å­?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:223
 msgid "Open New Note Template"
 msgstr "æ??å¼?æ?°ç??便笺模æ?¿"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:281
+#: ../Tomboy/PreferencesDialog.cs:280
 msgid "Listen for _Hotkeys"
 msgstr "ç??å?¬ç?­é?®(_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:290
+#: ../Tomboy/PreferencesDialog.cs:289
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b>&lt;Control&gt;&lt;Shift&gt;F11</b>, <b>&lt;"
@@ -1326,101 +1338,101 @@ msgstr ""
 "b>ï¼?<b>&lt;Alt&gt;N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:310
+#: ../Tomboy/PreferencesDialog.cs:309
 msgid "Show notes _menu"
 msgstr "æ?¾ç¤ºä¾¿ç¬ºè??å??(_M)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:327
+#: ../Tomboy/PreferencesDialog.cs:326
 msgid "Open \"_Start Here\""
 msgstr "æ??å¼?â??ä»?è¿?é??å¼?å§?â??(_S)"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:344
+#: ../Tomboy/PreferencesDialog.cs:343
 msgid "Create _new note"
 msgstr "å??建æ?°ä¾¿ç¬º(_N)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:361
+#: ../Tomboy/PreferencesDialog.cs:360
 msgid "Open \"Search _All Notes\""
 msgstr "æ??å¼?â??æ??ç´¢å?¨é?¨ä¾¿ç¬ºâ??(_A)"
 
-#: ../Tomboy/PreferencesDialog.cs:388
+#: ../Tomboy/PreferencesDialog.cs:387
 msgid "Ser_vice:"
 msgstr "æ??å?¡(_V)ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:441 ../Tomboy/PreferencesDialog.cs:1019
+#: ../Tomboy/PreferencesDialog.cs:440 ../Tomboy/PreferencesDialog.cs:1017
 msgid "Not configurable"
 msgstr "ä¸?å?¯é??ç½®"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:461
+#: ../Tomboy/PreferencesDialog.cs:460
 msgid "_Advanced..."
 msgstr "�级(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:522
+#: ../Tomboy/PreferencesDialog.cs:521
 msgid "The following add-ins are installed"
 msgstr "å·²å®?è£?以ä¸?æ·»å? 项"
 
-#: ../Tomboy/PreferencesDialog.cs:553
+#: ../Tomboy/PreferencesDialog.cs:552
 msgid "_Enable"
-msgstr "å¼?å?¯(_E)"
+msgstr "��(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:559
+#: ../Tomboy/PreferencesDialog.cs:558
 msgid "_Disable"
 msgstr "��(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:690
+#: ../Tomboy/PreferencesDialog.cs:689
 msgid "Not Implemented"
 msgstr "����"
 
-#: ../Tomboy/PreferencesDialog.cs:704
+#: ../Tomboy/PreferencesDialog.cs:703
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} é¦?é??项"
 
-#: ../Tomboy/PreferencesDialog.cs:843
+#: ../Tomboy/PreferencesDialog.cs:842
 msgid "Choose Note Font"
 msgstr "é??æ?©ä¾¿ç¬ºå­?ä½?"
 
-#: ../Tomboy/PreferencesDialog.cs:887
+#: ../Tomboy/PreferencesDialog.cs:886
 msgid "Other Synchronization Options"
 msgstr "å?¶å®?å??æ­¥é??项"
 
-#: ../Tomboy/PreferencesDialog.cs:894
+#: ../Tomboy/PreferencesDialog.cs:892
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "å½?æ£?æµ?å?°æ?¬å?°ä¾¿ç¬ºå??æ??é??ç½®ç??å??æ­¥æ??å?¡å?¨ä¸?ç??便笺æ??å?²çª?æ?¶ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:901
+#: ../Tomboy/PreferencesDialog.cs:899
 msgid "Always ask me what to do."
 msgstr "é?®æ??该æ??ä¹?å??ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:905
+#: ../Tomboy/PreferencesDialog.cs:903
 msgid "Rename my local note."
 msgstr "é??å?½å??æ??ç??æ?¬å?°ä¾¿ç¬ºã??"
 
-#: ../Tomboy/PreferencesDialog.cs:909
+#: ../Tomboy/PreferencesDialog.cs:907
 msgid "Replace my local note with the server's update."
 msgstr "ç?¨æ??å?¡å?¨ä¸?ç??便笺æ?´æ?°æ??ç??æ?¬å?°ä¾¿ç¬ºã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1055
+#: ../Tomboy/PreferencesDialog.cs:1053
 msgid "WARNING: Are you sure?"
 msgstr "è­¦å??ï¼?æ?¨ç¡®å®?å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1057
+#: ../Tomboy/PreferencesDialog.cs:1055
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
 msgstr ""
 "ä¸?æ?¨è??æ¸?空æ?¨ç??å??步设置ã??å½?æ?¨ä¿?å­?æ?°è®¾ç½®æ?¶å?¯è?½å??次被强å?¶å??æ­¥ä½ ç??æ??æ??便笺ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1070
+#: ../Tomboy/PreferencesDialog.cs:1068
 msgid "Resetting Synchronization Settings"
 msgstr "é??ç½®å??步设置"
 
-#: ../Tomboy/PreferencesDialog.cs:1072
+#: ../Tomboy/PreferencesDialog.cs:1070
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1429,40 +1441,40 @@ msgstr ""
 "æ?¨å·²å?³é?­æ??é??ç½®ç??å??æ­¥æ??å?¡ã??æ?¨ç??å??步设置ç?°å?¨å°?被æ¸?空ã??å½?æ?¨ä¿?å­?æ?°è®¾ç½®æ?¶å?¯è?½å??次"
 "被强å?¶å??æ­¥ä½ ç??æ??æ??便笺"
 
-#: ../Tomboy/PreferencesDialog.cs:1170
+#: ../Tomboy/PreferencesDialog.cs:1168
 msgid "Success! You're connected!"
 msgstr "æ??å??ï¼?æ?¨å·²è¿?æ?¥ä¸?ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1172
+#: ../Tomboy/PreferencesDialog.cs:1170
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy å·²ç»?å??å¤?好å??æ­¥æ?¨ç??便笺ã??æ?¨æ?³è¦?ç?°å?¨å??æ­¥å®?们å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1195
+#: ../Tomboy/PreferencesDialog.cs:1193
 msgid ""
 "Sorry, but something went wrong.  Please check your information and try "
 "again.  The ~/.tomboy.log might be useful too."
 msgstr ""
 "对ä¸?èµ·ï¼?å??ç??äº?é??误ã??请æ£?æ?¥æ?¨ç??ä¿¡æ?¯å¹¶é??è¯?ã??æ?¥ç?? ~/.tomboy.log ä¹?许ä¼?æ??帮å?©ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1204
+#: ../Tomboy/PreferencesDialog.cs:1202
 msgid "Error connecting :("
 msgstr "è¿?æ?¥å?ºé?? :("
 
-#: ../Tomboy/PreferencesDialog.cs:1280
+#: ../Tomboy/PreferencesDialog.cs:1278
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1287
+#: ../Tomboy/PreferencesDialog.cs:1285
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1294
+#: ../Tomboy/PreferencesDialog.cs:1292
 msgid "Copyright:"
-msgstr "ç??æ??ï¼?"
+msgstr "ç??æ??æ??æ??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1300
+#: ../Tomboy/PreferencesDialog.cs:1298
 msgid "Add-in Dependencies:"
 msgstr "æ??件ä¾?èµ?ï¼?"
 
@@ -1478,71 +1490,78 @@ msgstr "æ??ç´¢(_S)ï¼?"
 msgid "C_ase Sensitive"
 msgstr "å?ºå??大å°?å??(_A)"
 
-#: ../Tomboy/RecentChanges.cs:316
+#: ../Tomboy/RecentChanges.cs:318
 msgid "Note"
 msgstr "便笺"
 
-#: ../Tomboy/RecentChanges.cs:338
+#: ../Tomboy/RecentChanges.cs:340
 msgid "Last Changed"
-msgstr "�次��"
+msgstr "æ??è¿?æ?´æ?¹"
 
-#: ../Tomboy/RecentChanges.cs:470
+#: ../Tomboy/RecentChanges.cs:472
 msgid "Matches"
 msgstr "å?¹é??项"
 
-#: ../Tomboy/RecentChanges.cs:521
+#: ../Tomboy/RecentChanges.cs:523
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
-msgstr[0] "{0} 项å?¹é??"
+msgstr[0] "{0} 个å?¹é??项"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:537
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "�计�{0} 个便笺"
 
-#: ../Tomboy/RecentChanges.cs:545
+#: ../Tomboy/RecentChanges.cs:548
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
-msgstr[0] "���{0} 个便笺"
+msgstr[0] "å?¹é??ï¼?{0} 个便笺"
 
-#: ../Tomboy/RecentChanges.cs:676
+#: ../Tomboy/RecentChanges.cs:678
 msgid "Notes"
 msgstr "便笺"
 
-#: ../Tomboy/Tomboy.cs:205
+#: ../Tomboy/Tomboy.cs:243
 msgid "Cannot create new note"
 msgstr "æ? æ³?å??建æ?°ä¾¿ç¬º"
 
-#: ../Tomboy/Tomboy.cs:292
+#: ../Tomboy/Tomboy.cs:331
 msgid "translator-credits"
-msgstr "Funda Wang <fundawang gmail com>, 2005-2008."
+msgstr ""
+"Funda Wang <fundawang gmail com>, 2005-2008.\n"
+"Ray Wang <wanglei1123 gmail com>, 2009.\n"
+"Aron Xu <aronmalache 163 com>, 2009."
 
-#: ../Tomboy/Tomboy.cs:301
-msgid "Copyright © 2004-2007 Alex Graveley"
-msgstr "ç??æ?? (C) 2004-2007 Alex Graveley"
+#: ../Tomboy/Tomboy.cs:340
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2009 Others\n"
+msgstr ""
+"ç??æ??æ??æ?? © 2004-2007 Alex Graveley\n"
+"ç??æ??æ??æ?? ©·2004-2009·å?¶ä»?人\n"
 
-#: ../Tomboy/Tomboy.cs:302
+#: ../Tomboy/Tomboy.cs:342
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "ç®?å??æ??ç?¨ç??æ¡?é?¢é??æ??å¸?åº?ç?¨ç¨?åº?ã??"
 
-#: ../Tomboy/Tomboy.cs:312
+#: ../Tomboy/Tomboy.cs:352
 msgid "Homepage"
 msgstr "主页"
 
-#: ../Tomboy/Tomboy.cs:419
+#: ../Tomboy/Tomboy.cs:466
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 msgstr ""
 "é?¿å¸?ï¼?ç®?å??æ??ç?¨ç??æ¡?é?¢é??æ??å¸?åº?ç?¨ç¨?åº?ã??\n"
-"ç??æ?? (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
+"ç??æ??æ??æ?? (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:431
+#: ../Tomboy/Tomboy.cs:478
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1551,12 +1570,12 @@ msgid ""
 "  --search [text]\t\tOpen the search all notes window with the search text.\n"
 msgstr ""
 "���\n"
-"  --version\t\t\tæ??å?°ç??æ?¬ä¿¡æ?¯ã??\n"
-"  --help\t\t\tæ??å?°æ­¤ç?¨æ³?ä¿¡æ?¯ã??\n"
+"  --version\t\t\tæ?¾ç¤ºç??æ?¬ä¿¡æ?¯ã??\n"
+"  --help\t\t\tæ?¾ç¤ºæ­¤ç?¨æ³?ä¿¡æ?¯ã??\n"
 "  --note-path [è·¯å¾?]\t\tè£?å?¥/ä¿?å­?æ­¤ç?®å½?中ç??便笺æ?°æ?®ã??\n"
 "  --search [æ??æ?¬]\t\tæ??å¼?æ??ç´¢å?¨é?¨ä¾¿ç¬ºçª?å?£ï¼?并é¢?ç½®æ??ç´¢æ??æ?¬ã??\n"
 
-#: ../Tomboy/Tomboy.cs:442
+#: ../Tomboy/Tomboy.cs:489
 msgid ""
 "  --new-note\t\t\tCreate and display a new note.\n"
 "  --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1575,16 +1594,16 @@ msgstr ""
 #. Catalog.GetString (
 #. "  --check-plugin-unloading\tCheck if plugins are " +
 #. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:459
+#: ../Tomboy/Tomboy.cs:506
 msgid "D-BUS remote control disabled.\n"
 msgstr "D-BUS è¿?ç¨?æ?§å?¶å·²ç¦?ç?¨ã??\n"
 
-#: ../Tomboy/Tomboy.cs:467
+#: ../Tomboy/Tomboy.cs:514
 #, csharp-format
 msgid "Version {0}"
-msgstr "ç??æ?¬ {0}"
+msgstr "{0} ç??æ?¬"
 
-#: ../Tomboy/Tomboy.cs:537
+#: ../Tomboy/Tomboy.cs:587
 #, csharp-format
 msgid ""
 "Tomboy: unsupported option '{0}'\n"
@@ -1620,11 +1639,11 @@ msgstr "æ? æ³?æ??å¼?ä½?ç½®"
 #: ../Tomboy/Utils.cs:193
 #, csharp-format
 msgid "Today, {0}"
-msgstr "�天�{0}"
+msgstr "���{0}"
 
 #: ../Tomboy/Utils.cs:195
 msgid "Today"
-msgstr "�天"
+msgstr "ä»?æ?¥"
 
 #: ../Tomboy/Utils.cs:199
 #, csharp-format
@@ -1639,13 +1658,13 @@ msgstr "�天"
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
-msgstr[0] "{0}天å??ï¼?{1}"
+msgstr[0] "{0} 天å??ï¼?{1}"
 
 #: ../Tomboy/Utils.cs:210
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
-msgstr[0] "{0}天å??"
+msgstr[0] "{0} 天å??"
 
 #: ../Tomboy/Utils.cs:216
 #, csharp-format
@@ -1660,21 +1679,21 @@ msgstr "æ??天"
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
-msgstr[0] "å?¨ {0} 天å??ï¼?{1}"
+msgstr[0] "{0} 天å??ï¼?{1}"
 
 #: ../Tomboy/Utils.cs:227
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
-msgstr[0] "å?¨ {0} 天å??"
+msgstr[0] "{0} 天å??"
 
 #: ../Tomboy/Utils.cs:232
 msgid "MMMM d, h:mm tt"
-msgstr "Mæ??dæ?¥ï¼?h:mm tt"
+msgstr "M æ?? d æ?¥ï¼?h:mm tt"
 
 #: ../Tomboy/Utils.cs:233
 msgid "MMMM d"
-msgstr "Mæ??dæ?¥"
+msgstr "M æ?? d æ?¥"
 
 #: ../Tomboy/Utils.cs:235
 msgid "No Date"
@@ -1682,11 +1701,11 @@ msgstr "没æ??æ?¥æ??"
 
 #: ../Tomboy/Utils.cs:238
 msgid "MMMM d yyyy, h:mm tt"
-msgstr "yyyyå¹´Mæ??dæ?¥ï¼?h:mm tt"
+msgstr "yyyy å¹´ M æ?? d æ?¥ï¼?h:mm tt"
 
 #: ../Tomboy/Utils.cs:239
 msgid "MMMM d yyyy"
-msgstr "yyyyå¹´Mæ??dæ?¥"
+msgstr "yyyy å¹´ M æ?? d æ?¥"
 
 #: ../Tomboy/Watchers.cs:155
 #, csharp-format
@@ -1704,11 +1723,11 @@ msgstr "å·²ç»?å­?å?¨æ ?é¢?为 <b>{0}</b> ç??便笺ã??请å?¨ç»§ç»­å??为此便笺
 msgid "Note title taken"
 msgstr "便笺æ ?é¢?已被使ç?¨"
 
-#: ../Tomboy/Watchers.cs:551
+#: ../Tomboy/Watchers.cs:548
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
-#: ../Tomboy/Watchers.cs:556
+#: ../Tomboy/Watchers.cs:553
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
@@ -1838,7 +1857,7 @@ msgstr "å??步已å®?æ??"
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
-msgstr[0] "{0} 个便笺已æ?´æ?°ã??"
+msgstr[0] "å·²æ?´æ?° {0} 个便笺ã??"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Your notes are now up to date."
@@ -1874,7 +1893,7 @@ msgstr "å??æ­¥æ??å?¡å?¨å?ºé??"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:320
 msgid "Service error"
-msgstr "æ??å?¡å?ºé??"
+msgstr "æ??å?¡é??误"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:321
 msgid "Error connecting to the synchronization service.  Please try again."
@@ -1911,7 +1930,7 @@ msgstr "便笺��"
 #. Suggest renaming note by appending " (old)" to the existing title
 #: ../Tomboy/Synchronization/SyncDialog.cs:507
 msgid " (old)"
-msgstr "(æ?§)"
+msgstr " (æ?§)"
 
 #: ../Tomboy/Synchronization/SyncDialog.cs:546
 msgid "Rename local note:"
@@ -1945,25 +1964,25 @@ msgstr "â??{0}â??ç??æ??å?¡å?¨ç??æ?¬ä¸?æ?¨ç??æ?¬å?°ä¾¿ç¬ºå?²çª?ã??æ?¨å¸?æ??å¦?ä½?
 msgid "_Tools"
 msgstr "工�(_T)"
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:133
-#: ../Tomboy/Synchronization/SyncUtils.cs:177
+#: ../Tomboy/Synchronization/SyncUtils.cs:119
+#: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
 msgstr "æ? æ³?å?¯ç?¨ FUSE"
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:134
-#: ../Tomboy/Synchronization/SyncUtils.cs:178
+#: ../Tomboy/Synchronization/SyncUtils.cs:120
+#: ../Tomboy/Synchronization/SyncUtils.cs:164
 msgid ""
 "The FUSE module could not be loaded. Please check that it is installed "
 "properly and try again."
 msgstr "æ? æ³?å? è½½ FUSE 模å??ã??请æ£?æ?¥å®?已正确å®?è£?并é??è¯?ã??"
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:149
+#: ../Tomboy/Synchronization/SyncUtils.cs:135
 msgid "Enable FUSE?"
 msgstr "�� FUSE�"
 
 #. TODO: This message isn't entirely accurate.
 #. We should fix it.
-#: ../Tomboy/Synchronization/SyncUtils.cs:153
+#: ../Tomboy/Synchronization/SyncUtils.cs:139
 msgid ""
 "The synchronization you've chosen requires the FUSE module to be loaded.\n"
 "\n"