[tomboy] Updated Shavian transliteration

[Thomas James Alexander Thurman <tthurman src gnome org>]

commit 1eca56efb96fb3f15488bb9e38e4a9e09e8cee9a
Author: Thomas Thurman <tthurman gnome org>
Date:   Wed May 12 18:41:43 2010 -0400

    Updated Shavian transliteration

 po/en shaw po | 1439 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 1112 insertions(+), 327 deletions(-)
---
diff --git a/po/en shaw po b/po/en shaw po
index 5111be5..792ac94 100644
--- a/po/en shaw po
+++ b/po/en shaw po
@@ -4,13 +4,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2009-11-06 19:17+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&component=general\n";
+"POT-Creation-Date: 2010-05-11 16:59+0000\n"
+"PO-Revision-Date: 2010-05-12 18:38 -0400\n"
 "Last-Translator: Thomas Thurman <tthurman gnome org>\n"
-"Language-Team: Shavian <ubuntu-l10n-en-shaw lists launchpad net>\n"
+"Language-Team: Shavian <ubuntu-l10n-en-shaw launchpad net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -25,21 +27,27 @@ msgid "Tomboy Applet Factory"
 msgstr "·ð???ð??ªð??¥ð???ð??¶ ð??¨ð???ð??¤ð??©ð??? ð???ð??¨ð???ð???ð??¼ð??¦"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:568
+#: ../Tomboy/Tray.cs:573
 msgid "Tomboy Notes"
 msgstr "·ð???ð??ªð??¥ð???ð??¶ ð??¯ð??´ð???ð???"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:164
+#, fuzzy
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:268
+msgid "S_ynchronize Notes"
+msgstr "S_ynchronize ð??¯ð??´ð???ð???"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "_ð??©ð???ð??¬ð???"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:277
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:282
 msgid "_Help"
 msgstr "_ð??£ð??§ð??¤ð???"
 
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:272
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:277
 msgid "_Preferences"
 msgstr "_ð???ð??®ð??§ð???ð??¼ð??©ð??¯ð???ð??©ð???"
 
@@ -55,63 +63,115 @@ msgstr "ð???ð??±ð??? ð??¯ð??´ð???ð???, ð??¤ð??¦ð???ð??? ð??²ð???ð??¾ð???, ð??¯ 
 msgid "Accept SSL Certificates"
 msgstr "ð??¨ð???ð???ð??§ð???ð??? SSL ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð???ð???"
 
+#, fuzzy
 #: ../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 ð???ð??´ð??¹ð???ð??©ð??¯ð??±ð??? ð??? ð???ð??»ð??? ð??¢ð??¦ð??¯ð???ð??´; ð???ð???ð??¹ð??? ð??ªð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð??§ð???ð???ð??¦ð???."
 
-#: ../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 ð???ð??´ð??¹ð???ð??©ð??¯ð??±ð??? ð??? ð???ð??»ð??? ð??¢ð??¦ð??¯ð???ð??´; ð???ð???ð??¹ð??? ð??ªð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð??§ð???ð???ð??¦ð???."
 
-#: ../data/tomboy.schemas.in.h:6
+#: ../data/tomboy.schemas.in.h:7
 msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgstr "ð???ð??¦ð???ð??»ð??¥ð??¦ð??¯ð??? ð???ð??¦ð???ð???ð??©ð??¤ ð??£ð??²ð??? ð??? ð???ð??»ð??? ð??¢ð??¦ð??¯ð???ð??´; ð???ð???ð??¹ð??? ð??ªð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð??§ð???ð???ð??¦ð???."
 
-#: ../data/tomboy.schemas.in.h:7
+#: ../data/tomboy.schemas.in.h:8
 msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgstr "ð???ð??¦ð???ð??»ð??¥ð??¦ð??¯ð??? ð???ð??¦ð???ð???ð??©ð??¤ ð??¢ð??¦ð???ð??? ð??? ð???ð??»ð??? ð??¢ð??¦ð??¯ð???ð??´; ð???ð???ð??¹ð??? ð??ªð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð??§ð???ð???ð??¦ð???."
 
+#, fuzzy
 #: ../data/tomboy.schemas.in.h:9
+msgid "Enable Auto bulleted lists."
+msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð??·ð???ð??´ bulleted ð??¤ð??¦ð???ð???ð???."
+
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð??¥ð??¦ð???ð??©ð??¤-ð???ð??¤ð??¦ð??? ð???ð??±ð???ð??? ð??ªð??¯ ð??²ð???ð??ªð??¯."
 
+#, fuzzy
 #: ../data/tomboy.schemas.in.h:11
+msgid "Enable WikiWord highlighting"
+msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ WikiWord ð??£ð??²ð??¤ð??²ð???ð??¦ð???"
+
+#: ../data/tomboy.schemas.in.h:12
 msgid "Enable closing notes with escape."
 msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??¤ð??´ð???ð??¦ð??? ð??¯ð??´ð???ð??? ð??¢ð??¦ð??? ð??¦ð???ð???ð??±ð???."
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:13
 msgid "Enable custom font"
 msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??³ð???ð???ð??©ð??¥ ð???ð??ªð??¯ð???"
 
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:14
+msgid "Enable global keybindings"
+msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??¤ð??´ð???ð??©ð??¤ keybindings"
+
+#, fuzzy
 #: ../data/tomboy.schemas.in.h:15
+msgid "Enable spellchecking"
+msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ spellchecking"
+
+#: ../data/tomboy.schemas.in.h:16
 msgid "Enable startup notes"
 msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð???ð??¸ð???ð??³ð??? ð??¯ð??´ð???ð???"
 
+#, fuzzy
+#: ../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 ""
+"ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¦ð??? ð??¿ ð??¢ð??ªð??¯ð??? bulleted ð??¤ð??¦ð???ð???ð??? ð??? ð???ð??° ð??·ð???ð??´ð??¥ð??¨ð???ð??¦ð??? ð??¢ð??§ð??¯ ð??¿ ð???ð??¤ð??±ð??? - ð??¹ * ð??¨ð??? ð??? "
+"ð???ð??©ð???ð??¦ð??¯ð??¦ð??? ð??? ð??© ð??¤ð??²ð??¯."
+
+#, fuzzy
+#: ../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 ""
+"ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??¦ð??? ð??¿ ð??¢ð??ªð??¯ð??? ð??? ð???ð??° ð??±ð???ð??©ð??¤ ð??? ð??¥ð??¦ð???ð??©ð??¤-ð???ð??¤ð??¦ð??? ð??? ð???ð??ªð??¥ð???ð??¶ ð??²ð???ð??ªð??¯ ð??? ð???ð??±ð???ð??? "
+"timestamped ð???ð??ªð??¯ð???ð??§ð??¯ð??? ð??¦ð??¯ð???ð??« ð??? ð???ð???ð??¸ð??? ð??£ð??½ ð??¯ð??´ð???."
+
+#, fuzzy
 #: ../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 ""
+"ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??? ð??£ð??²ð??¤ð??²ð??? ð??¢ð??»ð???ð??? ThatLookLikeThis. ð???ð??¤ð??¦ð???ð??¦ð??? ð??? ð??¢ð??»ð??? ð??¢ð??¦ð??¤ ð???ð??®ð??¦ð??±ð??? ð??© ð??¯ð??´ð??? "
+"ð??¢ð??¦ð??? ð???ð??¨ð??? ð??¯ð??±ð??¥."
+
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "ð???ð???ð??µð??? ð??¥ð??¬ð??¯ð???ð??¦ð??? ð???ð??²ð??¥ð??¬ð??? (ð??¥ð??¦ð???)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "HTML ð??§ð???ð???ð???ð??¹ð??? ð??·ð??¤ ð??¤ð??¦ð???ð???ð??? ð??¯ð??´ð???ð???"
 
-#: ../data/tomboy.schemas.in.h:21
+#: ../data/tomboy.schemas.in.h:22
 msgid "HTML Export Last Directory"
 msgstr "HTML ð??§ð???ð???ð???ð??¹ð??? ð??¤ð??­ð???ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦"
 
-#: ../data/tomboy.schemas.in.h:22
+#: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export Linked Notes"
 msgstr "HTML ð??§ð???ð???ð???ð??¹ð??? ð??¤ð??¦ð???ð???ð??? ð??¯ð??´ð???ð???"
 
-#: ../data/tomboy.schemas.in.h:23
+#: ../data/tomboy.schemas.in.h:24
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -119,7 +179,7 @@ msgstr ""
 "ð??¦ð??? enable_custom_font ð??¦ð??? ð???ð??®ð??µ, ð??? ð???ð??ªð??¯ð??? ð??¯ð??±ð??¥ ð???ð??§ð??? ð??£ð??½ ð??¢ð??¦ð??¤ ð???ð??° ð??¿ð???ð??? ð??¨ð??? ð??? ð???ð??ªð??¯ð??? ð??¢ð??§ð??¯ "
 "ð???ð??¦ð???ð???ð??¤ð??±ð??¦ð??? ð??¯ð??´ð???ð???."
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -127,137 +187,341 @@ msgstr ""
 "ð??¦ð??? ð??¦ð??¯ð??±ð???ð??©ð??¤ð???, ð??·ð??¤ ð??¯ð??´ð???ð??? ð???ð??¨ð??? ð??¢ð??» ð??´ð???ð??©ð??¯ ð??¢ð??§ð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð???ð??¢ð??¦ð??? ð??¢ð??¦ð??¤ ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ ð???ð??° ð??®ð??°ð??´ð???ð??©ð??¯ð??? ð??¨ð??? "
 "ð???ð???ð??¸ð???ð??³ð???."
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:26
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "ð??¦ð??? ð??¦ð??¯ð??±ð???ð??©ð??¤ð???, ð??©ð??¯ ð??´ð???ð??©ð??¯ð??? ð??¯ð??´ð??? ð???ð??¨ð??¯ ð???ð??° ð???ð??¤ð??´ð???ð??? ð???ð??² ð??£ð??¦ð???ð??¦ð??? ð??? ð??¦ð???ð???ð??±ð??? ð???ð??°."
 
+#, fuzzy
+#: ../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 ""
+"ð??¦ð??? ð???ð??®ð??µ, misspellings ð??¢ð??¦ð??¤ ð???ð??° ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯ð??? ð??¦ð??¯ ð??®ð??§ð???, ð??¯ ð???ð??©ð??®ð??§ð???ð??? ð???ð???ð??§ð??¤ð??¦ð??? ð???ð??©ð??¡ð??§ð???ð???ð??©ð??¯ð??? ð???ð??´ð??¯ ð??¦ð??¯ "
+"ð??? ð??®ð??²ð???-ð???ð??¤ð??¦ð??? ð??¥ð??§ð??¯ð??¿."
+
+#, fuzzy
 #: ../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 ""
+"ð??¦ð??? ð???ð??®ð??µ, ð??? ð???ð??§ð???ð???ð???ð??ªð???-ð???ð??¤ð??´ð???ð??©ð??¤ keybindings ð???ð??§ð??? ð??¦ð??¯ /ð??¨ð???ð???/ð???ð??ªð??¥ð???ð??¶/global_keybindings ð??¢ð??¦ð??¤ "
+"ð???ð??° ð??¦ð??¯ð??±ð???ð??©ð??¤ð???, ð??©ð??¤ð??¬ð??¦ð??? ð???ð??¹ ð??¿ð???ð???ð??©ð??¤ ð???ð??ªð??¥ð???ð??¶ ð??¨ð???ð???ð??©ð??¯ð??? ð??? ð???ð??° ð??©ð???ð??±ð??¤ð??©ð???ð??©ð??¤ ð???ð??®ð??ªð??¥ ð??§ð??¯ð??¦ ð??©ð???ð??¤ð??¦ð???ð??±ð???ð??©ð??¯."
+
+#: ../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 ""
 "ð??¦ð??? ð???ð??®ð??µ, ð??? ð???ð??ªð??¯ð??? ð??¯ð??±ð??¥ ð???ð??§ð??? ð??¦ð??¯ 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."
+"Indicates that the Sticky Note Importer plugin has not been run, so it should "
+"run automatically the next time Tomboy starts."
 msgstr ""
 "ð??¦ð??¯ð???ð??¦ð???ð??±ð???ð??? ð???ð??¨ð??? ð??? ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð??? ð??¦ð??¥ð???ð??¹ð???ð??¼ ð???ð??¤ð??³ð???ð??¦ð??¯ ð??£ð??¨ð??? ð??¯ð??ªð??? ð???ð??°ð??¯ ð??®ð??³ð??¯, ð???ð??´ ð??¦ð??? ð???ð??«ð??? ð??®ð??³ð??¯ "
 "ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ ð??? ð??¯ð??§ð???ð???ð??? ð???ð??²ð??¥ ·ð???ð??ªð??¥ð???ð??¶ ð???ð???ð??¸ð???ð???."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "ð??¦ð??¯ð???ð??©ð??¡ð??¼ ð???ð??¦ð???ð??»ð??¥ð??¦ð??¯ð??¦ð??? ð??? ð??¥ð??¦ð??¯ð??©ð??¥ð??©ð??¥ ð??¯ð??³ð??¥ð???ð??¼ ð??? ð??¯ð??´ð???ð??? ð??? ð???ð??´ ð??¦ð??¯ ð??? ·ð???ð??ªð??¥ð???ð??¶ ð??¯ð??´ð??? ð??¥ð??§ð??¯ð??¿."
 
-#: ../data/tomboy.schemas.in.h:31
+#, fuzzy
+#: ../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 ð??¦ð??¯ð???ð??¦ð???ð??±ð???ð??? ð???ð??¨ð??? autosync ð??¦ð??? ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???. ð??? "
+"ð??¤ð??´ð??©ð???ð??? ð??¨ð???ð???ð??§ð???ð???ð??©ð???ð??©ð??¤ ð???ð??ªð???ð??¦ð???ð??¦ð??? ð???ð??¨ð??¤ð??¿ ð??¦ð??? 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 "
-"user. The values map to an internal enumeration. 0 indicates that the user "
-"wishes to be prompted when a conflict occurs, so that they may handle each "
-"conflict situation on a case-by-case basis."
+"specific behavior when a conflict is detected, instead of prompting the user. "
+"The values map to an internal enumeration. 0 indicates that the user wishes "
+"to be prompted when a conflict occurs, so that they may handle each conflict "
+"situation on a case-by-case basis."
 msgstr ""
 "ð??¦ð??¯ð???ð??©ð??¡ð??¼ ð???ð??¨ð??¤ð??¿ ð??¦ð??¯ð???ð??¦ð???ð??±ð???ð??¦ð??? ð??¦ð??? ð???ð??º ð??¦ð??? ð??© ð???ð??®ð??§ð???ð??¼ð??©ð??¯ð??? ð??? ð??·ð??¤ð??¢ð??±ð??? ð???ð??¼ð???ð??¹ð??¥ ð??© ð???ð???ð??©ð???ð??¦ð???ð??¦ð??? ð???ð??¦ð??£ð??±ð???ð???ð??¼ "
-"ð??¢ð??§ð??¯ ð??© ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð??? ð??¦ð??? ð???ð??¦ð???ð??§ð???ð???ð??©ð???, ð??¦ð??¯ð???ð???ð??§ð??? ð??? ð???ð??®ð??ªð??¥ð???ð???ð??¦ð??? ð??? ð??¿ð???ð??¼. ð??? ð???ð??¨ð??¤ð??¿ð??? ð??¥ð??¨ð??? ð??? ð??©ð??¯ "
-"ð??¦ð??¯ð???ð??»ð??¯ð??©ð??¤ ð??¦ð??¯ð??µð??¥ð??»ð??±ð???ð??©ð??¯. 0 ð??¦ð??¯ð???ð??¦ð???ð??±ð???ð??? ð???ð??¨ð??? ð??? ð??¿ð???ð??¼ ð??¢ð??¦ð???ð??©ð??? ð??? ð???ð??° ð???ð??®ð??ªð??¥ð???ð???ð??©ð??? ð??¢ð??§ð??¯ ð??© ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð??? "
-"ð??ªð???ð??»ð???, ð???ð??´ ð???ð??¨ð??? ð???ð??± ð??¥ð??± ð??£ð??¨ð??¯ð???ð??©ð??¤ ð??°ð??? ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð??? ð???ð??¦ð???ð??¿ð??±ð???ð??©ð??¯ ð??ªð??¯ ð??© ð???ð??±ð???-ð???ð??²-ð???ð??±ð??? ð???ð??±ð???ð??¦ð???."
+"ð??¢ð??§ð??¯ ð??© ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð??? ð??¦ð??? ð???ð??¦ð???ð??§ð???ð???ð??©ð???, ð??¦ð??¯ð???ð???ð??§ð??? ð??? ð???ð??®ð??ªð??¥ð???ð???ð??¦ð??? ð??? ð??¿ð???ð??¼. ð??? ð???ð??¨ð??¤ð??¿ð??? ð??¥ð??¨ð??? ð??? ð??©ð??¯ ð??¦ð??¯ð???ð??»ð??¯ð??©ð??¤ "
+"ð??¦ð??¯ð??µð??¥ð??»ð??±ð???ð??©ð??¯. 0 ð??¦ð??¯ð???ð??¦ð???ð??±ð???ð??? ð???ð??¨ð??? ð??? ð??¿ð???ð??¼ ð??¢ð??¦ð???ð??©ð??? ð??? ð???ð??° ð???ð??®ð??ªð??¥ð???ð???ð??©ð??? ð??¢ð??§ð??¯ ð??© ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð??? ð??ªð???ð??»ð???, ð???ð??´ "
+"ð???ð??¨ð??? ð???ð??± ð??¥ð??± ð??£ð??¨ð??¯ð???ð??©ð??¤ ð??°ð??? ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð??? ð???ð??¦ð???ð??¿ð??±ð???ð??©ð??¯ ð??ªð??¯ ð??© ð???ð??±ð???-ð???ð??²-ð???ð??±ð??? ð???ð??±ð???ð??¦ð???."
 
-#: ../data/tomboy.schemas.in.h:32
+#, fuzzy
+#: ../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 ð??¦ð??¯ð???ð??¦ð???ð??±ð???ð??? ð???ð??¨ð??? ð??¤ð??¦ð???ð??? ð???ð??§ð???ð???ð??? ð???ð??«ð??? ð???ð??° ð??³ð???ð???ð??±ð???ð??©ð??? ð??? ð??? ð??¯ð??¿ ð??¯ð??´ð??? ð??¯ð??±ð??¥ "
+"ð???ð??´ ð???ð??¨ð??? ð??¦ð??? ð??¢ð??¦ð??¤ ð???ð??©ð??¯ð???ð??¦ð??¯ð??¿ ð??¤ð??¦ð???ð???ð??¦ð??? ð??? ð??? ð??®ð??°ð??¯ð??±ð??¥ð??? ð??¯ð??´ð???."
+
+#, fuzzy
+#: ../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 ""
 "ð??¥ð??¨ð???ð???ð??¦ð??¥ð??©ð??¥ ð???ð??¸ð??©ð???ð???ð??¼ð??? ð??? ð??¯ð??´ð??? ð???ð??²ð???ð??©ð??¤ ð??? ð???ð??´ ð??¦ð??¯ ð??? ·ð???ð??ªð??¥ð???ð??¶ ð???ð??®ð??± ð??¹ ð???ð??¨ð??¯ð??©ð??¤ ð??¨ð???ð??¤ð??©ð??? ð??¯ð??´ð??? ð??¥ð??§ð??¯ð??¿."
 
-#: ../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 "ð??´ð???ð??©ð??¯ ð???ð???ð??¸ð??? ð??£ð??½"
 
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:44
+msgid "Path on SSH server to Tomboy synchronization directory (optional)."
+msgstr "ð???ð??­ð??? ð??ªð??¯ SSH ð???ð??»ð???ð??¼ ð??? ð???ð??ªð??¥ð???ð??¶ ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ (ð??ªð???ð???ð??©ð??¯ð??©ð??¤)."
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:45
+msgid ""
+"Path to the synchronization server when using the filesystem synchronization "
+"service addin."
+msgstr ""
+"ð???ð??­ð??? ð??? ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¼ ð??¢ð??§ð??¯ ð??¿ð???ð??¦ð??? ð??? ð???ð??²ð??¤ð???ð??¦ð???ð???ð??©ð??¥ ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¦ð??? addin."
+
+#, fuzzy
 #: ../data/tomboy.schemas.in.h:46
+msgid "SSHFS Remote Synchronization Folder"
+msgstr "SSHFS ð??®ð??¦ð??¥ð??´ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??´ð??¤ð???ð??¼"
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:47
+msgid "SSHFS Remote Synchronization User Name"
+msgstr "SSHFS ð??®ð??¦ð??¥ð??´ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð??¿ð???ð??¼ ð??¯ð??±ð??¥"
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:48
+msgid "SSHFS Synchronization Server Port"
+msgstr "SSHFS ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¼ ð???ð??¹ð???"
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:49
+msgid "SSHFS Synchronization Server URL"
+msgstr "SSHFS ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¼ ·ð??¿Â·ð??®Â·ð??¤"
+
+#: ../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:51
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:54
+msgid "Selected Synchronization Service Addin"
+msgstr "ð???ð??©ð??¤ð??§ð???ð???ð??©ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¦ð??? Addin"
+
+#: ../data/tomboy.schemas.in.h:55
 msgid "Set to TRUE to activate"
 msgstr "ð???ð??§ð??? ð??? ð???ð??®ð??µ ð??? ð??¨ð???ð???ð??¦ð???ð??±ð???"
 
-#: ../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 "ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð??¤ð??´ð???ð??©ð??¤ ð???ð??»ð???ð??¼ ð???ð??­ð???"
 
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:61
+msgid "The date format that is used for the timestamp."
+msgstr "ð??? ð???ð??±ð??? ð???ð??¹ð??¥ð??¨ð??? ð???ð??¨ð??? ð??¦ð??? ð??¿ð???ð??? ð???ð??¹ ð??? timestamp."
+
+#, fuzzy
+#: ../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 parser "
+"is fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
+"string \"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"ð??? ð???ð??¤ð??´ð???ð??©ð??¤ keybinding ð???ð??¹ ð???ð??®ð??¦ð??±ð???ð??¦ð??? ð??¯ ð???ð??¦ð???ð???ð??¤ð??±ð??¦ð??? ð??© ð??¯ð??¿ ð??¯ð??´ð???. ð??? ð???ð??¹ð??¥ð??¨ð??? ð??¤ð??«ð???ð??? ð??¤ð??²ð??? "
+"\"&lt;ð???ð??©ð??¯ð???ð??®ð??´ð??¤&gt;ð??©\" ð??¹ \"&lt;ð???ð??¦ð???ð???&gt;&lt;·ð??·ð??¤ð???&gt;F1\". ð??? ð???ð??¸ð???ð??¼ ð??¦ð??? ð???ð??ºð??¤ð??¦ ð??¤ð??¦ð???ð??¼ð??©ð??¤ "
+"ð??¯ ð??©ð??¤ð??¬ð??? ð??¤ð??´ð??¼ ð??¹ ð??³ð???ð??» ð???ð??±ð???, ð??¯ ð??·ð??¤ð???ð??´ ð??©ð???ð??®ð??°ð???ð??°ð??±ð???ð??©ð??¯ð??? ð???ð??³ð??? ð??¨ð??? \"&lt;Ctl&gt;\" ð??¯ "
+"\"&lt;·ð???ð???ð??®ð??¤&gt;\". ð??¦ð??? ð??¿ ð???ð??§ð??? ð??? ð??ªð???ð???ð??©ð??¯ ð??? ð??? ð???ð???ð??§ð???ð??©ð??¤ ð???ð???ð??®ð??¦ð??? \"ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???\", ð???ð??§ð??¯ ð???ð??º ð??¢ð??¦ð??¤ "
+"ð???ð??° ð??¯ð??´ keybinding ð???ð??¹ ð???ð??¦ð??? ð??¨ð???ð???ð??©ð??¯."
+
+#, fuzzy
 #: ../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 "
+"fairly liberal and allows lower or upper case, and also abbreviations such as "
+"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
+"string \"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"ð??? ð???ð??¤ð??´ð???ð??©ð??¤ keybinding ð???ð??¹ ð??´ð???ð??©ð??¯ð??¦ð??? ð??? \"ð???ð???ð??¸ð??? ð??£ð??½\" ð??¯ð??´ð???. ð??? ð???ð??¹ð??¥ð??¨ð??? ð??¤ð??«ð???ð??? ð??¤ð??²ð??? "
+"\"&lt;ð???ð??©ð??¯ð???ð??®ð??´ð??¤&gt;ð??©\" ð??¹ \"&lt;ð???ð??¦ð???ð???&gt;&lt;·ð??·ð??¤ð???&gt;F1\". ð??? ð???ð??¸ð???ð??¼ ð??¦ð??? ð???ð??ºð??¤ð??¦ ð??¤ð??¦ð???ð??¼ð??©ð??¤ "
+"ð??¯ ð??©ð??¤ð??¬ð??? ð??¤ð??´ð??¼ ð??¹ ð??³ð???ð??» ð???ð??±ð???, ð??¯ ð??·ð??¤ð???ð??´ ð??©ð???ð??®ð??°ð???ð??°ð??±ð???ð??©ð??¯ð??? ð???ð??³ð??? ð??¨ð??? \"&lt;Ctl&gt;\" ð??¯ "
+"\"&lt;·ð???ð???ð??®ð??¤&gt;\". ð??¦ð??? ð??¿ ð???ð??§ð??? ð??? ð??ªð???ð???ð??©ð??¯ ð??? ð??? ð???ð???ð??§ð???ð??©ð??¤ ð???ð???ð??®ð??¦ð??? \"ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???\", ð???ð??§ð??¯ ð???ð??º ð??¢ð??¦ð??¤ "
+"ð???ð??° ð??¯ð??´ keybinding ð???ð??¹ ð???ð??¦ð??? ð??¨ð???ð???ð??©ð??¯."
+
+#, fuzzy
+#: ../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 "
+"fairly liberal and allows lower or upper case, and also abbreviations such as "
+"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
+"string \"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"ð??? ð???ð??¤ð??´ð???ð??©ð??¤ keybinding ð???ð??¹ ð??´ð???ð??©ð??¯ð??¦ð??? ð??? ð??¯ð??´ð??? ð???ð??»ð??? ð???ð??²ð??©ð??¤ð??ªð???. ð??? ð???ð??¹ð??¥ð??¨ð??? ð??¤ð??«ð???ð??? ð??¤ð??²ð??? "
+"\"&lt;ð???ð??©ð??¯ð???ð??®ð??´ð??¤&gt;ð??©\" ð??¹ \"&lt;ð???ð??¦ð???ð???&gt;&lt;·ð??·ð??¤ð???&gt;F1\". ð??? ð???ð??¸ð???ð??¼ ð??¦ð??? ð???ð??ºð??¤ð??¦ ð??¤ð??¦ð???ð??¼ð??©ð??¤ "
+"ð??¯ ð??©ð??¤ð??¬ð??? ð??¤ð??´ð??¼ ð??¹ ð??³ð???ð??» ð???ð??±ð???, ð??¯ ð??·ð??¤ð???ð??´ ð??©ð???ð??®ð??°ð???ð??°ð??±ð???ð??©ð??¯ð??? ð???ð??³ð??? ð??¨ð??? \"&lt;Ctl&gt;\" ð??¯ "
+"\"&lt;·ð???ð???ð??®ð??¤&gt;\". ð??¦ð??? ð??¿ ð???ð??§ð??? ð??? ð??ªð???ð???ð??©ð??¯ ð??? ð??? ð???ð???ð??§ð???ð??©ð??¤ ð???ð???ð??®ð??¦ð??? \"ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???\", ð???ð??§ð??¯ ð???ð??º ð??¢ð??¦ð??¤ "
+"ð???ð??° ð??¯ð??´ keybinding ð???ð??¹ ð???ð??¦ð??? ð??¨ð???ð???ð??©ð??¯."
+
+#, fuzzy
+#: ../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 parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such as "
+"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
+"string \"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"ð??? ð???ð??¤ð??´ð???ð??©ð??¤ keybinding ð???ð??¹ ð??´ð???ð??©ð??¯ð??¦ð??? ð??? ð??®ð??°ð???ð??©ð??¯ð??? ð???ð??±ð??¯ð??¡ð??©ð??? ð???ð??²ð??©ð??¤ð??ªð???. ð??? ð???ð??¹ð??¥ð??¨ð??? ð??¤ð??«ð???ð??? ð??¤ð??²ð??? "
+"\"&lt;ð???ð??©ð??¯ð???ð??®ð??´ð??¤&gt;ð??©\" ð??¹ \"&lt;ð???ð??¦ð???ð???&gt;&lt;·ð??·ð??¤ð???&gt;F1\". ð??? ð???ð??¸ð???ð??¼ ð??¦ð??? ð???ð??ºð??¤ð??¦ ð??¤ð??¦ð???ð??¼ð??©ð??¤ "
+"ð??¯ ð??©ð??¤ð??¬ð??? ð??¤ð??´ð??¼ ð??¹ ð??³ð???ð??» ð???ð??±ð???, ð??¯ ð??·ð??¤ð???ð??´ ð??©ð???ð??®ð??°ð???ð??°ð??±ð???ð??©ð??¯ð??? ð???ð??³ð??? ð??¨ð??? \"&lt;Ctl&gt;\" ð??¯ "
+"\"&lt;·ð???ð???ð??®ð??¤&gt;\". ð??¦ð??? ð??¿ ð???ð??§ð??? ð??? ð??ªð???ð???ð??©ð??¯ ð??? ð??? ð???ð???ð??§ð???ð??©ð??¤ ð???ð???ð??®ð??¦ð??? \"ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???\", ð???ð??§ð??¯ ð???ð??º ð??¢ð??¦ð??¤ "
+"ð???ð??° ð??¯ð??´ keybinding ð???ð??¹ ð???ð??¦ð??? ð??¨ð???ð???ð??©ð??¯."
+
+#, fuzzy
+#: ../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 "
+"fairly liberal and allows lower or upper case, and also abbreviations such as "
+"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
+"string \"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"ð??? ð???ð??¤ð??´ð???ð??©ð??¤ keybinding ð???ð??¹ ð???ð??´ð??¦ð??? ð??? ð???ð??ªð??¥ð???ð??¶ applet's ð??¥ð??§ð??¯ð??¿. ð??? ð???ð??¹ð??¥ð??¨ð??? ð??¤ð??«ð???ð??? ð??¤ð??²ð??? "
+"\"&lt;ð???ð??©ð??¯ð???ð??®ð??´ð??¤&gt;ð??©\" ð??¹ \"&lt;ð???ð??¦ð???ð???&gt;&lt;·ð??·ð??¤ð???&gt;F1\". ð??? ð???ð??¸ð???ð??¼ ð??¦ð??? ð???ð??ºð??¤ð??¦ ð??¤ð??¦ð???ð??¼ð??©ð??¤ "
+"ð??¯ ð??©ð??¤ð??¬ð??? ð??¤ð??´ð??¼ ð??¹ ð??³ð???ð??» ð???ð??±ð???, ð??¯ ð??·ð??¤ð???ð??´ ð??©ð???ð??®ð??°ð???ð??°ð??±ð???ð??©ð??¯ð??? ð???ð??³ð??? ð??¨ð??? \"&lt;Ctl&gt;\" ð??¯ "
+"\"&lt;·ð???ð???ð??®ð??¤&gt;\". ð??¦ð??? ð??¿ ð???ð??§ð??? ð??? ð??ªð???ð???ð??©ð??¯ ð??? ð??? ð???ð???ð??§ð???ð??©ð??¤ ð???ð???ð??®ð??¦ð??? \"ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???\", ð???ð??§ð??¯ ð???ð??º ð??¢ð??¦ð??¤ "
+"ð???ð??° ð??¯ð??´ keybinding ð???ð??¹ ð???ð??¦ð??? ð??¨ð???ð???ð??©ð??¯."
+
+#: ../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 ð???ð??¤ð??³ð???ð??¦ð??¯."
 
-#: ../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."
+"The last setting for the 'Export linked notes' checkbox in the Export to HTML "
+"plugin."
 msgstr ""
 "ð??? ð??¤ð??­ð???ð??? ð???ð??§ð???ð??¦ð??? ð???ð??¹ ð??? 'ð??§ð???ð???ð???ð??¹ð??? ð??¤ð??¦ð???ð???ð??? ð??¯ð??´ð???ð???' ð???ð??§ð???ð???ð??ªð???ð??? ð??¦ð??¯ ð??? ð??§ð???ð???ð???ð??¹ð??? ð??? HTML ð???ð??¤ð??³ð???ð??¦ð??¯."
 
-#: ../data/tomboy.schemas.in.h:69
+#, fuzzy
+#: ../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 "
+"Export Linked Notes' setting and is used to specify whether all notes (found "
+"recursively) should be included during an export to HTML."
+msgstr ""
+"ð??? ð??¤ð??­ð???ð??? ð???ð??§ð???ð??¦ð??? ð???ð??¹ ð??? 'ð??¦ð??¯ð???ð??¤ð??µð??? ð??·ð??¤ ð??³ð???ð??¼ ð??¤ð??¦ð???ð???ð??? ð??¯ð??´ð???ð???' ð???ð??§ð???ð???ð??ªð???ð??? ð??¦ð??¯ ð??? ð??§ð???ð???ð???ð??¹ð??? ð??? ·ð??£Â·ð???·ð??¥Â·ð??¤ "
+"ð???ð??¤ð??³ð???ð??¦ð??¯. ð???ð??¦ð??? ð???ð??§ð???ð??¦ð??? ð??¦ð??? ð??¿ð???ð??? ð??¦ð??¯ ð???ð??©ð??¯ð??¡ð??©ð???ð???ð???ð??©ð??¯ ð??¢ð??¦ð??? ð??? '·ð??£Â·ð???·ð??¥Â·ð??¤ ð??§ð???ð???ð???ð??¹ð??? ð??¤ð??¦ð???ð???ð??? ð??¯ð??´ð???ð???' "
+"ð???ð??§ð???ð??¦ð??? ð??¯ ð??¦ð??? ð??¿ð???ð??? ð??? ð???ð???ð??§ð???ð??¦ð???ð??² ð??¢ð??§ð???ð??¼ ð??·ð??¤ ð??¯ð??´ð???ð??? (ð???ð??¬ð??¯ð??? recursively) ð???ð??«ð??? ð???ð??° ð??¦ð??¯ð???ð??¤ð??µð???ð??©ð??? "
+"ð???ð???ð??«ð??¼ð??¦ð??? ð??©ð??¯ ð??§ð???ð???ð???ð??¹ð??? ð??? ·ð??£Â·ð???·ð??¥Â·ð??¤."
+
+#, fuzzy
+#: ../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 ""
+"ð??? ð??¯ð??´ð??? ð???ð??»ð??° ð??? ð??? ð??¯ð??´ð??? ð???ð??¨ð??? ð???ð??«ð??? ð???ð??° ð???ð??©ð??¯ð???ð??¦ð???ð??¼ð??? ð??? \"ð???ð???ð??¸ð??? ð??£ð??½\" ð??¯ð??´ð???, ð??¢ð??¦ð??? ð??¦ð??? ð??·ð??¤ð??¢ð??±ð??? ð???ð??¤ð??±ð???ð??? "
+"ð??¨ð??? ð??? ð???ð??ªð???ð??«ð??¥ ð??? ð??? ð???ð??ªð??¥ð???ð??¶ ð??¯ð??´ð??? ð??¥ð??§ð??¯ð??¿ ð??¯ ð??·ð??¤ð???ð??´ ð??¨ð???ð???ð??§ð???ð??©ð???ð??©ð??¤ ð???ð??² hotkey."
+
+#, fuzzy
+#: ../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. ð???ð??§ð??? ð??? -1 ð??¹ ð??¤ð??§ð??? ð??¦ð??? "
+"ð???ð??¦ð???ð??·ð??¤ð??? SSH ð???ð??¹ð??? ð???ð??§ð???ð??¦ð???ð??? ð???ð??«ð??? ð???ð??° ð??¿ð???ð??? ð??¦ð??¯ð???ð???ð??§ð???."
+
+#: ../data/tomboy.schemas.in.h:73
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -265,6 +529,54 @@ msgstr ""
 "ð???ð??²ð??¥ (ð??¦ð??¯ ð??¥ð??¦ð??¤ð??¦ð???ð??§ð???ð??©ð??¯ð???ð???) ·ð???ð??ªð??¥ð???ð??¶ ð???ð??«ð??? ð??¢ð??±ð??? ð???ð??¹ ð??© ð??®ð??¦ð???ð???ð??ªð??¯ð??? ð??¢ð??§ð??¯ ð??¿ð???ð??¦ð??? ð???ð???ð??µð??? ð??? ð??¥ð??¬ð??¯ð??? ð??© ð???ð??¦ð???ð??? "
 "ð???ð??º."
 
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:74
+msgid "Timestamp format"
+msgstr "Timestamp ð???ð??¹ð??¥ð??¨ð???"
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:75
+msgid "URL of SSH server containing Tomboy synchronization directory."
+msgstr "·ð??¿Â·ð??®Â·ð??¤ ð??? SSH ð???ð??»ð???ð??¼ ð???ð??©ð??¯ð???ð??±ð??¯ð??¦ð??? ð???ð??ªð??¥ð???ð??¶ ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦."
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:76
+msgid ""
+"Unique identifier for the currently configured note synchronization service "
+"addin."
+msgstr "ð??¿ð??¯ð??°ð??? ð??²ð???ð??§ð??¯ð???ð??¦ð???ð??²ð??¼ ð???ð??¹ ð??? ð???ð??³ð??®ð??©ð??¯ð???ð??¤ð??¦ ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð??? ð??¯ð??´ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¦ð??? addin."
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:77
+msgid ""
+"Unique identifier for this Tomboy client, used when communicating with a "
+"sychronization server."
+msgstr ""
+"ð??¿ð??¯ð??°ð??? ð??²ð???ð??§ð??¯ð???ð??¦ð???ð??²ð??¼ ð???ð??¹ ð???ð??¦ð??? ð???ð??ªð??¥ð???ð??¶ ð???ð??¤ð??²ð??©ð??¯ð???, ð??¿ð???ð??? ð??¢ð??§ð??¯ ð???ð??©ð??¥ð??¿ð??¯ð??¦ð???ð??±ð???ð??¦ð??? ð??¢ð??¦ð??? ð??© sychronization "
+"ð???ð??»ð???ð??¼."
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:78
+msgid ""
+"Use wdfs option \"-ac\" to accept SSL certificates without prompting the user."
+msgstr ""
+"ð??¿ð??? wdfs ð??ªð???ð???ð??©ð??¯ \"-ð??±ð???ð??°\" ð??? ð??¨ð???ð???ð??§ð???ð??? ·ð???·ð???·ð??¤ ð???ð??©ð???ð??¦ð???ð??¦ð???ð??©ð???ð??? ð??¢ð??¦ð???ð??¬ð??? ð???ð??®ð??ªð??¥ð???ð???ð??¦ð??? ð??? ð??¿ð???ð??¼."
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:79
+msgid ""
+"User name to use when connecting to the synchronization server via SSH."
+msgstr "ð??¿ð???ð??¼ ð??¯ð??±ð??¥ ð??? ð??¿ð??? ð??¢ð??§ð??¯ ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? ð??? ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¼ ð???ð??²ð??© SSH."
+
+#, fuzzy
+#: ../data/tomboy.schemas.in.h:80
+msgid ""
+"Whitespace-separated list of note URIs for notes that should always appear in "
+"the Tomboy note menu."
+msgstr ""
+"Whitespace-ð???ð??§ð???ð??¼ð??±ð???ð??©ð??? ð??¤ð??¦ð???ð??? ð??? ð??¯ð??´ð??? URIs ð???ð??¹ ð??¯ð??´ð???ð??? ð???ð??¨ð??? ð???ð??«ð??? ð??·ð??¤ð??¢ð??±ð??? ð??©ð???ð??½ ð??¦ð??¯ ð??? ð???ð??ªð??¥ð???ð??¶ ð??¯ð??´ð??? "
+"ð??¥ð??§ð??¯ð??¿."
+
 #: ../Tomboy/ActionManager.cs:127
 msgid "_File"
 msgstr "_ð???ð??²ð??¤"
@@ -301,7 +613,7 @@ msgstr "_ð???ð??¤ð??´ð???"
 msgid "Close this window"
 msgstr "ð???ð??¤ð??´ð??? ð???ð??¦ð??? ð??¢ð??¦ð??¯ð???ð??´"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:289
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:294
 msgid "_Quit"
 msgstr "_ð???ð??¢ð??¦ð???"
 
@@ -313,7 +625,7 @@ msgstr "ð???ð??¢ð??¦ð??? ·ð???ð??ªð??¥ð???ð??¶"
 msgid "_Edit"
 msgstr "_ð??§ð???ð??¦ð???"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "·ð???ð??ªð??¥ð???ð??¶ ð???ð??®ð??§ð???ð??¼ð??©ð??¯ð???ð??©ð???"
 
@@ -325,10 +637,15 @@ msgstr "_ð???ð??ªð??¯ð???ð??©ð??¯ð???ð???"
 msgid "Tomboy Help"
 msgstr "·ð???ð??ªð??¥ð???ð??¶ ð??£ð??§ð??¤ð???"
 
-#: ../Tomboy/ActionManager.cs:165
+#: ../Tomboy/ActionManager.cs:165 ../Tomboy/MacApplication.cs:233
 msgid "About Tomboy"
 msgstr "ð??©ð???ð??¬ð??? ·ð???ð??ªð??¥ð???ð??¶"
 
+#, fuzzy
+#: ../Tomboy/ActionManager.cs:168
+msgid "TrayIcon"
+msgstr "TrayIcon"
+
 #: ../Tomboy/ActionManager.cs:171
 msgid "Create _New Note"
 msgstr "ð???ð??®ð??¦ð??±ð??? _ð??¯ð??¿ ð??¯ð??´ð???"
@@ -353,6 +670,15 @@ msgstr "ð??¢ð??ªð??? ð??¤ð??¦ð???ð???ð??? ð??£ð??½?"
 msgid "(none)"
 msgstr "(ð??¯ð??³ð??¯)"
 
+#, fuzzy
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:23
+msgid ""
+"You can use any bugzilla just by dragging links into notes.  If you want a "
+"special icon for certain hosts, add them here."
+msgstr ""
+"ð??¿ ð???ð??¨ð??¯ ð??¿ð??? ð??§ð??¯ð??¦ bugzilla ð??¡ð??³ð???ð??? ð???ð??² ð???ð??®ð??¨ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ð???ð??« ð??¯ð??´ð???ð???.  ð??¦ð??? ð??¿ ð??¢ð??ªð??¯ð??? ð??© ð???ð???ð??§ð???ð??©ð??¤ "
+"ð??²ð???ð??ªð??¯ ð???ð??¹ ð???ð??»ð???ð??©ð??¯ ð??£ð??´ð???ð???ð???, ð??¨ð??? ð???ð??§ð??¥ ð??£ð??½."
+
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
 msgstr "ð??£ð??´ð???ð??? ð??¯ð??±ð??¥"
@@ -374,6 +700,11 @@ msgstr "_ð??£ð??´ð???ð??? ð??¯ð??±ð??¥:"
 msgid "No host name specified"
 msgstr "ð??¯ð??´ ð??£ð??´ð???ð??? ð??¯ð??±ð??¥ ð???ð???ð??§ð???ð??¦ð???ð??²ð???"
 
+#, fuzzy
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
+msgid "You must specify the Bugzilla host name to use with this icon."
+msgstr "ð??¿ ð??¥ð??³ð???ð??? ð???ð???ð??§ð???ð??¦ð???ð??² ð??? Bugzilla ð??£ð??´ð???ð??? ð??¯ð??±ð??¥ ð??? ð??¿ð??? ð??¢ð??¦ð??? ð???ð??¦ð??? ð??²ð???ð??ªð??¯."
+
 #: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
 msgid "Error saving icon"
 msgstr "ð??»ð??¼ ð???ð??±ð???ð??¦ð??? ð??²ð???ð??ªð??¯"
@@ -394,8 +725,8 @@ msgstr "ð??¦ð??? ð??¿ ð??®ð??¦ð??¥ð??µð??? ð??©ð??¯ ð??²ð???ð??ªð??¯ ð??¦ð??? 
 msgid "Export to HTML"
 msgstr "ð??§ð???ð???ð???ð??¹ð??? ð??? HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:114
 #, csharp-format
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:114
 msgid "Your note was exported to \"{0}\"."
 msgstr "ð??¿ð??¼ ð??¯ð??´ð??? ð??¢ð??ªð??? ð??§ð???ð???ð???ð??¹ð???ð??©ð??? ð??? \"{0}\"."
 
@@ -411,8 +742,8 @@ msgstr "ð??¨ð???ð???ð??§ð??? ð???ð??¦ð??¯ð??²ð???."
 msgid "Folder does not exist."
 msgstr "ð???ð??´ð??¤ð???ð??¼ ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:148
 #, csharp-format
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:148
 msgid "Could not save the file \"{0}\""
 msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??±ð??? ð??? ð???ð??²ð??¤ \"{0}\""
 
@@ -436,24 +767,20 @@ msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð??°ð??¥ð??±ð??¤"
 msgid "_Folder Path:"
 msgstr "_ð???ð??´ð??¤ð???ð??¼ ð???ð??­ð???:"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:109
-msgid "_Browse..."
-msgstr "_ð???ð??®ð??¬ð???..."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:128
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
 msgstr "ð???ð??©ð??¤ð??§ð???ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??´ð??¤ð???ð??¼..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:156
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
 msgid "Folder path field is empty."
 msgstr "ð???ð??´ð??¤ð???ð??¼ ð???ð??­ð??? ð???ð??°ð??¤ð??? ð??¦ð??? ð??§ð??¥ð???ð???ð??¦."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:165
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "ð???ð???ð??§ð???ð??¦ð???ð??²ð??? ð???ð??´ð??¤ð???ð??¼ ð???ð??­ð??? ð???ð??³ð??? ð??¯ð??ªð??? ð??§ð???ð???ð??¦ð???ð???, ð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð??¢ð??ªð??? ð??³ð??¯ð??±ð???ð??©ð??¤ ð??? ð???ð??®ð??¦ð??±ð??? ð??¦ð???."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "ð??¤ð??´ð???ð??©ð??¤ ð???ð??´ð??¤ð???ð??¼"
 
@@ -461,6 +788,34 @@ msgstr "ð??¤ð??´ð???ð??©ð??¤ ð???ð??´ð??¤ð???ð??¼"
 msgid "Fixed Wid_th"
 msgstr "ð???ð??¦ð???ð???ð??? Wid_th"
 
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
+msgid "Cannot contact '{0}'"
+msgstr "ð???ð??¨ð??¯ð??ªð??? ð???ð??ªð??¯ð???ð??¨ð???ð??? '{0}'"
+
+#, fuzzy, csharp-format
+#: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:247
+msgid "Error running gaim-remote: {0}"
+msgstr "ð??»ð??¼ ð???ð??®ð??¦ð??¯ð???ð??¦ð??? ð??¯ð??´ð???"
+
+#, fuzzy
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs:29
+msgid "Insert Timestamp"
+msgstr "ð??¦ð??¯ð???ð??»ð??? Timestamp"
+
+#. initial newline
+#, fuzzy
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
+#: ../Tomboy/Applet.cs:227 ../Tomboy/Preferences.cs:146
+msgid "dddd, MMMM d, h:mm tt"
+msgstr "dddd, ð??¥ð??¥ ð???ð??°, ð??±ð???:mm tt"
+
+#, fuzzy
+#: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
+msgid "Choose one of the predefined formats or use your own."
+msgstr "ð???ð??µð??? ð??¢ð??³ð??¯ ð??? ð??? predefined ð???ð??¹ð??¥ð??¨ð???ð??? ð??¹ ð??¿ð??? ð??¿ð??¼ ð??´ð??¯."
+
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:62
 msgid "Use _Selected Format"
 msgstr "ð??¿ð??? _ð???ð??©ð??¤ð??§ð???ð???ð??©ð??? ð???ð??¹ð??¥ð??¨ð???"
@@ -477,6 +832,12 @@ msgstr "ð???ð??«ð???ð??±: ð???ð??§ð??¥ð???ð??¤ð??±ð???"
 msgid "Today: "
 msgstr "ð???ð??«ð???ð??±: "
 
+#. Format: "Today: Friday, July 01 2005"
+#, fuzzy
+#: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
+msgid "dddd, MMMM d yyyy"
+msgstr "dddd, ð??¥ð??¥ ð???ð??° yyyy"
+
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
 msgid "Tasks"
 msgstr "ð???ð??­ð???ð???ð???"
@@ -487,11 +848,11 @@ 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 <span weight=\"bold\">Today: Template</span> 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"
@@ -505,23 +866,66 @@ msgstr "ð???ð??®ð??¦ð??¯ð???"
 msgid "Error printing note"
 msgstr "ð??»ð??¼ ð???ð??®ð??¦ð??¯ð???ð??¦ð??? ð??¯ð??´ð???"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:219
 #, csharp-format
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:223
 msgid "Page {0} of {1}"
 msgstr "ð???ð??±ð??¡ {0} ð??? {1}"
 
+#. Translators: Explanation of the date and time format specifications can be found here:
+#. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
+#, fuzzy
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:242
+msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
+msgstr "dddd MM/dd/yyyy, hh:mm:ss tt"
+
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "ð??¨ð??? ð??© ð???ð???ð??§ð???"
 
+#, fuzzy
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
+msgid "Se_rver:"
+msgstr "Se_rver:"
+
+#, fuzzy
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
+msgid "User_name:"
+msgstr "User_name:"
+
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
 msgid "_Folder Path (optional):"
 msgstr "_ð???ð??´ð??¤ð???ð??¼ ð???ð??­ð??? (ð??ªð???ð???ð??©ð??¯ð??©ð??¤):"
 
+#. Text for label describing setup required for SSH sync addin to work
+#, fuzzy
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:58
+msgid ""
+"SSH synchronization requires an existing SSH key for this server and user, "
+"added to a running SSH daemon."
+msgstr ""
+"SSH ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð??®ð??¦ð???ð??¢ð??²ð??¼ð??? ð??©ð??¯ ð??§ð???ð???ð??¦ð???ð???ð??¦ð??? SSH ð???ð??° ð???ð??¹ ð???ð??¦ð??? ð???ð??»ð???ð??¼ ð??¯ ð??¿ð???ð??¼, ð??¨ð???ð??©ð??? ð??? ð??© "
+"ð??®ð??³ð??¯ð??¦ð??? SSH ð???ð??°ð??¥ð??©ð??¯."
+
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
 msgid "Server or username field is empty."
 msgstr "ð???ð??»ð???ð??¼ ð??¹ ð??¿ð???ð??¼ð??¯ð??±ð??¥ ð???ð??°ð??¤ð??? ð??¦ð??? ð??§ð??¥ð???ð???ð??¦."
 
+#, fuzzy
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
+msgid "SSH (sshfs FUSE)"
+msgstr "SSH (sshfs ð???ð???ð??µð???)"
+
+#, fuzzy
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:179
+msgid ""
+"Timeout connecting to server. Please ensure that your SSH key has been added "
+"to a running SSH daemon."
+msgstr ""
+"ð???ð??²ð??¥ð??¬ð??? ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? ð??? ð???ð??»ð???ð??¼. ð???ð??¤ð??°ð??? ð??¦ð??¯ð???ð??«ð??¼ ð???ð??¨ð??? ð??¿ð??¼ SSH ð???ð??° ð??£ð??¨ð??? ð???ð??°ð??¯ ð??¨ð???ð??©ð??? ð??? ð??© ð??®ð??³ð??¯ð??¦ð??? SSH "
+"ð???ð??°ð??¥ð??©ð??¯."
+
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:50
 msgid "Import from Sticky Notes"
 msgstr "ð??¦ð??¥ð???ð??¹ð??? ð???ð??®ð??ªð??¥ ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???ð???"
@@ -530,8 +934,8 @@ msgstr "ð??¦ð??¥ð???ð??¹ð??? ð???ð??®ð??ªð??¥ ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???
 msgid "No Sticky Notes found"
 msgstr "ð??¯ð??´ ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???ð??? ð???ð??¬ð??¯ð???"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
 #, csharp-format
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:134
 msgid "No suitable Sticky Notes file was found at \"{0}\"."
 msgstr "ð??¯ð??´ ð???ð??¿ð???ð??©ð???ð??©ð??¤ ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???ð??? ð???ð??²ð??¤ ð??¢ð??ªð??? ð???ð??¬ð??¯ð??? ð??¨ð??? \"{0}\"."
 
@@ -539,15 +943,25 @@ msgstr "ð??¯ð??´ ð???ð??¿ð???ð??©ð???ð??©ð??¤ ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???
 msgid "Sticky Notes import completed"
 msgstr "ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???ð??? ð??¦ð??¥ð???ð??¹ð??? ð???ð??©ð??¥ð???ð??¤ð??°ð???ð??©ð???"
 
-#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 #, csharp-format
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:144
 msgid "<b>{0}</b> of <b>{1}</b> Sticky Notes were successfully imported."
 msgstr "<b>{0}</b> ð??? <b>{1}</b> ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???ð??? ð??¢ð??» ð???ð??©ð???ð???ð??§ð???ð???ð??©ð??¤ð??¦ ð??¦ð??¥ð???ð??¹ð???ð??©ð???."
 
+#, fuzzy
+#: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:156
+msgid "Untitled"
+msgstr "Untitled"
+
 #: ../Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs:185
 msgid "Sticky Note: "
 msgstr "ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???: "
 
+#, fuzzy
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:62
+msgid "Tasque"
+msgstr "Tasque"
+
 #. Note to translators: "All" here must match up with the "All"
 #. category translation in Tasque for this to work properly.  "All"
 #. is used here to allow Tasque to decide which default category
@@ -556,6 +970,11 @@ msgstr "ð???ð???ð??¦ð???ð??¦ ð??¯ð??´ð???: "
 msgid "All"
 msgstr "ð??·ð??¤"
 
+#, fuzzy
+#: ../Tomboy/Addins/Tasque/TasqueNoteAddin.cs:145
+msgid "--- Tasque is not running ---"
+msgstr "--- Tasque ð??¦ð??? ð??¯ð??ªð??? ð??®ð??³ð??¯ð??¦ð??? ---"
+
 #: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
 msgid "_Underline"
 msgstr "_ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯"
@@ -572,6 +991,11 @@ msgstr "_ð???ð??­ð???ð??¢ð??¼ð???:"
 msgid "URL, username, or password field is empty."
 msgstr "URL, ð??¿ð???ð??¼ð??¯ð??±ð??¥, ð??¹ ð???ð??­ð???ð??¢ð??¼ð??? ð???ð??°ð??¤ð??? ð??¦ð??? ð??§ð??¥ð???ð???ð??¦."
 
+#, fuzzy
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
+msgid "WebDAV (wdfs FUSE)"
+msgstr "WebDAV (wdfs ð???ð???ð??µð???)"
+
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
@@ -641,11 +1065,39 @@ msgstr "ð??ªð???ð??»ð??²ð???ð??¦ð??? ð??¦ð??¯ ð???ð??®ð??¬ð???ð??¼ (ð???ð??®ð??§
 msgid "Set the default browser and try again"
 msgstr "ð???ð??§ð??? ð??? ð???ð??¦ð???ð??·ð??¤ð??? ð???ð??®ð??¬ð???ð??¼ ð??¯ ð???ð??®ð??² ð??©ð???ð??±ð??¯"
 
+#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:83
+msgid "Search All Notes"
+msgstr "ð???ð??»ð??? ð??·ð??¤ ð??¯ð??´ð???ð???"
+
+#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
+#. icons_path, (int)TomboyIcons.NewNotebook);
+#. if (new_notebook != null)
+#. object_collection.AddObject(new_notebook);
+#, fuzzy
+#: ../Tomboy/JumpListManager.cs:87
+msgid "Create New Note"
+msgstr "ð???ð??®ð??¦ð??±ð??? ð??¯ð??¿ ð??¯ð??´ð???"
+
+#, fuzzy, csharp-format
+#: ../Tomboy/JumpListManager.cs:117
+msgid "{0} (new)"
+msgstr " (ð??¯ð??¿)"
+
+#, fuzzy
+#: ../Tomboy/JumpListManager.cs:139
+msgid "Recent Notes"
+msgstr "ð??®ð??°ð???ð??©ð??¯ð??? ð??¯ð??´ð???ð???"
+
 #. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:214
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "_ð??¢ð??¦ð??¯ð???ð??´"
 
+#, fuzzy
+#: ../Tomboy/MacApplication.cs:234
+msgid "Preferences..."
+msgstr "ð???ð??®ð??§ð???ð??¼ð??©ð??¯ð???ð??©ð???..."
+
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:24
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:53
 msgid "Create a new notebook"
@@ -655,6 +1107,11 @@ msgstr "ð???ð??®ð??¦ð??±ð??? ð??© ð??¯ð??¿ ð??¯ð??´ð???ð???ð??«ð???"
 msgid "Type the name of the notebook you'd like to create."
 msgstr "ð???ð??²ð??? ð??? ð??¯ð??±ð??¥ ð??? ð??? ð??¯ð??´ð???ð???ð??«ð??? ð??¿'ð???ð??° ð??¤ð??²ð??? ð??? ð???ð??®ð??¦ð??±ð???."
 
+#, fuzzy
+#: ../Tomboy/Notebooks/CreateNotebookDialog.cs:31
+msgid "N_otebook name:"
+msgstr "N_otebook ð??¯ð??±ð??¥:"
+
 #: ../Tomboy/Notebooks/CreateNotebookDialog.cs:45
 msgid "Name already taken"
 msgstr "ð??¯ð??±ð??¥ ð??·ð??¤ð??®ð??§ð???ð??¦ ð???ð??±ð???ð??©ð??¯"
@@ -672,8 +1129,8 @@ msgstr "_ð???ð??®ð??°ð??±ð???"
 #. name of the notebook accordingly using "{0}".
 #. TODO: Figure out how to make this note for
 #. translators appear properly.
-#: ../Tomboy/Notebooks/Notebook.cs:79
 #, csharp-format
+#: ../Tomboy/Notebooks/Notebook.cs:79
 msgid "{0} Notebook Template"
 msgstr "{0} ð??¯ð??´ð???ð???ð??«ð??? ð???ð??§ð??¥ð???ð??¤ð??±ð???"
 
@@ -681,11 +1138,27 @@ msgstr "{0} ð??¯ð??´ð???ð???ð??«ð??? ð???ð??§ð??¥ð???ð??¤ð??±ð???"
 msgid "All Notes"
 msgstr "ð??·ð??¤ ð??¯ð??´ð???ð???"
 
+#, fuzzy
+#: ../Tomboy/Notebooks/Notebook.cs:215
+msgid "Unfiled Notes"
+msgstr "Unfiled ð??¯ð??´ð???ð???"
+
+#, fuzzy
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:48
+msgid "Note_books"
+msgstr "Note_books"
+
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:49
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:69
 msgid "Create a new note in a notebook"
 msgstr "ð???ð??®ð??¦ð??±ð??? ð??© ð??¯ð??¿ ð??¯ð??´ð??? ð??¦ð??¯ ð??© ð??¯ð??´ð???ð???ð??«ð???"
 
+#, fuzzy
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:52
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:223
+msgid "New Note_book..."
+msgstr "ð??¯ð??¿ Note_book..."
+
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:56
 msgid "_New Note"
 msgstr "_ð??¯ð??¿ ð??¯ð??´ð???"
@@ -702,12 +1175,17 @@ msgstr "_ð??´ð???ð??©ð??¯ ð???ð??§ð??¥ð???ð??¤ð??±ð??? ð??¯ð??´ð???"
 msgid "Open this notebook's template note"
 msgstr "ð??´ð???ð??©ð??¯ ð???ð??¦ð??? ð??¯ð??´ð???ð???ð??«ð???'ð??? ð???ð??§ð??¥ð???ð??¤ð??±ð??? ð??¯ð??´ð???"
 
+#, fuzzy
+#: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:64
+msgid "Delete Note_book"
+msgstr "ð???ð??¦ð??¤ð??°ð??? Note_book"
+
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:65
 msgid "Delete the selected notebook"
 msgstr "ð???ð??¦ð??¤ð??°ð??? ð??? ð???ð??©ð??¤ð??§ð???ð???ð??©ð??? ð??¯ð??´ð???ð???ð??«ð???"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:251
+#: ../Tomboy/RecentChanges.cs:259
 msgid "Notebooks"
 msgstr "ð??¯ð??´ð???ð???ð??«ð???ð???"
 
@@ -731,8 +1209,8 @@ msgstr "ð??¯ð??´ ð??¯ð??´ð???ð???ð??«ð???"
 #. string.  After being formatted for a notebook named,
 #. "Meetings", for example, the resultant string would be:
 #. New "Meetings" Note
-#: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
 #, csharp-format
+#: ../Tomboy/Notebooks/NotebookNewNoteMenuItem.cs:27
 msgid "New \"{0}\" Note"
 msgstr "ð??¯ð??¿ \"{0}\" ð??¯ð??´ð???"
 
@@ -748,121 +1226,206 @@ msgstr "ð??¯ð??´ð???ð???ð??«ð???"
 msgid "_New notebook..."
 msgstr "_ð??¯ð??¿ ð??¯ð??´ð???ð???ð??«ð???..."
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1566
 msgid "Really delete this note?"
 msgstr "ð??®ð??¾ð??¤ð??¦ ð???ð??¦ð??¤ð??°ð??? ð???ð??¦ð??? ð??¯ð??´ð????"
 
-#: ../Tomboy/Note.cs:1463
+#, fuzzy, csharp-format
+#: ../Tomboy/Note.cs:1569
+msgid "Really delete this {0} note?"
+msgid_plural "Really delete these {0} notes?"
+msgstr[0] "ð??®ð??¾ð??¤ð??¦ ð???ð??¦ð??¤ð??°ð??? ð???ð??¦ð??? ð??¯ð??´ð????"
+msgstr[1] "ð??®ð??¾ð??¤ð??¦ ð???ð??¦ð??¤ð??°ð??? ð???ð??¦ð??? ð??¯ð??´ð????"
+
+#: ../Tomboy/Note.cs:1580
 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
+#, fuzzy, csharp-format
+#: ../Tomboy/Note.cs:1608
 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 {1}."
 msgstr ""
 "ð??©ð??¯ ð??»ð??¼ ð??ªð???ð??»ð??? ð??¢ð??²ð??¤ ð???ð??±ð???ð??¦ð??? ð??¿ð??¼ ð??¯ð??´ð???ð???. ð???ð??¤ð??°ð??? ð???ð??§ð??? ð???ð??¨ð??? ð??¿ ð??£ð??¨ð??? ð???ð??©ð???ð??¦ð???ð??©ð??¯ð??? ð???ð??¦ð???ð??? ð???ð???ð??±ð???, ð??¯ ð???ð??¨ð??? ð??¿ "
 "ð??£ð??¨ð??? ð??©ð???ð??®ð??´ð???ð??®ð??¦ð??±ð??? ð??®ð??²ð???ð??? ð??ªð??¯ ~/.tomboy. ð??»ð??¼ ð???ð??°ð???ð??±ð??¤ð??? ð???ð??¨ð??¯ ð???ð??° ð???ð??¬ð??¯ð??? ð??¦ð??¯ ~/.tomboy.log."
 
+#: ../Tomboy/Note.cs:1624
+msgid "Error saving note data."
+msgstr "ð??»ð??¼ ð???ð??±ð???ð??¦ð??? ð??¯ð??´ð??? ð???ð??±ð???ð??©."
+
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:19 ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
 msgid "New Note Template"
 msgstr "ð??¯ð??¿ ð??¯ð??´ð??? ð???ð??§ð??¥ð???ð??¤ð??±ð???"
 
 #. Create migration notification note
 #. Translators: The title of the data migration note
-#: ../Tomboy/NoteManager.cs:111
+#: ../Tomboy/NoteManager.cs:147
 msgid "Your Notes Have Moved!"
 msgstr "ð??¿ð??¼ ð??¯ð??´ð???ð??? ð??£ð??¨ð??? ð??¥ð??µð???ð???!"
 
-#: ../Tomboy/NoteManager.cs:222
-msgid ""
-"<note-content>Start Here\n"
-"\n"
-"<bold>Welcome to Tomboy!</bold>\n"
-"\n"
-"Use this \"Start Here\" note to begin organizing your ideas and thoughts.\n"
-"\n"
-"You can create new notes to hold your ideas by selecting the \"Create New "
-"Note\" item from the Tomboy Notes menu in your GNOME Panel. Your note will "
-"be saved automatically.\n"
-"\n"
-"Then organize the notes you create by linking related notes and ideas "
-"together!\n"
-"\n"
-"We've created a note called <link:internal>Using Links in Tomboy</"
-"link:internal>.  Notice how each time we type <link:internal>Using Links in "
-"Tomboy</link:internal> it automatically gets underlined?  Click on the link "
-"to open the note.</note-content>"
+#. 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
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/NoteManager.cs:160
+msgid ""
+"In the latest version of Tomboy, your note files have moved.  You have "
+"probably never cared where your notes are stored, and if you still don't "
+"care, please go ahead and <bold>delete this note</bold>.  :-)\n\nYour old "
+"note directory is still safe and sound at <link:url>{0}</link:url> . If you "
+"go back to an older version of Tomboy, it will look for notes there.\n\nBut "
+"we've copied your notes and configuration info into new directories, which "
+"will be used from now on:\n\n<list><list-item dir=\"ltr\">Notes can now be "
+"found at <link:url>{1}</link:url>\n</list-item><list-item "
+"dir=\"ltr\">Configuration is at "
+"<link:url>{2}</link:url>\n</list-item><list-item dir=\"ltr\">You can install "
+"add-ins at <link:url>{3}</link:url>\n</list-item><list-item dir=\"ltr\">Log "
+"files can be found at <link:url>{4}</link:url></list-item></list>\n\nCiao!"
 msgstr ""
-"<note-content>ð???ð???ð??¸ð??? ð??£ð??½\n"
-"\n"
-"<bold>ð??¢ð??§ð??¤ð???ð??©ð??¥ ð??? ·ð???ð??ªð??¥ð???ð??¶!</bold>\n"
-"\n"
-"ð??¿ð??? ð???ð??¦ð??? \"ð???ð???ð??¸ð??? ð??£ð??½\" ð??¯ð??´ð??? ð??? ð???ð??©ð???ð??¦ð??¯ ð??¹ð???ð??©ð??¯ð??²ð???ð??¦ð??? ð??¿ð??¼ ð??²ð???ð??¾ð??? ð??¯ ð???ð??·ð???ð???.\n"
-"\n"
-"ð??¿ ð???ð??¨ð??¯ ð???ð??®ð??¦ð??±ð??? ð??¯ð??¿ ð??¯ð??´ð???ð??? ð??? ð??£ð??´ð??¤ð??? ð??¿ð??¼ ð??²ð???ð??¾ð??? ð???ð??² ð???ð??©ð??¤ð??§ð???ð???ð??¦ð??? ð??? \"ð???ð??®ð??¦ð??±ð??? ð??¯ð??¿ ð??¯ð??´ð???\" ð??²ð???ð??©ð??¥ ð???ð??®ð??ªð??¥ "
-"ð??? ·ð???ð??ªð??¥ð???ð??¶ ð??¯ð??´ð???ð??? ð??¥ð??§ð??¯ð??¿ ð??¦ð??¯ ð??¿ð??¼ ð??¯ð??´ð??¥ ð???ð??¨ð??¯ð??©ð??¤. ð??¿ð??¼ ð??¯ð??´ð??? ð??¢ð??¦ð??¤ ð???ð??° ð???ð??±ð???ð??? ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦.\n"
-"\n"
-"ð???ð??§ð??¯ ð??¹ð???ð??©ð??¯ð??²ð??? ð??? ð??¯ð??´ð???ð??? ð??¿ ð???ð??®ð??¦ð??±ð??? ð???ð??² ð??¤ð??¦ð???ð???ð??¦ð??? ð??®ð??¦ð??¤ð??±ð???ð??©ð??? ð??¯ð??´ð???ð??? ð??¯ ð??²ð???ð??¾ð??? ð???ð??«ð???ð??§ð???ð??¼!\n"
-"\n"
-"ð??¢ð??°'ð??? ð???ð??®ð??¦ð??±ð???ð??©ð??? ð??© ð??¯ð??´ð??? ð???ð??·ð??¤ð??? <link:internal>ð??¿ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ ·ð???ð??ªð??¥ð???ð??¶</link:internal>.  "
-"ð??¯ð??´ð???ð??¦ð??? ð??£ð??¬ ð??°ð??? ð???ð??²ð??¥ ð??¢ð??° ð???ð??²ð??? <link:internal>ð??¿ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ ·ð???ð??ªð??¥ð???ð??¶</link:internal> ð??¦ð??? "
-"ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ ð???ð??§ð???ð??? ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯ð????  ð???ð??¤ð??¦ð??? ð??ªð??¯ ð??? ð??¤ð??¦ð???ð??? ð??? ð??´ð???ð??©ð??¯ ð??? ð??¯ð??´ð???.</ð??¯ð??´ð???-ð???ð??ªð??¯ð???ð??§ð??¯ð???>"
-
-#: ../Tomboy/NoteManager.cs:241
-msgid ""
-"<note-content>Using Links in Tomboy\n"
-"\n"
-"Notes in Tomboy can be linked together by highlighting text in the current "
-"note and clicking the <bold>Link</bold> button above in the toolbar.  Doing "
-"so will create a new note and also underline the note's title in the current "
-"note.\n"
-"\n"
-"Changing the title of a note will update links present in other notes.  This "
-"prevents broken links from occurring when a note is renamed.\n"
-"\n"
-"Also, if you type the name of another note in your current note, it will "
-"automatically be linked for you.</note-content>"
+"ð??¦ð??¯ ð??? ð??¤ð??±ð???ð??©ð???ð??? ð???ð??»ð?? ð??©ð??¯ ð??? ð???ð??ªð??¥ð???ð??¶, ð??¿ð??¼ ð??¯ð??´ð??? ð???ð??²ð??¤ð??? ð??£ð??¨ð??? ð??¥ð??µð???ð???.  ð??¿ ð??£ð??¨ð??? ð???ð??®ð??ªð???ð??©ð???ð??¤ð??¦ ð??¯ð??§ð???ð??¼ ð???ð??ºð??? ð??¢ð??º "
+"ð??¿ð??¼ ð??¯ð??´ð???ð??? ð??¸ ð???ð???ð??¹ð???, ð??¯ ð??¦ð??? ð??¿ ð???ð???ð??¦ð??¤ ð???ð??´ð??¯ð??? ð???ð??º, ð???ð??¤ð??°ð??? ð???ð??´ ð??©ð??£ð??§ð??? ð??¯ <ð???ð??´ð??¤ð???>ð???ð??¦ð??¤ð??°ð??? ð???ð??¦ð??? "
+"ð??¯ð??´ð???</ð???ð??´ð??¤ð???>.  :-)\n\nð??¿ð??¼ ð??´ð??¤ð??? ð??¯ð??´ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ ð??¦ð??? ð???ð???ð??¦ð??¤ ð???ð??±ð??? ð??¯ ð???ð??¬ð??¯ð??? ð??¨ð??? "
+"<ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>{0}</ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤> . ð??¦ð??? ð??¿ ð???ð??´ ð???ð??¨ð??? ð??? ð??©ð??¯ ð??´ð??¤ð???ð??¼ ð???ð??»ð?? ð??©ð??¯ ð??? ð???ð??ªð??¥ð???ð??¶, ð??¦ð??? ð??¢ð??¦ð??¤ "
+"ð??¤ð??«ð??? ð???ð??¹ ð??¯ð??´ð???ð??? ð???ð??º.\n\nð???ð??³ð??? ð??¢ð??°'ð??? ð???ð??ªð???ð??¦ð??? ð??¿ð??¼ ð??¯ð??´ð???ð??? ð??¯ ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð??±ð???ð??©ð??¯ ð??¦ð??¯ð???ð??´ ð??¦ð??¯ð???ð??« ð??¯ð??¿ "
+"ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦ð???, ð??¢ð??¦ð??? ð??¢ð??¦ð??¤ ð???ð??° ð??¿ð???ð??? ð???ð??®ð??ªð??¥ ð??¯ð??¬ ð??ªð??¯:\n\n<ð??¤ð??¦ð???ð???><ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥ dir=\"ltr\">ð??¯ð??´ð???ð??? "
+"ð???ð??¨ð??¯ ð??¯ð??¬ ð???ð??° ð???ð??¬ð??¯ð??? ð??¨ð??? <ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>{1}</ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>\n</ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥><ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥ "
+"dir=\"ltr\">ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð??±ð???ð??©ð??¯ ð??¦ð??? ð??¨ð??? "
+"<ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>{2}</ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>\n</ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥><ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥ dir=\"ltr\">ð??¿ ð???ð??¨ð??¯ "
+"ð??¦ð??¯ð???ð???ð??·ð??¤ ð??¨ð???-ð??¦ð??¯ð??? ð??¨ð??? <ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>{3}</ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>\n</ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥><ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥ "
+"dir=\"ltr\">ð??¤ð??ªð??? ð???ð??²ð??¤ð??? ð???ð??¨ð??¯ ð???ð??° ð???ð??¬ð??¯ð??? ð??¨ð??? "
+"<ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤>{4}</ð??¤ð??¦ð???ð???:·ð??¿Â·ð??®Â·ð??¤></ð??¤ð??¦ð???ð???-ð??²ð???ð??©ð??¥></ð??¤ð??¦ð???ð???>\n\nð???ð??¶!"
+
+#: ../Tomboy/NoteManager.cs:265
+msgid ""
+"<note-content>Start Here\n\n<bold>Welcome to Tomboy!</bold>\n\nUse this "
+"\"Start Here\" note to begin organizing your ideas and thoughts.\n\nYou can "
+"create new notes to hold your ideas by selecting the \"Create New Note\" item "
+"from the Tomboy Notes menu in your GNOME Panel. Your note will be saved "
+"automatically.\n\nThen organize the notes you create by linking related notes "
+"and ideas together!\n\nWe've created a note called <link:internal>Using Links "
+"in Tomboy</link:internal>.  Notice how each time we type <link:internal>Using "
+"Links in Tomboy</link:internal> it automatically gets underlined?  Click on "
+"the link to open the note.</note-content>"
 msgstr ""
-"<note-content>ð??¿ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ ·ð???ð??ªð??¥ð???ð??¶\n"
-"\n"
-"ð??¯ð??´ð???ð??? ð??¦ð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð???ð??¨ð??¯ ð???ð??° ð??¤ð??¦ð???ð???ð??? ð???ð??«ð???ð??§ð???ð??¼ ð???ð??² ð??£ð??²ð??¤ð??²ð???ð??¦ð??? ð???ð??§ð???ð???ð??? ð??¦ð??¯ ð??? ð???ð??³ð??®ð??©ð??¯ð??? ð??¯ð??´ð??? ð??¯ ð???ð??¤ð??¦ð???ð??¦ð??? "
-"ð??? <bold>ð??¤ð??¦ð???ð???</bold> ð???ð??³ð???ð??©ð??¯ ð??©ð???ð??³ð??? ð??¦ð??¯ ð??? ð???ð??µð??¤ð???ð??¸.  ð???ð??µð??¦ð??? ð???ð??´ ð??¢ð??¦ð??¤ ð???ð??®ð??¦ð??±ð??? ð??© ð??¯ð??¿ ð??¯ð??´ð??? ð??¯ "
-"ð??·ð??¤ð???ð??´ ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯ ð??? ð??¯ð??´ð???'ð??? ð???ð??²ð???ð??©ð??¤ ð??¦ð??¯ ð??? ð???ð??³ð??®ð??©ð??¯ð??? ð??¯ð??´ð???.\n"
-"\n"
-"ð???ð??±ð??¯ð??¡ð??¦ð??? ð??? ð???ð??²ð???ð??©ð??¤ ð??? ð??© ð??¯ð??´ð??? ð??¢ð??¦ð??¤ ð??³ð???ð???ð??±ð??? ð??¤ð??¦ð???ð???ð??? ð???ð??®ð??©ð???ð??§ð??¯ð??? ð??¦ð??¯ ð??³ð???ð??¼ ð??¯ð??´ð???ð???.  ð???ð??¦ð??? ð???ð??®ð??¦ð???ð??§ð??¯ð???ð??? "
-"ð???ð??®ð??´ð???ð??©ð??¯ ð??¤ð??¦ð???ð???ð??? ð???ð??®ð??ªð??¥ ð??ªð???ð??»ð??¦ð??? ð??¢ð??§ð??¯ ð??© ð??¯ð??´ð??? ð??¦ð??? ð??®ð??°ð??¯ð??±ð??¥ð???.\n"
-"\n"
-"ð??·ð??¤ð???ð??´, ð??¦ð??? ð??¿ ð???ð??²ð??? ð??? ð??¯ð??±ð??¥ ð??? ð??©ð??¯ð??³ð???ð??¼ ð??¯ð??´ð??? ð??¦ð??¯ ð??¿ð??¼ ð???ð??³ð??®ð??©ð??¯ð??? ð??¯ð??´ð???, ð??¦ð??? ð??¢ð??¦ð??¤ ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ ð???ð??° "
-"ð??¤ð??¦ð???ð???ð??? ð???ð??¹ ð??¿.</note-content>"
+"<note-content>ð???ð???ð??¸ð??? ð??£ð??½\n\n<bold>ð??¢ð??§ð??¤ð???ð??©ð??¥ ð??? ·ð???ð??ªð??¥ð???ð??¶!</bold>\n\nð??¿ð??? ð???ð??¦ð??? \"ð???ð???ð??¸ð??? ð??£ð??½\" "
+"ð??¯ð??´ð??? ð??? ð???ð??©ð???ð??¦ð??¯ ð??¹ð???ð??©ð??¯ð??²ð???ð??¦ð??? ð??¿ð??¼ ð??²ð???ð??¾ð??? ð??¯ ð???ð??·ð???ð???.\n\nð??¿ ð???ð??¨ð??¯ ð???ð??®ð??¦ð??±ð??? ð??¯ð??¿ ð??¯ð??´ð???ð??? ð??? ð??£ð??´ð??¤ð??? ð??¿ð??¼ ð??²ð???ð??¾ð??? ð???ð??² "
+"ð???ð??©ð??¤ð??§ð???ð???ð??¦ð??? ð??? \"ð???ð??®ð??¦ð??±ð??? ð??¯ð??¿ ð??¯ð??´ð???\" ð??²ð???ð??©ð??¥ ð???ð??®ð??ªð??¥ ð??? ·ð???ð??ªð??¥ð???ð??¶ ð??¯ð??´ð???ð??? ð??¥ð??§ð??¯ð??¿ ð??¦ð??¯ ð??¿ð??¼ ð??¯ð??´ð??¥ ð???ð??¨ð??¯ð??©ð??¤. ð??¿ð??¼ "
+"ð??¯ð??´ð??? ð??¢ð??¦ð??¤ ð???ð??° ð???ð??±ð???ð??? ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦.\n\nð???ð??§ð??¯ ð??¹ð???ð??©ð??¯ð??²ð??? ð??? ð??¯ð??´ð???ð??? ð??¿ ð???ð??®ð??¦ð??±ð??? ð???ð??² ð??¤ð??¦ð???ð???ð??¦ð??? ð??®ð??¦ð??¤ð??±ð???ð??©ð??? "
+"ð??¯ð??´ð???ð??? ð??¯ ð??²ð???ð??¾ð??? ð???ð??«ð???ð??§ð???ð??¼!\n\nð??¢ð??°'ð??? ð???ð??®ð??¦ð??±ð???ð??©ð??? ð??© ð??¯ð??´ð??? ð???ð??·ð??¤ð??? <link:internal>ð??¿ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ "
+"·ð???ð??ªð??¥ð???ð??¶</link:internal>.  ð??¯ð??´ð???ð??¦ð??? ð??£ð??¬ ð??°ð??? ð???ð??²ð??¥ ð??¢ð??° ð???ð??²ð??? <link:internal>ð??¿ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ "
+"·ð???ð??ªð??¥ð???ð??¶</link:internal> ð??¦ð??? ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ ð???ð??§ð???ð??? ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯ð????  ð???ð??¤ð??¦ð??? ð??ªð??¯ ð??? ð??¤ð??¦ð???ð??? ð??? ð??´ð???ð??©ð??¯ ð??? "
+"ð??¯ð??´ð???.</ð??¯ð??´ð???-ð???ð??ªð??¯ð???ð??§ð??¯ð???>"
+
+#: ../Tomboy/NoteManager.cs:284
+msgid ""
+"<note-content>Using Links in Tomboy\n\nNotes in Tomboy can be linked together "
+"by highlighting text in the current note and clicking the <bold>Link</bold> "
+"button above in the toolbar.  Doing so will create a new note and also "
+"underline the note's title in the current note.\n\nChanging the title of a "
+"note will update links present in other notes.  This prevents broken links "
+"from occurring when a note is renamed.\n\nAlso, if you type the name of "
+"another note in your current note, it will automatically be linked for "
+"you.</note-content>"
+msgstr ""
+"<note-content>ð??¿ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ ·ð???ð??ªð??¥ð???ð??¶\n\nð??¯ð??´ð???ð??? ð??¦ð??¯ ·ð???ð??ªð??¥ð???ð??¶ ð???ð??¨ð??¯ ð???ð??° ð??¤ð??¦ð???ð???ð??? ð???ð??«ð???ð??§ð???ð??¼ ð???ð??² "
+"ð??£ð??²ð??¤ð??²ð???ð??¦ð??? ð???ð??§ð???ð???ð??? ð??¦ð??¯ ð??? ð???ð??³ð??®ð??©ð??¯ð??? ð??¯ð??´ð??? ð??¯ ð???ð??¤ð??¦ð???ð??¦ð??? ð??? <bold>ð??¤ð??¦ð???ð???</bold> ð???ð??³ð???ð??©ð??¯ ð??©ð???ð??³ð??? ð??¦ð??¯ ð??? "
+"ð???ð??µð??¤ð???ð??¸.  ð???ð??µð??¦ð??? ð???ð??´ ð??¢ð??¦ð??¤ ð???ð??®ð??¦ð??±ð??? ð??© ð??¯ð??¿ ð??¯ð??´ð??? ð??¯ ð??·ð??¤ð???ð??´ ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯ ð??? ð??¯ð??´ð???'ð??? ð???ð??²ð???ð??©ð??¤ ð??¦ð??¯ ð??? ð???ð??³ð??®ð??©ð??¯ð??? "
+"ð??¯ð??´ð???.\n\nð???ð??±ð??¯ð??¡ð??¦ð??? ð??? ð???ð??²ð???ð??©ð??¤ ð??? ð??© ð??¯ð??´ð??? ð??¢ð??¦ð??¤ ð??³ð???ð???ð??±ð??? ð??¤ð??¦ð???ð???ð??? ð???ð??®ð??©ð???ð??§ð??¯ð??? ð??¦ð??¯ ð??³ð???ð??¼ ð??¯ð??´ð???ð???.  ð???ð??¦ð??? "
+"ð???ð??®ð??¦ð???ð??§ð??¯ð???ð??? ð???ð??®ð??´ð???ð??©ð??¯ ð??¤ð??¦ð???ð???ð??? ð???ð??®ð??ªð??¥ ð??ªð???ð??»ð??¦ð??? ð??¢ð??§ð??¯ ð??© ð??¯ð??´ð??? ð??¦ð??? ð??®ð??°ð??¯ð??±ð??¥ð???.\n\nð??·ð??¤ð???ð??´, ð??¦ð??? ð??¿ ð???ð??²ð??? ð??? ð??¯ð??±ð??¥ "
+"ð??? ð??©ð??¯ð??³ð???ð??¼ ð??¯ð??´ð??? ð??¦ð??¯ ð??¿ð??¼ ð???ð??³ð??®ð??©ð??¯ð??? ð??¯ð??´ð???, ð??¦ð??? ð??¢ð??¦ð??¤ ð??·ð???ð??©ð??¥ð??¨ð???ð??¦ð???ð??¤ð??¦ ð???ð??° ð??¤ð??¦ð???ð???ð??? ð???ð??¹ ð??¿.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:256 ../Tomboy/NoteManager.cs:324
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:368
 msgid "Start Here"
 msgstr "ð???ð???ð??¸ð??? ð??£ð??½"
 
-#: ../Tomboy/NoteManager.cs:261
+#: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
 msgstr "ð??¿ð???ð??¦ð??? ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ ·ð???ð??ªð??¥ð???ð??¶"
 
-#: ../Tomboy/NoteManager.cs:401
 #, csharp-format
+#: ../Tomboy/NoteManager.cs:445
 msgid "New Note {0}"
 msgstr "ð??¯ð??¿ ð??¯ð??´ð??? {0}"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:474 ../Tomboy/NoteManager.cs:566
+#: ../Tomboy/NoteManager.cs:518 ../Tomboy/NoteManager.cs:611
 msgid "Describe your new note here."
 msgstr "ð???ð??¦ð???ð???ð??®ð??²ð??? ð??¿ð??¼ ð??¯ð??¿ ð??¯ð??´ð??? ð??£ð??½."
 
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "ð??®ð??°ð??¯ð??±ð??¥ ð??¯ð??´ð??? ð??¤ð??¦ð???ð???ð????"
+
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "_Rename ð??¤ð??¦ð???ð???ð???"
+
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "_Don'ð???ð??° ð??®ð??°ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???ð???"
+
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:67
+msgid ""
+"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" to "
+"\"<span underline=\"single\">{1}</span>\"?\n\nIf you do not rename the links, "
+"they will no longer link to anything."
+msgstr ""
+"ð??®ð??°ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???ð??? ð??¦ð??¯ ð??³ð???ð??¼ ð??¯ð??´ð???ð??? ð???ð??®ð??ªð??¥ \"<ð???ð???ð??¨ð??¯ ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯=\"ð???ð??¦ð???ð???ð??©ð??¤\">{0}</ð???ð???ð??¨ð??¯>\" ð??? "
+"\"<ð???ð???ð??¨ð??¯ ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯=\"ð???ð??¦ð???ð???ð??©ð??¤\">{1}</ð???ð???ð??¨ð??¯>\"?\n\nð??¦ð??? ð??¿ ð???ð??µ ð??¯ð??ªð??? ð??®ð??°ð??¯ð??±ð??¥ ð??? ð??¤ð??¦ð???ð???ð???, ð???ð??± ð??¢ð??¦ð??¤ "
+"ð??¯ð??´ ð??¤ð??ªð???ð???ð??¼ ð??¤ð??¦ð???ð??? ð??? ð??§ð??¯ð??¦ð???ð??¦ð???."
+
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:81
+msgid "Rename Links"
+msgstr "ð??®ð??°ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???ð???"
+
+#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "ð??¯ð??´ð??? ð???ð??²ð???ð??©ð??¤"
+
+#. Translators: This button causes all notes in the list to be selected
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:116
+msgid "Select All"
+msgstr "ð???ð??©ð??¤ð??§ð???ð??? ð??·ð??¤"
+
+#. Translators: This button causes all notes in the list to be unselected
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:125
+msgid "Select None"
+msgstr "ð???ð??©ð??¤ð??§ð???ð??? ð??¯ð??³ð??¯"
+
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:142
+msgid "Ad_vanced"
+msgstr "Ad_vanced"
+
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:145
+msgid "Always show this _window"
+msgstr "ð??·ð??¤ð??¢ð??±ð??? ð???ð??´ ð???ð??¦ð??? _window"
+
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:153
+msgid "Never rename _links"
+msgstr "ð??¯ð??§ð???ð??¼ ð??®ð??°ð??¯ð??±ð??¥ _links"
+
+#, fuzzy
+#: ../Tomboy/NoteRenameDialog.cs:161
+msgid "Alwa_ys rename links"
+msgstr "Alwa_ys ð??®ð??°ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???ð???"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "ð???ð??²ð??¯ð??? ð??¦ð??¯ ð???ð??¦ð??? ð??¯ð??´ð???"
@@ -871,10 +1434,20 @@ msgstr "ð???ð??²ð??¯ð??? ð??¦ð??¯ ð???ð??¦ð??? ð??¯ð??´ð???"
 msgid "_Link to New Note"
 msgstr "_ð??¤ð??¦ð???ð??? ð??? ð??¯ð??¿ ð??¯ð??´ð???"
 
+#, fuzzy
+#: ../Tomboy/NoteWindow.cs:373
+msgid "Te_xt"
+msgstr "Te_xt"
+
 #: ../Tomboy/NoteWindow.cs:381
 msgid "_Find in This Note"
 msgstr "_ð???ð??²ð??¯ð??? ð??¦ð??¯ ð???ð??¦ð??? ð??¯ð??´ð???"
 
+#, fuzzy
+#: ../Tomboy/NoteWindow.cs:396
+msgid "Clos_e All Notes"
+msgstr "Clos_e ð??·ð??¤ ð??¯ð??´ð???ð???"
+
 #: ../Tomboy/NoteWindow.cs:436
 msgid "Search"
 msgstr "ð???ð??»ð???"
@@ -899,6 +1472,11 @@ msgstr "_ð???ð??§ð???ð???ð???"
 msgid "Set properties of text"
 msgstr "ð???ð??§ð??? ð???ð??®ð??ªð???ð??¼ð???ð??¦ð??? ð??? ð???ð??§ð???ð???ð???"
 
+#, fuzzy
+#: ../Tomboy/NoteWindow.cs:480
+msgid "T_ools"
+msgstr "T_ools"
+
 #: ../Tomboy/NoteWindow.cs:484
 msgid "Use tools on this note"
 msgstr "ð??¿ð??? ð???ð??µð??¤ð??? ð??ªð??¯ ð???ð??¦ð??? ð??¯ð??´ð???"
@@ -907,7 +1485,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 "ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??²ð??? ð??¯ð??´ð???ð???"
 
@@ -963,10 +1541,20 @@ msgstr "ð???ð??ªð??¯ð??? ð???ð??²ð???"
 msgid "_Normal"
 msgstr "_ð??¯ð??¹ð??¥ð??©ð??¤"
 
+#, fuzzy
+#: ../Tomboy/NoteWindow.cs:1327
+msgid "Hu_ge"
+msgstr "Hu_ge"
+
 #: ../Tomboy/NoteWindow.cs:1335
 msgid "_Large"
 msgstr "_ð??¤ð??¸ð??¡"
 
+#, fuzzy
+#: ../Tomboy/NoteWindow.cs:1343
+msgid "S_mall"
+msgstr "S_mall"
+
 #: ../Tomboy/NoteWindow.cs:1352
 msgid "Increase Font Size"
 msgstr "ð??¦ð??¯ð???ð??®ð??°ð??? ð???ð??ªð??¯ð??? ð???ð??²ð???"
@@ -979,133 +1567,224 @@ msgstr "ð???ð??¦ð???ð??®ð??°ð??? ð???ð??ªð??¯ð??? ð???ð??²ð???"
 msgid "Bullets"
 msgstr "ð???ð??«ð??¤ð??©ð???ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:78
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
 msgstr "ð??§ð???ð??¦ð???ð??¦ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:84
+msgid "Hotkeys"
+msgstr "Hotkeys"
+
+#: ../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 "_ð???ð???ð??§ð??¤ ð???ð??§ð??? ð??¢ð??²ð??¤ ð???ð??²ð???ð??¦ð???"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:188
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:182
+msgid ""
+"Misspellings will be underlined in red, with correct spelling suggestions "
+"shown in the context menu."
+msgstr ""
+"Misspellings ð??¢ð??¦ð??¤ ð???ð??° ð??©ð??¯ð???ð??»ð??¤ð??²ð??¯ð??? ð??¦ð??¯ ð??®ð??§ð???, ð??¢ð??¦ð??? ð???ð??©ð??®ð??§ð???ð??? ð???ð???ð??§ð??¤ð??¦ð??? ð???ð??©ð??¡ð??§ð???ð???ð??©ð??¯ð??? ð???ð??´ð??¯ ð??¦ð??¯ ð??? "
+"ð???ð??ªð??¯ð???ð??§ð???ð???ð??? ð??¥ð??§ð??¯ð??¿."
+
+#. WikiWords...
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:193
+msgid "Highlight _WikiWords"
+msgstr "ð??£ð??²ð??¤ð??²ð??? _WikiWords"
+
+#, fuzzy
+#: ../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 ""
+"ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð??¦ð??? ð??ªð???ð???ð??©ð??¯ ð??? ð??£ð??²ð??¤ð??²ð??? ð??¢ð??»ð???ð??? <ð???ð??°>ThatLookLikeThis</ð???ð??°>. ð???ð??¤ð??¦ð???ð??¦ð??? ð??? ð??¢ð??»ð??? ð??¢ð??¦ð??¤ "
+"ð???ð??®ð??¦ð??±ð??? ð??© ð??¯ð??´ð??? ð??¢ð??¦ð??? ð???ð??¨ð??? ð??¯ð??±ð??¥."
+
+#. Auto bulleted list
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:208
+msgid "Enable auto-_bulleted lists"
+msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð??·ð???ð??´-_bulleted ð??¤ð??¦ð???ð???ð???"
+
+#: ../Tomboy/PreferencesDialog.cs:217
 msgid "Use custom _font"
 msgstr "ð??¿ð??? ð???ð??³ð???ð???ð??©ð??¥ _ð???ð??ªð??¯ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:212
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:235
+msgid "When renaming a linked note: "
+msgstr "ð??¢ð??§ð??¯ ð??®ð??°ð??¯ð??±ð??¥ð??¦ð??? ð??© ð??¤ð??¦ð???ð???ð??? ð??¯ð??´ð???: "
+
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:238
+msgid "Ask me what to do"
+msgstr "ð??­ð???ð??? ð??¥ð??° ð??¢ð??ªð??? ð??? ð???ð??µ"
+
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Never rename links"
+msgstr "ð??¯ð??§ð???ð??¼ ð??®ð??°ð??¯ð??±ð??¥ ð??¤ð??¦ð???ð???ð???"
+
+#, fuzzy
+#: ../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...
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:326
+msgid "Listen for _Hotkeys"
+msgstr "ð??¤ð??¦ð???ð??©ð??¯ ð???ð??¹ _Hotkeys"
+
+#, fuzzy
+#: ../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;Alt&gt;N</b>"
+msgstr ""
+"Hotkeys ð??©ð??¤ð??¬ ð??¿ ð??? ð???ð??¢ð??¦ð???ð??¤ð??¦ ð??¨ð???ð???ð??§ð??? ð??¿ð??¼ ð??¯ð??´ð???ð??? ð???ð??®ð??ªð??¥ ð??§ð??¯ð??¦ð??¢ð??º ð??¢ð??¦ð??? ð??© keypress. ð??¦ð???ð???ð??­ð??¥ð???ð??©ð??¤ "
+"Hotkeys: <ð???ð??°>&lt;ð???ð??©ð??¯ð???ð??®ð??´ð??¤&gt;&lt;ð???ð??¦ð???ð???&gt;F11</ð???ð??°>, <ð???ð??°>&lt;·ð??·ð??¤ð???&gt;ð??§ð??¯</ð???ð??°>"
+
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:307
+#: ../Tomboy/PreferencesDialog.cs:355
 msgid "Show notes _menu"
 msgstr "ð???ð??´ ð??¯ð??´ð???ð??? _ð??¥ð??§ð??¯ð??¿"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:324
+#: ../Tomboy/PreferencesDialog.cs:372
 msgid "Open \"_Start Here\""
 msgstr "ð??´ð???ð??©ð??¯ \"_ð???ð???ð??¸ð??? ð??£ð??½\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:341
+#: ../Tomboy/PreferencesDialog.cs:389
 msgid "Create _new note"
 msgstr "ð???ð??®ð??¦ð??±ð??? _ð??¯ð??¿ ð??¯ð??´ð???"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:358
+#: ../Tomboy/PreferencesDialog.cs:406
 msgid "Open \"Search _All Notes\""
 msgstr "ð??´ð???ð??©ð??¯ \"ð???ð??»ð??? _ð??·ð??¤ ð??¯ð??´ð???ð???\""
 
-#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:433
+msgid "Ser_vice:"
+msgstr "Ser_vice:"
+
+#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "ð??¯ð??ªð??? ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð??©ð???ð??©ð??¤"
 
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:512
+msgid "Automaticall_y Sync in Background Every"
+msgstr "Automaticall_y ð???ð??¦ð???ð??? ð??¦ð??¯ ð???ð??¨ð???ð???ð??®ð??¬ð??¯ð??? ð??§ð???ð??®ð??¦"
+
+#. Translators: See above comment for details on
+#. this string.
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:518
+msgid "Minutes"
+msgstr "ð??¥ð??¦ð??¯ð??¦ð???ð???"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:458
+#: ../Tomboy/PreferencesDialog.cs:540
 msgid "_Advanced..."
 msgstr "_ð??©ð???ð???ð??­ð??¯ð???ð???..."
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:601
 msgid "The following add-ins are installed"
 msgstr "ð??? ð???ð??ªð??¤ð??´ð??¦ð??? ð??¨ð???-ð??¦ð??¯ð??? ð??¸ ð??¦ð??¯ð???ð???ð??·ð??¤ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:622
 msgid "Get More Add-Ins..."
 msgstr "ð???ð??§ð??? ð??¥ð??¹ ð??¨ð???-ð??¦ð??¯ð???..."
 
-#: ../Tomboy/PreferencesDialog.cs:566
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_ð??¦ð??¯ð??±ð???ð??©ð??¤"
 
-#: ../Tomboy/PreferencesDialog.cs:572
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_ð???ð??¦ð???ð??±ð???ð??©ð??¤"
 
-#: ../Tomboy/PreferencesDialog.cs:703
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "ð??¯ð??ªð??? ð??¦ð??¥ð???ð??¤ð??©ð??¥ð??§ð??¯ð???ð??©ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:717
 #, csharp-format
+#: ../Tomboy/PreferencesDialog.cs:799
 msgid "{0} Preferences"
 msgstr "{0} ð???ð??®ð??§ð???ð??¼ð??©ð??¯ð???ð??©ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "ð???ð??µð??? ð??¯ð??´ð??? ð???ð??ªð??¯ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "ð??³ð???ð??¼ ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð??ªð???ð???ð??©ð??¯ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:906
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
-"When a conflict is detected between a local note and a note on the "
-"configured synchronization server:"
+"When a conflict is detected between a local note and a note on the configured "
+"synchronization server:"
 msgstr ""
 "ð??¢ð??§ð??¯ ð??© ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð??? ð??¦ð??? ð???ð??¦ð???ð??§ð???ð???ð??©ð??? ð???ð??¦ð???ð??¢ð??°ð??¯ ð??© ð??¤ð??´ð???ð??©ð??¤ ð??¯ð??´ð??? ð??¯ ð??© ð??¯ð??´ð??? ð??ªð??¯ ð??? ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð??? "
 "ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¼:"
 
-#: ../Tomboy/PreferencesDialog.cs:913
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "ð??·ð??¤ð??¢ð??±ð??? ð??­ð???ð??? ð??¥ð??° ð??¢ð??ªð??? ð??? ð???ð??µ."
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "ð??®ð??°ð??¯ð??±ð??¥ ð??¥ð??² ð??¤ð??´ð???ð??©ð??¤ ð??¯ð??´ð???."
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "ð??®ð??¦ð???ð??¤ð??±ð??? ð??¥ð??² ð??¤ð??´ð???ð??©ð??¤ ð??¯ð??´ð??? ð??¢ð??¦ð??? ð??? ð???ð??»ð???ð??¼'ð??? ð??³ð???ð???ð??±ð???."
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "WARNING: Are you sure?"
 msgstr "ð??¢ð??¹ð??¯ð??¦ð???: ð??¸ ð??¿ ð???ð??«ð??¼?"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
-"Clearing your synchronization settings is not recommended.  You may be "
-"forced to synchronize all of your notes again when you save new settings."
+"Clearing your synchronization settings is not recommended.  You may be forced "
+"to synchronize all of your notes again when you save new settings."
 msgstr ""
 "ð???ð??¤ð??¦ð??®ð??¦ð??? ð??¿ð??¼ ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??§ð???ð??¦ð???ð??? ð??¦ð??? ð??¯ð??ªð??? ð??®ð??§ð???ð??©ð??¥ð??§ð??¯ð???ð??©ð???.  ð??¿ ð??¥ð??± ð???ð??° ð???ð??¹ð???ð??? ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??²ð??? "
 "ð??·ð??¤ ð??? ð??¿ð??¼ ð??¯ð??´ð???ð??? ð??©ð???ð??±ð??¯ ð??¢ð??§ð??¯ ð??¿ ð???ð??±ð??? ð??¯ð??¿ ð???ð??§ð???ð??¦ð???ð???."
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#, fuzzy
+#: ../Tomboy/PreferencesDialog.cs:1164
+msgid "Resetting Synchronization Settings"
+msgstr "Resetting ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??§ð???ð??¦ð???ð???"
+
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1114,150 +1793,166 @@ msgstr ""
 "ð??¿ ð??£ð??¨ð??? ð???ð??¦ð???ð??±ð???ð??©ð??¤ð??? ð??? ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??»ð???ð??¦ð???.  ð??¿ð??¼ ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð???ð??§ð???ð??¦ð???ð??? ð??¢ð??¦ð??¤ "
 "ð??¯ð??¬ ð???ð??° ð???ð??¤ð??½ð???.  ð??¿ ð??¥ð??± ð???ð??° ð???ð??¹ð???ð??? ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??²ð??? ð??·ð??¤ ð??? ð??¿ð??¼ ð??¯ð??´ð???ð??? ð??©ð???ð??±ð??¯ ð??¢ð??§ð??¯ ð??¿ ð???ð??±ð??? ð??¯ð??¿ ð???ð??§ð???ð??¦ð???ð???"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Success! You're connected!"
 msgstr "ð???ð??©ð???ð???ð??§ð???! ð??¿'ð??®ð??° ð???ð??©ð??¯ð??§ð???ð???ð??©ð???!"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
-"Tomboy is ready to synchronize your notes. Would you like to synchronize "
-"them now?"
+"Tomboy is ready to synchronize your notes. Would you like to synchronize them "
+"now?"
 msgstr "·ð???ð??ªð??¥ð???ð??¶ ð??¦ð??? ð??®ð??§ð???ð??¦ ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??²ð??? ð??¿ð??¼ ð??¯ð??´ð???ð???. ð??¢ð??«ð??? ð??¿ ð??¤ð??²ð??? ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??²ð??? ð???ð??§ð??¥ ð??¯ð??¬?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#, fuzzy, csharp-format
+#: ../Tomboy/PreferencesDialog.cs:1269
 msgid ""
 "Sorry, but something went wrong.  Please check your information and try "
-"again.  The ~/.tomboy.log might be useful too."
+"again.  The {0} might be useful too."
 msgstr ""
-"ð???ð??ªð??®ð??¦, ð???ð??³ð??? ð???ð??³ð??¥ð???ð??¦ð??? ð??¢ð??§ð??¯ð??? ð??®ð??ªð???.  ð???ð??¤ð??°ð??? ð???ð??§ð??? ð??¿ð??¼ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯ ð??¯ ð???ð??®ð??² ð??©ð???ð??±ð??¯.  ð??? ~/.·ð???ð??ªð??¥ð???ð??¶."
-"ð??¤ð??ªð??? ð??¥ð??²ð??? ð???ð??° ð??¿ð???ð???ð??©ð??¤ ð???ð??µ."
+"ð???ð??ªð??®ð??¦, ð???ð??³ð??? ð???ð??³ð??¥ð???ð??¦ð??? ð??¢ð??§ð??¯ð??? ð??®ð??ªð???.  ð???ð??¤ð??°ð??? ð???ð??§ð??? ð??¿ð??¼ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯ ð??¯ ð???ð??®ð??² ð??©ð???ð??±ð??¯.  ð??? "
+"~/.·ð???ð??ªð??¥ð???ð??¶.ð??¤ð??ªð??? ð??¥ð??²ð??? ð???ð??° ð??¿ð???ð???ð??©ð??¤ ð???ð??µ."
 
-#: ../Tomboy/PreferencesDialog.cs:1196
+#: ../Tomboy/PreferencesDialog.cs:1282
 msgid "Error connecting :("
 msgstr "ð??»ð??¼ ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? :("
 
-#: ../Tomboy/PreferencesDialog.cs:1272
+#: ../Tomboy/PreferencesDialog.cs:1358
 msgid "Version:"
 msgstr "ð???ð??»ð?? ð??©ð??¯:"
 
-#: ../Tomboy/PreferencesDialog.cs:1279
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Author:"
 msgstr "ð??·ð???ð??¼:"
 
-#: ../Tomboy/PreferencesDialog.cs:1286
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Copyright:"
 msgstr "ð???ð??ªð???ð??¦ð??®ð??²ð???:"
 
-#: ../Tomboy/PreferencesDialog.cs:1292
+#: ../Tomboy/PreferencesDialog.cs:1378
 msgid "Add-in Dependencies:"
 msgstr "ð??¨ð???-ð??¦ð??¯ ð???ð??¦ð???ð??§ð??¯ð???ð??©ð??¯ð???ð??°ð???:"
 
-#: ../Tomboy/RecentChanges.cs:75
-msgid "Search All Notes"
-msgstr "ð???ð??»ð??? ð??·ð??¤ ð??¯ð??´ð???ð???"
-
-#: ../Tomboy/RecentChanges.cs:90
+#: ../Tomboy/RecentChanges.cs:98
 msgid "_Search:"
 msgstr "_ð???ð??»ð???:"
 
-#: ../Tomboy/RecentChanges.cs:319
+#: ../Tomboy/RecentChanges.cs:330
 msgid "Note"
 msgstr "ð??¯ð??´ð???"
 
-#: ../Tomboy/RecentChanges.cs:341
+#: ../Tomboy/RecentChanges.cs:352
 msgid "Last Changed"
 msgstr "ð??¤ð??­ð???ð??? ð???ð??±ð??¯ð??¡ð???"
 
-#: ../Tomboy/RecentChanges.cs:472
+#: ../Tomboy/RecentChanges.cs:483
 msgid "Matches"
 msgstr "ð??¥ð??¨ð???ð??©ð???"
 
-#: ../Tomboy/RecentChanges.cs:680
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/RecentChanges.cs:534
+msgid "{0} match"
+msgid_plural "{0} matches"
+msgstr[0] "{0} ð??¥ð??¨ð???"
+msgstr[1] "{0} ð??¥ð??¨ð???ð??©ð???"
+
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/RecentChanges.cs:548
+msgid "Total: {0} note"
+msgid_plural "Total: {0} notes"
+msgstr[0] "ð???ð??´ð???ð??©ð??¤: {0} ð??¯ð??´ð???"
+msgstr[1] "ð???ð??´ð???ð??©ð??¤: {0} ð??¯ð??´ð???ð???"
+
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/RecentChanges.cs:559
+msgid "Matches: {0} note"
+msgid_plural "Matches: {0} notes"
+msgstr[0] "ð??¥ð??¨ð???ð??©ð???: {0} ð??¯ð??´ð???"
+msgstr[1] "ð??¥ð??¨ð???ð??©ð???: {0} ð??¯ð??´ð???ð???"
+
+#: ../Tomboy/RecentChanges.cs:695
 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:403
 msgid "translator-credits"
 msgstr "·ð???ð??ªð??¥ð??©ð??? ·ð???ð??»ð??¥ð??©ð??¯"
 
-#: ../Tomboy/Tomboy.cs:386
+#, fuzzy
+#: ../Tomboy/Tomboy.cs:412
+msgid "Copyright © 2004-2007 Alex Graveley\nCopyright © 2004-2009 Others\n"
+msgstr "ð???ð??ªð???ð??¦ð??®ð??²ð??? © 2004-2007 ð??¨ð??¤ð??©ð???ð??? Graveley\nð???ð??ªð???ð??¦ð??®ð??²ð??? © 2004-2009 ð??³ð???ð??¼ð???\n"
+
+#: ../Tomboy/Tomboy.cs:414
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "ð??© ð???ð??¦ð??¥ð???ð??©ð??¤ ð??¯ ð??°ð???ð??¦ ð??? ð??¿ð??? ð???ð??§ð???ð???ð???ð??ªð??? ð??¯ð??´ð???-ð???ð??±ð???ð??¦ð??? ð??©ð???ð??¤ð??¦ð???ð??±ð???ð??©ð??¯."
 
-#: ../Tomboy/Tomboy.cs:526
+#, fuzzy
+#: ../Tomboy/Tomboy.cs:424
+msgid "Homepage"
+msgstr "Homepage"
+
+#, fuzzy
+#: ../Tomboy/Tomboy.cs:536
 msgid ""
-"Usage:\n"
-"  --version\t\t\tPrint version information.\n"
-"  --help\t\t\tPrint this usage message.\n"
-"  --note-path [path]\t\tLoad/store note data in this directory.\n"
-"  --search [text]\t\tOpen the search all notes window with the search text.\n"
+"Tomboy: A simple, easy to use desktop note-taking application.\nCopyright (C) "
+"2004-2006 Alex Graveley <alex beatniksoftware com>\n\n"
 msgstr ""
-"ð??¿ð???ð??¦ð??¡:\n"
-"  --version\t\t\tð???ð??®ð??¦ð??¯ð??? ð???ð??»ð?? ð??©ð??¯ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯.\n"
-"  --help\t\t\tð???ð??®ð??¦ð??¯ð??? ð???ð??¦ð??? ð??¿ð???ð??¦ð??¡ ð??¥ð??§ð???ð??¦ð??¡.\n"
-"  --note-path [ð???ð??­ð???]\t\tð??¤ð??´ð???/ð???ð???ð??¹ ð??¯ð??´ð??? ð???ð??±ð???ð??© ð??¦ð??¯ ð???ð??¦ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦.\n"
-"  --search [ð???ð??§ð???ð???ð???]\t\tð??´ð???ð??©ð??¯ ð??? ð???ð??»ð??? ð??·ð??¤ ð??¯ð??´ð???ð??? ð??¢ð??¦ð??¯ð???ð??´ ð??¢ð??¦ð??? ð??? ð???ð??»ð??? ð???ð??§ð???ð???ð???.\n"
-
-#: ../Tomboy/Tomboy.cs:537
-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"
-"  --open-note [title/url]\tDisplay the existing note matching title.\n"
-"  --start-here\t\t\tDisplay the 'Start Here' note.\n"
-"  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
+"ð???ð??ªð??¥ð???ð??¶: ð??© ð???ð??¦ð??¥ð???ð??©ð??¤, ð??°ð???ð??¦ ð??? ð??¿ð??? ð???ð??§ð???ð???ð???ð??ªð??? ð??¯ð??´ð???-ð???ð??±ð???ð??¦ð??? ð??©ð???ð??¤ð??¦ð???ð??±ð???ð??©ð??¯.\nð???ð??ªð???ð??¦ð??®ð??²ð??? (ð???ð??°) "
+"2004-2006 ð??¨ð??¤ð??©ð???ð??? Graveley <ð??¨ð??¤ð??©ð???ð??? beatniksoftware ð???ð??ªð??¥>\n\n"
+
+#: ../Tomboy/Tomboy.cs:548
+msgid ""
+"Usage:\n  --version\t\t\tPrint version information.\n  --help\t\t\tPrint this "
+"usage message.\n  --note-path [path]\t\tLoad/store note data in this "
+"directory.\n  --search [text]\t\tOpen the search all notes window with the "
+"search text.\n"
 msgstr ""
-"  --new-note\t\t\tð???ð??®ð??¦ð??±ð??? ð??¯ ð???ð??¦ð???ð???ð??¤ð??± ð??© ð??¯ð??¿ ð??¯ð??´ð???.\n"
-"  --new-note [ð???ð??²ð???ð??©ð??¤]\t\tð???ð??®ð??¦ð??±ð??? ð??¯ ð???ð??¦ð???ð???ð??¤ð??± ð??© ð??¯ð??¿ ð??¯ð??´ð???, ð??¢ð??¦ð??? ð??© ð???ð??²ð???ð??©ð??¤.\n"
-"  --open-note [ð???ð??²ð???ð??©ð??¤/URL]\tð???ð??©ð???ð???ð??¤ð??± ð??? ð??§ð???ð???ð??¦ð???ð???ð??¦ð??? ð??¯ð??´ð??? ð??¥ð??¨ð???ð??¦ð??? ð???ð??²ð???ð??©ð??¤.\n"
-"  --start-here\t\t\tð???ð??©ð???ð???ð??¤ð??± ð??? 'ð???ð???ð??¸ð??? ð??£ð??½' ð??¯ð??´ð???.\n"
-"  --highlight-search [ð???ð??§ð???ð???ð???]\tð???ð??»ð??? ð??¯ ð??£ð??²ð??¤ð??²ð??? ð???ð??§ð???ð???ð??? ð??¦ð??¯ ð??? ð??´ð???ð??©ð??¯ð??? ð??¯ð??´ð???.\n"
-
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:554
-msgid "D-BUS remote control disabled.\n"
-msgstr "D-BUS ð??®ð??¦ð??¥ð??´ð??? ð???ð??©ð??¯ð???ð??®ð??´ð??¤ ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???.\n"
-
-#: ../Tomboy/Tomboy.cs:562
-#, csharp-format
-msgid "Version {0}"
-msgstr "ð???ð??»ð?? ð??©ð??¯ {0}"
+"ð??¿ð???ð??¦ð??¡:\n  --version\t\t\tð???ð??®ð??¦ð??¯ð??? ð???ð??»ð?? ð??©ð??¯ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯.\n  --help\t\t\tð???ð??®ð??¦ð??¯ð??? ð???ð??¦ð??? ð??¿ð???ð??¦ð??¡ "
+"ð??¥ð??§ð???ð??¦ð??¡.\n  --note-path [ð???ð??­ð???]\t\tð??¤ð??´ð???/ð???ð???ð??¹ ð??¯ð??´ð??? ð???ð??±ð???ð??© ð??¦ð??¯ ð???ð??¦ð??? ð???ð??²ð??®ð??§ð???ð???ð??¼ð??¦.\n  --search "
+"[ð???ð??§ð???ð???ð???]\t\tð??´ð???ð??©ð??¯ ð??? ð???ð??»ð??? ð??·ð??¤ ð??¯ð??´ð???ð??? ð??¢ð??¦ð??¯ð???ð??´ ð??¢ð??¦ð??? ð??? ð???ð??»ð??? ð???ð??§ð???ð???ð???.\n"
 
-#: ../Tomboy/Tomboy.cs:635
-#, csharp-format
+#: ../Tomboy/Tomboy.cs:558
 msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
+"  --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  --open-note "
+"[title/url]\tDisplay the existing note matching title.\n  "
+"--start-here\t\t\tDisplay the 'Start Here' note.\n  --highlight-search "
+"[text]\tSearch and highlight text in the opened note.\n"
 msgstr ""
-"·ð???ð??ªð??¥ð???ð??¶: ð??³ð??¯ð???ð??©ð???ð??¹ð???ð??©ð??? ð??ªð???ð???ð??©ð??¯ '{0}'\n"
-"ð???ð??®ð??² '·ð???ð??ªð??¥ð???ð??¶ --help' ð???ð??¹ ð??¥ð??¹ ð??¦ð??¯ð???ð??¼ð??¥ð??±ð???ð??©ð??¯.\n"
-"D-BUS ð??®ð??¦ð??¥ð??´ð??? ð???ð??©ð??¯ð???ð??®ð??´ð??¤ ð???ð??¦ð???ð??±ð???ð??©ð??¤ð???."
+"  --new-note\t\t\tð???ð??®ð??¦ð??±ð??? ð??¯ ð???ð??¦ð???ð???ð??¤ð??± ð??© ð??¯ð??¿ ð??¯ð??´ð???.\n  --new-note [ð???ð??²ð???ð??©ð??¤]\t\tð???ð??®ð??¦ð??±ð??? ð??¯ "
+"ð???ð??¦ð???ð???ð??¤ð??± ð??© ð??¯ð??¿ ð??¯ð??´ð???, ð??¢ð??¦ð??? ð??© ð???ð??²ð???ð??©ð??¤.\n  --open-note [ð???ð??²ð???ð??©ð??¤/URL]\tð???ð??©ð???ð???ð??¤ð??± ð??? ð??§ð???ð???ð??¦ð???ð???ð??¦ð??? "
+"ð??¯ð??´ð??? ð??¥ð??¨ð???ð??¦ð??? ð???ð??²ð???ð??©ð??¤.\n  --start-here\t\t\tð???ð??©ð???ð???ð??¤ð??± ð??? 'ð???ð???ð??¸ð??? ð??£ð??½' ð??¯ð??´ð???.\n  "
+"--highlight-search [ð???ð??§ð???ð???ð???]\tð???ð??»ð??? ð??¯ ð??£ð??²ð??¤ð??²ð??? ð???ð??§ð???ð???ð??? ð??¦ð??¯ ð??? ð??´ð???ð??©ð??¯ð??? ð??¯ð??´ð???.\n"
+
+#, csharp-format
+#: ../Tomboy/Tomboy.cs:572
+msgid "Version {0}"
+msgstr "ð???ð??»ð?? ð??©ð??¯ {0}"
 
 #: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (ð??¯ð??¿)"
 
-#: ../Tomboy/Tray.cs:282
+#: ../Tomboy/Tray.cs:287
 msgid "_About Tomboy"
 msgstr "_ð??©ð???ð??¬ð??? ·ð???ð??ªð??¥ð???ð??¶"
 
-#: ../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."
@@ -1265,51 +1960,103 @@ msgstr ""
 "ð??? \"·ð???ð??ªð??¥ð???ð??¶ ð??¯ð??´ð???ð??? ð??¥ð??¨ð??¯ð???ð??«ð??©ð??¤\" ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??° ð???ð??¬ð??¯ð???.  ð???ð??¤ð??°ð??? ð???ð??§ð??®ð??¦ð???ð??² ð???ð??¨ð??? ð??¿ð??¼ ð??¦ð??¯ð???ð???ð??©ð??¤ð??±ð???ð??©ð??¯ ð??£ð??¨ð??? "
 "ð???ð??°ð??¯ ð???ð??©ð??¥ð???ð??¤ð??°ð???ð??©ð??? ð???ð??©ð???ð???ð??§ð???ð???ð??©ð??¤ð??¦."
 
-#: ../Tomboy/Utils.cs:151
+#: ../Tomboy/Utils.cs:152
 msgid "Help not found"
 msgstr "ð??£ð??§ð??¤ð??? ð??¯ð??ªð??? ð???ð??¬ð??¯ð???"
 
-#: ../Tomboy/Utils.cs:167
+#: ../Tomboy/Utils.cs:168
 msgid "Cannot open location"
 msgstr "ð???ð??¨ð??¯ð??ªð??? ð??´ð???ð??©ð??¯ ð??¤ð??´ð???ð??±ð???ð??©ð??¯"
 
-#: ../Tomboy/Utils.cs:189
 #, csharp-format
+#: ../Tomboy/Utils.cs:190
 msgid "Today, {0}"
 msgstr "ð???ð??«ð???ð??±, {0}"
 
-#: ../Tomboy/Utils.cs:191
+#: ../Tomboy/Utils.cs:192
 msgid "Today"
 msgstr "ð???ð??«ð???ð??±"
 
-#: ../Tomboy/Utils.cs:195
 #, csharp-format
+#: ../Tomboy/Utils.cs:196
 msgid "Yesterday, {0}"
 msgstr "ð???ð??§ð???ð???ð??¼ð???ð??±, {0}"
 
-#: ../Tomboy/Utils.cs:197
+#: ../Tomboy/Utils.cs:198
 msgid "Yesterday"
 msgstr "ð???ð??§ð???ð???ð??¼ð???ð??±"
 
-#: ../Tomboy/Utils.cs:212
 #, csharp-format
+#, fuzzy
+#: ../Tomboy/Utils.cs:203
+msgid "{0} day ago, {1}"
+msgid_plural "{0} days ago, {1}"
+msgstr[0] "{0} ð???ð??± ð??©ð???ð??´, {1}"
+msgstr[1] "{0} ð???ð??±ð??? ð??©ð???ð??´, {1}"
+
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/Utils.cs:207
+msgid "{0} day ago"
+msgid_plural "{0} days ago"
+msgstr[0] "{0} ð???ð??± ð??©ð???ð??´"
+msgstr[1] "{0} ð???ð??±ð??? ð??©ð???ð??´"
+
+#, csharp-format
+#: ../Tomboy/Utils.cs:213
 msgid "Tomorrow, {0}"
 msgstr "ð???ð??«ð??¥ð??ªð??®ð??´, {0}"
 
-#: ../Tomboy/Utils.cs:214
+#: ../Tomboy/Utils.cs:215
 msgid "Tomorrow"
 msgstr "ð???ð??«ð??¥ð??ªð??®ð??´"
 
+#, fuzzy, csharp-format
+#: ../Tomboy/Utils.cs:220
+msgid "In {0} day, {1}"
+msgid_plural "In {0} days, {1}"
+msgstr[0] "ð???ð??±ð??¡ {0} ð??? {1}"
+msgstr[1] "ð???ð??±ð??¡ {0} ð??? {1}"
+
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/Utils.cs:224
+msgid "In {0} day"
+msgid_plural "In {0} days"
+msgstr[0] "ð??¦ð??¯ {0} ð???ð??±"
+msgstr[1] "ð??¦ð??¯ {0} ð???ð??±ð???"
+
+#, fuzzy
 #: ../Tomboy/Utils.cs:229
+msgid "MMMM d, h:mm tt"
+msgstr "ð??¥ð??¥ ð???ð??°, ð??±ð???:mm tt"
+
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "MMMM d"
 
-#: ../Tomboy/Utils.cs:231
+#: ../Tomboy/Utils.cs:232
 msgid "No Date"
 msgstr "ð??¯ð??´ ð???ð??±ð???"
 
-#: ../Tomboy/Watchers.cs:188
+#, fuzzy
+#: ../Tomboy/Utils.cs:235
+msgid "MMMM d yyyy, h:mm tt"
+msgstr "ð??¥ð??¥ ð???ð??° yyyy, ð??±ð???:mm tt"
+
+#, fuzzy
+#: ../Tomboy/Utils.cs:236
+msgid "MMMM d yyyy"
+msgstr "ð??¥ð??¥ ð???ð??° yyyy"
+
 #, csharp-format
+#, fuzzy
+#: ../Tomboy/Watchers.cs:155
+msgid "(Untitled {0})"
+msgstr "(Untitled {0})"
+
+#, csharp-format
+#: ../Tomboy/Watchers.cs:189
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
 "for this note before continuing."
@@ -1317,18 +2064,33 @@ 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 "_ð???ð??ªð???ð??¦ ð??¤ð??¦ð???ð??? ð??©ð???ð??®ð??§ð???"
 
-#: ../Tomboy/Watchers.cs:553
+#: ../Tomboy/Watchers.cs:554
 msgid "_Open Link"
 msgstr "_ð??´ð???ð??©ð??¯ ð??¤ð??¦ð???ð???"
 
+#, csharp-format
+#, fuzzy
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:94
+msgid ""
+"This synchronization addin is not supported on your computer. Please make "
+"sure you have FUSE and {0} correctly installed and configured"
+msgstr ""
+"ð???ð??¦ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ addin ð??¦ð??? ð??¯ð??ªð??? ð???ð??©ð???ð??¹ð???ð??©ð??? ð??ªð??¯ ð??¿ð??¼ ð???ð??©ð??¥ð???ð??¿ð???ð??¼. ð???ð??¤ð??°ð??? ð??¥ð??±ð??? ð???ð??«ð??¼ ð??¿ ð??£ð??¨ð??? ð???ð???ð??µð??? "
+"ð??¯ {0} ð???ð??©ð??®ð??§ð???ð???ð??¤ð??¦ ð??¦ð??¯ð???ð???ð??·ð??¤ð??? ð??¯ ð???ð??©ð??¯ð???ð??¦ð???ð???ð??¼ð???"
+
+#, fuzzy
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:129
+msgid "Could not read testfile."
+msgstr "ð???ð??«ð??? ð??¯ð??ªð??? ð??®ð??§ð??? testfile."
+
 #: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:132
 msgid "Write test failed."
 msgstr "ð??®ð??²ð??? ð???ð??§ð???ð??? ð???ð??±ð??¤ð???."
@@ -1345,202 +2107,210 @@ msgstr "ð??»ð??¼ ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? ð??? ð???ð??»ð???ð??¼."
 msgid "FUSE could not be enabled."
 msgstr "ð???ð???ð??µð??? ð???ð??«ð??? ð??¯ð??ªð??? ð???ð??° ð??¦ð??¯ð??±ð???ð??©ð??¤ð???."
 
+#, fuzzy
+#: ../Tomboy/Synchronization/FuseSyncServiceAddin.cs:233
+msgid "An error ocurred while connecting to the specified server:"
+msgstr "ð??©ð??¯ ð??»ð??¼ ocurred ð??¢ð??²ð??¤ ð???ð??©ð??¯ð??§ð???ð???ð??¦ð??? ð??? ð??? ð???ð???ð??§ð???ð??¦ð???ð??²ð??? ð???ð??»ð???ð??¼:"
+
 #. 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:303
+#, fuzzy, csharp-format
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
+msgid "{0} note updated."
+msgid_plural "{0} notes updated."
+msgstr[0] "{0} ð??¯ð??´ð???ð???ð??«ð??? ð???ð??§ð??¥ð???ð??¤ð??±ð???"
+msgstr[1] "{0} ð??¯ð??´ð???ð???ð??«ð??? ð???ð??§ð??¥ð???ð??¤ð??±ð???"
+
+#: ../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
 #, csharp-format
+#: ../Tomboy/Synchronization/SyncDialog.cs:565
 msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 msgstr ""
-"ð??? ð???ð??»ð???ð??¼ ð???ð??»ð?? ð??©ð??¯ ð??? \"{0}\" ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð???ð??? ð??¢ð??¦ð??? ð??¿ð??¼ ð??¤ð??´ð???ð??©ð??¤ ð??¯ð??´ð???.  ð??¢ð??ªð??? ð???ð??µ ð??¿ ð??¢ð??ªð??¯ð??? ð??? ð???ð??µ ð??¢ð??¦ð??? "
-"ð??¿ð??¼ ð??¤ð??´ð???ð??©ð??¤ ð??¯ð??´ð????"
+"ð??? ð???ð??»ð???ð??¼ ð???ð??»ð?? ð??©ð??¯ ð??? \"{0}\" ð???ð??ªð??¯ð???ð??¤ð??¦ð???ð???ð??? ð??¢ð??¦ð??? ð??¿ð??¼ ð??¤ð??´ð???ð??©ð??¤ ð??¯ð??´ð???.  ð??¢ð??ªð??? ð???ð??µ ð??¿ ð??¢ð??ªð??¯ð??? ð??? ð???ð??µ ð??¢ð??¦ð??? ð??¿ð??¼ "
+"ð??¤ð??´ð???ð??©ð??¤ ð??¯ð??´ð????"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:159
+#: ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "_Tools"
 msgstr "_ð???ð??µð??¤ð???"
 
@@ -1560,3 +2330,18 @@ msgstr ""
 #: ../Tomboy/Synchronization/SyncUtils.cs:135
 msgid "Enable FUSE?"
 msgstr "ð??¦ð??¯ð??±ð???ð??©ð??¤ ð???ð???ð??µð????"
+
+#. TODO: This message isn't entirely accurate.
+#. We should fix it.
+#, fuzzy
+#: ../Tomboy/Synchronization/SyncUtils.cs:139
+msgid ""
+"The synchronization you've chosen requires the FUSE module to be "
+"loaded.\n\nTo avoid getting this prompt in the future, you should load FUSE "
+"at startup.  Add \"modprobe fuse\" to /etc/init.d/boot.local or \"fuse\" to "
+"/etc/modules."
+msgstr ""
+"ð??? ð???ð??¦ð???ð???ð??®ð??©ð??¯ð??©ð???ð??±ð???ð??©ð??¯ ð??¿'ð??? ð???ð??´ð???ð??©ð??¯ ð??®ð??¦ð???ð??¢ð??²ð??¼ð??? ð??? ð???ð???ð??µð??? ð??¥ð??ªð???ð??¿ð??¤ ð??? ð???ð??° ð??¤ð??´ð???ð??©ð???.\n\nð??? ð??©ð???ð??¶ð??? ð???ð??§ð???ð??¦ð??? "
+"ð???ð??¦ð??? ð???ð??®ð??ªð??¥ð???ð??? ð??¦ð??¯ ð??? ð???ð??¿ð???ð??¼, ð??¿ ð???ð??«ð??? ð??¤ð??´ð??? ð???ð???ð??µð??? ð??¨ð??? ð???ð???ð??¸ð???ð??³ð???.  ð??¨ð??? \"modprobe ð???ð???ð??µð???\" ð??? "
+"/ð??§ð???ð???/init.ð???ð??°/ð???ð??µð???.ð??¤ð??´ð???ð??©ð??¤ ð??¹ \"ð???ð???ð??µð???\" ð??? /ð??§ð???ð???/ð??¥ð??ªð???ð??¿ð??¤ð???."
+