[tomboy] Updated Simplified Chinese translation.



commit 528357fbf233a45257a36c297895299d655301ec
Author: Tao Wei <weitao1979 gmail com>
Date:   Sun Nov 29 23:08:50 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po |  772 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 351 insertions(+), 421 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5d21e94..e167b40 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,13 +9,13 @@ 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-07-06 22:19+0000\n"
-"PO-Revision-Date: 2009-06-23 14:01+0800\n"
-"Last-Translator: Ray Wang <raywang gnome org>\n"
+"POT-Creation-Date: 2009-11-27 01:23+0000\n"
+"PO-Revision-Date: 2009-11-29 11:03+0100\n"
+"Last-Translator: Tao Wei <weitao1979 gmail 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: 8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
@@ -31,21 +31,26 @@ msgid "Tomboy Applet Factory"
 msgstr "é?¿å¸?å°?ç¨?åº?å·¥å??"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:534
+#: ../Tomboy/Tray.cs:568
 msgid "Tomboy Notes"
 msgstr "��便笺"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:263
+msgid "S_ynchronize Notes"
+msgstr "å??步便笺(_Y)"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "��(_A)"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:248
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:277
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:243
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:272
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
@@ -55,7 +60,7 @@ msgstr "记��"
 
 #: ../data/tomboy.desktop.in.h:2
 msgid "Take notes, link ideas, and stay organized"
-msgstr "è®°å½?ç¬?è®°ï¼?é?¾æ?¥æ?³æ³?ï¼?è?¯å¥½ç??ç»?ç»?"
+msgstr "è®°å½?便笺ï¼?é?¾æ?¥æ?³æ³?ï¼?è?¯å¥½ç??ç»?ç»?"
 
 #: ../data/tomboy.schemas.in.h:1
 msgid "Accept SSL Certificates"
@@ -224,100 +229,110 @@ msgid "List of pinned notes."
 msgstr "å? é??便笺å??表ã??"
 
 #: ../data/tomboy.schemas.in.h:33
+msgid ""
+"Maximum characters of note title to show in the Tomboy tray or panel applet "
+"note menu."
+msgstr "å?¨ Tomboy æ??ç??æ??è??é?¢æ?¿å°?ç¨?åº?便笺è??å??中æ?¾ç¤ºç??æ??大便笺æ ?é¢?å­?符ã??"
+
+#: ../data/tomboy.schemas.in.h:34
+msgid "Maximum note title length to show in tray menu."
+msgstr "å?¨æ??ç??è??å??中æ?¾ç¤ºç??æ??大便笺æ ?é¢?é?¿åº¦ã??"
+
+#: ../data/tomboy.schemas.in.h:35
 msgid "Minimum number of notes to show in menu"
 msgstr "è??å??中è¦?æ?¾ç¤ºç??æ??å°?便笺æ?°"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:36
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "便笺å??æ­¥å?²çª?ä¿?å­?è¡?为"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:37
 msgid "Open Recent Changes"
 msgstr "æ??å¼?æ??è¿?ç??æ?´æ?¹"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:38
 msgid "Open Search Dialog"
 msgstr "æ??å¼?æ??索对è¯?æ¡?"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:39
 msgid "Open Start Here"
 msgstr "æ??å¼?â??ä»?è¿?é??å¼?å§?â??"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:40
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "SSH æ??å?¡å?¨å?° Tomboy å??æ­¥ç?®å½?ç??è·¯å¾? (å?¯é??)ã??"
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:41
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
 msgstr "使ç?¨æ??件系ç»?å??æ­¥æ??å?¡æ??件æ?¶ç??å??æ­¥æ??å?¡å?¨è·¯å¾?ã??"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:42
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "SSHFS è¿?ç¨?å??æ­¥æ??件夹"
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:43
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "SSHFS è¿?ç¨?å??æ­¥ç?¨æ?·å??"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:44
 msgid "SSHFS Synchronization Server Port"
 msgstr "SSHFS å??æ­¥æ??å?¡å?¨ç«¯å?£"
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:45
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS å??æ­¥æ??å?¡å?¨ URL"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:46
 msgid "Saved height of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£é«?度"
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:47
 msgid "Saved horizontal position of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£æ°´å¹³ä½?ç½®"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:48
 msgid "Saved vertical position of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£å??ç?´ä½?ç½®"
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:49
 msgid "Saved width of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£å®½åº¦"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:50
 msgid "Selected Synchronization Service Addin"
 msgstr "æ??é??ç??å??æ­¥æ??å?¡æ??件"
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:51
 msgid "Set to TRUE to activate"
 msgstr "设为 TRUE ��活"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:52
 msgid "Show applet menu"
 msgstr "æ?¾ç¤ºå°?ç¨?åº?è??å??"
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:53
 msgid "Start Here Note"
 msgstr "â??ä»?è¿?é??å¼?å§?â??便笺"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:54
 msgid "Sticky Note Importer First Run"
 msgstr "置顶便笺导���次��"
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:55
 msgid "Synchronization Client ID"
 msgstr "å??步客æ?·ç«¯ ID"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:56
 msgid "Synchronization Local Server Path"
 msgstr "æ?¬å?°å??æ­¥æ??å?¡å?¨è·¯å¾?"
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:57
 msgid "The date format that is used for the timestamp."
 msgstr "ç?¨äº?æ?¶é?´æ?³ç??æ?¥æ??æ ¼å¼?ã??"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:58
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
@@ -331,7 +346,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:59
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -345,7 +360,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:60
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -359,7 +374,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:61
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
@@ -373,7 +388,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "The global keybinding for showing the Tomboy applet's menu. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -387,22 +402,22 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:63
 msgid "The handler for \"note://\" URLs"
-msgstr "â??note://â?? ç±»å?? URL ç??å¤?ç??ç¨?åº?"
+msgstr "â??note://â?? ç±»å??ç½?å??ç??å¤?ç??å?¨"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr "使ç?¨å¯¼å?ºè?³ HTML æ??件导å?ºä¾¿ç¬ºæ?¶ä¸?次使ç?¨ç??ç?®å½?ã??"
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:65
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 msgstr "导å?ºå?° HTML æ??件中â??导å?ºé?¾æ?¥ç??便笺â??å¤?é??æ¡?ä¸?次ç??é??中ç?¶æ??ã??"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:66
 msgid ""
 "The last setting for the 'Include all other linked notes' checkbox in the "
 "Export to HTML plugin. This setting is used in conjunction with the 'HTML "
@@ -412,7 +427,7 @@ msgstr ""
 "导å?ºè?³ HTML æ??件中â??å??å?«é?¾æ?¥ç??å?¨é?¨ä¾¿ç¬ºâ??ç??ä¸?次设置ã??此设置å°?ä¸?â??HTML 导å?ºé?¾æ?¥ç??"
 "便笺â??设置ç»?å??使ç?¨ï¼?ç?¨äº?æ??å®?å?¨å¯¼å?ºè?³ HTML æ?¶æ?¯å?¦åº?é??å½?å??å?«æ??æ¶?å??ç??å?¨é?¨ä¾¿ç¬ºã??"
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:67
 msgid ""
 "The note URI of the note that should be considered the \"Start Here\" note, "
 "which is always placed at the bottom of the Tomboy note menu and also "
@@ -421,48 +436,52 @@ msgstr ""
 "åº?被è§?为â??ä»?è¿?é??å¼?å§?â??便笺ç?? URIï¼?å®?å°?æ?»æ?¾ç¤ºå?¨é?¿å¸?便笺è??å??ç??åº?端ï¼?并ä¸?å?¯ä»¥ç?¨å¿«"
 "æ?·é?®è®¿é?®ã??"
 
-#: ../data/tomboy.schemas.in.h:66
-msgid "The port to use when connecting to the synchronization server via SSH."
-msgstr "é??è¿?·SSH·è¿?æ?¥å??æ­¥æ??å?¡å?¨æ?¶ä½¿ç?¨ç??端å?£ã??"
+#: ../data/tomboy.schemas.in.h:68
+msgid ""
+"The port to use when connecting to the synchronization server via SSH. Set "
+"to -1 or less if default SSH port settings should be used instead."
+msgstr ""
+"é??è¿? SSH è¿?æ?¥å??æ­¥æ??å?¡å?¨æ?¶ä½¿ç?¨ç??端å?£ã??å¦?æ??æ?³ä½¿ç?¨é»?认ç?? SSH 端å?£ï¼?é?£ä¹?设为 -1 "
+"æ??è??æ?´å°?ã??"
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:69
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
 msgstr ""
 "æ?¶é?´ (毫ç§?) å½?使ç?¨ FUSE æ?¥æ??è½½ä¸?个å??æ­¥å?±äº«æ?¶ï¼?Tomboy é??è¦?ç­?å¾?ä¸?个å??åº?ã??"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:70
 msgid "Timestamp format"
 msgstr "���格�"
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:71
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "å??å?« Tomboy·å??æ­¥ç?®å½?ç?? SSH·æ??å?¡å?¨ URLã??"
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr "ç?®å??å·²é??ç½®ç??便笺å??æ­¥æ??å?¡æ??件ç??å?¯ä¸?æ ?è¯?符"
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:73
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
 msgstr "æ­¤é?¿å¸?客æ?·ç«¯ç??å?¯ä¸?æ ?è¯?符ï¼?ç?¨äº?ä¸?å??æ­¥æ??å?¡å?¨é??讯ã??"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:74
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr "使ç?¨Â·wdfs·é??项·\"-ac\"·让ç?¨æ?·æ?¥å??·SSL·è¯?书æ?¶ä¸?å?ºç?°æ??示信æ?¯ã??"
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:75
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr "é??è¿? SSH è¿?æ?¥å??æ­¥æ??å?¡å?¨æ?¶ä½¿ç?¨ç??ç?¨æ?·å??ã??"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -504,7 +523,7 @@ msgstr "��(_C)"
 msgid "Close this window"
 msgstr "��此��"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:260
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:289
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
@@ -548,10 +567,6 @@ msgstr "æ??ç´¢å?¨é?¨ä¾¿ç¬º(_S)"
 msgid "Open the Search All Notes window"
 msgstr "æ??å¼?æ??ç´¢å?¨é?¨ä¾¿ç¬ºçª?å?£"
 
-#: ../Tomboy/ActionManager.cs:179
-msgid "S_ynchronize Notes"
-msgstr "å??步便笺(_Y)"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "å¼?å§?å??步便笺"
@@ -564,7 +579,7 @@ msgstr "å??å??é?¾æ?¥"
 msgid "(none)"
 msgstr "(æ? )"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:32
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
 msgid ""
 "You can use any bugzilla just by dragging links into notes.  If you want a "
 "special icon for certain hosts, add them here."
@@ -572,44 +587,44 @@ msgstr ""
 "æ?¨å?¯ä»¥ä½¿ç?¨ä»»ä½? Bugzilla 项ç?®ï¼?å?ªé??å°?å?¶é?¾æ?¥æ??æ?³å?°ä¾¿ç¬ºä¸­ã??å¦?æ??ä½ å¸?æ??为ç?¹å®?主æ?º"
 "使ç?¨ç?¹æ®?å?¾æ ?ï¼?请å?¨æ­¤å¤?æ·»å? ã??"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:50
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
 msgstr "主æ?ºå??"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:67
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
 msgid "Icon"
 msgstr "��"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:185
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
 msgid "Select an icon..."
 msgstr "é??æ?©å?¾æ ?..."
 
 #. Extra Widget
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:200
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
 msgid "_Host name:"
 msgstr "主æ?ºå??(_H)ï¼?"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:229
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
 msgid "No host name specified"
 msgstr "æ?ªæ??å®?主æ?ºå??"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:230
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
 msgid "You must specify the Bugzilla host name to use with this icon."
 msgstr "è¦?使ç?¨æ­¤å?¾æ ?ï¼?æ?¨å¿?é¡»æ??å®? Bugzilla 主æ?ºå??ã??"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:256
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
 msgid "Error saving icon"
 msgstr "ä¿?å­?å?¾æ ?æ?¶å?ºé??"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:257
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
 msgid "Could not save the icon file."
 msgstr "æ? æ³?ä¿?å­?å?¾æ ?æ??件ã??"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:311
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
 msgstr "ç??ç??è¦?å? é?¤æ­¤å?¾æ ?å??ï¼?"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:312
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
 msgstr "å¦?æ??æ?¨å? é?¤äº?å?¾æ ?ï¼?å?¶å??容å°?æ°¸ä¹?丢失ã??"
 
@@ -617,24 +632,24 @@ msgstr "å¦?æ??æ?¨å? é?¤äº?å?¾æ ?ï¼?å?¶å??容å°?æ°¸ä¹?丢失ã??"
 msgid "Export to HTML"
 msgstr "导�为 HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:113
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:114
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "æ?¨ç??便笺已导å?ºä¸ºâ??{0}â??ã??"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:124
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:125
 msgid "Note exported successfully"
 msgstr "便笺导å?ºæ??å??"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:130
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:131
 msgid "Access denied."
 msgstr "访é?®è¢«ç¦?æ­¢ã??"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 msgid "Folder does not exist."
 msgstr "æ??件夹ä¸?å­?å?¨ã??"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:147
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:148
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "æ? æ³?ä¿?å­?æ??件â??{0}â??"
@@ -655,28 +670,28 @@ msgstr "å??å?«é?¾æ?¥ç??å?¨é?¨å?¶å®?便笺"
 msgid "Cannot open email"
 msgstr "æ? æ³?æ??å¼?ç?µå­?é?®ä»¶"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:91
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "æ??件夹路å¾?(_F)ï¼?"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:101
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:109
 msgid "_Browse..."
 msgstr "��(_B)..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:120
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:128
 msgid "Select Synchronization Folder..."
 msgstr "é??æ?©å??æ­¥æ??件夹..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:148
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:156
 msgid "Folder path field is empty."
 msgstr "æ??件夹路å¾?为空ã??"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:157
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:165
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "ç?¹æ®?æ??件夹路å¾?ä¸?å­?å?¨ï¼?é?¿å¸?æ? æ³?å??建å®?ã??"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:235
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
 msgid "Local Folder"
 msgstr "æ?¬å?°æ??件夹"
 
@@ -700,7 +715,7 @@ msgstr "æ??å?¥æ?¶é?´æ?³"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:133
+#: ../Tomboy/Applet.cs:216 ../Tomboy/Preferences.cs:137
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "M æ?? dd æ?¥ dddd h:mm tt"
 
@@ -771,37 +786,37 @@ msgstr "yyyy å¹´ MM æ?? dd æ?¥ dddd hh:mm:ss tt"
 msgid "Add a sketch"
 msgstr "æ·»å? è??å?¾"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:43
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:49
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "æ??å?¡å?¨(_R)ï¼?"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:60
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
 msgid "User_name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:61
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
 msgid "_Folder Path (optional):"
 msgstr "æ??件夹路å¾?(å?¯é??)(_F)ï¼?"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:71
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
 msgid ""
 "SSH synchronization requires an existing SSH key for this server and user, "
 "added to a running SSH daemon."
 msgstr ""
 "SSH å??æ­¥é??è¦?å°?该æ??å?¡å?¨å??ç?¨æ?·ç??å·²æ?? SSH é?¥å??æ·»å? å?°æ­£å?¨è¿?è¡?ç?? SSH å®?æ?¤è¿?ç¨?ã??"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:95
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
 msgid "Server or username field is empty."
 msgstr "æ??å?¡å?¨æ??ç?¨æ?·å??为空ã??"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
 msgid "SSH (sshfs FUSE)"
 msgstr "SSH (sshfs FUSE)"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:191
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
 msgid ""
 "Timeout connecting to server. Please ensure that your SSH key has been added "
 "to a running SSH daemon."
@@ -858,23 +873,23 @@ msgstr "--- Tasque ��� ---"
 msgid "_Underline"
 msgstr "ä¸?å??线(_U)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:51
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
 msgid "_URL:"
 msgstr "_URLï¼?"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:69
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
 msgid "_Password:"
 msgstr "��(_P)�"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:90
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
 msgid "URL, username, or password field is empty."
 msgstr "URLã??ç?¨æ?·å??æ??å¯?ç ?为空ã??"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:132
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
 msgid "WebDAV (wdfs FUSE)"
 msgstr "WebDAV (wdfs FUSE)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:191
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -885,7 +900,7 @@ msgstr "è¿?æ?¥å?°æ??å?¡å?¨å?ºé??ã??å?¯è?½æ?¯å? ä¸ºç?¨æ?·å??æ??å¯?ç ?é??误ã??"
 #. Save configuration into GConf
 #. Preferences.Set ("/apps/tomboy/sync_wdfs_url", url ?? string.Empty);
 #. Preferences.Set ("/apps/tomboy/sync_wdfs_username", username ?? string.Empty);
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:267
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:254
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr "å°?é??ç½®ä¿?å­?å?° GNOME å¯?é?¥ç?¯æ?¶å¤±è´¥ï¼?å?ºé??ä¿¡æ?¯å¦?ä¸?ï¼?"
@@ -894,50 +909,55 @@ msgstr "å°?é??ç½®ä¿?å­?å?° GNOME å¯?é?¥ç?¯æ?¶å¤±è´¥ï¼?å?ºé??ä¿¡æ?¯å¦?ä¸?ï¼?"
 msgid "Tomboy Web"
 msgstr "����"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:56
-#, fuzzy
-#| msgid "Connecting to the server..."
-msgid "_Connect to Server"
-msgstr "æ­£å?¨è¿?æ?¥å?°æ??å?¡å?¨..."
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:58
-msgid "Connected"
-msgstr ""
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:86
-#, fuzzy
-#| msgid "Connecting to the server..."
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
 msgid "Connect to Server"
-msgstr "æ­£å?¨è¿?æ?¥å?°æ??å?¡å?¨..."
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:111
-msgid "Server not responding. Try again later."
-msgstr ""
+msgstr "è¿?æ?¥å?°æ??å?¡å?¨"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:118
-msgid "Click Here After Authorizing"
-msgstr ""
-
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:121
-msgid "Set the default browser and try again"
-msgstr ""
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
+msgid "Connected"
+msgstr "è¿?æ?¥ç??"
 
+#. Translators: The web service supporting Tomboy WebSync is not responding as expected
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-msgid "Processing..."
-msgstr ""
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
+msgid "Server not responding. Try again later."
+msgstr "æ??å?¡å?¨æ²¡æ??å??åº?ã??以å??å?¨é??æ?°å°?è¯?ã??"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:136
-#, fuzzy
-#| msgid "Synchronization Failed"
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
 msgid "Authorization Failed, Try Again"
-msgstr "å??步失败"
+msgstr "认è¯?失败ï¼?é??è¯?"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:143
-msgid "Connected. Click Save to start synchronizing"
-msgstr ""
+#. Translators: Title of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+msgid "Tomboy Web Authorization Successful"
+msgstr "Tomboy ç½?ç»?认è¯?æ??å??"
+
+#. Translators: Body of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+msgid ""
+"Please return to the Tomboy Preferences window and press Save to start "
+"synchronizing."
+msgstr "请è¿?å??å?° Tomboy é¦?é??项çª?å?£å¹¶æ??ä¸?ä¿?å­?æ?¥å¼?å§?å??æ­¥ã??"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+msgid "Connected. Press Save to start synchronizing"
+msgstr "å·²ç»?è¿?æ?¥ã??æ??ä¸?ä¿?å­?æ?¥å¼?å§?å??æ­¥"
+
+#. Translators: The user must take action in their web browser to continue the authorization process
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+msgid "Authorizing in browser (Press to reset connection)"
+msgstr "å?¨æµ?è§?å?¨ä¸­è®¤è¯?(æ??ä¸?æ?¥é??ç½®è¿?æ?¥)"
+
+#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+msgid "Set the default browser and try again"
+msgstr "设å®?é»?认æµ?è§?å?¨å¹¶é??è¯?"
 
 #. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:160
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "��(_W)"
 
@@ -1023,7 +1043,7 @@ msgid "Delete the selected notebook"
 msgstr "å? é?¤é??中ç¬?è®°æ?¬"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:253
+#: ../Tomboy/RecentChanges.cs:251
 msgid "Notebooks"
 msgstr "�记�"
 
@@ -1051,15 +1071,15 @@ msgstr "没æ??ç¬?è®°æ?¬"
 msgid "New \"{0}\" Note"
 msgstr "æ?°å»ºâ??{0}â??便笺"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:45
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
 msgid "Place this note into a notebook"
 msgstr "�此便笺���个�记�"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:126
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
 msgid "Notebook"
 msgstr "�记�"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:155
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
 msgid "_New notebook..."
 msgstr "�建�记�(_N)..."
 
@@ -1077,26 +1097,60 @@ msgstr[0] "ç??ç??è¦?å? é?¤ {0} 个便笺å??ï¼?"
 msgid "If you delete a note it is permanently lost."
 msgstr "å¦?æ??æ?¨å? é?¤äº?便笺ï¼?å?¶å??容å°?æ°¸ä¹?丢失ã??"
 
-#: ../Tomboy/Note.cs:1497
-msgid "Error saving note data."
-msgstr "ä¿?å­?便笺æ?°æ?®æ?¶å?ºé??ã??"
-
-#: ../Tomboy/Note.cs:1498
+#: ../Tomboy/Note.cs:1491
+#, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
-"sufficient disk space, and that you have appropriate rights on ~/.tomboy. "
-"Error details can be found in ~/.tomboy.log."
+"sufficient disk space, and that you have appropriate rights on {0}. Error "
+"details can be found in {0}."
 msgstr ""
-"ä¿?å­?æ?¨ç??便笺æ?¶å??ç??äº?é??误ã??请æ£?æ?¥æ?¨æ?¯å?¦æ??足å¤?ç??ç£?ç??空é?´ï¼?以å??æ?¨å?¨ ~/.tomboy æ?¯"
-"å?¦æ??足å¤?ç??æ??é??ã??é??误ç»?è??å?¯å?¨ ~/.tomboy.log 中æ?¾å?°ã??"
+"ä¿?å­?æ?¨ç??便笺æ?¶å??ç??äº?é??误ã??请æ£?æ?¥æ?¨æ?¯å?¦æ??足å¤?ç??ç£?ç??空é?´ï¼?以å??æ?¨å?¨ {0} æ?¯å?¦æ??足"
+"å¤?ç??æ??é??ã??é??误ç»?è??å?¯å?¨ {0} 中æ?¾å?°ã??"
+
+#: ../Tomboy/Note.cs:1507
+msgid "Error saving note data."
+msgstr "ä¿?å­?便笺æ?°æ?®æ?¶å?ºé??ã??"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:19 ../Tomboy/PreferencesDialog.cs:210
+#: ../Tomboy/NoteManager.cs:19 ../Tomboy/PreferencesDialog.cs:208
 msgid "New Note Template"
 msgstr "�建便笺模�"
 
-#: ../Tomboy/NoteManager.cs:135
+#. Create migration notification note
+#. Translators: The title of the data migration note
+#: ../Tomboy/NoteManager.cs:111
+msgid "Your Notes Have Moved!"
+msgstr "æ?¨ç??ç¬?è®°å·²ç»?移é?¤ï¼?"
+
+#. Translators: The contents (not including the title) of the data migration note. {0}, {1}, {2}, {3}, and {4} are replaced by directory paths and should not be changed
+#: ../Tomboy/NoteManager.cs:124
+#, csharp-format
+msgid ""
+"In the latest version of Tomboy, your note files have moved.  You have "
+"probably never cared where your notes are stored, and if you still don't "
+"care, please go ahead and <bold>delete this note</bold>.  :-)\n"
+"\n"
+"Your old note directory is still safe and sound at <link:url>{0}</link:"
+"url> . If you go back to an older version of Tomboy, it will look for notes "
+"there.\n"
+"\n"
+"But we've copied your notes and configuration info into new directories, "
+"which will be used from now on:\n"
+"\n"
+"<list><list-item dir=\"ltr\">Notes can now be found at <link:url>{1}</link:"
+"url>\n"
+"</list-item><list-item dir=\"ltr\">Configuration is at <link:url>{2}</link:"
+"url>\n"
+"</list-item><list-item dir=\"ltr\">You can install add-ins at <link:url>{3}</"
+"link:url>\n"
+"</list-item><list-item dir=\"ltr\">Log files can be found at <link:url>{4}</"
+"link:url></list-item></list>\n"
+"\n"
+"Ciao!"
+msgstr ""
+
+#: ../Tomboy/NoteManager.cs:222
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1131,7 +1185,7 @@ msgstr ""
 "æ?¯å?¦å·²ç»?注æ??å?°ï¼?æ??们æ¯?次è¾?å?¥<link:internal>å?¨é?¿å¸?中使ç?¨é?¾æ?¥</link:internal>ç??"
 "æ?¶å??ï¼?é?½ä¼?è?ªå?¨å? ä¸?å??线ï¼?å??å?»é?¾æ?¥å?³å?¯æ??å¼?该便笺ã??</note-content>"
 
-#: ../Tomboy/NoteManager.cs:154
+#: ../Tomboy/NoteManager.cs:241
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1159,22 +1213,22 @@ msgstr ""
 "</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:169 ../Tomboy/NoteManager.cs:237
+#: ../Tomboy/NoteManager.cs:256 ../Tomboy/NoteManager.cs:324
 msgid "Start Here"
 msgstr "ä»?è¿?é??å¼?å§?"
 
-#: ../Tomboy/NoteManager.cs:174
+#: ../Tomboy/NoteManager.cs:261
 msgid "Using Links in Tomboy"
 msgstr "���中使���"
 
-#: ../Tomboy/NoteManager.cs:314
+#: ../Tomboy/NoteManager.cs:401
 #, 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:387 ../Tomboy/NoteManager.cs:479
+#: ../Tomboy/NoteManager.cs:474 ../Tomboy/NoteManager.cs:566
 msgid "Describe your new note here."
 msgstr "å?¨æ­¤æ??è¿°æ?¨ç??æ?°ä¾¿ç¬ºã??"
 
@@ -1290,62 +1344,62 @@ msgstr "��大�"
 msgid "_Normal"
 msgstr "æ?®é??(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1317
+#: ../Tomboy/NoteWindow.cs:1327
 msgid "Hu_ge"
 msgstr "巨大(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1325
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1333
+#: ../Tomboy/NoteWindow.cs:1343
 msgid "S_mall"
 msgstr "å°?(_M)"
 
-#: ../Tomboy/NoteWindow.cs:1342
+#: ../Tomboy/NoteWindow.cs:1352
 msgid "Increase Font Size"
 msgstr "�大��"
 
-#: ../Tomboy/NoteWindow.cs:1350
+#: ../Tomboy/NoteWindow.cs:1370
 msgid "Decrease Font Size"
 msgstr "å??å°?å­?å?·"
 
-#: ../Tomboy/NoteWindow.cs:1360
+#: ../Tomboy/NoteWindow.cs:1390
 msgid "Bullets"
 msgstr "项�符�"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:78
 msgid "Editing"
 msgstr "ç¼?è¾?"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Hotkeys"
 msgstr "ç?­é?®"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:83
 msgid "Synchronization"
 msgstr "å??æ­¥"
 
-#: ../Tomboy/PreferencesDialog.cs:87
+#: ../Tomboy/PreferencesDialog.cs:85
 msgid "Add-ins"
 msgstr "添�项"
 
-#: ../Tomboy/PreferencesDialog.cs:146
+#: ../Tomboy/PreferencesDialog.cs:144
 msgid "_Spell check while typing"
 msgstr "è¾?å?¥æ?¶æ£?æ?¥æ?¼å??(_S)"
 
-#: ../Tomboy/PreferencesDialog.cs:155
+#: ../Tomboy/PreferencesDialog.cs:153
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr "æ?¼é??ç??å??è¯?å°?以红è?²æ?¾ç¤ºï¼?è??纠正æ?¼å??é??误ç??建议å°?æ?¾ç¤ºå?¨å?³é?®è??å??中ã??"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:166
+#: ../Tomboy/PreferencesDialog.cs:164
 msgid "Highlight _WikiWords"
 msgstr "�亮 _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:174
+#: ../Tomboy/PreferencesDialog.cs:172
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1353,31 +1407,31 @@ msgstr ""
 "å?¯ç?¨æ­¤é??项å°?å? äº®ç±»ä¼¼ <b>WikiWords</b> ç??å??è¯?ã??å??å?»æ­¤å??è¯?å°?以该å??称å??建便笺ã??"
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:181
+#: ../Tomboy/PreferencesDialog.cs:179
 msgid "Enable auto-_bulleted lists"
 msgstr "å??许对å??表è?ªå?¨ç¼?å?·(_B)"
 
 #. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:190
+#: ../Tomboy/PreferencesDialog.cs:188
 msgid "Use custom _font"
 msgstr "使������(_F)"
 
-#: ../Tomboy/PreferencesDialog.cs:214
+#: ../Tomboy/PreferencesDialog.cs:212
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "å??建æ?°ç??便笺æ?¶ä½¿ç?¨æ?°ç??便笺模æ?¿æ?¥è®¾å®?åº?使ç?¨ç??æ??å­?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:223
+#: ../Tomboy/PreferencesDialog.cs:221
 msgid "Open New Note Template"
 msgstr "æ??å¼?æ?°ç??便笺模æ?¿"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:280
+#: ../Tomboy/PreferencesDialog.cs:278
 msgid "Listen for _Hotkeys"
 msgstr "ç??å?¬ç?­é?®(_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:289
+#: ../Tomboy/PreferencesDialog.cs:287
 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;"
@@ -1387,105 +1441,105 @@ msgstr ""
 "b>ï¼?<b>&lt;Alt&gt;N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:309
+#: ../Tomboy/PreferencesDialog.cs:307
 msgid "Show notes _menu"
 msgstr "æ?¾ç¤ºä¾¿ç¬ºè??å??(_M)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:324
 msgid "Open \"_Start Here\""
 msgstr "æ??å¼?â??ä»?è¿?é??å¼?å§?â??(_S)"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:343
+#: ../Tomboy/PreferencesDialog.cs:341
 msgid "Create _new note"
 msgstr "å??建æ?°ä¾¿ç¬º(_N)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:360
+#: ../Tomboy/PreferencesDialog.cs:358
 msgid "Open \"Search _All Notes\""
 msgstr "æ??å¼?â??æ??ç´¢å?¨é?¨ä¾¿ç¬ºâ??(_A)"
 
-#: ../Tomboy/PreferencesDialog.cs:387
+#: ../Tomboy/PreferencesDialog.cs:385
 msgid "Ser_vice:"
 msgstr "æ??å?¡(_V)ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:440 ../Tomboy/PreferencesDialog.cs:1033
+#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
 msgid "Not configurable"
 msgstr "ä¸?å?¯é??ç½®"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:460
+#: ../Tomboy/PreferencesDialog.cs:458
 msgid "_Advanced..."
 msgstr "�级(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:521
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "The following add-ins are installed"
 msgstr "已��以�添�项"
 
-#: ../Tomboy/PreferencesDialog.cs:542
+#: ../Tomboy/PreferencesDialog.cs:540
 msgid "Get More Add-Ins..."
-msgstr ""
+msgstr "è?·å??æ?´å¤?æ??件..."
 
-#: ../Tomboy/PreferencesDialog.cs:568
+#: ../Tomboy/PreferencesDialog.cs:566
 msgid "_Enable"
 msgstr "��(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:574
+#: ../Tomboy/PreferencesDialog.cs:572
 msgid "_Disable"
 msgstr "��(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:705
+#: ../Tomboy/PreferencesDialog.cs:703
 msgid "Not Implemented"
 msgstr "����"
 
-#: ../Tomboy/PreferencesDialog.cs:719
+#: ../Tomboy/PreferencesDialog.cs:717
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} é¦?é??项"
 
-#: ../Tomboy/PreferencesDialog.cs:858
+#: ../Tomboy/PreferencesDialog.cs:856
 msgid "Choose Note Font"
 msgstr "é??æ?©ä¾¿ç¬ºå­?ä½?"
 
-#: ../Tomboy/PreferencesDialog.cs:902
+#: ../Tomboy/PreferencesDialog.cs:900
 msgid "Other Synchronization Options"
 msgstr "å?¶å®?å??æ­¥é??项"
 
-#: ../Tomboy/PreferencesDialog.cs:908
+#: ../Tomboy/PreferencesDialog.cs:906
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "å½?æ£?æµ?å?°æ?¬å?°ä¾¿ç¬ºå??æ??é??ç½®ç??å??æ­¥æ??å?¡å?¨ä¸?ç??便笺æ??å?²çª?æ?¶ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:915
+#: ../Tomboy/PreferencesDialog.cs:913
 msgid "Always ask me what to do."
 msgstr "é?®æ??该æ??ä¹?å??ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:919
+#: ../Tomboy/PreferencesDialog.cs:917
 msgid "Rename my local note."
 msgstr "é??å?½å??æ??ç??æ?¬å?°ä¾¿ç¬ºã??"
 
-#: ../Tomboy/PreferencesDialog.cs:923
+#: ../Tomboy/PreferencesDialog.cs:921
 msgid "Replace my local note with the server's update."
 msgstr "ç?¨æ??å?¡å?¨ä¸?ç??便笺æ?´æ?°æ??ç??æ?¬å?°ä¾¿ç¬ºã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1067
 msgid "WARNING: Are you sure?"
 msgstr "è­¦å??ï¼?æ?¨ç¡®å®?å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1071
+#: ../Tomboy/PreferencesDialog.cs:1069
 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:1084
+#: ../Tomboy/PreferencesDialog.cs:1082
 msgid "Resetting Synchronization Settings"
 msgstr "é??ç½®å??步设置"
 
-#: ../Tomboy/PreferencesDialog.cs:1086
+#: ../Tomboy/PreferencesDialog.cs:1084
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1494,60 +1548,56 @@ msgstr ""
 "æ?¨å·²å?³é?­æ??é??ç½®ç??å??æ­¥æ??å?¡ã??æ?¨ç??å??步设置ç?°å?¨å°?被æ¸?空ã??å½?æ?¨ä¿?å­?æ?°è®¾ç½®æ?¶å?¯è?½å??次"
 "被强å?¶å??步你ç??æ??æ??便笺"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1162
 msgid "Success! You're connected!"
 msgstr "æ??å??ï¼?æ?¨å·²è¿?æ?¥ä¸?ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy å·²ç»?å??å¤?好å??æ­¥æ?¨ç??便笺ã??æ?¨æ?³è¦?ç?°å?¨å??æ­¥å®?们å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1189
+#: ../Tomboy/PreferencesDialog.cs:1187
+#, csharp-format
 msgid ""
 "Sorry, but something went wrong.  Please check your information and try "
-"again.  The ~/.tomboy.log might be useful too."
-msgstr ""
-"对ä¸?èµ·ï¼?å??ç??äº?é??误ã??请æ£?æ?¥æ?¨ç??ä¿¡æ?¯å¹¶é??è¯?ã??æ?¥ç?? ~/.tomboy.log ä¹?许ä¼?æ??帮å?©ã??"
+"again.  The {0} might be useful too."
+msgstr "对ä¸?èµ·ï¼?å??ç??äº?é??误ã??请æ£?æ?¥æ?¨ç??ä¿¡æ?¯å¹¶é??è¯?ã??æ?¥ç?? {0} ä¹?许ä¼?æ??帮å?©ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1198
+#: ../Tomboy/PreferencesDialog.cs:1200
 msgid "Error connecting :("
 msgstr "è¿?æ?¥å?ºé?? :("
 
-#: ../Tomboy/PreferencesDialog.cs:1274
+#: ../Tomboy/PreferencesDialog.cs:1276
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1281
+#: ../Tomboy/PreferencesDialog.cs:1283
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1288
+#: ../Tomboy/PreferencesDialog.cs:1290
 msgid "Copyright:"
 msgstr "ç??æ??æ??æ??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1294
+#: ../Tomboy/PreferencesDialog.cs:1296
 msgid "Add-in Dependencies:"
 msgstr "æ??件ä¾?èµ?ï¼?"
 
-#: ../Tomboy/RecentChanges.cs:76
+#: ../Tomboy/RecentChanges.cs:75
 msgid "Search All Notes"
 msgstr "æ??ç´¢å?¨é?¨ä¾¿ç¬º"
 
-#: ../Tomboy/RecentChanges.cs:93
+#: ../Tomboy/RecentChanges.cs:90
 msgid "_Search:"
 msgstr "æ??ç´¢(_S)ï¼?"
 
-#: ../Tomboy/RecentChanges.cs:114
-msgid "C_ase Sensitive"
-msgstr "å?ºå??大å°?å??(_A)"
-
-#: ../Tomboy/RecentChanges.cs:318
+#: ../Tomboy/RecentChanges.cs:319
 msgid "Note"
 msgstr "便笺"
 
-#: ../Tomboy/RecentChanges.cs:340
+#: ../Tomboy/RecentChanges.cs:341
 msgid "Last Changed"
 msgstr "æ??è¿?æ?´æ?¹"
 
@@ -1573,22 +1623,30 @@ msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "å?¹é??ï¼?{0} 个便笺"
 
-#: ../Tomboy/RecentChanges.cs:678
+#: ../Tomboy/RecentChanges.cs:680
 msgid "Notes"
 msgstr "便笺"
 
-#: ../Tomboy/Tomboy.cs:244
+#: ../Tomboy/Tomboy.cs:248
 msgid "Cannot create new note"
 msgstr "æ? æ³?å??建æ?°ä¾¿ç¬º"
 
-#: ../Tomboy/Tomboy.cs:332
+#: ../Tomboy/Tomboy.cs:314
+msgid "Primary Development:"
+msgstr "é¦?席å¼?å??ï¼?"
+
+#: ../Tomboy/Tomboy.cs:320
+msgid "Contributors:"
+msgstr "è´¡ç?®è??ï¼?"
+
+#: ../Tomboy/Tomboy.cs:379
 msgid "translator-credits"
 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:341
+#: ../Tomboy/Tomboy.cs:388
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
@@ -1596,15 +1654,15 @@ msgstr ""
 "ç??æ??æ??æ?? © 2004-2007 Alex Graveley\n"
 "ç??æ??æ??æ?? ©·2004-2009·å?¶ä»?人\n"
 
-#: ../Tomboy/Tomboy.cs:343
+#: ../Tomboy/Tomboy.cs:390
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "ç®?å??æ??ç?¨ç??æ¡?é?¢é??æ??å¸?åº?ç?¨ç¨?åº?ã??"
 
-#: ../Tomboy/Tomboy.cs:353
+#: ../Tomboy/Tomboy.cs:400
 msgid "Homepage"
 msgstr "主页"
 
-#: ../Tomboy/Tomboy.cs:467
+#: ../Tomboy/Tomboy.cs:518
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
@@ -1614,7 +1672,7 @@ msgstr ""
 "ç??æ??æ??æ?? (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:479
+#: ../Tomboy/Tomboy.cs:530
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1628,7 +1686,7 @@ msgstr ""
 "  --note-path [è·¯å¾?]\t\tè£?å?¥/ä¿?å­?æ­¤ç?®å½?中ç??便笺æ?°æ?®ã??\n"
 "  --search [æ??æ?¬]\t\tæ??å¼?æ??ç´¢å?¨é?¨ä¾¿ç¬ºçª?å?£ï¼?并é¢?ç½®æ??ç´¢æ??æ?¬ã??\n"
 
-#: ../Tomboy/Tomboy.cs:490
+#: ../Tomboy/Tomboy.cs:540
 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"
@@ -1642,121 +1700,101 @@ msgstr ""
 "  --start-here\t\t\tæ?¾ç¤ºâ??ä»?è¿?é??å¼?å§?â??便笺ã??\n"
 "  --highlight-search [æ??æ?¬]\tå?¨æ??å¼?ç??便笺中æ??ç´¢çª?å?ºæ?¾ç¤ºç??æ??æ?¬ã??\n"
 
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:507
-msgid "D-BUS remote control disabled.\n"
-msgstr "D-BUS è¿?ç¨?æ?§å?¶å·²ç¦?ç?¨ã??\n"
-
-#: ../Tomboy/Tomboy.cs:515
+#: ../Tomboy/Tomboy.cs:554
 #, csharp-format
 msgid "Version {0}"
 msgstr "{0} ç??æ?¬"
 
-#: ../Tomboy/Tomboy.cs:588
-#, csharp-format
-msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-msgstr ""
-"é?¿å¸?ï¼?ä¸?æ?¯æ??ç??é??项â??{0}â??\n"
-"使ç?¨â??tomboy --helpâ??å?¯è?·å¾?æ?´å¤?ä¿¡æ?¯ã??\n"
-"D-BUS è¿?ç¨?æ?§å?¶è¢«ç¦?ç?¨ã??"
-
-#: ../Tomboy/Tray.cs:63
+#: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (æ?°)"
 
-#: ../Tomboy/Tray.cs:253
+#: ../Tomboy/Tray.cs:282
 msgid "_About Tomboy"
 msgstr "����(_A)"
 
-#: ../Tomboy/Utils.cs:146
+#: ../Tomboy/Utils.cs:142
 msgid ""
 "The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
 msgstr "æ?¾ä¸?å?°â??é?¿å¸?便笺æ??å??â??ã??请æ£?æ?¥æ?¨ç??å®?è£?æ?¯å?¦å·²æ??å??å®?æ??ã??"
 
-#: ../Tomboy/Utils.cs:155
+#: ../Tomboy/Utils.cs:151
 msgid "Help not found"
 msgstr "帮����"
 
-#: ../Tomboy/Utils.cs:171
+#: ../Tomboy/Utils.cs:167
 msgid "Cannot open location"
 msgstr "æ? æ³?æ??å¼?ä½?ç½®"
 
-#: ../Tomboy/Utils.cs:193
+#: ../Tomboy/Utils.cs:189
 #, csharp-format
 msgid "Today, {0}"
 msgstr "���{0}"
 
-#: ../Tomboy/Utils.cs:195
+#: ../Tomboy/Utils.cs:191
 msgid "Today"
 msgstr "ä»?æ?¥"
 
-#: ../Tomboy/Utils.cs:199
+#: ../Tomboy/Utils.cs:195
 #, csharp-format
 msgid "Yesterday, {0}"
 msgstr "�天�{0}"
 
-#: ../Tomboy/Utils.cs:201
+#: ../Tomboy/Utils.cs:197
 msgid "Yesterday"
 msgstr "�天"
 
-#: ../Tomboy/Utils.cs:206
+#: ../Tomboy/Utils.cs:202
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
 msgstr[0] "{0} 天å??ï¼?{1}"
 
-#: ../Tomboy/Utils.cs:210
+#: ../Tomboy/Utils.cs:206
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
 msgstr[0] "{0} 天å??"
 
-#: ../Tomboy/Utils.cs:216
+#: ../Tomboy/Utils.cs:212
 #, csharp-format
 msgid "Tomorrow, {0}"
 msgstr "æ??天ï¼?{0}"
 
-#: ../Tomboy/Utils.cs:218
+#: ../Tomboy/Utils.cs:214
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../Tomboy/Utils.cs:223
+#: ../Tomboy/Utils.cs:219
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
 msgstr[0] "{0} 天å??ï¼?{1}"
 
-#: ../Tomboy/Utils.cs:227
+#: ../Tomboy/Utils.cs:223
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
 msgstr[0] "{0} 天å??"
 
-#: ../Tomboy/Utils.cs:232
+#: ../Tomboy/Utils.cs:228
 msgid "MMMM d, h:mm tt"
 msgstr "M æ?? d æ?¥ï¼?h:mm tt"
 
-#: ../Tomboy/Utils.cs:233
+#: ../Tomboy/Utils.cs:229
 msgid "MMMM d"
 msgstr "M æ?? d æ?¥"
 
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:231
 msgid "No Date"
 msgstr "没æ??æ?¥æ??"
 
-#: ../Tomboy/Utils.cs:238
+#: ../Tomboy/Utils.cs:234
 msgid "MMMM d yyyy, h:mm tt"
 msgstr "yyyy å¹´ M æ?? d æ?¥ï¼?h:mm tt"
 
-#: ../Tomboy/Utils.cs:239
+#: ../Tomboy/Utils.cs:235
 msgid "MMMM d yyyy"
 msgstr "yyyy å¹´ M æ?? d æ?¥"
 
@@ -1816,197 +1854,197 @@ msgid "An error ocurred while connecting to the specified server:"
 msgstr "è¿?æ?¥å?°æ??å®?æ??å?¡å?¨æ?¶å?ºé??ï¼?"
 
 #. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:88
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
 msgid "Details"
 msgstr "ç»?è??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:118
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
 msgid "Note Title"
 msgstr "便笺��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:125
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:240
+#: ../Tomboy/Synchronization/SyncDialog.cs:241
 msgid "Acquiring sync lock..."
 msgstr "æ­£å?¨è¯·æ±?å??æ­¥é??..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "Committing changes..."
 msgstr "æ­£å?¨æ??交æ?´æ?¹..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
+#: ../Tomboy/Synchronization/SyncDialog.cs:247
 msgid "Synchronizing Notes"
 msgstr "å??步便笺"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:248
 msgid "Synchronizing your notes..."
 msgstr "æ­£å?¨å??æ­¥æ?¨ç??便笺..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:249
 msgid "This may take a while, kick back and enjoy!"
 msgstr "è¿?å?¯è?½é??è¦?è?±ä¸?äº?æ?¶é?´ï¼?请ç¨?å??ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:250
+#: ../Tomboy/Synchronization/SyncDialog.cs:251
 msgid "Connecting to the server..."
 msgstr "æ­£å?¨è¿?æ?¥å?°æ??å?¡å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
+#: ../Tomboy/Synchronization/SyncDialog.cs:257
 msgid "Deleting notes off of the server..."
 msgstr "æ­£å?¨ä»?æ??å?¡å?¨å? é?¤ä¾¿ç¬º..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:260
+#: ../Tomboy/Synchronization/SyncDialog.cs:261
 msgid "Downloading new/updated notes..."
 msgstr "æ­£å?¨ä¸?è½½æ?°ç??/å·²æ?´æ?°ç??便笺..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:272
+#: ../Tomboy/Synchronization/SyncDialog.cs:273
 msgid "Server Locked"
 msgstr "æ??å?¡å?¨å·²é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Server is locked"
 msgstr "æ??å?¡å?¨å·²è¢«é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
+#: ../Tomboy/Synchronization/SyncDialog.cs:275
 msgid ""
 "One of your other computers is currently synchronizing.  Please wait 2 "
 "minutes and try again."
 msgstr "æ?¨ç??å?¶å®?ç?µè??æ­£å?¨å??步中ã??请ç­?2å??é??å??é??è¯?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:278
+#: ../Tomboy/Synchronization/SyncDialog.cs:279
 msgid "Preparing to download updates from server..."
 msgstr "æ­£å?¨å??å¤?ä»?æ??å?¡å?¨ä¸?è½½æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:281
+#: ../Tomboy/Synchronization/SyncDialog.cs:282
 msgid "Preparing to upload updates to server..."
 msgstr "æ­£å?¨å??å¤?å??æ??å?¡å?¨ä¸?ä¼ æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Uploading notes to server..."
 msgstr "æ­£å?¨å??æ??å?¡å?¨ä¸?ä¼ æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:287
+#: ../Tomboy/Synchronization/SyncDialog.cs:288
 msgid "Synchronization Failed"
 msgstr "å??步失败"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:289
 msgid "Failed to synchronize"
 msgstr "å??步失败"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:290
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "æ? æ³?å??步便笺ã??请æ£?æ?¥ä»¥ä¸?ç»?è??并é??è¯?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:295
+#: ../Tomboy/Synchronization/SyncDialog.cs:296
 msgid "Synchronization Complete"
 msgstr "å??æ­¥å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:297
 msgid "Synchronization is complete"
 msgstr "å??步已å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:298
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "å·²æ?´æ?° {0} 个便笺ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Your notes are now up to date."
 msgstr "æ?¨ç??便笺已ç»?æ?¯æ??æ?°ç??äº?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:307
+#: ../Tomboy/Synchronization/SyncDialog.cs:308
 msgid "Synchronization Canceled"
 msgstr "å??步已å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization was canceled"
 msgstr "å??步已被å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "æ?¨å??æ¶?äº?å??æ­¥ã??æ?¨ç?°å?¨å?¯ä»¥å?³é?­çª?å?£ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:313
+#: ../Tomboy/Synchronization/SyncDialog.cs:314
 msgid "Synchronization Not Configured"
 msgstr "å??æ­¥æ?ªé??ç½®"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization is not configured"
 msgstr "å??æ­¥å°?æ?ªé??置好"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "请å?¨é¦?é??项对è¯?æ¡?中é??ç½®å??æ­¥ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:319
+#: ../Tomboy/Synchronization/SyncDialog.cs:320
 msgid "Synchronization Service Error"
 msgstr "å??æ­¥æ??å?¡å?¨å?ºé??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:321
 msgid "Service error"
 msgstr "æ??å?¡é??误"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:322
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "è¿?æ?¥å?°å??æ­¥æ??å?¡å?ºé??ã??请é??è¯?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:338
+#: ../Tomboy/Synchronization/SyncDialog.cs:339
 msgid "Deleted locally"
 msgstr "已�����"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:341
+#: ../Tomboy/Synchronization/SyncDialog.cs:342
 msgid "Deleted from server"
 msgstr "å·²ä»?æ??å?¡å?¨å? é?¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:344
+#: ../Tomboy/Synchronization/SyncDialog.cs:345
 msgid "Updated"
 msgstr "已��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:347
+#: ../Tomboy/Synchronization/SyncDialog.cs:348
 msgid "Added"
 msgstr "已添�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:350
+#: ../Tomboy/Synchronization/SyncDialog.cs:351
 msgid "Uploaded changes to server"
 msgstr "å·²å°?æ?´æ?¹ä¸?ä¼ å?°æ??å?¡å?¨"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:353
+#: ../Tomboy/Synchronization/SyncDialog.cs:354
 msgid "Uploaded new note to server"
 msgstr "å·²å°?æ?°ä¾¿ç¬ºä¸?ä¼ å?°æ??å?¡å?¨"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:501
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid "Note Conflict"
 msgstr "便笺��"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:507
+#: ../Tomboy/Synchronization/SyncDialog.cs:508
 msgid " (old)"
 msgstr " (æ?§)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:546
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Rename local note:"
 msgstr "é??å?½å??æ?¬å?°ä¾¿ç¬ºï¼?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:552
+#: ../Tomboy/Synchronization/SyncDialog.cs:553
 msgid "Update links in referencing notes"
 msgstr "æ?´æ?°å¼?ç?¨ä¾¿ç¬ºä¸­ç??é?¾æ?¥"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:559
+#: ../Tomboy/Synchronization/SyncDialog.cs:560
 msgid "Overwrite local note"
 msgstr "è¦?ç??æ?¬å?°ä¾¿ç¬º"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:563
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Always perform this action"
 msgstr "æ?»æ?¯æ?§è¡?è¿?ä¸?æ??ä½?"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:569
+#: ../Tomboy/Synchronization/SyncDialog.cs:570
 msgid "Note conflict detected"
 msgstr "���便笺��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:570
+#: ../Tomboy/Synchronization/SyncDialog.cs:571
 #, csharp-format
 msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
@@ -2047,111 +2085,3 @@ msgstr ""
 "\n"
 "为äº?é?¿å??å°?æ?¥å¼¹å?ºè¿?个æ¶?æ?¯ï¼?æ?¨åº?该å?¨å?¯å?¨æ?¶å? è½½ FUSE ã??æ·»å? â??modprobe fuseâ??å?° /"
 "etc/init.d/boot.local æ??è??â??fuseâ??å?° /etc/modules ã??"
-
-#~ msgid "Add-in"
-#~ msgstr "æ??件"
-
-#~ msgid "Version"
-#~ msgstr "ç??æ?¬"
-
-#~ msgid "Other"
-#~ msgstr "��"
-
-#~ msgid "Preparing pages..."
-#~ msgstr "æ­£å?¨å??å¤?页é?¢..."
-
-#~ msgid "Rendering page %d of %d..."
-#~ msgstr "æ­£å?¨æ¸²æ??第%d页ï¼?å?±%d页..."
-
-#~ msgid "Printing page %d of %d..."
-#~ msgstr "æ­£å?¨æ??å?°ç¬¬%d页ï¼?å?±%d页..."
-
-#~ msgid "Print preview"
-#~ msgstr "æ??å?°é¢?è§?"
-
-#~ msgid "%A %x, %X"
-#~ msgstr "%x%A %X"
-
-#~ msgid "Configuration"
-#~ msgstr "é??ç½®"
-
-#~ msgid "Configuration options for the print job"
-#~ msgstr "æ??å?°ä»»å?¡é??ç½®é??项"
-
-#~ msgid "Source Buffer"
-#~ msgstr "����"
-
-#~ msgid "GtkTextBuffer object to print"
-#~ msgstr "ç?¨äº?æ??å?°ç?? GtkTextBuffer 对象"
-
-#~ msgid "Tabs Width"
-#~ msgstr "�签宽度"
-
-#~ msgid "Width in equivalent space characters of tabs"
-#~ msgstr "ä¸?æ ?签空格å­?符ç­?宽ç??宽度"
-
-#~ msgid "Wrap Mode"
-#~ msgstr "æ??è¡?模å¼?"
-
-#~ msgid "Word wrapping mode"
-#~ msgstr "æ??å­?æ??è¡?模å¼?"
-
-#~ msgid "Highlight"
-#~ msgstr "�亮�示"
-
-#~ msgid "Whether to print the document with highlighted syntax"
-#~ msgstr "æ?¯å?¦ä»¥é«?亮语æ³?æ??å?°è¯¥æ??æ¡£"
-
-#~ msgid "Font"
-#~ msgstr "å­?ä½?"
-
-#~ msgid "GnomeFont name to use for the document text (deprecated)"
-#~ msgstr "ç?¨äº?æ??æ¡£æ??æ?¬ç?? GnomeFont å­?ä½?å??称(ä¸?建议使ç?¨)"
-
-#~ msgid "Font Description"
-#~ msgstr "å­?ä½?æ??è¿°"
-
-#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
-#~ msgstr "ç?¨äº?æ??æ¡£æ??æ?¬ç??å­?ä½?(æ¯?å¦?â??Monospace 10â??)"
-
-#~ msgid "Numbers Font"
-#~ msgstr "æ?°å­?å­?ä½?"
-
-#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
-#~ msgstr "ç?¨äº?è¡?å?·ç?? GnomeFont å­?ä½?å??称(ä¸?建议使ç?¨)"
-
-#~ msgid "Font description to use for the line numbers"
-#~ msgstr "ç?¨äº?è¡?å?·ç??å­?ä½?说æ??"
-
-#~ msgid "Print Line Numbers"
-#~ msgstr "æ??å?°è¡?å?·"
-
-#~ msgid "Interval of printed line numbers (0 means no numbers)"
-#~ msgstr "æ??å?°è¡?å?·ç??é?´é??(0表示æ? é?´é??)"
-
-#~ msgid "Print Header"
-#~ msgstr "æ??å?°å¤´"
-
-#~ msgid "Whether to print a header in each page"
-#~ msgstr "æ?¯å?¦å?¨æ¯?页æ??å?°é¡µç??"
-
-#~ msgid "Print Footer"
-#~ msgstr "æ??å?°é¡µè??"
-
-#~ msgid "Whether to print a footer in each page"
-#~ msgstr "æ?¯å?¦å?¨æ¯?页æ??å?°é¡µè??"
-
-#~ msgid "Header and Footer Font"
-#~ msgstr "页ç??页è??ç??å­?ä½?"
-
-#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
-#~ msgstr "ç?¨äº?页ç??页è??ç?? GnomeFont å­?ä½?å??称(ä¸?建议使ç?¨)"
-
-#~ msgid "Header and Footer Font Description"
-#~ msgstr "页ç??页è??ç??å­?ä½?说æ??"
-
-#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
-#~ msgstr "ç?¨äº?页ç??页è??ç??å­?ä½?(æ¯?å¦?â??Monospace 10â??)"
-
-#~ msgid "Really delete these notes?"
-#~ msgstr "ç??ç??è¦?å? é?¤è¿?äº?便笺å??ï¼?"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]