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



commit 8fa0ae28d2faaba4d24679f2ddf24d4798910ebf
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Feb 16 19:18:29 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  655 +++++++++++++++++++++++++++++++++-------------------------
 po/zh_TW.po |  666 ++++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 762 insertions(+), 559 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b592015..75e80ae 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,10 +8,10 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: tomboy 1.0.0\n"
+"Project-Id-Version: tomboy 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-19 20:54+0800\n"
-"PO-Revision-Date: 2009-09-19 20:55+0800\n"
+"POT-Creation-Date: 2010-02-16 19:17+0800\n"
+"PO-Revision-Date: 2010-02-16 19:18+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -34,21 +34,26 @@ msgid "Tomboy Applet Factory"
 msgstr "Tomboy ����工廠"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:563
+#: ../Tomboy/Tray.cs:568
 msgid "Tomboy Notes"
 msgstr "Tomboy ��"
 
-#: ../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:272
+#: ../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:267
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:272
 msgid "_Preferences"
 msgstr "å??好設å®?(_P)"
 
@@ -65,143 +70,155 @@ 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 "å??ç?¨ä»¥ escape é??é??ç­?è¨?ã??"
 
-#: ../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."
 msgstr "å??ç?¨æ­¤é?¸é ?è?½ä»¥æ»?鼠中é?µé»?é?¸ Tomboy å??示æ??æ?¼å??å§?é ?é?¢è²¼ä¸?æ??å?»æ?³è¨?ã??"
 
-#: ../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 "å??ç?¨é??å??é?¸é ?å?¯ä»¥å? å¼·é¡¯ç¤ºå?? <b>ThatLookLikeThis</b> é??種å°?å?©å??æ??以ä¸?è?±æ??å­?å??ä½µç??å­?ã??é»?é?¸é??å??å­?å°±æ??å? ä¸?é ?æ?°ç­?è¨?ï¼?以é??å??å­?å?½å??ã??"
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE æ??è¼?é?¾æ?? (毫ç§?)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "å?¯å?ºæ??æ??é?£çµ?ç??ç­?è¨?é ?"
 
-#: ../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 "å?¯å?ºæ??é?£çµ?ç??ç­?è¨?é ?"
 
-#: ../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 設å®?é?µç?º trueï¼?顯示ç­?è¨?æ??æ??使ç?¨é??è£?設å®?ç??å­?å??ã??"
 
-#: ../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 "å¦?æ??å??ç?¨ï¼?æ??æ??å?¨ Tomboy é??é??æ??ä»?ç?¶é??å??ç??ç­?è¨?æ??å?¨ä¸?次å??å??æ??è?ªå??é??æ?°é??å??ã??"
 
-#: ../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 "å¦?æ??å??ç?¨ï¼?å?¯ä»¥æ??ä¸? escape é?µä¾?é??é??é??å??ç??ç­?è¨?ã??"
 
-#: ../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."
 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 "
 "available from any application."
 msgstr "å¦?æ??æ?¯ trueï¼?å?¨ /apps/tomboy/global_keybindings 中設å®?ç??æ¡?é?¢æ??é?µçµ?å??å°±æ??å??ç?¨ï¼?é??樣ç?¡è«?å?¨ä»»ä½?ç¨?å¼?中é?½å?¯ä»¥é?¨æ??使ç?¨ Tomboyã??"
 
-#: ../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."
 msgstr "å¦?æ??æ?¯ trueï¼?æ??使ç?¨å?¨ 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 "é??è£?表示å?¯å?¥è??ã??便æ¢?ã??ç??å¤?æ??ç¨?å¼?æ?ªå?·è¡?é??ï¼?ä¸?次å??å?? Tomboy æ??æ??è?ªå??å?·è¡?該å¤?æ??ç¨?å¼?ã??"
 
-#: ../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 "決å®?å?¨ Tomboy ç­?è¨?é?¸å?®ä¸­é¡¯ç¤ºæ??å°?ç­?è¨?æ?¸ç??æ?´æ?¸å?¼ã??"
 
-#: ../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 "
@@ -210,115 +227,130 @@ msgid ""
 "conflict situation on a case-by-case basis."
 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 å??æ­¥å??伺æ??å?¨ç¶²å??"
 
-#: ../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 "
@@ -328,7 +360,7 @@ msgid ""
 "for this action."
 msgstr "é??å??æ?¯ç?¢ç??å??顯示æ?°ç­?è¨?æ??使ç?¨ç??æ??é?µçµ?å??ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å­?串æ??æ?¯æ¯?è¼?寬é¬?ç??ï¼?å??許使ç?¨å¤§å¯«æ??å°?寫ï¼?ä¹?å??許使ç?¨å??â??&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 "
@@ -338,7 +370,7 @@ msgid ""
 "action."
 msgstr "é??å??æ?¯é??å??ã??èµ·å§?é ?é?¢ã??æ??使ç?¨ç??æ??é?µçµ?å??ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å­?串æ??æ?¯æ¯?è¼?寬é¬?ç??ï¼?å??許使ç?¨å¤§å¯«æ??å°?寫ï¼?ä¹?å??許使ç?¨å??â??&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 "
@@ -348,7 +380,7 @@ msgid ""
 "action."
 msgstr "é??å??æ?¯é??å??æ??å°?ç­?è¨?å°?話æ?¹å¡?æ??使ç?¨ç??æ??é?µçµ?å??ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å­?串æ??æ?¯æ¯?è¼?寬é¬?ç??ï¼?å??許使ç?¨å¤§å¯«æ??å°?寫ï¼?ä¹?å??許使ç?¨å??â??&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 "
@@ -358,7 +390,7 @@ msgid ""
 "for this action."
 msgstr "é??å??æ?¯é¡¯ç¤ºæ??è¿?æ?´æ?¹ç´?é??æ??使ç?¨ç??æ??é?µçµ?å??ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å­?串æ??æ?¯æ¯?è¼?寬é¬?ç??ï¼?å??許使ç?¨å¤§å¯«æ??å°?寫ï¼?ä¹?å??許使ç?¨å??â??&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 "
@@ -368,22 +400,22 @@ msgid ""
 "action."
 msgstr "é??å??æ?¯é¡¯ç¤º Tomboy ç??é?¢æ?¿ç¨?å¼?é?¸å?®æ??使ç?¨ç??æ??é?µçµ?å??ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å­?串æ??æ?¯æ¯?è¼?寬é¬?ç??ï¼?å??許使ç?¨å¤§å¯«æ??å°?寫ï¼?ä¹?å??許使ç?¨å??â??&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://â?? é¡?å?? URL ç??è??ç??ç¨?å¼?"
 
-#: ../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ã??å¤?æ??ç¨?å¼?æ??å¾?ä¸?次å°?ç­?è¨?å?¯å?ºæ??ç?º 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 "
@@ -391,56 +423,56 @@ msgid ""
 "recursively) should be included during an export to HTML."
 msgstr "å?¨å?¯å?º 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 "
 "accessible by hotkey."
 msgstr "ä½?ç?ºã??èµ·å§?é ?é?¢ã??ç??ç­?è¨? URIï¼?å®?å°?被æ?¾ç½®å?¨ Tomboy ç­?è¨?é?¸å?®ç??åº?é?¨ï¼?並ä¸?å?¯ä»¥ä½¿ç?¨å¿«é??é?µä¾?æ??ä½?å®?ã??"
 
-#: ../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."
 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 伺æ??å?¨ç¶²å??"
 
-#: ../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 "é??å?? Tomboy 客æ?¶ç«¯ç?¨ç?¹è­?å?¥ç¬¦ï¼?ç?¨æ?¼å??æ­¥å??伺æ??å?¨ç??æº?é??ã??"
 
-#: ../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."
@@ -482,7 +514,7 @@ msgstr "é??é??(_C)"
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:284
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:289
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
@@ -494,7 +526,7 @@ msgstr "çµ?æ?? Tomboy"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "Tomboy å??好設å®?"
 
@@ -526,10 +558,6 @@ msgstr "æ??å°?æ??æ??ç­?è¨?(_S)"
 msgid "Open the Search All Notes window"
 msgstr "é??å??æ??å°?æ??æ??ç­?è¨?è¦?çª?"
 
-#: ../Tomboy/ActionManager.cs:179 ../Tomboy/Tray.cs:258
-msgid "S_ynchronize Notes"
-msgstr "å??æ­¥ç­?è¨?(_Y)"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "é??å§?å??æ­¥ç­?è¨?"
@@ -637,24 +665,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 ç?¡æ³?建ç«?å®?ã??"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "æ?¬å?°ç«¯è³?æ??夾"
 
@@ -678,7 +702,7 @@ msgstr "æ??å?¥æ??å?»æ?³è¨?"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Applet.cs:221 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "MMMM dæ?¥ (dddd) h:mm tt"
 
@@ -880,7 +904,7 @@ msgstr "已��"
 
 #. Translators: The web service supporting Tomboy WebSync is not responding as expected
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
 msgid "Server not responding. Try again later."
 msgstr "伺æ??å?¨æ²?æ??å??æ??ã??è«?ç¨?å¾?å??試ã??"
@@ -906,18 +930,18 @@ 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:228
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
+#: ../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:236
+#: ../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:214
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "��(_W)"
 
@@ -1042,45 +1066,46 @@ msgstr "��簿"
 msgid "_New notebook..."
 msgstr "����簿(_N)..."
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1569
 msgid "Really delete this note?"
 msgstr "確å®?è¦?å?ªé?¤é??å??ç­?è¨?ï¼?"
 
-#: ../Tomboy/Note.cs:1452
+#: ../Tomboy/Note.cs:1572
 #, 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:1583
 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:1611
+#, 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."
-msgstr "ç?¶å?²å­?ä½ ç??ç­?è¨?æ??ç?¼ç??é?¯èª¤ã??è«?檢æ?¥æ?¯å?¦æ??足夠ç??ç£?ç¢?空é??ï¼?並ä¸?å?¨ ~/.tomboy æ??é?©ç?¶ç??æ¬?é??ã??é?¯èª¤ç??詳細è³?è¨?å?¯ä»¥å?¨ ~/.tomboy.log 中æ?¾å?°ã??"
+"sufficient disk space, and that you have appropriate rights on {0}. Error "
+"details can be found in {0}."
+msgstr "ç?¶å?²å­?ä½ ç??ç­?è¨?æ??ç?¼ç??é?¯èª¤ã??è«?檢æ?¥æ?¯å?¦æ??足夠ç??ç£?ç¢?空é??ï¼?並ä¸?å?¨ {0} æ??é?©ç?¶ç??æ¬?é??ã??é?¯èª¤ç??詳細è³?è¨?å?¯ä»¥å?¨ {0} 中æ?¾å?°ã??"
+
+#: ../Tomboy/Note.cs:1627
+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 "
@@ -1118,7 +1143,7 @@ msgstr ""
 "\n"
 "å??è¦?ï¼?"
 
-#: ../Tomboy/NoteManager.cs:222
+#: ../Tomboy/NoteManager.cs:259
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1150,7 +1175,7 @@ msgstr ""
 "\n"
 "æ??å??å·²ç¶?建ç«?ä¸?å??å??ç?º <link:internal>å?¨ Tomboy 中使ç?¨é?£çµ?</link:internal>ç??ç­?è¨?ã??注æ??å?°ç?¶æ??å??輸å?¥ <link:internal>å?¨ Tomboy 中使ç?¨é?£çµ?</link:internal> æ??å®?æ??è?ªå??å? ä¸?åº?ç·?å??ï¼?æ??ä¸?該é?£çµ?å°±å?¯ä»¥é??å??ç­?è¨?ã??</note-content>"
 
-#: ../Tomboy/NoteManager.cs:241
+#: ../Tomboy/NoteManager.cs:278
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1174,25 +1199,82 @@ msgstr ""
 "é??æ??ï¼?å¦?æ??å?¨ç?®å??ç??ç­?è¨?中輸å?¥å?¶ä»?ç­?è¨?ç??å??稱ï¼?ä¹?æ??è?ªå??ç?ºä½ å»ºç«?é?£çµ?ã??</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:256 ../Tomboy/NoteManager.cs:324
+#: ../Tomboy/NoteManager.cs:293 ../Tomboy/NoteManager.cs:361
 msgid "Start Here"
 msgstr "起���"
 
-#: ../Tomboy/NoteManager.cs:261
+#: ../Tomboy/NoteManager.cs:298
 msgid "Using Links in Tomboy"
 msgstr "� Tomboy 中使���"
 
-#: ../Tomboy/NoteManager.cs:401
+#: ../Tomboy/NoteManager.cs:438
 #, 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:511 ../Tomboy/NoteManager.cs:603
 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 "�����"
+
+#: ../Tomboy/NoteRenameDialog.cs:115
+msgid "Select All"
+msgstr "å?¨é?¨é?¸å??"
+
+#: ../Tomboy/NoteRenameDialog.cs:123
+msgid "Select None"
+msgstr "ä¸?é?¸å??"
+
+#: ../Tomboy/NoteRenameDialog.cs:140
+msgid "Ad_vanced"
+msgstr "é?²é??(_V)"
+
+#: ../Tomboy/NoteRenameDialog.cs:143
+msgid "Always show this _window"
+msgstr "æ°¸é? é¡¯ç¤ºé??å??è¦?çª?(_W)"
+
+#: ../Tomboy/NoteRenameDialog.cs:151
+msgid "Never rename _links"
+msgstr "æ°¸ä¸?é??æ?°å?½å??é?£çµ?(_L)"
+
+#: ../Tomboy/NoteRenameDialog.cs:159
+msgid "Alwa_ys rename links"
+msgstr "æ°¸é? é??æ?°å?½å??é?£çµ?(_Y)"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "å?¨é??å??ç­?è¨?中å°?æ?¾"
@@ -1249,7 +1331,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 "å??æ­¥ç­?è¨?"
 
@@ -1329,69 +1411,84 @@ 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 "� _WikiWord �強顯示"
 
-#: ../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."
 msgstr "å??ç?¨é??å??é?¸é ?ä¾?å? å¼·é¡¯ç¤ºå?? <b>ThatLookLikeThis</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;"
@@ -1399,143 +1496,154 @@ msgid ""
 msgstr "å¿«é??é?µå??許你å¾?ä»»ä½?å?°æ?¹ä»¥æ??é?µçµ?å??å¿«é??å­?å??ç­?è¨?é ?ï¼?ä¾?å¦? <b>&lt;Control&gt;&lt;Shift&gt;F11</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:1114
 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:541
 msgid "_Advanced..."
 msgstr "é?²é??(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "å·²å®?è£?ä¸?å??é??å? å??件"
 
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "å??å¾?æ?´å¤?é??å? å??件..."
 
-#: ../Tomboy/PreferencesDialog.cs:566
+#: ../Tomboy/PreferencesDialog.cs:649
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:572
+#: ../Tomboy/PreferencesDialog.cs:655
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:703
+#: ../Tomboy/PreferencesDialog.cs:786
 msgid "Not Implemented"
 msgstr "�實�"
 
-#: ../Tomboy/PreferencesDialog.cs:717
+#: ../Tomboy/PreferencesDialog.cs:800
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} å??好設å®?"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:939
 msgid "Choose Note Font"
 msgstr "é?¸æ??å­?å??"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:983
 msgid "Other Synchronization Options"
 msgstr "å?¶ä»?å??æ­¥å??é?¸é ?"
 
-#: ../Tomboy/PreferencesDialog.cs:906
+#: ../Tomboy/PreferencesDialog.cs:989
 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:996
 msgid "Always ask me what to do."
 msgstr "æ°¸é? è©¢å??æ??è¦?æ??麼å??ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:1000
 msgid "Rename my local note."
 msgstr "é??æ?°å?½å??æ??ç??æ?¬å?°ç«¯ç­?è¨?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1004
 msgid "Replace my local note with the server's update."
 msgstr "以該伺æ??å?¨ç??æ?´æ?°å??代æ??ç??æ?¬å?°ç«¯ç­?è¨?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1150
 msgid "WARNING: Are you sure?"
 msgstr "è­¦å??ï¼?你確å®?å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1152
 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:1165
 msgid "Resetting Synchronization Settings"
 msgstr "é??æ?°è¨­å®?å??æ­¥å??設å®?å?¼"
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#: ../Tomboy/PreferencesDialog.cs:1167
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
 "synchronize all of your notes again when you save new settings"
 msgstr "ä½ å·²ç¶?å??ç?¨è¨­å®?ç??å??æ­¥å??æ??å??ã??ç?¾å?¨å°?建ç«?ä½ ç??å??æ­¥å??設å®?å?¼ã??ã??ç?¶ä½ å?²å­?æ?°ç??設å®?å?¼æ??å?¯è?½è¢«å¼·è¿«è¦?å??次å??æ­¥æ??æ??ç??ç­?è¨?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1245
 msgid "Success! You're connected!"
 msgstr "æ??å??ï¼?ä½ å·²ç¶?é?£ç·?ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1247
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy å·²æº?å??好å??步你ç??ç­?è¨?ã??æ?¯å?¦è¦?ç«?å?»å??æ­¥å®?å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#: ../Tomboy/PreferencesDialog.cs:1270
+#, 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:1196
+#: ../Tomboy/PreferencesDialog.cs:1283
 msgid "Error connecting :("
 msgstr "���誤 :("
 
-#: ../Tomboy/PreferencesDialog.cs:1272
+#: ../Tomboy/PreferencesDialog.cs:1359
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../Tomboy/PreferencesDialog.cs:1279
+#: ../Tomboy/PreferencesDialog.cs:1366
 msgid "Author:"
 msgstr "ä½?è??:"
 
-#: ../Tomboy/PreferencesDialog.cs:1286
+#: ../Tomboy/PreferencesDialog.cs:1373
 msgid "Copyright:"
 msgstr "ç??æ¬?:"
 
-#: ../Tomboy/PreferencesDialog.cs:1292
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Add-in Dependencies:"
 msgstr "é??å? å??件ç?¸æ ¹æ??æ?§:"
 
@@ -1581,19 +1689,19 @@ msgstr[0] "符å??æ?¸ï¼?{0} é ?ç­?è¨?"
 msgid "Notes"
 msgstr "��"
 
-#: ../Tomboy/Tomboy.cs:244
+#: ../Tomboy/Tomboy.cs:266
 msgid "Cannot create new note"
 msgstr "��建�����"
 
-#: ../Tomboy/Tomboy.cs:310
+#: ../Tomboy/Tomboy.cs:332
 msgid "Primary Development:"
 msgstr "主è¦?é??ç?¼è??ï¼?"
 
-#: ../Tomboy/Tomboy.cs:316
+#: ../Tomboy/Tomboy.cs:338
 msgid "Contributors:"
 msgstr "è²¢ç?»è??ï¼?"
 
-#: ../Tomboy/Tomboy.cs:375
+#: ../Tomboy/Tomboy.cs:400
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -1605,7 +1713,7 @@ msgstr ""
 "Youchen Lee <copyleft ubuntu org tw>, 2005\n"
 "BlueT <BlueT Ubuntu org tw>, 2005"
 
-#: ../Tomboy/Tomboy.cs:384
+#: ../Tomboy/Tomboy.cs:409
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
@@ -1613,15 +1721,15 @@ msgstr ""
 "ç??æ¬?æ??æ?? © 2004-2007 Alex Graveley\n"
 "ç??æ¬?æ??æ?? © 2004-2009 å?¶ä»?人士\n"
 
-#: ../Tomboy/Tomboy.cs:386
+#: ../Tomboy/Tomboy.cs:411
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "ä¸?款簡å?®æ??ç?¨ç??æ¡?é?¢ç­?è¨?è»?件ã??"
 
-#: ../Tomboy/Tomboy.cs:396
+#: ../Tomboy/Tomboy.cs:421
 msgid "Homepage"
 msgstr "��"
 
-#: ../Tomboy/Tomboy.cs:514
+#: ../Tomboy/Tomboy.cs:533
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
@@ -1631,7 +1739,7 @@ msgstr ""
 "ç??æ¬?æ??æ?? (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:526
+#: ../Tomboy/Tomboy.cs:545
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1645,7 +1753,7 @@ msgstr ""
 "  --note-path [path]\t\tå?¨æ­¤ç?®é??è¼?å?¥æ??å?²å­?ç­?è¨?è³?æ??\n"
 "  --search [text]\t\t以è¦?æ??å°?ç??æ??å­?é??å??æ??å°?æ??æ??ç­?è¨?è¦?çª?ã??\n"
 
-#: ../Tomboy/Tomboy.cs:537
+#: ../Tomboy/Tomboy.cs:555
 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"
@@ -1659,121 +1767,101 @@ msgstr ""
 "\t--start-here\t\t\t顯示ã??èµ·å§?é ?é?¢ã??ç­?è¨?é ?\n"
 "\t--highlight-search [text]\tæ??å°?ç­?è¨?並å?¨å?¶ä¸?å? å¼·é¡¯ç¤ºæ??å®?æ??å­?\n"
 
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:554
-msgid "D-BUS remote control disabled.\n"
-msgstr "é??é?? D-BUS é? ç«¯æ?§å?¶å??è?½ã??\n"
-
-#: ../Tomboy/Tomboy.cs:562
+#: ../Tomboy/Tomboy.cs:569
 #, csharp-format
 msgid "Version {0}"
 msgstr "{0} ç??æ?¬"
 
-#: ../Tomboy/Tomboy.cs:635
-#, csharp-format
-msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-msgstr ""
-"Tomboy������ '{0}'\n"
-"è«?å??試å?·è¡?â??tomboy --helpâ??å??å¾?æ?´å¤?è³?è¨?ã??\n"
-"D-BUS é? ç«¯æ?§å?¶å??è?½æ²?æ??é??å??ã??"
-
-#: ../Tomboy/Tray.cs:63
+#: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (æ?°)"
 
-#: ../Tomboy/Tray.cs:277
+#: ../Tomboy/Tray.cs:282
 msgid "_About Tomboy"
 msgstr "é??æ?¼ _Tomboy"
 
-#: ../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 ç­?è¨?使ç?¨æ??å??ã??ã??è«?檢æ?¥ä½ ç??å®?è£?é??ç¨?æ?¯å?¦æ­£ç¢ºç??çµ?æ??ã??"
 
-#: ../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 æ?? dd æ?¥ï¼?h:mm tt"
 
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "MMMM 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å¹´ MMMM dæ?¥"
 
@@ -1782,22 +1870,22 @@ msgstr "yyyyå¹´ MMMM 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)"
 
@@ -1833,204 +1921,200 @@ 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
-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:236
 msgid "Acquiring sync lock..."
 msgstr "æ­£å?¨å??å¾?å??æ­¥é??å®?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "æ­£å?¨æ??交æ?´æ?¹..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "æ­£å?¨å??æ­¥ç­?è¨?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "æ­£å?¨å??步你ç??ç­?è¨?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "é??å?¯è?½æ??è?±é»?æ??é??ï¼?è«?æ?¾è¼?é¬?好好享å??ï¼?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:250
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "æ­£å?¨é?£ç·?è?³ä¼ºæ??å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "æ­£è?ªä¼ºæ??å?¨å?ªé?¤ç­?è¨?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:260
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "æ­£å?¨ä¸?è¼?æ?°ç??/æ?´æ?°ç­?è¨?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:272
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "伺æ??å?¨å·²é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "伺æ??å?¨å·²è¢«é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
+#: ../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:278
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "æ­£å?¨æº?å??è?ªä¼ºæ??å?¨ä¸?è¼?æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:281
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "æ­£å?¨æº?å??ä¸?å?³æ?´æ?°è?³ä¼ºæ??å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "æ­£å?¨ä¸?å?³ç­?è¨?å?°ä¼ºæ??å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:287
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "å??æ­¥å??失æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "å??æ­¥å??失æ??äº?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "ç?¡æ³?å??æ­¥ç­?è¨?ã??è«?檢æ?¥ä¸?å??詳細è³?è¨?並å??試ä¸?次ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:295
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "å??æ­¥å??å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "å??æ­¥å??å·²ç¶?å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:298
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "{0} å??ç­?è¨?å·²æ?´æ?°ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "ä½ ç??ç­?è¨?å·²æ?¯æ??æ?°ç??ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:307
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "å??æ­¥å??å·²å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "å??æ­¥å??已被å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "ä½ å·²ç¶?å??æ¶?äº?å??æ­¥å??ã??ç?¾å?¨å?¯ä»¥é??é??è¦?çª?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:313
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "å??æ­¥å??æ?ªè¨­å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "å??æ­¥å??å°?æ?ªè¨­å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "è«?å?¨å??好設å®?å°?話ç??中設å®?å??æ­¥å??ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:319
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "å??æ­¥å??æ??å??é?¯èª¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "æ??å??é?¯èª¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "é?£ç·?è?³å??æ­¥å??æ??å??æ??ç?¼ç??é?¯èª¤ã??è«?å??試ä¸?次ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:338
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "���端��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:341
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "è?ªä¼ºæ??å?¨å?ªé?¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:344
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "已��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:347
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "已��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:350
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "ä¸?å?³è?³ä¼ºæ??å?¨ç??æ?´æ?¹"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:353
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "ä¸?å?³è?³ä¼ºæ??å?¨ç??æ?°ç­?è¨?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:501
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "ç­?è¨?ç?¼ç??è¡?çª?"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:507
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (è??)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:546
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "é??æ?°å?½å??æ?¬å?°ç«¯ç­?è¨?ï¼?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:552
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "æ?´æ?°å??ç?§ç­?è¨?中ç??é?£çµ?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:559
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "è¦?è??æ?¬å?°ç«¯ç­?è¨?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:563
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "æ°¸é? é?²è¡?é??å??å??ä½?"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:569
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "已�測�����"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:570
+#: ../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)"
 
@@ -2064,6 +2148,21 @@ msgstr ""
 "\n"
 "ä¸?å¸?æ??æ?ªä¾?å??ç??å?°é??å??æ??示ï¼?ä½ æ??該å?¨å??å??æ??è¼?å?¥ FUSEã??è«?å?¨ /etc/init.d/boot.local å? å?¥ã??modprobe fuseã??æ??å?¨ /etc/modules å? å?¥ã??fuseã??ã??"
 
+#~ msgid "_Browse..."
+#~ msgstr "ç??覽(_B)..."
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "é??é?? D-BUS é? ç«¯æ?§å?¶å??è?½ã??\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy������ '{0}'\n"
+#~ "è«?å??試å?·è¡?â??tomboy --helpâ??å??å¾?æ?´å¤?è³?è¨?ã??\n"
+#~ "D-BUS é? ç«¯æ?§å?¶å??è?½æ²?æ??é??å??ã??"
+
 #~ msgid "Click Here After Authorizing"
 #~ msgstr "é©?è­?å¾?è«?æ??é??裡"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 16c8bc3..f77c49d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,10 +8,10 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: tomboy 1.0.0\n"
+"Project-Id-Version: tomboy 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-19 20:54+0800\n"
-"PO-Revision-Date: 2009-09-15 20:57+0800\n"
+"POT-Creation-Date: 2010-02-16 19:17+0800\n"
+"PO-Revision-Date: 2010-02-16 14:57+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
@@ -34,21 +34,26 @@ msgid "Tomboy Applet Factory"
 msgstr "Tomboy ����工廠"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:563
+#: ../Tomboy/Tray.cs:568
 msgid "Tomboy Notes"
 msgstr "Tomboy ��"
 
-#: ../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:272
+#: ../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:267
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:272
 msgid "_Preferences"
 msgstr "å??好設å®?(_P)"
 
@@ -65,74 +70,78 @@ 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 "å??ç?¨ä»¥ escape é??é??ç­?è¨?ã??"
 
-#: ../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."
 msgstr "å??ç?¨æ­¤é?¸é ?è?½ä»¥æ»?鼠中é?µé»?é?¸ Tomboy å??示æ??æ?¼å??å§?é ?é?¢è²¼ä¸?æ??å?»æ?³è¨?ã??"
 
-#: ../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."
@@ -140,48 +149,48 @@ msgstr ""
 "å??ç?¨é??å??é?¸é ?å?¯ä»¥å? å¼·é¡¯ç¤ºå?? <b>ThatLookLikeThis</b> é??種å°?å?©å??æ??以ä¸?è?±æ??å­?å??ä½µ"
 "ç??å­?ã??é»?é?¸é??å??å­?å°±æ??å? ä¸?é ?æ?°ç­?è¨?ï¼?以é??å??å­?å?½å??ã??"
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE æ??è¼?é?¾æ?? (毫ç§?)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "å?¯å?ºæ??æ??é?£çµ?ç??ç­?è¨?é ?"
 
-#: ../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 "å?¯å?ºæ??é?£çµ?ç??ç­?è¨?é ?"
 
-#: ../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 設å®?é?µç?º trueï¼?顯示ç­?è¨?æ??æ??使ç?¨é??裡設å®?ç??å­?å??ã??"
 
-#: ../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 ""
 "å¦?æ??å??ç?¨ï¼?æ??æ??å?¨ Tomboy é??é??æ??ä»?ç?¶é??å??ç??ç­?è¨?æ??å?¨ä¸?次å??å??æ??è?ªå??é??æ?°é??å??ã??"
 
-#: ../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 "å¦?æ??å??ç?¨ï¼?å?¯ä»¥æ??ä¸? escape é?µä¾?é??é??é??å??ç??ç­?è¨?ã??"
 
-#: ../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."
 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 "
@@ -190,7 +199,7 @@ msgstr ""
 "å¦?æ??æ?¯ trueï¼?å?¨ /apps/tomboy/global_keybindings 中設å®?ç??æ¡?é?¢æ??é?µçµ?å??å°±æ??å??"
 "ç?¨ï¼?é??樣ç?¡è«?å?¨ä»»ä½?ç¨?å¼?中é?½å?¯ä»¥é?¨æ??使ç?¨ Tomboyã??"
 
-#: ../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."
@@ -198,7 +207,7 @@ msgstr ""
 "å¦?æ??æ?¯ trueï¼?æ??使ç?¨å?¨ 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."
@@ -206,13 +215,23 @@ msgstr ""
 "é??裡表示å?¯å?¥è??ã??便æ¢?ã??ç??å¤?æ??ç¨?å¼?æ?ªå?·è¡?é??ï¼?ä¸?次å??å?? Tomboy æ??æ??è?ªå??å?·è¡?該å¤?æ??"
 "ç¨?å¼?ã??"
 
-#: ../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 "決å®?å?¨ Tomboy ç­?è¨?é?¸å?®ä¸­é¡¯ç¤ºæ??å°?ç­?è¨?æ?¸ç??æ?´æ?¸å?¼ã??"
 
-#: ../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 +243,134 @@ 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 å??æ­¥å??伺æ??å?¨ç¶²å??"
 
-#: ../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 +384,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 +398,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 +412,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 +426,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 +440,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://â?? é¡?å?? URL ç??è??ç??ç¨?å¼?"
 
-#: ../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ã??å¤?æ??ç¨?å¼?æ??å¾?ä¸?次å°?ç­?è¨?å?¯å?ºæ??ç?º 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 "
@@ -428,7 +466,7 @@ msgstr ""
 "ç?¨ä¾?é??å??â??å?¯å?ºæ??é?£çµ?ç??ç­?è¨?é ?â??設å®?å?¼ï¼?å®?å?¯ä»¥æ??å®?å?¨å?¯å?ºç­?è¨?é ?æ??æ?¯å?¦æ??å??å?«æ??æ??ç??"
 "ç­?è¨?ã??"
 
-#: ../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 "
@@ -437,7 +475,7 @@ msgstr ""
 "ä½?ç?ºã??èµ·å§?é ?é?¢ã??ç??ç­?è¨? URIï¼?å®?å°?被æ?¾ç½®å?¨ Tomboy ç­?è¨?é?¸å?®ç??åº?é?¨ï¼?並ä¸?å?¯ä»¥ä½¿ç?¨"
 "å¿«é??é?µä¾?æ??ä½?å®?ã??"
 
-#: ../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."
@@ -445,43 +483,43 @@ 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 伺æ??å?¨ç¶²å??"
 
-#: ../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 "é??å?? Tomboy 客æ?¶ç«¯ç?¨ç?¹è­?å?¥ç¬¦ï¼?ç?¨æ?¼å??æ­¥å??伺æ??å?¨ç??æº?é??ã??"
 
-#: ../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 +561,7 @@ msgstr "é??é??(_C)"
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:284
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:289
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
@@ -535,7 +573,7 @@ msgstr "çµ?æ?? Tomboy"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "Tomboy å??好設å®?"
 
@@ -567,10 +605,6 @@ msgstr "æ??å°?æ??æ??ç­?è¨?(_S)"
 msgid "Open the Search All Notes window"
 msgstr "é??å??æ??å°?æ??æ??ç­?è¨?è¦?çª?"
 
-#: ../Tomboy/ActionManager.cs:179 ../Tomboy/Tray.cs:258
-msgid "S_ynchronize Notes"
-msgstr "å??æ­¥ç­?è¨?(_Y)"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "é??å§?å??æ­¥ç­?è¨?"
@@ -680,24 +714,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 ç?¡æ³?建ç«?å®?ã??"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "æ?¬å?°ç«¯è³?æ??夾"
 
@@ -721,7 +751,7 @@ msgstr "æ??å?¥æ??å?»æ?³è¨?"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Applet.cs:221 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "MMMM dæ?¥ (dddd) h:mm tt"
 
@@ -927,7 +957,7 @@ msgstr "已��"
 
 #. Translators: The web service supporting Tomboy WebSync is not responding as expected
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:157
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
 msgid "Server not responding. Try again later."
 msgstr "伺æ??å?¨æ²?æ??å??æ??ã??è«?ç¨?å¾?å??試ã??"
@@ -953,18 +983,18 @@ 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:228
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:240
+#: ../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:236
+#: ../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:214
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "��(_W)"
 
@@ -1091,47 +1121,48 @@ msgstr "��簿"
 msgid "_New notebook..."
 msgstr "����簿(_N)..."
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1569
 msgid "Really delete this note?"
 msgstr "確å®?è¦?å?ªé?¤é??å??ç­?è¨?ï¼?"
 
-#: ../Tomboy/Note.cs:1452
+#: ../Tomboy/Note.cs:1572
 #, 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:1583
 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:1611
+#, 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:1627
+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 "
@@ -1173,7 +1204,7 @@ msgstr ""
 "\n"
 "å??è¦?ï¼?"
 
-#: ../Tomboy/NoteManager.cs:222
+#: ../Tomboy/NoteManager.cs:259
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1208,7 +1239,7 @@ msgstr ""
 "è¨?ã??注æ??å?°ç?¶æ??å??輸å?¥ <link:internal>å?¨ Tomboy 中使ç?¨é?£çµ?</link:internal> æ??å®?"
 "æ??è?ªå??å? ä¸?åº?ç·?å??ï¼?æ??ä¸?該é?£çµ?å°±å?¯ä»¥é??å??ç­?è¨?ã??</note-content>"
 
-#: ../Tomboy/NoteManager.cs:241
+#: ../Tomboy/NoteManager.cs:278
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1236,25 +1267,83 @@ msgstr ""
 "content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:256 ../Tomboy/NoteManager.cs:324
+#: ../Tomboy/NoteManager.cs:293 ../Tomboy/NoteManager.cs:361
 msgid "Start Here"
 msgstr "起���"
 
-#: ../Tomboy/NoteManager.cs:261
+#: ../Tomboy/NoteManager.cs:298
 msgid "Using Links in Tomboy"
 msgstr "� Tomboy 中使���"
 
-#: ../Tomboy/NoteManager.cs:401
+#: ../Tomboy/NoteManager.cs:438
 #, 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:511 ../Tomboy/NoteManager.cs:603
 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 "�����"
+
+#: ../Tomboy/NoteRenameDialog.cs:115
+msgid "Select All"
+msgstr "å?¨é?¨é?¸å??"
+
+#: ../Tomboy/NoteRenameDialog.cs:123
+msgid "Select None"
+msgstr "ä¸?é?¸å??"
+
+#: ../Tomboy/NoteRenameDialog.cs:140
+msgid "Ad_vanced"
+msgstr "é?²é??(_V)"
+
+#: ../Tomboy/NoteRenameDialog.cs:143
+msgid "Always show this _window"
+msgstr "æ°¸é? é¡¯ç¤ºé??å??è¦?çª?(_W)"
+
+#: ../Tomboy/NoteRenameDialog.cs:151
+msgid "Never rename _links"
+msgstr "æ°¸ä¸?é??æ?°å?½å??é?£çµ?(_L)"
+
+#: ../Tomboy/NoteRenameDialog.cs:159
+msgid "Alwa_ys rename links"
+msgstr "æ°¸é? é??æ?°å?½å??é?£çµ?(_Y)"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "å?¨é??å??ç­?è¨?中å°?æ?¾"
@@ -1311,7 +1400,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 "å??æ­¥ç­?è¨?"
 
@@ -1391,27 +1480,27 @@ 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."
@@ -1419,11 +1508,11 @@ msgstr ""
 "æ?¼å­?æ??é?¯èª¤ç??å?°æ?¹æ??被å??ä¸?ç´?è?²åº?ç·?ï¼?å?¨ä¸?é?¢æ??ä¸?æ»?é¼ å?³é?µæ??å°?å?ºç?¾æ­£ç¢ºæ?¼å­?ç??建議ã??"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:164
+#: ../Tomboy/PreferencesDialog.cs:193
 msgid "Highlight _WikiWords"
 msgstr "� _WikiWord �強顯示"
 
-#: ../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."
@@ -1432,31 +1521,46 @@ msgstr ""
 "å­?ã??é»?é?¸é??å??å­?å°±æ??å? ä¸?é ?æ?°ç­?è¨?ï¼?以é??å??å­?å?½å??ã??"
 
 #. 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;"
@@ -1466,105 +1570,115 @@ msgstr ""
 "Shift&gt;F11</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:1114
 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:541
 msgid "_Advanced..."
 msgstr "é?²é??(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "å·²å®?è£?ä¸?å??é??å? å??件"
 
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "å??å¾?æ?´å¤?é??å? å??件..."
 
-#: ../Tomboy/PreferencesDialog.cs:566
+#: ../Tomboy/PreferencesDialog.cs:649
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:572
+#: ../Tomboy/PreferencesDialog.cs:655
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:703
+#: ../Tomboy/PreferencesDialog.cs:786
 msgid "Not Implemented"
 msgstr "�實�"
 
-#: ../Tomboy/PreferencesDialog.cs:717
+#: ../Tomboy/PreferencesDialog.cs:800
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} å??好設å®?"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:939
 msgid "Choose Note Font"
 msgstr "é?¸æ??å­?å??"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:983
 msgid "Other Synchronization Options"
 msgstr "å?¶ä»?å??æ­¥å??é?¸é ?"
 
-#: ../Tomboy/PreferencesDialog.cs:906
+#: ../Tomboy/PreferencesDialog.cs:989
 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:996
 msgid "Always ask me what to do."
 msgstr "æ°¸é? è©¢å??æ??è¦?æ??麼å??ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:1000
 msgid "Rename my local note."
 msgstr "é??æ?°å?½å??æ??ç??æ?¬å?°ç«¯ç­?è¨?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1004
 msgid "Replace my local note with the server's update."
 msgstr "以該伺æ??å?¨ç??æ?´æ?°å??代æ??ç??æ?¬å?°ç«¯ç­?è¨?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1150
 msgid "WARNING: Are you sure?"
 msgstr "è­¦å??ï¼?æ?¨ç¢ºå®?å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1152
 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:1165
 msgid "Resetting Synchronization Settings"
 msgstr "é??æ?°è¨­å®?å??æ­¥å??設å®?å?¼"
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#: ../Tomboy/PreferencesDialog.cs:1167
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1573,41 +1687,40 @@ msgstr ""
 "æ?¨å·²ç¶?å??ç?¨è¨­å®?ç??å??æ­¥å??æ??å??ã??ç?¾å?¨å°?建ç«?æ?¨ç??å??æ­¥å??設å®?å?¼ã??ã??ç?¶æ?¨å?²å­?æ?°ç??設å®?å?¼"
 "æ??å?¯è?½è¢«å¼·è¿«è¦?å??次å??æ­¥æ??æ??ç??ç­?è¨?ã??"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1245
 msgid "Success! You're connected!"
 msgstr "æ??å??ï¼?æ?¨å·²ç¶?é?£ç·?ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1247
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy å·²æº?å??好å??æ­¥æ?¨ç??ç­?è¨?ã??æ?¯å?¦è¦?ç«?å?»å??æ­¥å®?å??ï¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#: ../Tomboy/PreferencesDialog.cs:1270
+#, 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:1196
+#: ../Tomboy/PreferencesDialog.cs:1283
 msgid "Error connecting :("
 msgstr "���誤 :("
 
-#: ../Tomboy/PreferencesDialog.cs:1272
+#: ../Tomboy/PreferencesDialog.cs:1359
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../Tomboy/PreferencesDialog.cs:1279
+#: ../Tomboy/PreferencesDialog.cs:1366
 msgid "Author:"
 msgstr "ä½?è??:"
 
-#: ../Tomboy/PreferencesDialog.cs:1286
+#: ../Tomboy/PreferencesDialog.cs:1373
 msgid "Copyright:"
 msgstr "ç??æ¬?:"
 
-#: ../Tomboy/PreferencesDialog.cs:1292
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Add-in Dependencies:"
 msgstr "é??å? å??件ç?¸ä¾?æ?§:"
 
@@ -1653,19 +1766,19 @@ msgstr[0] "符å??æ?¸ï¼?{0} é ?ç­?è¨?"
 msgid "Notes"
 msgstr "��"
 
-#: ../Tomboy/Tomboy.cs:244
+#: ../Tomboy/Tomboy.cs:266
 msgid "Cannot create new note"
 msgstr "��建�����"
 
-#: ../Tomboy/Tomboy.cs:310
+#: ../Tomboy/Tomboy.cs:332
 msgid "Primary Development:"
 msgstr "主è¦?é??ç?¼è??ï¼?"
 
-#: ../Tomboy/Tomboy.cs:316
+#: ../Tomboy/Tomboy.cs:338
 msgid "Contributors:"
 msgstr "è²¢ç?»è??ï¼?"
 
-#: ../Tomboy/Tomboy.cs:375
+#: ../Tomboy/Tomboy.cs:400
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -1677,7 +1790,7 @@ msgstr ""
 "Youchen Lee <copyleft ubuntu org tw>, 2005\n"
 "BlueT <BlueT Ubuntu org tw>, 2005"
 
-#: ../Tomboy/Tomboy.cs:384
+#: ../Tomboy/Tomboy.cs:409
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
@@ -1685,15 +1798,15 @@ msgstr ""
 "ç??æ¬?æ??æ?? © 2004-2007 Alex Graveley\n"
 "ç??æ¬?æ??æ?? © 2004-2009 å?¶ä»?人士\n"
 
-#: ../Tomboy/Tomboy.cs:386
+#: ../Tomboy/Tomboy.cs:411
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "ä¸?款簡å?®æ??ç?¨ç??æ¡?é?¢ç­?è¨?è»?é«?ã??"
 
-#: ../Tomboy/Tomboy.cs:396
+#: ../Tomboy/Tomboy.cs:421
 msgid "Homepage"
 msgstr "��"
 
-#: ../Tomboy/Tomboy.cs:514
+#: ../Tomboy/Tomboy.cs:533
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
@@ -1703,7 +1816,7 @@ msgstr ""
 "ç??æ¬?æ??æ?? (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:526
+#: ../Tomboy/Tomboy.cs:545
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1717,7 +1830,7 @@ msgstr ""
 "  --note-path [path]\t\tå?¨æ­¤ç?®é??è¼?å?¥æ??å?²å­?ç­?è¨?è³?æ??\n"
 "  --search [text]\t\t以è¦?æ??å°?ç??æ??å­?é??å??æ??å°?æ??æ??ç­?è¨?è¦?çª?ã??\n"
 
-#: ../Tomboy/Tomboy.cs:537
+#: ../Tomboy/Tomboy.cs:555
 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"
@@ -1731,121 +1844,101 @@ msgstr ""
 "\t--start-here\t\t\t顯示ã??èµ·å§?é ?é?¢ã??ç­?è¨?é ?\n"
 "\t--highlight-search [text]\tæ??å°?ç­?è¨?並å?¨å?¶ä¸?å? å¼·é¡¯ç¤ºæ??å®?æ??å­?\n"
 
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:554
-msgid "D-BUS remote control disabled.\n"
-msgstr "é??é?? D-BUS é? ç«¯æ?§å?¶å??è?½ã??\n"
-
-#: ../Tomboy/Tomboy.cs:562
+#: ../Tomboy/Tomboy.cs:569
 #, csharp-format
 msgid "Version {0}"
 msgstr "{0} ç??æ?¬"
 
-#: ../Tomboy/Tomboy.cs:635
-#, csharp-format
-msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-msgstr ""
-"Tomboy������ '{0}'\n"
-"è«?å??試å?·è¡?â??tomboy --helpâ??å??å¾?æ?´å¤?è³?è¨?ã??\n"
-"D-BUS é? ç«¯æ?§å?¶å??è?½æ²?æ??é??å??ã??"
-
-#: ../Tomboy/Tray.cs:63
+#: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (æ?°)"
 
-#: ../Tomboy/Tray.cs:277
+#: ../Tomboy/Tray.cs:282
 msgid "_About Tomboy"
 msgstr "é??æ?¼ _Tomboy"
 
-#: ../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 ç­?è¨?使ç?¨æ??å??ã??ã??è«?檢æ?¥æ?¨ç??å®?è£?é??ç¨?æ?¯å?¦æ­£ç¢ºç??çµ?æ??ã??"
 
-#: ../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 æ?? dd æ?¥ï¼?h:mm tt"
 
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "MMMM 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å¹´ MMMM dæ?¥"
 
@@ -1854,7 +1947,7 @@ msgstr "yyyyå¹´ MMMM 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 "
@@ -1862,15 +1955,15 @@ msgid ""
 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)"
 
@@ -1907,204 +2000,200 @@ 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
-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:236
 msgid "Acquiring sync lock..."
 msgstr "æ­£å?¨å??å¾?å??æ­¥é??å®?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "æ­£å?¨æ??交è®?æ?´..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "æ­£å?¨å??æ­¥ç­?è¨?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "æ­£å?¨å??æ­¥æ?¨ç??ç­?è¨?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "é??å?¯è?½æ??è?±é»?æ??é??ï¼?è«?æ?¾è¼?é¬?好好享å??ï¼?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:250
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "æ­£å?¨é?£ç·?è?³ä¼ºæ??å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "æ­£è?ªä¼ºæ??å?¨å?ªé?¤ç­?è¨?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:260
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "æ­£å?¨ä¸?è¼?æ?°ç??/æ?´æ?°ç­?è¨?..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:272
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "伺æ??å?¨å·²é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "伺æ??å?¨å·²è¢«é??å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
+#: ../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:278
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "æ­£å?¨æº?å??è?ªä¼ºæ??å?¨ä¸?è¼?æ?´æ?°..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:281
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "æ­£å?¨æº?å??ä¸?è¼?æ?´æ?°è?³ä¼ºæ??å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "æ­£å?¨ä¸?è¼?ç­?è¨?å?°ä¼ºæ??å?¨..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:287
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "å??æ­¥å??失æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "å??æ­¥å??失æ??äº?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "ç?¡æ³?å??æ­¥ç­?è¨?ã??è«?檢æ?¥ä¸?å??詳細è³?è¨?並å??試ä¸?次ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:295
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "å??æ­¥å??å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "å??æ­¥å??å·²ç¶?å®?æ??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:298
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "{0} å??ç­?è¨?å·²æ?´æ?°ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "æ?¨ç??ç­?è¨?å·²æ?¯æ??æ?°ç??ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:307
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "å??æ­¥å??å·²å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "å??æ­¥å??已被å??æ¶?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "æ?¨å·²ç¶?å??æ¶?äº?å??æ­¥å??ã??ç?¾å?¨å?¯ä»¥é??é??è¦?çª?ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:313
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "å??æ­¥å??æ?ªè¨­å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "å??æ­¥å??å°?æ?ªè¨­å®?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "è«?å?¨å??好設å®?å°?話ç??中設å®?å??æ­¥å??ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:319
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "å??æ­¥å??æ??å??é?¯èª¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "æ??å??é?¯èª¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "é?£ç·?è?³å??æ­¥å??æ??å??æ??ç?¼ç??é?¯èª¤ã??è«?å??試ä¸?次ã??"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:338
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "���端��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:341
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "è?ªä¼ºæ??å?¨å?ªé?¤"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:344
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "已��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:347
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "已��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:350
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "ä¸?è¼?è?³ä¼ºæ??å?¨ç??è®?æ?´"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:353
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "ä¸?è¼?è?³ä¼ºæ??å?¨ç??æ?°ç­?è¨?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:501
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "ç­?è¨?ç?¼ç??è¡?çª?"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:507
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (è??)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:546
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "é??æ?°å?½å??æ?¬å?°ç«¯ç­?è¨?ï¼?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:552
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "æ?´æ?°å??ç?§ç­?è¨?中ç??é?£çµ?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:559
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "è¦?è??æ?¬å?°ç«¯ç­?è¨?"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:563
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "æ°¸é? é?²è¡?é??å??å??ä½?"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:569
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "已�測�����"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:570
+#: ../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)"
 
@@ -2139,6 +2228,21 @@ msgstr ""
 "ä¸?å¸?æ??æ?ªä¾?å??ç??å?°é??å??æ??示ï¼?æ?¨æ??該å?¨å??å??æ??è¼?å?¥ FUSEã??è«?å?¨ /etc/init.d/boot."
 "local å? å?¥ã??modprobe fuseã??æ??å?¨ /etc/modules å? å?¥ã??fuseã??ã??"
 
+#~ msgid "_Browse..."
+#~ msgstr "ç??覽(_B)..."
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "é??é?? D-BUS é? ç«¯æ?§å?¶å??è?½ã??\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy������ '{0}'\n"
+#~ "è«?å??試å?·è¡?â??tomboy --helpâ??å??å¾?æ?´å¤?è³?è¨?ã??\n"
+#~ "D-BUS é? ç«¯æ?§å?¶å??è?½æ²?æ??é??å??ã??"
+
 #~ msgid "Click Here After Authorizing"
 #~ msgstr "é©?è­?å¾?è«?æ??é??裡"
 



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