[tomboy/gnome-2-30] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit d4492835f62ecae7c4ccff1ba8f213188f7e04c3
Author: Yinghua Wang <wantinghard gmail com>
Date:   Sat Mar 19 02:42:49 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  651 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 398 insertions(+), 253 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e167b40..69e5702 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,9 +9,9 @@ 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-11-27 01:23+0000\n"
-"PO-Revision-Date: 2009-11-29 11:03+0100\n"
-"Last-Translator: Tao Wei <weitao1979 gmail com>\n"
+"POT-Creation-Date: 2010-06-29 13:25+0000\n"
+"PO-Revision-Date: 2011-03-19 02:42+0000\n"
+"Last-Translator: Yinghua Wang <wantinghard 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"
@@ -31,12 +31,12 @@ msgid "Tomboy Applet Factory"
 msgstr "é?¿å¸?å°?ç¨?åº?å·¥å??"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:568
+#: ../Tomboy/Tray.cs:573
 msgid "Tomboy Notes"
 msgstr "��便笺"
 
 #: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
-#: ../Tomboy/Tray.cs:263
+#: ../Tomboy/Tray.cs:268
 msgid "S_ynchronize Notes"
 msgstr "å??步便笺(_Y)"
 
@@ -45,12 +45,12 @@ msgid "_About"
 msgstr "��(_A)"
 
 #: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:277
+#: ../Tomboy/Tray.cs:282
 msgid "_Help"
 msgstr "帮�(_H)"
 
 #: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:272
+#: ../Tomboy/Tray.cs:277
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
@@ -67,69 +67,73 @@ msgid "Accept SSL Certificates"
 msgstr "æ?¥å?? SSL è¯?书"
 
 #: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "å??å?°è?ªå?¨å??æ­¥è¶?æ?¶"
+
+#: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
 msgstr "å??建æ?°ä¾¿ç¬º"
 
-#: ../data/tomboy.schemas.in.h:3
+#: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "�����"
 
-#: ../data/tomboy.schemas.in.h:4
+#: ../data/tomboy.schemas.in.h:5
 msgid "Determines X coordinate of Search window; stored on Tomboy exit."
 msgstr "å?³å®?æ??ç´¢çª?å?£ç?? X å??æ ?ï¼? å½? Tomboy é??å?ºæ?¶ä¿?å­?ã??"
 
-#: ../data/tomboy.schemas.in.h:5
+#: ../data/tomboy.schemas.in.h:6
 msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
 msgstr "å?³å®?æ??ç´¢çª?å?£ç??·Y·å??æ ?ï¼?·å½?·Tomboy·é??å?ºæ?¶ä¿?å­?ã??"
 
-#: ../data/tomboy.schemas.in.h:6
+#: ../data/tomboy.schemas.in.h:7
 msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgstr "å?³å®?æ??ç´¢çª?å?£ç??å??ç´ é«?度ï¼?·å½?·Tomboy·é??å?ºæ?¶ä¿?å­?ã??"
 
-#: ../data/tomboy.schemas.in.h:7
+#: ../data/tomboy.schemas.in.h:8
 msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgstr "å?³å®?æ??ç´¢çª?å?£ç??å??ç´ å®½åº¦ï¼?·å½?·Tomboy·é??å?ºæ?¶ä¿?å­?ã??"
 
-#: ../data/tomboy.schemas.in.h:8
+#: ../data/tomboy.schemas.in.h:9
 msgid "Enable Auto bulleted lists."
 msgstr "å??许è?ªå?¨å??è¡¨æ ¼å¼?ã??"
 
-#: ../data/tomboy.schemas.in.h:9
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "å??许å?¨å?¾æ ?ä¸?å??å?»ä¸­é?®ç²?è´´ã??"
 
-#: ../data/tomboy.schemas.in.h:10
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "�� WikiWord �亮�示"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:12
 msgid "Enable closing notes with escape."
 msgstr "å??许ç?¨ Esc å?³é?­ä¾¿ç¬ºã??"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:13
 msgid "Enable custom font"
 msgstr "å??许è?ªå®?ä¹?å­?ä½?"
 
-#: ../data/tomboy.schemas.in.h:13
+#: ../data/tomboy.schemas.in.h:14
 msgid "Enable global keybindings"
 msgstr "å??许å?¨å±?æ??é?®ç»?å®?"
 
-#: ../data/tomboy.schemas.in.h:14
+#: ../data/tomboy.schemas.in.h:15
 msgid "Enable spellchecking"
 msgstr "å??许æ?¼å??æ£?æ?¥"
 
-#: ../data/tomboy.schemas.in.h:15
+#: ../data/tomboy.schemas.in.h:16
 msgid "Enable startup notes"
 msgstr "å??许å?¯å?¨ä¾¿ç¬º"
 
-#: ../data/tomboy.schemas.in.h:16
+#: ../data/tomboy.schemas.in.h:17
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 msgstr ""
 "å¦?æ??æ?¨å¸?æ??ç³»ç»?å½?æ?¨å?¨è¡?é¦?è¾?å?¥ - æ?? * æ?¶å°?æ??æ?¬è?ªå?¨è½¬æ?¢ä¸ºå??表ï¼?请å?¯ç?¨æ­¤é??项ã??"
 
-#: ../data/tomboy.schemas.in.h:17
+#: ../data/tomboy.schemas.in.h:18
 msgid ""
 "Enable this option if you want to be able to middle-click the Tomboy icon to "
 "paste timestamped content into the Start Here note."
@@ -137,45 +141,45 @@ msgstr ""
 "å¦?æ??æ?¨å¸?æ??ç?¨é¼ æ ?中é?®å??å?»é?¿å¸?å?¾æ ?æ?¶å°?带æ??æ?¶é?´æ?³ç??å??容ç²?è´´å?°â??ä»?è¿?é??å¼?å§?â??便笺ï¼?"
 "请å?¯ç?¨æ­¤é??项ã??"
 
-#: ../data/tomboy.schemas.in.h:18
+#: ../data/tomboy.schemas.in.h:19
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 msgstr "å?¯ç?¨æ­¤é??项å°?对 WikiWord è¿?æ ·ç??è¯?é«?亮æ?¾ç¤ºã??å??å?»å??è¯?å°?å??建该å??称ç??便笺ã??"
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE æ??è½½è¶?æ?¶ (ms)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "HTML 导å?ºé?¾æ?¥ç??å?¨é?¨ä¾¿ç¬º"
 
-#: ../data/tomboy.schemas.in.h:21
+#: ../data/tomboy.schemas.in.h:22
 msgid "HTML Export Last Directory"
 msgstr "HTML 导��个��"
 
-#: ../data/tomboy.schemas.in.h:22
+#: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export Linked Notes"
 msgstr "HTML 导å?ºé?¾æ?¥ç??便笺"
 
-#: ../data/tomboy.schemas.in.h:23
+#: ../data/tomboy.schemas.in.h:24
 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 为ç??ï¼?å?¨æ­¤è®¾å®?ç??å­?ä½?å??称å°?ç?¨ä½?æ?¾ç¤ºä¾¿ç¬ºæ?¶ç??å­?ä½?ã??"
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 msgstr "å¦?æ??å?¯ç?¨æ­¤é??项ï¼?é?¿å¸?é??å?ºæ?¶æ??å¼?ç??å?¨é?¨ä¾¿ç¬ºå°?ä¼?å?¨ä¸?次å?¯å?¨æ?¶è?ªå?¨é??æ?°æ??å¼?ã??"
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:26
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "å¦?æ??å?¯ç?¨æ­¤é??项ï¼?å??å?¯ç?¨ Esc é?®å?³é?­æ??å¼?ç??便笺ã??"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -183,7 +187,7 @@ msgstr ""
 "è?¥ä¸ºç??ï¼?å??æ?¼é??ç??å??è¯?å°?被å? 红è?²ä¸?å??线ï¼?è??正确ç??æ?¼å??建议å°?æ?¾ç¤ºå?¨å?³é?®å??å?»è??å??"
 "中ã??"
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -192,7 +196,7 @@ msgstr ""
 "è?¥ä¸ºç??ï¼?å°?å?¯ç?¨ /apps/tomboy/global_keybindings 中设å®?ç??æ¡?é?¢å?¨å±?æ??é?®ç»?å??ï¼?以便"
 "å??许å?¨ä»»ä½?åº?ç?¨ç¨?åº?中æ?§è¡?é?¿å¸?æ??ä½?ã??"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:29
 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."
@@ -200,19 +204,29 @@ msgstr ""
 "è?¥ä¸ºç??ï¼?å??å°?使ç?¨ custom_font_face 中设å®?ç??å­?ä½?å??称æ?¾ç¤ºä¾¿ç¬ºã??å?¦å??å°?使ç?¨é»?认ç??"
 "æ¡?é?¢å­?ä½?æ?¾ç¤ºä¾¿ç¬ºã??"
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 msgstr "表æ??置顶便笺导å?¥å?¨æ??件ä»?æ?ªè¿?è¡?è¿?ï¼?æ??以ä¸?次é?¿å¸?å?¯å?¨æ?¶ä¼?è?ªå?¨è¿?è¡?该æ??件ã??"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "å?³å®?å?¨é?¿å¸?便笺è??å??中æ?¾ç¤ºç??æ??å°?便笺æ?°ã??"
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:32
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+"æ­¤æ?´æ?°å?¼ä»£è¡¨æ?§è¡?å??å?°ä¾¿ç¬ºå??æ­¥ç??é¢?ç??(å½?é??ç½®äº?å??æ­¥)ã??ä»»ä½?å°?äº? 1 ç??å?¼è¡¨ç¤ºç¦?ç?¨å??"
+"æ­¥ã??å?¯æ?¥æ?¶ç??æ??å°?å?¼æ?¯ 5ã??æ?°å?¼ç??å??ä½?为å??é??ã??"
+
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -224,115 +238,133 @@ msgstr ""
 "å°?å?°å??é?¨æ??举é??ä¸?ã??0 代表ç?¨æ?·å¸?æ??å??ç??å?²çª?æ?¶å¾?å?°æ??示ï¼?以便å?¯ä»¥é??ä¸?å¤?ç??è¿?äº?å?²"
 "çª?ã??"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behavior when a note is renamed, instead of prompting "
+"the user. The values map to an internal enumeration. 0 indicates that the "
+"user wishes to be prompted when renaming a note may impact links that exist "
+"in other notes. 1 indicates that links should automatically be removed. 2 "
+"indicates that link text should be updated to the new note name so that it "
+"will continue linking to the renamed note."
+msgstr ""
+"æ­¤æ?´æ?°å?¼è¡¨ç¤ºé??å?½å??便笺æ?¶æ?¯å?¦æ?»æ?¯æ?´æ?°é?¾æ?¥ï¼?è??ä¸?æ?¯æ??示ç?¨æ?·ã??æ­¤å?¼å°?ä¼?æ? å°?å?°å??é?¨"
+"æ??举é??ä¸?ã??0 代表ç?¨æ?·å¸?æ??å?¨ç?±äº?é??å?½å??è??å?¯è?½å½±å??å?¶ä»?便笺ç??é?¾æ?¥æ?¶å¾?å?°æ??示ã??1 代"
+"表è?ªå?¨ç§»é?¤å??å½±å??ç??é?¾æ?¥ã??2 代表æ?´æ?°é?¾æ?¥æ??æ?¬ä»?è??继续é?¾æ?¥å?°æ?°å??å­?ç??便笺ã??"
+
+#: ../data/tomboy.schemas.in.h:35
+msgid "Link Updating Behavior on Note Rename"
+msgstr "å?¨ä¾¿ç¬ºç­¾å??æ?¶ç??é?¾æ?¥æ?´æ?°è¡?为"
+
+#: ../data/tomboy.schemas.in.h:36
 msgid "List of pinned notes."
 msgstr "å? é??便笺å??表ã??"
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:37
 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
+#: ../data/tomboy.schemas.in.h:38
 msgid "Maximum note title length to show in tray menu."
 msgstr "å?¨æ??ç??è??å??中æ?¾ç¤ºç??æ??大便笺æ ?é¢?é?¿åº¦ã??"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:39
 msgid "Minimum number of notes to show in menu"
 msgstr "è??å??中è¦?æ?¾ç¤ºç??æ??å°?便笺æ?°"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:40
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "便笺å??æ­¥å?²çª?ä¿?å­?è¡?为"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:41
 msgid "Open Recent Changes"
 msgstr "æ??å¼?æ??è¿?ç??æ?´æ?¹"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:42
 msgid "Open Search Dialog"
 msgstr "æ??å¼?æ??索对è¯?æ¡?"
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:43
 msgid "Open Start Here"
 msgstr "æ??å¼?â??ä»?è¿?é??å¼?å§?â??"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:44
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "SSH æ??å?¡å?¨å?° Tomboy å??æ­¥ç?®å½?ç??è·¯å¾? (å?¯é??)ã??"
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:45
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
 msgstr "使ç?¨æ??件系ç»?å??æ­¥æ??å?¡æ??件æ?¶ç??å??æ­¥æ??å?¡å?¨è·¯å¾?ã??"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:46
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "SSHFS è¿?ç¨?å??æ­¥æ??件夹"
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:47
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "SSHFS è¿?ç¨?å??æ­¥ç?¨æ?·å??"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:48
 msgid "SSHFS Synchronization Server Port"
 msgstr "SSHFS å??æ­¥æ??å?¡å?¨ç«¯å?£"
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:49
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS å??æ­¥æ??å?¡å?¨ URL"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:50
 msgid "Saved height of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£é«?度"
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:51
 msgid "Saved horizontal position of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£æ°´å¹³ä½?ç½®"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:52
 msgid "Saved vertical position of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£å??ç?´ä½?ç½®"
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:53
 msgid "Saved width of Search window"
 msgstr "ä¿?å­?ç??æ??ç´¢çª?å?£å®½åº¦"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:54
 msgid "Selected Synchronization Service Addin"
 msgstr "æ??é??ç??å??æ­¥æ??å?¡æ??件"
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:55
 msgid "Set to TRUE to activate"
 msgstr "设为 TRUE ��活"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:56
 msgid "Show applet menu"
 msgstr "æ?¾ç¤ºå°?ç¨?åº?è??å??"
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:57
 msgid "Start Here Note"
 msgstr "â??ä»?è¿?é??å¼?å§?â??便笺"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:58
 msgid "Sticky Note Importer First Run"
 msgstr "置顶便笺导���次��"
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Client ID"
 msgstr "å??步客æ?·ç«¯ ID"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:60
 msgid "Synchronization Local Server Path"
 msgstr "æ?¬å?°å??æ­¥æ??å?¡å?¨è·¯å¾?"
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:61
 msgid "The date format that is used for the timestamp."
 msgstr "ç?¨äº?æ?¶é?´æ?³ç??æ?¥æ??æ ¼å¼?ã??"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:62
 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 "
@@ -346,7 +378,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:63
 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 "
@@ -360,7 +392,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:64
 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 "
@@ -374,7 +406,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:65
 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 "
@@ -388,7 +420,7 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:66
 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 "
@@ -402,22 +434,22 @@ msgstr ""
 "å¦?â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ã??å¦?æ??å°?该é??项设置为ç?¹æ®?å­?符串â??disabledâ??ï¼?é?£ä¹?"
 "æ­¤æ??ä½?å°?没æ??æ??é?®ç»?å??ã??"
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:67
 msgid "The handler for \"note://\" URLs"
 msgstr "â??note://â?? ç±»å??ç½?å??ç??å¤?ç??å?¨"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:68
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr "使ç?¨å¯¼å?ºè?³ HTML æ??件导å?ºä¾¿ç¬ºæ?¶ä¸?次使ç?¨ç??ç?®å½?ã??"
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:69
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 msgstr "导å?ºå?° HTML æ??件中â??导å?ºé?¾æ?¥ç??便笺â??å¤?é??æ¡?ä¸?次ç??é??中ç?¶æ??ã??"
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:70
 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 "
@@ -427,7 +459,7 @@ msgstr ""
 "导å?ºè?³ HTML æ??件中â??å??å?«é?¾æ?¥ç??å?¨é?¨ä¾¿ç¬ºâ??ç??ä¸?次设置ã??此设置å°?ä¸?â??HTML 导å?ºé?¾æ?¥ç??"
 "便笺â??设置ç»?å??使ç?¨ï¼?ç?¨äº?æ??å®?å?¨å¯¼å?ºè?³ HTML æ?¶æ?¯å?¦åº?é??å½?å??å?«æ??æ¶?å??ç??å?¨é?¨ä¾¿ç¬ºã??"
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:71
 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 "
@@ -436,7 +468,7 @@ msgstr ""
 "åº?被è§?为â??ä»?è¿?é??å¼?å§?â??便笺ç?? URIï¼?å®?å°?æ?»æ?¾ç¤ºå?¨é?¿å¸?便笺è??å??ç??åº?端ï¼?并ä¸?å?¯ä»¥ç?¨å¿«"
 "æ?·é?®è®¿é?®ã??"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:72
 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."
@@ -444,44 +476,44 @@ msgstr ""
 "é??è¿? SSH è¿?æ?¥å??æ­¥æ??å?¡å?¨æ?¶ä½¿ç?¨ç??端å?£ã??å¦?æ??æ?³ä½¿ç?¨é»?认ç?? SSH 端å?£ï¼?é?£ä¹?设为 -1 "
 "æ??è??æ?´å°?ã??"
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:73
 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:70
+#: ../data/tomboy.schemas.in.h:74
 msgid "Timestamp format"
 msgstr "æ?¶é?´æ?³æ ¼å¼?"
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:75
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "å??å?« Tomboy·å??æ­¥ç?®å½?ç?? SSH·æ??å?¡å?¨ URLã??"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr "ç?®å??å·²é??ç½®ç??便笺å??æ­¥æ??å?¡æ??件ç??å?¯ä¸?æ ?è¯?符"
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:77
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
 msgstr "æ­¤é?¿å¸?客æ?·ç«¯ç??å?¯ä¸?æ ?è¯?符ï¼?ç?¨äº?ä¸?å??æ­¥æ??å?¡å?¨é??讯ã??"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:78
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr "使ç?¨Â·wdfs·é??项·\"-ac\"·让ç?¨æ?·æ?¥å??·SSL·è¯?书æ?¶ä¸?å?ºç?°æ??示信æ?¯ã??"
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:79
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr "é??è¿? SSH è¿?æ?¥å??æ­¥æ??å?¡å?¨æ?¶ä½¿ç?¨ç??ç?¨æ?·å??ã??"
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:80
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -523,7 +555,7 @@ msgstr "��(_C)"
 msgid "Close this window"
 msgstr "��此��"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:289
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:294
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
@@ -535,7 +567,7 @@ msgstr "é??å?ºé?¿å¸?"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "é?¿å¸?é¦?é??项"
 
@@ -674,24 +706,20 @@ msgstr "æ? æ³?æ??å¼?ç?µå­?é?®ä»¶"
 msgid "_Folder Path:"
 msgstr "æ??件夹路å¾?(_F)ï¼?"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:109
-msgid "_Browse..."
-msgstr "��(_B)..."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:128
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
 msgstr "é??æ?©å??æ­¥æ??件夹..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:156
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
 msgid "Folder path field is empty."
 msgstr "æ??件夹路å¾?为空ã??"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:165
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "ç?¹æ®?æ??件夹路å¾?ä¸?å­?å?¨ï¼?é?¿å¸?æ? æ³?å??建å®?ã??"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "æ?¬å?°æ??件夹"
 
@@ -715,7 +743,7 @@ msgstr "æ??å?¥æ?¶é?´æ?³"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:216 ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Applet.cs:227 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "M æ?? dd æ?¥ dddd h:mm tt"
 
@@ -771,14 +799,14 @@ msgstr "æ??å?°"
 msgid "Error printing note"
 msgstr "æ??å?°ä¾¿ç¬ºæ?¶å?ºé??"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:219
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
 #, 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:238
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "yyyy å¹´ MM æ?? dd æ?¥ dddd hh:mm:ss tt"
 
@@ -956,6 +984,27 @@ msgstr "å?¨æµ?è§?å?¨ä¸­è®¤è¯?(æ??ä¸?æ?¥é??ç½®è¿?æ?¥)"
 msgid "Set the default browser and try again"
 msgstr "设å®?é»?认æµ?è§?å?¨å¹¶é??è¯?"
 
+#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:83
+msgid "Search All Notes"
+msgstr "æ??ç´¢å?¨é?¨ä¾¿ç¬º"
+
+#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
+#. icons_path, (int)TomboyIcons.NewNotebook);
+#. if (new_notebook != null)
+#. object_collection.AddObject(new_notebook);
+#: ../Tomboy/JumpListManager.cs:87
+msgid "Create New Note"
+msgstr "å??建æ?°ä¾¿ç¬º"
+
+#: ../Tomboy/JumpListManager.cs:117
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (æ?°)"
+
+#: ../Tomboy/JumpListManager.cs:139
+msgid "Recent Notes"
+msgstr "æ??è¿?ç??便笺"
+
 #. Translators: This is the name of "Window" menu in the Mac menubar
 #: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
@@ -1043,7 +1092,7 @@ msgid "Delete the selected notebook"
 msgstr "å? é?¤é??中ç¬?è®°æ?¬"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:251
+#: ../Tomboy/RecentChanges.cs:259
 msgid "Notebooks"
 msgstr "�记�"
 
@@ -1083,48 +1132,48 @@ msgstr "�记�"
 msgid "_New notebook..."
 msgstr "�建�记�(_N)..."
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1566
 msgid "Really delete this note?"
 msgstr "ç??ç??è¦?å? é?¤æ­¤ä¾¿ç¬ºå??ï¼?"
 
-#: ../Tomboy/Note.cs:1452
+#: ../Tomboy/Note.cs:1569
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "ç??ç??è¦?å? é?¤ {0} 个便笺å??ï¼?"
 
-#: ../Tomboy/Note.cs:1463
+#: ../Tomboy/Note.cs:1580
 msgid "If you delete a note it is permanently lost."
 msgstr "å¦?æ??æ?¨å? é?¤äº?便笺ï¼?å?¶å??容å°?æ°¸ä¹?丢失ã??"
 
-#: ../Tomboy/Note.cs:1491
+#: ../Tomboy/Note.cs:1608
 #, 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 {0}. Error "
-"details can be found in {0}."
+"details can be found in {1}."
 msgstr ""
 "ä¿?å­?æ?¨ç??便笺æ?¶å??ç??äº?é??误ã??请æ£?æ?¥æ?¨æ?¯å?¦æ??足å¤?ç??ç£?ç??空é?´ï¼?以å??æ?¨å?¨ {0} æ?¯å?¦æ??足"
-"å¤?ç??æ??é??ã??é??误ç»?è??å?¯å?¨ {0} 中æ?¾å?°ã??"
+"å¤?ç??æ??é??ã??é??误ç»?è??å?¯å?¨ {1} 中æ?¾å?°ã??"
 
-#: ../Tomboy/Note.cs:1507
+#: ../Tomboy/Note.cs:1624
 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:208
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
 msgid "New Note Template"
 msgstr "�建便笺模�"
 
 #. Create migration notification note
 #. Translators: The title of the data migration note
-#: ../Tomboy/NoteManager.cs:111
+#: ../Tomboy/NoteManager.cs:147
 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
+#: ../Tomboy/NoteManager.cs:160
 #, csharp-format
 msgid ""
 "In the latest version of Tomboy, your note files have moved.  You have "
@@ -1149,8 +1198,24 @@ msgid ""
 "\n"
 "Ciao!"
 msgstr ""
+"å?¨æ??æ?°ç??æ?¬ç?? Tomboy 中ï¼?æ?¨ç??便笺æ??件ä½?置移å?¨äº?ã??æ?¨å?¯è?½ä»?æ?ªç??æ??è?ªå·±ç??便笺ä¿?å­?"
+"å?¨å?ªé??ï¼?å¦?æ??æ?¨ä¾?ç?¶ä¸?å?³å¿?ï¼?ç?´æ?¥ç»§ç»­å¹¶<bold>å? é?¤è¿?个便笺</bold> 好äº?ã?? :-)\n"
+"\n"
+"æ?¨ç??æ?§ä¾¿ç¬ºç?®å½?ä¾?ç?¶å®?好ï¼?å®?ä½?äº? <link:url>{0}</link:url>ã??å¦?æ??æ?¨ä½¿ç?¨æ?§ç??ç?? "
+"Tomboyï¼?å®?ä¼?å?¨é?£é??æ??索便笺ã??\n"
+"\n"
+"ä¸?è¿?ï¼?æ??们æ??æ?¨ç??便笺å??é??ç½®å¤?å?¶å?°äº?æ?°ç?®å½?中ï¼?ä»?æ­¤å°?转è??使ç?¨å®?们ï¼?\n"
+"\n"
+"<list><list-item dir=\"ltr\">便笺���� <link:url>{1}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">é??ç½®ä½?äº? <link:url>{2}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">��以�便笺��� <link:url>{3}</link:"
+"url>\n"
+"</list-item><list-item dir=\"ltr\">æ?¥å¿?æ??件ä¿?å­?å?¨ <link:url>{4}</link:url></"
+"list-item></list>\n"
+"\n"
+"谢谢使��"
 
-#: ../Tomboy/NoteManager.cs:222
+#: ../Tomboy/NoteManager.cs:265
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1185,7 +1250,7 @@ msgstr ""
 "æ?¯å?¦å·²ç»?注æ??å?°ï¼?æ??们æ¯?次è¾?å?¥<link:internal>å?¨é?¿å¸?中使ç?¨é?¾æ?¥</link:internal>ç??"
 "æ?¶å??ï¼?é?½ä¼?è?ªå?¨å? ä¸?å??线ï¼?å??å?»é?¾æ?¥å?³å?¯æ??å¼?该便笺ã??</note-content>"
 
-#: ../Tomboy/NoteManager.cs:241
+#: ../Tomboy/NoteManager.cs:284
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1213,25 +1278,85 @@ msgstr ""
 "</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:256 ../Tomboy/NoteManager.cs:324
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:368
 msgid "Start Here"
 msgstr "ä»?è¿?é??å¼?å§?"
 
-#: ../Tomboy/NoteManager.cs:261
+#: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
 msgstr "���中使���"
 
-#: ../Tomboy/NoteManager.cs:401
+#: ../Tomboy/NoteManager.cs:445
 #, 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:474 ../Tomboy/NoteManager.cs:566
+#: ../Tomboy/NoteManager.cs:518 ../Tomboy/NoteManager.cs:611
 msgid "Describe your new note here."
 msgstr "å?¨æ­¤æ??è¿°æ?¨ç??æ?°ä¾¿ç¬ºã??"
 
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "é??å?½å??便笺é?¾æ?¥ï¼?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "é??å?½å??é?¾æ?¥(_R)"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "ä¸?é??å?½å??é?¾æ?¥(_D)"
+
+#: ../Tomboy/NoteRenameDialog.cs:67
+#, csharp-format
+msgid ""
+"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" "
+"to \"<span underline=\"single\">{1}</span>\"?\n"
+"\n"
+"If you do not rename the links, they will no longer link to anything."
+msgstr ""
+"å°?å?¶ä»?便笺中ç??é?¾æ?¥ç?± \"<span underline=\"single\">{0}</span>\" é??å?½å??为 "
+"\"<span underline=\"single\">{1}</span>\"ï¼?\n"
+"\n"
+"å¦?æ??æ?¨ä¸?é??å?½å??è¿?äº?é?¾æ?¥ï¼?å®?们å°?ä¸?å??é?¾æ?¥å?°ä»»ä½?ä¸?西ã??"
+
+#: ../Tomboy/NoteRenameDialog.cs:81
+msgid "Rename Links"
+msgstr "é??å?½å??é?¾æ?¥"
+
+#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "便笺æ ?é¢?"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:116
+msgid "Select All"
+msgstr "å?¨é??"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:125
+msgid "Select None"
+msgstr "ä¸?é??"
+
+#: ../Tomboy/NoteRenameDialog.cs:142
+msgid "Ad_vanced"
+msgstr "�级(_V)"
+
+#: ../Tomboy/NoteRenameDialog.cs:145
+msgid "Always show this _window"
+msgstr "���示此��(_W)"
+
+#: ../Tomboy/NoteRenameDialog.cs:153
+msgid "Never rename _links"
+msgstr "æ?»ä¸?é??å?½å??è¿?æ?¥(_L)"
+
+#: ../Tomboy/NoteRenameDialog.cs:161
+msgid "Alwa_ys rename links"
+msgstr "æ?»æ?¯é??å?½å??é?¾æ?¥(_Y)"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "�此便笺中��"
@@ -1288,7 +1413,7 @@ msgstr "�此便笺�使�工�"
 msgid "Delete this note"
 msgstr "å? é?¤æ­¤ä¾¿ç¬º"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:161
+#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "å??步便笺"
 
@@ -1368,38 +1493,38 @@ msgstr "å??å°?å­?å?·"
 msgid "Bullets"
 msgstr "项�符�"
 
-#: ../Tomboy/PreferencesDialog.cs:78
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
 msgstr "ç¼?è¾?"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
 msgstr "ç?­é?®"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
 msgstr "å??æ­¥"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
 msgstr "æ·»å? 项"
 
-#: ../Tomboy/PreferencesDialog.cs:144
+#: ../Tomboy/PreferencesDialog.cs:173
 msgid "_Spell check while typing"
 msgstr "è¾?å?¥æ?¶æ£?æ?¥æ?¼å??(_S)"
 
-#: ../Tomboy/PreferencesDialog.cs:153
+#: ../Tomboy/PreferencesDialog.cs:182
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr "æ?¼é??ç??å??è¯?å°?以红è?²æ?¾ç¤ºï¼?è??çº æ­£æ?¼å??é??误ç??建议å°?æ?¾ç¤ºå?¨å?³é?®è??å??中ã??"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:164
+#: ../Tomboy/PreferencesDialog.cs:193
 msgid "Highlight _WikiWords"
 msgstr "å? 亮 _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:172
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1407,31 +1532,46 @@ msgstr ""
 "å?¯ç?¨æ­¤é??项å°?å? 亮类似 <b>WikiWords</b> ç??å??è¯?ã??å??å?»æ­¤å??è¯?å°?以该å??称å??建便笺ã??"
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:179
+#: ../Tomboy/PreferencesDialog.cs:208
 msgid "Enable auto-_bulleted lists"
 msgstr "å??许对å??表è?ªå?¨ç¼?å?·(_B)"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:188
+#: ../Tomboy/PreferencesDialog.cs:217
 msgid "Use custom _font"
 msgstr "使������(_F)"
 
-#: ../Tomboy/PreferencesDialog.cs:212
+#: ../Tomboy/PreferencesDialog.cs:235
+msgid "When renaming a linked note: "
+msgstr "å½?é??å?½å??ä¸?个被é?¾æ?¥ç??便笺æ?¶ï¼?"
+
+#: ../Tomboy/PreferencesDialog.cs:238
+msgid "Ask me what to do"
+msgstr "询é?®å??ä»?ä¹?"
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Never rename links"
+msgstr "æ?»ä¸?é??å?½å??é?¾æ?¥"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Always rename links"
+msgstr "æ?»æ?¯é??å?½å??é?¾æ?¥"
+
+#: ../Tomboy/PreferencesDialog.cs:260
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "å??建æ?°ç??便笺æ?¶ä½¿ç?¨æ?°ç??便笺模æ?¿æ?¥è®¾å®?åº?使ç?¨ç??æ??å­?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:221
+#: ../Tomboy/PreferencesDialog.cs:269
 msgid "Open New Note Template"
 msgstr "æ??å¼?æ?°ç??便笺模æ?¿"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:278
+#: ../Tomboy/PreferencesDialog.cs:326
 msgid "Listen for _Hotkeys"
 msgstr "ç??å?¬ç?­é?®(_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:287
+#: ../Tomboy/PreferencesDialog.cs:335
 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;"
@@ -1441,105 +1581,115 @@ msgstr ""
 "b>ï¼?<b>&lt;Alt&gt;N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:307
+#: ../Tomboy/PreferencesDialog.cs:355
 msgid "Show notes _menu"
 msgstr "æ?¾ç¤ºä¾¿ç¬ºè??å??(_M)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:324
+#: ../Tomboy/PreferencesDialog.cs:372
 msgid "Open \"_Start Here\""
 msgstr "æ??å¼?â??ä»?è¿?é??å¼?å§?â??(_S)"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:341
+#: ../Tomboy/PreferencesDialog.cs:389
 msgid "Create _new note"
 msgstr "å??建æ?°ä¾¿ç¬º(_N)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:358
+#: ../Tomboy/PreferencesDialog.cs:406
 msgid "Open \"Search _All Notes\""
 msgstr "æ??å¼?â??æ??ç´¢å?¨é?¨ä¾¿ç¬ºâ??(_A)"
 
-#: ../Tomboy/PreferencesDialog.cs:385
+#: ../Tomboy/PreferencesDialog.cs:433
 msgid "Ser_vice:"
 msgstr "æ??å?¡(_V)ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
+#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "ä¸?å?¯é??ç½®"
 
+#: ../Tomboy/PreferencesDialog.cs:512
+msgid "Automaticall_y Sync in Background Every"
+msgstr "è?ªå?¨å?¨å??å?°å??æ­¥(_Y)ï¼?æ¯?é??"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:518
+msgid "Minutes"
+msgstr "å??é??"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:458
+#: ../Tomboy/PreferencesDialog.cs:540
 msgid "_Advanced..."
 msgstr "�级(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:601
 msgid "The following add-ins are installed"
 msgstr "å·²å®?è£?以ä¸?æ·»å? 项"
 
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:622
 msgid "Get More Add-Ins..."
 msgstr "è?·å??æ?´å¤?æ??件..."
 
-#: ../Tomboy/PreferencesDialog.cs:566
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "��(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:572
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "��(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:703
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "����"
 
-#: ../Tomboy/PreferencesDialog.cs:717
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} é¦?é??项"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "é??æ?©ä¾¿ç¬ºå­?ä½?"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "å?¶å®?å??æ­¥é??项"
 
-#: ../Tomboy/PreferencesDialog.cs:906
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "å½?æ£?æµ?å?°æ?¬å?°ä¾¿ç¬ºå??æ??é??ç½®ç??å??æ­¥æ??å?¡å?¨ä¸?ç??便笺æ??å?²çª?æ?¶ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:913
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "é?®æ??该æ??ä¹?å??ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "é??å?½å??æ??ç??æ?¬å?°ä¾¿ç¬ºã??"
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "ç?¨æ??å?¡å?¨ä¸?ç??便笺æ?´æ?°æ??ç??æ?¬å?°ä¾¿ç¬ºã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "WARNING: Are you sure?"
 msgstr "è­¦å??ï¼?æ?¨ç¡®å®?å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1151
 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:1082
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "é??ç½®å??步设置"
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1548,105 +1698,101 @@ msgstr ""
 "æ?¨å·²å?³é?­æ??é??ç½®ç??å??æ­¥æ??å?¡ã??æ?¨ç??å??步设置ç?°å?¨å°?被æ¸?空ã??å½?æ?¨ä¿?å­?æ?°è®¾ç½®æ?¶å?¯è?½å??次"
 "被强å?¶å??æ­¥ä½ ç??æ??æ??便笺"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Success! You're connected!"
 msgstr "æ??å??ï¼?æ?¨å·²è¿?æ?¥ä¸?ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy å·²ç»?å??å¤?好å??æ­¥æ?¨ç??便笺ã??æ?¨æ?³è¦?ç?°å?¨å??æ­¥å®?们å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Sorry, but something went wrong.  Please check your information and try "
 "again.  The {0} might be useful too."
 msgstr "对ä¸?èµ·ï¼?å??ç??äº?é??误ã??请æ£?æ?¥æ?¨ç??ä¿¡æ?¯å¹¶é??è¯?ã??æ?¥ç?? {0} ä¹?许ä¼?æ??帮å?©ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1200
+#: ../Tomboy/PreferencesDialog.cs:1282
 msgid "Error connecting :("
 msgstr "è¿?æ?¥å?ºé?? :("
 
-#: ../Tomboy/PreferencesDialog.cs:1276
+#: ../Tomboy/PreferencesDialog.cs:1358
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1283
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1290
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Copyright:"
 msgstr "ç??æ??æ??æ??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1296
+#: ../Tomboy/PreferencesDialog.cs:1378
 msgid "Add-in Dependencies:"
 msgstr "æ??件ä¾?èµ?ï¼?"
 
-#: ../Tomboy/RecentChanges.cs:75
-msgid "Search All Notes"
-msgstr "æ??ç´¢å?¨é?¨ä¾¿ç¬º"
-
-#: ../Tomboy/RecentChanges.cs:90
+#: ../Tomboy/RecentChanges.cs:98
 msgid "_Search:"
 msgstr "æ??ç´¢(_S)ï¼?"
 
-#: ../Tomboy/RecentChanges.cs:319
+#: ../Tomboy/RecentChanges.cs:330
 msgid "Note"
 msgstr "便笺"
 
-#: ../Tomboy/RecentChanges.cs:341
+#: ../Tomboy/RecentChanges.cs:352
 msgid "Last Changed"
 msgstr "æ??è¿?æ?´æ?¹"
 
-#: ../Tomboy/RecentChanges.cs:472
+#: ../Tomboy/RecentChanges.cs:483
 msgid "Matches"
 msgstr "å?¹é??项"
 
-#: ../Tomboy/RecentChanges.cs:523
+#: ../Tomboy/RecentChanges.cs:534
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} 个å?¹é??项"
 
-#: ../Tomboy/RecentChanges.cs:537
+#: ../Tomboy/RecentChanges.cs:548
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "�计�{0} 个便笺"
 
-#: ../Tomboy/RecentChanges.cs:548
+#: ../Tomboy/RecentChanges.cs:559
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "å?¹é??ï¼?{0} 个便笺"
 
-#: ../Tomboy/RecentChanges.cs:680
+#: ../Tomboy/RecentChanges.cs:695
 msgid "Notes"
 msgstr "便笺"
 
-#: ../Tomboy/Tomboy.cs:248
+#: ../Tomboy/Tomboy.cs:266
 msgid "Cannot create new note"
 msgstr "æ? æ³?å??建æ?°ä¾¿ç¬º"
 
-#: ../Tomboy/Tomboy.cs:314
+#: ../Tomboy/Tomboy.cs:332
 msgid "Primary Development:"
 msgstr "é¦?席å¼?å??ï¼?"
 
-#: ../Tomboy/Tomboy.cs:320
+#: ../Tomboy/Tomboy.cs:338
 msgid "Contributors:"
 msgstr "è´¡ç?®è??ï¼?"
 
-#: ../Tomboy/Tomboy.cs:379
+#: ../Tomboy/Tomboy.cs:403
 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:388
+#: ../Tomboy/Tomboy.cs:412
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
@@ -1654,15 +1800,15 @@ msgstr ""
 "ç??æ??æ??æ?? © 2004-2007 Alex Graveley\n"
 "ç??æ??æ??æ?? ©·2004-2009·å?¶ä»?人\n"
 
-#: ../Tomboy/Tomboy.cs:390
+#: ../Tomboy/Tomboy.cs:414
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "ç®?å??æ??ç?¨ç??æ¡?é?¢é??æ??å¸?åº?ç?¨ç¨?åº?ã??"
 
-#: ../Tomboy/Tomboy.cs:400
+#: ../Tomboy/Tomboy.cs:424
 msgid "Homepage"
 msgstr "主页"
 
-#: ../Tomboy/Tomboy.cs:518
+#: ../Tomboy/Tomboy.cs:536
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
@@ -1672,7 +1818,7 @@ msgstr ""
 "ç??æ??æ??æ?? (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:530
+#: ../Tomboy/Tomboy.cs:548
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1686,7 +1832,7 @@ msgstr ""
 "  --note-path [è·¯å¾?]\t\tè£?å?¥/ä¿?å­?æ­¤ç?®å½?中ç??便笺æ?°æ?®ã??\n"
 "  --search [æ??æ?¬]\t\tæ??å¼?æ??ç´¢å?¨é?¨ä¾¿ç¬ºçª?å?£ï¼?并é¢?ç½®æ??ç´¢æ??æ?¬ã??\n"
 
-#: ../Tomboy/Tomboy.cs:540
+#: ../Tomboy/Tomboy.cs:558
 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"
@@ -1700,7 +1846,7 @@ msgstr ""
 "  --start-here\t\t\tæ?¾ç¤ºâ??ä»?è¿?é??å¼?å§?â??便笺ã??\n"
 "  --highlight-search [æ??æ?¬]\tå?¨æ??å¼?ç??便笺中æ??ç´¢çª?å?ºæ?¾ç¤ºç??æ??æ?¬ã??\n"
 
-#: ../Tomboy/Tomboy.cs:554
+#: ../Tomboy/Tomboy.cs:572
 #, csharp-format
 msgid "Version {0}"
 msgstr "{0} ç??æ?¬"
@@ -1709,92 +1855,92 @@ msgstr "{0} ç??æ?¬"
 msgid " (new)"
 msgstr " (æ?°)"
 
-#: ../Tomboy/Tray.cs:282
+#: ../Tomboy/Tray.cs:287
 msgid "_About Tomboy"
 msgstr "����(_A)"
 
-#: ../Tomboy/Utils.cs:142
+#: ../Tomboy/Utils.cs:143
 msgid ""
 "The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
 msgstr "æ?¾ä¸?å?°â??é?¿å¸?便笺æ??å??â??ã??请æ£?æ?¥æ?¨ç??å®?è£?æ?¯å?¦å·²æ??å??å®?æ??ã??"
 
-#: ../Tomboy/Utils.cs:151
+#: ../Tomboy/Utils.cs:152
 msgid "Help not found"
 msgstr "帮����"
 
-#: ../Tomboy/Utils.cs:167
+#: ../Tomboy/Utils.cs:168
 msgid "Cannot open location"
 msgstr "æ? æ³?æ??å¼?ä½?ç½®"
 
-#: ../Tomboy/Utils.cs:189
+#: ../Tomboy/Utils.cs:190
 #, csharp-format
 msgid "Today, {0}"
 msgstr "���{0}"
 
-#: ../Tomboy/Utils.cs:191
+#: ../Tomboy/Utils.cs:192
 msgid "Today"
 msgstr "ä»?æ?¥"
 
-#: ../Tomboy/Utils.cs:195
+#: ../Tomboy/Utils.cs:196
 #, csharp-format
 msgid "Yesterday, {0}"
 msgstr "�天�{0}"
 
-#: ../Tomboy/Utils.cs:197
+#: ../Tomboy/Utils.cs:198
 msgid "Yesterday"
 msgstr "�天"
 
-#: ../Tomboy/Utils.cs:202
+#: ../Tomboy/Utils.cs:203
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
 msgstr[0] "{0} 天å??ï¼?{1}"
 
-#: ../Tomboy/Utils.cs:206
+#: ../Tomboy/Utils.cs:207
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
 msgstr[0] "{0} 天å??"
 
-#: ../Tomboy/Utils.cs:212
+#: ../Tomboy/Utils.cs:213
 #, csharp-format
 msgid "Tomorrow, {0}"
 msgstr "æ??天ï¼?{0}"
 
-#: ../Tomboy/Utils.cs:214
+#: ../Tomboy/Utils.cs:215
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../Tomboy/Utils.cs:219
+#: ../Tomboy/Utils.cs:220
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
 msgstr[0] "{0} 天å??ï¼?{1}"
 
-#: ../Tomboy/Utils.cs:223
+#: ../Tomboy/Utils.cs:224
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
 msgstr[0] "{0} 天å??"
 
-#: ../Tomboy/Utils.cs:228
+#: ../Tomboy/Utils.cs:229
 msgid "MMMM d, h:mm tt"
 msgstr "M æ?? d æ?¥ï¼?h:mm tt"
 
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "M æ?? d æ?¥"
 
-#: ../Tomboy/Utils.cs:231
+#: ../Tomboy/Utils.cs:232
 msgid "No Date"
 msgstr "没æ??æ?¥æ??"
 
-#: ../Tomboy/Utils.cs:234
+#: ../Tomboy/Utils.cs:235
 msgid "MMMM d yyyy, h:mm tt"
 msgstr "yyyy å¹´ M æ?? d æ?¥ï¼?h:mm tt"
 
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:236
 msgid "MMMM d yyyy"
 msgstr "yyyy å¹´ M æ?? d æ?¥"
 
@@ -1803,22 +1949,22 @@ msgstr "yyyy å¹´ M æ?? d æ?¥"
 msgid "(Untitled {0})"
 msgstr "(æ? æ ?é¢? {0})"
 
-#: ../Tomboy/Watchers.cs:188
+#: ../Tomboy/Watchers.cs:189
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
 "for this note before continuing."
 msgstr "å·²ç»?å­?å?¨æ ?é¢?为 <b>{0}</b> ç??便笺ã??请å?¨ç»§ç»­å??为此便笺é??æ?©å?¦å¤?ç??å??称ã??"
 
-#: ../Tomboy/Watchers.cs:203
+#: ../Tomboy/Watchers.cs:204
 msgid "Note title taken"
 msgstr "便笺æ ?é¢?已被使ç?¨"
 
-#: ../Tomboy/Watchers.cs:548
+#: ../Tomboy/Watchers.cs:549
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
-#: ../Tomboy/Watchers.cs:553
+#: ../Tomboy/Watchers.cs:554
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
@@ -1858,200 +2004,196 @@ msgstr "è¿?æ?¥å?°æ??å®?æ??å?¡å?¨æ?¶å?ºé??ï¼?"
 msgid "Details"
 msgstr "ç»?è??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:119
-msgid "Note Title"
-msgstr "便笺æ ?é¢?"
-
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:241
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
 msgid "Acquiring sync lock..."
 msgstr "æ­£å?¨è¯·æ±?å??æ­¥é??..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:244
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "æ­£å?¨æ??交æ?´æ?¹..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "å??步便笺"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "æ­£å?¨å??æ­¥æ?¨ç??便笺..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:249
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "è¿?å?¯è?½é??è¦?è?±ä¸?äº?æ?¶é?´ï¼?请ç¨?å??ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:251
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "æ­£å?¨è¿?æ?¥å?°æ??å?¡å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:257
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "æ­£å?¨ä»?æ??å?¡å?¨å? é?¤ä¾¿ç¬º..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:261
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "æ­£å?¨ä¸?è½½æ?°ç??/å·²æ?´æ?°ç??便笺..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "æ??å?¡å?¨å·²é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "æ??å?¡å?¨å·²è¢«é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:275
+#: ../Tomboy/Synchronization/SyncDialog.cs:270
 msgid ""
 "One of your other computers is currently synchronizing.  Please wait 2 "
 "minutes and try again."
 msgstr "æ?¨ç??å?¶å®?ç?µè??æ­£å?¨å??步中ã??请ç­?2å??é??å??é??è¯?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:279
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "æ­£å?¨å??å¤?ä»?æ??å?¡å?¨ä¸?è½½æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:282
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "æ­£å?¨å??å¤?å??æ??å?¡å?¨ä¸?ä¼ æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:285
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "æ­£å?¨å??æ??å?¡å?¨ä¸?ä¼ æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "å??步失败"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "å??步失败"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:290
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "æ? æ³?å??步便笺ã??请æ£?æ?¥ä»¥ä¸?ç»?è??并é??è¯?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "å??æ­¥å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:297
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "å??步已å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:299
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "å·²æ?´æ?° {0} 个便笺ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:304
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "æ?¨ç??便笺已ç»?æ?¯æ??æ?°ç??äº?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "å??步已å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "å??步已被å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:310
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "æ?¨å??æ¶?äº?å??æ­¥ã??æ?¨ç?°å?¨å?¯ä»¥å?³é?­çª?å?£ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "å??æ­¥æ?ªé??ç½®"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "å??æ­¥å°?æ?ªé??置好"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:316
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "请å?¨é¦?é??项对è¯?æ¡?中é??ç½®å??æ­¥ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "å??æ­¥æ??å?¡å?¨å?ºé??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "æ??å?¡é??误"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:322
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "è¿?æ?¥å?°å??æ­¥æ??å?¡å?ºé??ã??请é??è¯?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:339
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "å·²ä»?æ?¬å?°å? é?¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:342
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "å·²ä»?æ??å?¡å?¨å? é?¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:345
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "已��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:348
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "已添å? "
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:351
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "å·²å°?æ?´æ?¹ä¸?ä¼ å?°æ??å?¡å?¨"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:354
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "å·²å°?æ?°ä¾¿ç¬ºä¸?ä¼ å?°æ??å?¡å?¨"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:502
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "便笺��"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:508
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (æ?§)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:547
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "é??å?½å??æ?¬å?°ä¾¿ç¬ºï¼?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:553
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "æ?´æ?°å¼?ç?¨ä¾¿ç¬ºä¸­ç??é?¾æ?¥"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:560
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "è¦?ç??æ?¬å?°ä¾¿ç¬º"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:564
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "æ?»æ?¯æ?§è¡?è¿?ä¸?æ??ä½?"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:570
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "���便笺��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:571
+#: ../Tomboy/Synchronization/SyncDialog.cs:565
 #, csharp-format
 msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 msgstr "â??{0}â??ç??æ??å?¡å?¨ç??æ?¬ä¸?æ?¨ç??æ?¬å?°ä¾¿ç¬ºå?²çª?ã??æ?¨å¸?æ??å¦?ä½?å¤?ç??æ?¨ç??æ?¬å?°ä¾¿ç¬ºï¼?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:159
+#: ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "_Tools"
 msgstr "工�(_T)"
 
@@ -2085,3 +2227,6 @@ msgstr ""
 "\n"
 "为äº?é?¿å??å°?æ?¥å¼¹å?ºè¿?个æ¶?æ?¯ï¼?æ?¨åº?该å?¨å?¯å?¨æ?¶å? è½½ FUSE ã??æ·»å? â??modprobe fuseâ??å?° /"
 "etc/init.d/boot.local æ??è??â??fuseâ??å?° /etc/modules ã??"
+
+#~ msgid "_Browse..."
+#~ msgstr "��(_B)..."