[tomboy] Update Chinese (Simplified) translation

[Ray Wang <raywang src gnome org>]

commit c27a91725a055a2dac1dacd36002dcac9e31c76c
Author: Ray Wang <raywang gnome org>
Date:   Tue Jul 5 10:33:25 2011 +0800

    Update Chinese (Simplified) translation

 po/zh_CN.po |  511 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 321 insertions(+), 190 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36c0a10..a81eb80 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tomboy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 18:01+0800\n"
-"PO-Revision-Date: 2011-03-19 02:41+0000\n"
-"Last-Translator: du baodao <centerpoint 139 com>\n"
+"POT-Creation-Date: 2011-07-05 10:33+0800\n"
+"PO-Revision-Date: 2011-07-05 09:59+0800\n"
+"Last-Translator: lainme <lainme993 gmail com>\n"
 "Language-Team: Chinese (Simplified) <i18n-zh googlegroups com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -80,37 +80,44 @@ msgid "Custom Font Face"
 msgstr "èåäåä"
 
 #: ../data/tomboy.schemas.in.h:5
-msgid "Determines X coordinate of Search window; stored on Tomboy exit."
-msgstr "ååæççåç X åæï å Tomboy éåæäåã"
+msgid ""
+"Determines X coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr "ååâæçææäçâçåç X åæïå Tomboy éåæäåã"
 
 #: ../data/tomboy.schemas.in.h:6
-msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
-msgstr "ååæççåçÂYÂåæïÂåÂTomboyÂéåæäåã"
+msgid ""
+"Determines Y coordinate of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr "ååâæçææäçâçåç Y åæïå Tomboy éåæäåã"
 
 #: ../data/tomboy.schemas.in.h:7
-msgid "Determines pixel height of Search window; stored on Tomboy exit."
-msgstr "ååæççåçåçéåïÂåÂTomboyÂéåæäåã"
+msgid ""
+"Determines pixel height of \"Search All Notes\" window; stored on Tomboy "
+"exit."
+msgstr "ååâæçææäçâçåçåçéåïå Tomboy éåæäåã"
 
 #: ../data/tomboy.schemas.in.h:8
-msgid "Determines pixel width of Search window; stored on Tomboy exit."
-msgstr "ååæççåçåçååïÂåÂTomboyÂéåæäåã"
+msgid ""
+"Determines pixel width of \"Search All Notes\" window; stored on Tomboy exit."
+msgstr "ååâæçææäçâçåçåçååïå Tomboy éåæäåã"
 
 #: ../data/tomboy.schemas.in.h:9
-msgid "Enable Auto bulleted lists."
-msgstr "åèèååèæåã"
-
-#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "åèååæäååäéçèã"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Tray Icon"
 msgstr "åçæçåæ"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "åç WikiWord éäæç"
 
+#: ../data/tomboy.schemas.in.h:12
+msgid "Enable automatic bulleted lists."
+msgstr "åèèååèæåã"
+
 #: ../data/tomboy.schemas.in.h:13
 msgid "Enable closing notes with escape."
 msgstr "åèç Esc åéäçã"
@@ -165,35 +172,31 @@ msgid "HTML Export All Linked Notes"
 msgstr "HTML ååéæçåéäç"
 
 #: ../data/tomboy.schemas.in.h:24
-msgid "HTML Export Last Directory"
-msgstr "HTML ååääçå"
-
-#: ../data/tomboy.schemas.in.h:25
 msgid "HTML Export Linked Notes"
 msgstr "HTML ååéæçäç"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If disabled, the \"Delete Note\" confirmation dialog will be suppressed."
 msgstr "åæççïâåéäçâççèåèæäääåçã"
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:26
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
 msgstr "è enable_custom_font äçïåæèåçåäåçåçäæçäçæçåäã"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 msgstr "åæåçæééïéåéåææåçåéäçåäåäæååæèåéææåã"
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:28
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "åæåçæééïååç Esc éåéæåçäçã"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, Tomboy's tray icon will be displayed in the notification area. "
 "Disabling this may be useful when another application is providing the "
@@ -202,7 +205,7 @@ msgstr ""
 "åæäçïéèäççéçåååäæçæçåæãåææåäçåæäæåèåäç"
 "çæéã"
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -210,7 +213,7 @@ msgstr ""
 "èäçïåæéçåèåèåçèäåçïèæççæååèåæçååéååèå"
 "äã"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -219,7 +222,7 @@ msgstr ""
 "èäçïååç /apps/tomboy/global_keybindings äèåçæéååæéçåïää"
 "åèåääåççåäæèéåæäã"
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:32
 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."
@@ -227,19 +230,19 @@ msgstr ""
 "èäçïååäç custom_font_face äèåçåäåçæçäçãåååäçéèç"
 "æéåäæçäçã"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 msgstr "èæçéäçåååæääæèèèïæääæéåååæäèåèèèæäã"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:34
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "åååéåäçèåäæççæåäçæã"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:35
 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 "
@@ -249,7 +252,7 @@ msgstr ""
 "ææåèçååååææçäççéç(åæèçäåæ)ãääåä 1 çåèçäåç"
 "åæãæåçææåæ 5ãæåçåäæåéã"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:36
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -261,7 +264,7 @@ msgstr ""
 "åååéæäéäã0 äèçæåæåçåçæååæçïääåäéäåçèäå"
 "çã"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:37
 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 "
@@ -275,6 +278,10 @@ msgstr ""
 "æäéäã0 äèçæåæåçäéååèåèåååääççéææååæçã1 ä"
 "èèåçéåååçéæã2 äèææéæææäèççéæåæååçäçã"
 
+#: ../data/tomboy.schemas.in.h:38
+msgid "Last Directory used in HTML Export"
+msgstr "äæ HTML ååæçççå"
+
 #: ../data/tomboy.schemas.in.h:39
 msgid "Link Updating Behavior on Note Rename"
 msgstr "åéååäçæææéæ"
@@ -340,20 +347,20 @@ msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS åææåå URL"
 
 #: ../data/tomboy.schemas.in.h:54
-msgid "Saved height of Search window"
-msgstr "äåçæççåéå"
+msgid "Saved height of \"Search All Notes\" window"
+msgstr "åäåçâæçææäçâçåçéå"
 
 #: ../data/tomboy.schemas.in.h:55
-msgid "Saved horizontal position of Search window"
-msgstr "äåçæççåæåäç"
+msgid "Saved horizontal position of \"Search All Notes\" window"
+msgstr "åäåçâæçææäçâçåçæåäç"
 
 #: ../data/tomboy.schemas.in.h:56
-msgid "Saved vertical position of Search window"
-msgstr "äåçæççååçäç"
+msgid "Saved vertical position of \"Search All Notes\" window"
+msgstr "åäåçâæçææäçâçåçåçäç"
 
 #: ../data/tomboy.schemas.in.h:57
-msgid "Saved width of Search window"
-msgstr "äåçæççååå"
+msgid "Saved width of \"Search All Notes\" window"
+msgstr "åäåçâæçææäçâçåçåå"
 
 #: ../data/tomboy.schemas.in.h:58
 msgid "Selected Synchronization Service Addin"
@@ -630,7 +637,8 @@ msgstr "åååæäç"
 msgid "What links here?"
 msgstr "ååéæ"
 
-#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:84
+#. This is a disabled placeholder item for an empty menu
+#: ../Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs:85
 msgid "(none)"
 msgstr "(æ)"
 
@@ -683,6 +691,10 @@ msgstr "ççèåéæåæåï"
 msgid "If you remove an icon it is permanently lost."
 msgstr "åææåéäåæïååååæääåã"
 
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlApplicationAddin.cs:59
+msgid "HTML"
+msgstr "HTML"
+
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:67
 msgid "Export to HTML"
 msgstr "ååä HTML"
@@ -697,10 +709,14 @@ msgid "Note exported successfully"
 msgstr "äçååæå"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/ExportAllApplicationAddin.cs:195
+#: ../Tomboy/ExportAllApplicationAddin.cs:273
 msgid "Access denied."
 msgstr "èéèçæã"
 
 #: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:134
+#: ../Tomboy/ExportAllApplicationAddin.cs:200
+#: ../Tomboy/ExportAllApplicationAddin.cs:278
 msgid "Folder does not exist."
 msgstr "æäåäååã"
 
@@ -805,10 +821,10 @@ msgstr "çä"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:16
 msgid ""
-"Change the <span weight=\"bold\">Today: Template</span> note to customize "
-"the text that new Today notes have."
+"Change the <b>Today: Template</b> note to customize the text that new Today "
+"notes have."
 msgstr ""
-"äæ<span weight=\"bold\">äåïææ</span>äçääèåäæçäåäçææã"
+"äæ<span weight=\"bold\">äåïææ</span>äçäèåäæçäæäçææã"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs:24
 msgid "_Open Today: Template"
@@ -833,6 +849,11 @@ msgstr "ç {0} éïå {1} é"
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "yyyy å MM æ dd æ dddd hh:mm:ss tt"
 
+#. Adding menu item when note is opened and window created
+#: ../Tomboy/Addins/RemoveBrokenLinks/RemoveBrokenLinksAddin.cs:32
+msgid "Remove broken links"
+msgstr "åéåæçéæ"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "æåèå"
@@ -864,8 +885,8 @@ msgid "Server or username field is empty."
 msgstr "æååæçæåäçã"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
-msgid "SSH (sshfs FUSE)"
-msgstr "SSH (sshfs FUSE)"
+msgid "SSH"
+msgstr "SSH"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
 msgid ""
@@ -893,14 +914,16 @@ msgstr "çéäçååæå"
 
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
-msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
-msgstr "åæåååä <b>{1}</b> äçéäçäç <b>{0}</b> äã"
+msgid "<b>{0}</b> of <b>{1}</b> Sticky Note was successfully imported."
+msgid_plural ""
+"<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
+msgstr[0] "åæåååä <b>{1}</b> äçéäçäç <b>{0}</b> äã"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:159
 msgid "Untitled"
 msgstr "ææé"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:188
 msgid "Sticky Note: "
 msgstr "çéäçï"
 
@@ -937,8 +960,8 @@ msgid "URL, username, or password field is empty."
 msgstr "URLãçæåæåçäçã"
 
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
-msgid "WebDAV (wdfs FUSE)"
-msgstr "WebDAV (wdfs FUSE)"
+msgid "WebDAV"
+msgstr "WebDAV"
 
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
 msgid ""
@@ -1007,7 +1030,88 @@ msgstr "åæèåäèè(æäæéçèæ)"
 msgid "Set the default browser and try again"
 msgstr "èåéèæèååéè"
 
-#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:83
+#: ../Tomboy/ExportAllApplicationAddin.cs:53
+msgid "Export All Notes to "
+msgstr "ååææäçå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:54
+msgid "Start exporting notes to "
+msgstr "ååååäçå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:58
+msgid "Export selected notebook to "
+msgstr "ååéäççèæå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:59
+msgid "Start exporting notebook to "
+msgstr "ååååçèæå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:65
+#: ../Tomboy/Synchronization/SyncManager.cs:161
+msgid "_Tools"
+msgstr "åå(_T)"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:68
+msgid "Export"
+msgstr "åå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:69
+msgid "Export your notes."
+msgstr "ååæçäçã"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:72
+msgid "Export All Notes To "
+msgstr "åååéäçå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:77
+msgid "Export Selected Notebook To "
+msgstr "ååéåççèæå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:193
+#: ../Tomboy/ExportAllApplicationAddin.cs:271
+msgid "Could not export, access denied."
+msgstr "ææååïèéèæçã"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:198
+#: ../Tomboy/ExportAllApplicationAddin.cs:276
+msgid "Could not export, folder does not exist."
+msgstr "ææååïæäåäååã"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:203
+#: ../Tomboy/ExportAllApplicationAddin.cs:281
+#, csharp-format
+msgid "Could not export: {0}"
+msgstr "ææååï{0}"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:205
+#: ../Tomboy/ExportAllApplicationAddin.cs:283
+msgid "Unknown error."
+msgstr "æçéèã"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:236
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "æåçäç"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:389
+#, csharp-format
+msgid "Your notes were exported to \"{0}\"."
+msgstr "æçäçååååâ{0}âã"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:398
+msgid "Notes exported successfully"
+msgstr "äçååæå"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:421
+#, csharp-format
+msgid "Could not save the files in \"{0}\""
+msgstr "ææäåæäåâ{0}â"
+
+#: ../Tomboy/ExportAllApplicationAddin.cs:506
+msgid "Create destination folder for "
+msgstr "ååçææäåçä"
+
+#: ../Tomboy/JumpListManager.cs:96 ../Tomboy/RecentChanges.cs:85
 msgid "Search All Notes"
 msgstr "æçåéäç"
 
@@ -1076,10 +1180,6 @@ msgstr "{0} äçèæææ"
 msgid "All Notes"
 msgstr "åéäç"
 
-#: ../Tomboy/Notebooks/Notebook.cs:215
-msgid "Unfiled Notes"
-msgstr "æåçäç"
-
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
 msgid "Note_books"
 msgstr "çèæ(_B)"
@@ -1119,7 +1219,7 @@ msgid "Delete the selected notebook"
 msgstr "åééäçèæ"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:260
+#: ../Tomboy/RecentChanges.cs:285
 msgid "Notebooks"
 msgstr "çèæ"
 
@@ -1159,21 +1259,26 @@ msgstr "çèæ"
 msgid "_New notebook..."
 msgstr "æåçèæ(_N)..."
 
-#: ../Tomboy/Note.cs:1568
+#: ../Tomboy/Note.cs:497 ../Tomboy/NoteManager.cs:475
+#, csharp-format
+msgid "New Note {0}"
+msgstr "æäç {0}"
+
+#: ../Tomboy/Note.cs:1578
 msgid "Really delete this note?"
 msgstr "ççèåéæäçåï"
 
-#: ../Tomboy/Note.cs:1571
+#: ../Tomboy/Note.cs:1581
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "ççèåé {0} ääçåï"
 
-#: ../Tomboy/Note.cs:1582
+#: ../Tomboy/Note.cs:1592
 msgid "If you delete a note it is permanently lost."
 msgstr "åææåéääçïååååæääåã"
 
-#: ../Tomboy/Note.cs:1616
+#: ../Tomboy/Note.cs:1626
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
@@ -1183,13 +1288,13 @@ msgstr ""
 "äåæçäçæåçäéèãèææææåæèåççççéïäåæå {0} æåæè"
 "åçæéãéèçèåå {1} äæåã"
 
-#: ../Tomboy/Note.cs:1632
+#: ../Tomboy/Note.cs:1642
 msgid "Error saving note data."
 msgstr "äåäçæææåéã"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:257
 msgid "New Note Template"
 msgstr "æåäçææ"
 
@@ -1304,7 +1409,7 @@ msgstr ""
 "</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:369
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:395
 msgid "Start Here"
 msgstr "äèéåå"
 
@@ -1312,14 +1417,9 @@ msgstr "äèéåå"
 msgid "Using Links in Tomboy"
 msgstr "åéåääçéæ"
 
-#: ../Tomboy/NoteManager.cs:449
-#, 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:522 ../Tomboy/NoteManager.cs:615
+#: ../Tomboy/NoteManager.cs:548 ../Tomboy/NoteManager.cs:641
 msgid "Describe your new note here."
 msgstr "åææèæçæäçã"
 
@@ -1407,115 +1507,116 @@ msgstr "åéåéäç(_E)"
 msgid "Search"
 msgstr "æç"
 
-#: ../Tomboy/NoteWindow.cs:439
-msgid "Search your notes (Ctrl-Shift-F)"
-msgstr "æçæçäç(Ctrl-Shift-F)"
+#. TODO: If we ever add a way to customize internal keybindings, this will need to change
+#: ../Tomboy/NoteWindow.cs:440
+msgid "Search your notes"
+msgstr "æçæçäç"
 
-#: ../Tomboy/NoteWindow.cs:451
+#: ../Tomboy/NoteWindow.cs:452
 msgid "Link"
 msgstr "éæ"
 
-#: ../Tomboy/NoteWindow.cs:457
-msgid "Link selected text to a new note (Ctrl-L)"
-msgstr "åéäææéæåæäç(Ctrl-L)"
+#: ../Tomboy/NoteWindow.cs:459
+msgid "Link selected text to a new note"
+msgstr "åéäææéæåæäç"
 
-#: ../Tomboy/NoteWindow.cs:470
+#: ../Tomboy/NoteWindow.cs:472
 msgid "_Text"
 msgstr "ææ(_T)"
 
-#: ../Tomboy/NoteWindow.cs:475
+#: ../Tomboy/NoteWindow.cs:477
 msgid "Set properties of text"
 msgstr "èçææåæ"
 
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:482
 msgid "T_ools"
 msgstr "åå(_O)"
 
-#: ../Tomboy/NoteWindow.cs:484
+#: ../Tomboy/NoteWindow.cs:486
 msgid "Use tools on this note"
 msgstr "åæäçääçåå"
 
-#: ../Tomboy/NoteWindow.cs:492
+#: ../Tomboy/NoteWindow.cs:494
 msgid "Delete this note"
 msgstr "åéæäç"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
+#: ../Tomboy/NoteWindow.cs:502 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "åæäç"
 
-#: ../Tomboy/NoteWindow.cs:562
+#: ../Tomboy/NoteWindow.cs:564
 msgid "_Find..."
 msgstr "ææ(_F)..."
 
-#: ../Tomboy/NoteWindow.cs:573
+#: ../Tomboy/NoteWindow.cs:575
 msgid "Find _Next"
 msgstr "ææäää(_N)"
 
-#: ../Tomboy/NoteWindow.cs:586
+#: ../Tomboy/NoteWindow.cs:588
 msgid "Find _Previous"
 msgstr "ææäää(_P)"
 
-#: ../Tomboy/NoteWindow.cs:674
+#: ../Tomboy/NoteWindow.cs:676
 msgid "Cannot create note"
 msgstr "ææååäç"
 
-#: ../Tomboy/NoteWindow.cs:755
+#: ../Tomboy/NoteWindow.cs:757
 msgid "_Find:"
 msgstr "ææ(_F)ï"
 
-#: ../Tomboy/NoteWindow.cs:766
+#: ../Tomboy/NoteWindow.cs:768
 msgid "_Previous"
 msgstr "äää(_P)"
 
-#: ../Tomboy/NoteWindow.cs:775
+#: ../Tomboy/NoteWindow.cs:777
 msgid "_Next"
 msgstr "äää(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1258
+#: ../Tomboy/NoteWindow.cs:1260
 msgid "_Bold"
 msgstr "çä(_B)"
 
-#: ../Tomboy/NoteWindow.cs:1270
+#: ../Tomboy/NoteWindow.cs:1272
 msgid "_Italic"
 msgstr "æä(_I)"
 
-#: ../Tomboy/NoteWindow.cs:1282
+#: ../Tomboy/NoteWindow.cs:1284
 msgid "_Strikeout"
 msgstr "åéç(_S)"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1296
 msgid "_Highlight"
 msgstr "éäæç(_H)"
 
-#: ../Tomboy/NoteWindow.cs:1307
+#: ../Tomboy/NoteWindow.cs:1309
 msgid "Font Size"
 msgstr "åäåå"
 
-#: ../Tomboy/NoteWindow.cs:1310
+#: ../Tomboy/NoteWindow.cs:1312
 msgid "_Normal"
 msgstr "æé(_N)"
 
-#: ../Tomboy/NoteWindow.cs:1327
+#: ../Tomboy/NoteWindow.cs:1329
 msgid "Hu_ge"
 msgstr "åå(_G)"
 
-#: ../Tomboy/NoteWindow.cs:1335
+#: ../Tomboy/NoteWindow.cs:1337
 msgid "_Large"
 msgstr "å(_L)"
 
-#: ../Tomboy/NoteWindow.cs:1343
+#: ../Tomboy/NoteWindow.cs:1345
 msgid "S_mall"
 msgstr "å(_M)"
 
-#: ../Tomboy/NoteWindow.cs:1352
+#: ../Tomboy/NoteWindow.cs:1354
 msgid "Increase Font Size"
 msgstr "åååå"
 
-#: ../Tomboy/NoteWindow.cs:1370
+#: ../Tomboy/NoteWindow.cs:1372
 msgid "Decrease Font Size"
 msgstr "åååå"
 
-#: ../Tomboy/NoteWindow.cs:1390
+#: ../Tomboy/NoteWindow.cs:1392
 msgid "Bullets"
 msgstr "éççå"
 
@@ -1535,22 +1636,22 @@ msgstr "åæ"
 msgid "Add-ins"
 msgstr "æåé"
 
-#: ../Tomboy/PreferencesDialog.cs:173
+#: ../Tomboy/PreferencesDialog.cs:174
 msgid "_Spell check while typing"
 msgstr "èåææææå(_S)"
 
-#: ../Tomboy/PreferencesDialog.cs:182
+#: ../Tomboy/PreferencesDialog.cs:183
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr "æéçåèåäçèæçïèçææåéèçåèåæçååéèåäã"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:193
+#: ../Tomboy/PreferencesDialog.cs:194
 msgid "Highlight _WikiWords"
 msgstr "åä _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:201
+#: ../Tomboy/PreferencesDialog.cs:202
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1558,46 +1659,46 @@ msgstr ""
 "åçæééååäçä <b>WikiWords</b> çåèãååæåèåäèåçååäçã"
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/PreferencesDialog.cs:209
 msgid "Enable auto-_bulleted lists"
 msgstr "åèååèèåçå(_B)"
 
-#: ../Tomboy/PreferencesDialog.cs:217
+#: ../Tomboy/PreferencesDialog.cs:218
 msgid "Use custom _font"
 msgstr "äçèåäåä(_F)"
 
-#: ../Tomboy/PreferencesDialog.cs:235
+#: ../Tomboy/PreferencesDialog.cs:236
 msgid "When renaming a linked note: "
 msgstr "åéååääèéæçäçæï"
 
-#: ../Tomboy/PreferencesDialog.cs:238
+#: ../Tomboy/PreferencesDialog.cs:239
 msgid "Ask me what to do"
 msgstr "èéåää"
 
-#: ../Tomboy/PreferencesDialog.cs:239
+#: ../Tomboy/PreferencesDialog.cs:240
 msgid "Never rename links"
 msgstr "æäéååéæ"
 
-#: ../Tomboy/PreferencesDialog.cs:240
+#: ../Tomboy/PreferencesDialog.cs:241
 msgid "Always rename links"
 msgstr "ææéååéæ"
 
-#: ../Tomboy/PreferencesDialog.cs:260
+#: ../Tomboy/PreferencesDialog.cs:261
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "ååæçäçæäçæçäçæææèååäççæåã"
 
-#: ../Tomboy/PreferencesDialog.cs:269
+#: ../Tomboy/PreferencesDialog.cs:270
 msgid "Open New Note Template"
 msgstr "æåæçäçææ"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:326
+#: ../Tomboy/PreferencesDialog.cs:327
 msgid "Listen for _Hotkeys"
 msgstr "çåçé(_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:335
+#: ../Tomboy/PreferencesDialog.cs:336
 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;"
@@ -1607,195 +1708,211 @@ msgstr ""
 "b>ï<b>&lt;Alt&gt;N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:355
+#: ../Tomboy/PreferencesDialog.cs:356
 msgid "Show notes _menu"
 msgstr "æçäçèå(_M)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:372
+#: ../Tomboy/PreferencesDialog.cs:373
 msgid "Open \"_Start Here\""
 msgstr "æåâäèéååâ(_S)"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:389
+#: ../Tomboy/PreferencesDialog.cs:390
 msgid "Create _new note"
 msgstr "ååæäç(_N)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:406
+#: ../Tomboy/PreferencesDialog.cs:407
 msgid "Open \"Search _All Notes\""
 msgstr "æåâæçåéäçâ(_A)"
 
-#: ../Tomboy/PreferencesDialog.cs:433
+#: ../Tomboy/PreferencesDialog.cs:434
 msgid "Ser_vice:"
 msgstr "æå(_V)ï"
 
-#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
+#: ../Tomboy/PreferencesDialog.cs:487 ../Tomboy/PreferencesDialog.cs:1106
 msgid "Not configurable"
 msgstr "äåéç"
 
-#: ../Tomboy/PreferencesDialog.cs:512
+#: ../Tomboy/PreferencesDialog.cs:513
 msgid "Automaticall_y Sync in Background Every"
 msgstr "èåååååæ(_Y)ïæé"
 
 #. Translators: See above comment for details on
 #. this string.
-#: ../Tomboy/PreferencesDialog.cs:518
+#: ../Tomboy/PreferencesDialog.cs:519
 msgid "Minutes"
 msgstr "åé"
 
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "éç(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:601
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "ååèääæåé"
 
-#: ../Tomboy/PreferencesDialog.cs:622
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "èåæåæä..."
 
-#: ../Tomboy/PreferencesDialog.cs:648
+#: ../Tomboy/PreferencesDialog.cs:641
 msgid "_Enable"
 msgstr "åç(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:654
+#: ../Tomboy/PreferencesDialog.cs:647
 msgid "_Disable"
 msgstr "çç(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:785
+#: ../Tomboy/PreferencesDialog.cs:778
 msgid "Not Implemented"
 msgstr "åæåç"
 
-#: ../Tomboy/PreferencesDialog.cs:799
+#: ../Tomboy/PreferencesDialog.cs:792
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} ééé"
 
-#: ../Tomboy/PreferencesDialog.cs:938
+#: ../Tomboy/PreferencesDialog.cs:931
 msgid "Choose Note Font"
 msgstr "éæäçåä"
 
-#: ../Tomboy/PreferencesDialog.cs:982
+#: ../Tomboy/PreferencesDialog.cs:975
 msgid "Other Synchronization Options"
 msgstr "åååæéé"
 
-#: ../Tomboy/PreferencesDialog.cs:988
+#: ../Tomboy/PreferencesDialog.cs:981
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "åææåæåäçåæéççåææååäçäçæåçæï"
 
-#: ../Tomboy/PreferencesDialog.cs:995
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid "Always ask me what to do."
 msgstr "éæèæäåã"
 
-#: ../Tomboy/PreferencesDialog.cs:999
+#: ../Tomboy/PreferencesDialog.cs:992
 msgid "Rename my local note."
 msgstr "éååæçæåäçã"
 
-#: ../Tomboy/PreferencesDialog.cs:1003
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Replace my local note with the server's update."
 msgstr "çæååäçäçæææçæåäçã"
 
-#: ../Tomboy/PreferencesDialog.cs:1149
-msgid "WARNING: Are you sure?"
-msgstr "èåïæçååï"
+#: ../Tomboy/PreferencesDialog.cs:1142
+msgid "Are you sure?"
+msgstr "æçååï"
 
-#: ../Tomboy/PreferencesDialog.cs:1151
+#: ../Tomboy/PreferencesDialog.cs:1144
 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:1164
+#: ../Tomboy/PreferencesDialog.cs:1157
 msgid "Resetting Synchronization Settings"
 msgstr "éçåæèç"
 
-#: ../Tomboy/PreferencesDialog.cs:1166
+#: ../Tomboy/PreferencesDialog.cs:1159
 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"
+"synchronize all of your notes again when you save new settings."
 msgstr ""
 "æååéæéççåææåãæçåæèççååèæçãåæäåæèçæåèåæ"
-"èåååæäçææäç"
+"èåååæææäçã"
 
-#: ../Tomboy/PreferencesDialog.cs:1244
-msgid "Success! You're connected!"
-msgstr "æåïæåèæäï"
+#: ../Tomboy/PreferencesDialog.cs:1237
+msgid "Connection successful"
+msgstr "èææå"
 
-#: ../Tomboy/PreferencesDialog.cs:1246
+#: ../Tomboy/PreferencesDialog.cs:1239
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy åçååååææçäçãææèçååæåäåï"
 
-#: ../Tomboy/PreferencesDialog.cs:1269
+#: ../Tomboy/PreferencesDialog.cs:1262
 #, csharp-format
 msgid ""
-"Sorry, but something went wrong.  Please check your information and try "
-"again.  The {0} might be useful too."
-msgstr "åäèïåçäéèãèæææçäæåéèãæç {0} äèäæååã"
+"Please check your information and try again.  The log file {0} may contain "
+"more information about the error."
+msgstr "èæææçäæåéèãæåæä {0} äèäæåäæéèçæåäæã"
 
-#: ../Tomboy/PreferencesDialog.cs:1282
-msgid "Error connecting :("
-msgstr "èæåé :("
+#: ../Tomboy/PreferencesDialog.cs:1274
+msgid "Error connecting"
+msgstr "èæåé"
 
-#: ../Tomboy/PreferencesDialog.cs:1358
+#: ../Tomboy/PreferencesDialog.cs:1350
 msgid "Version:"
 msgstr "çæï"
 
-#: ../Tomboy/PreferencesDialog.cs:1365
+#: ../Tomboy/PreferencesDialog.cs:1357
 msgid "Author:"
 msgstr "äèï"
 
-#: ../Tomboy/PreferencesDialog.cs:1372
+#: ../Tomboy/PreferencesDialog.cs:1364
 msgid "Copyright:"
 msgstr "çæææï"
 
-#: ../Tomboy/PreferencesDialog.cs:1378
+#: ../Tomboy/PreferencesDialog.cs:1370
 msgid "Add-in Dependencies:"
 msgstr "æääèï"
 
-#: ../Tomboy/RecentChanges.cs:98
+#: ../Tomboy/RecentChanges.cs:100
 msgid "_Search:"
 msgstr "æç(_S)ï"
 
-#: ../Tomboy/RecentChanges.cs:331
+#: ../Tomboy/RecentChanges.cs:359
 msgid "Note"
 msgstr "äç"
 
-#: ../Tomboy/RecentChanges.cs:353
+#: ../Tomboy/RecentChanges.cs:381
 msgid "Last Changed"
 msgstr "æèææ"
 
-#: ../Tomboy/RecentChanges.cs:484
+#: ../Tomboy/RecentChanges.cs:520
 msgid "Matches"
 msgstr "åéé"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:571
+msgid "Title match"
+msgstr "æéåé"
+
+#: ../Tomboy/RecentChanges.cs:574
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} äåéé"
 
-#: ../Tomboy/RecentChanges.cs:549
+#: ../Tomboy/RecentChanges.cs:588
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "æèï{0} ääç"
 
-#: ../Tomboy/RecentChanges.cs:560
+#: ../Tomboy/RecentChanges.cs:599
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "åéï{0} ääç"
 
-#: ../Tomboy/RecentChanges.cs:696
+#: ../Tomboy/RecentChanges.cs:611
+msgid ""
+"No results found in the selected notebook.\n"
+"Click here to search across all notes."
+msgstr ""
+"éåççèæäæææåçæã\n"
+"çææçææäçã"
+
+#: ../Tomboy/RecentChanges.cs:617
+msgid "Click here to search across all notebooks"
+msgstr "çææçææäç"
+
+#: ../Tomboy/RecentChanges.cs:783
 msgid "Notes"
 msgstr "äç"
 
@@ -1807,44 +1924,47 @@ msgstr "ææååæäç"
 msgid "Primary Development:"
 msgstr "éåååï"
 
-#: ../Tomboy/Tomboy.cs:323
+#: ../Tomboy/Tomboy.cs:330
 msgid "Contributors:"
 msgstr "èçèï"
 
-#: ../Tomboy/Tomboy.cs:401
+#: ../Tomboy/Tomboy.cs:415
 msgid "translator-credits"
 msgstr ""
 "Funda Wang <fundawang gmail com>, 2005-2008.\n"
 "Ray Wang <wanglei1123 gmail com>, 2009.\n"
 "Aron Xu <aronmalache 163 com>, 2009."
 
-#: ../Tomboy/Tomboy.cs:410
+#: ../Tomboy/Tomboy.cs:424
 msgid ""
 "Copyright  2004-2007 Alex Graveley\n"
-"Copyright  2004-2010 Others\n"
+"Copyright  2004-2011 Others\n"
 msgstr ""
 "çæææ Â 2004-2007 Alex Graveley\n"
-"çæææ Â 2004-2010Âåää\n"
+"çæææ Â 2004-2010 åää\n"
 
-#: ../Tomboy/Tomboy.cs:412
+#: ../Tomboy/Tomboy.cs:426
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "çåæççæééæååççåã"
 
-#: ../Tomboy/Tomboy.cs:422
+#: ../Tomboy/Tomboy.cs:436
 msgid "Homepage"
 msgstr "äé"
 
-#: ../Tomboy/Tomboy.cs:540
+#: ../Tomboy/Tomboy.cs:554
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
-"Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
+"Copyright  2004-2007 Alex Graveley\n"
+"<alex beatniksoftware com>\n"
 "\n"
+"Copyright  2004-2011 Others\n"
 msgstr ""
 "éåïçåæççæééæååççåã\n"
-"çæææ (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
+"çæææ (C) 2004-2006 Alex Graveley\n"
+"<alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:552
+#: ../Tomboy/Tomboy.cs:568
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1858,7 +1978,7 @@ msgstr ""
 "  --note-path [èå]\t\tèå/äåæçåäçäçææã\n"
 "  --search [ææ]\t\tæåæçåéäççåïåéçæçææã\n"
 
-#: ../Tomboy/Tomboy.cs:562
+#: ../Tomboy/Tomboy.cs:578
 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"
@@ -1872,7 +1992,7 @@ msgstr ""
 "  --start-here\t\t\tæçâäèéååâäçã\n"
 "  --highlight-search [ææ]\tåæåçäçäæççåæççææã\n"
 
-#: ../Tomboy/Tomboy.cs:576
+#: ../Tomboy/Tomboy.cs:592
 #, csharp-format
 msgid "Version {0}"
 msgstr "{0} çæ"
@@ -1986,11 +2106,11 @@ msgstr "åçååæéä <b>{0}</b> çäçãèåççåäæäç
 msgid "Note title taken"
 msgstr "äçæéåèäç"
 
-#: ../Tomboy/Watchers.cs:549
+#: ../Tomboy/Watchers.cs:587
 msgid "_Copy Link Address"
 msgstr "ååéæåå(_C)"
 
-#: ../Tomboy/Watchers.cs:554
+#: ../Tomboy/Watchers.cs:592
 msgid "_Open Link"
 msgstr "æåéæ(_O)"
 
@@ -2219,10 +2339,6 @@ msgid ""
 "want to do with your local note?"
 msgstr "â{0}âçæååçæäæçæåäçåçãæåæåäåçæçæåäçï"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:161
-msgid "_Tools"
-msgstr "åå(_T)"
-
 #: ../Tomboy/Synchronization/SyncUtils.cs:119
 #: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
@@ -2254,5 +2370,20 @@ msgstr ""
 "ääéååæååèäææïæåèåååæåè FUSE ãæåâmodprobe fuseâå /"
 "etc/init.d/boot.local æèâfuseâå /etc/modules ã"
 
+#~ msgid "HTML Export Last Directory"
+#~ msgstr "HTML ååääçå"
+
+#~ msgid "SSH (sshfs FUSE)"
+#~ msgstr "SSH (sshfs FUSE)"
+
+#~ msgid "WebDAV (wdfs FUSE)"
+#~ msgstr "WebDAV (wdfs FUSE)"
+
+#~ msgid "Search your notes (Ctrl-Shift-F)"
+#~ msgstr "æçæçäç(Ctrl-Shift-F)"
+
+#~ msgid "Success! You're connected!"
+#~ msgstr "æåïæåèæäï"
+
 #~ msgid "_Browse..."
 #~ msgstr "æè(_B)..."