[tomboy] Updated British English translation



commit 7c43092959f31da39d0362d67d5cc7adddd91ff6
Author: Bruce Cowan <bcowan fastmail co uk>
Date:   Wed Feb 24 15:52:36 2010 +0000

    Updated British English translation

 po/en_GB.po |  713 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 413 insertions(+), 300 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index a4e0ac9..1c9eac9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,18 +3,21 @@
 # This file is distributed under the same license as the tomboy package.
 # David Lodge <dave cirt net>, 2004, 2009.
 # Philip Withnall <philip tecnocode co uk>, 2009.
+# Bruce Cowan <bcowan fastmail co uk>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 23:08+0100\n"
-"PO-Revision-Date: 2009-02-23 19:23+0000\n"
-"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"POT-Creation-Date: 2010-02-24 15:48+0000\n"
+"PO-Revision-Date: 2010-02-24 15:55+0100\n"
+"Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
 "Language-Team: British English <en li org>\n"
+"Language: en_GB\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"
+"X-Generator: Virtaal 0.5.2\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -29,21 +32,26 @@ msgid "Tomboy Applet Factory"
 msgstr "Tomboy Applet Factory"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:563
+#: ../Tomboy/Tray.cs:568
 msgid "Tomboy Notes"
 msgstr "Tomboy Notes"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:263
+msgid "S_ynchronize Notes"
+msgstr "S_ynchronise Notes"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "_About"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:272
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:277
 msgid "_Help"
 msgstr "_Help"
 
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:267
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:272
 msgid "_Preferences"
 msgstr "_Preferences"
 
@@ -60,62 +68,66 @@ msgid "Accept SSL Certificates"
 msgstr "Accept SSL Certificates"
 
 #: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Automatic Background Synchronisation Timeout"
+
+#: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
 msgstr "Create a new Note"
 
-#: ../data/tomboy.schemas.in.h:3
+#: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "Custom Font Face"
 
-#: ../data/tomboy.schemas.in.h:4
+#: ../data/tomboy.schemas.in.h:5
 msgid "Determines X coordinate of Search window; stored on Tomboy exit."
 msgstr "Determines X coordinate of Search window; stored on Tomboy exit."
 
-#: ../data/tomboy.schemas.in.h:5
+#: ../data/tomboy.schemas.in.h:6
 msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
 msgstr "Determines Y coordinate of Search window; stored on Tomboy exit."
 
-#: ../data/tomboy.schemas.in.h:6
+#: ../data/tomboy.schemas.in.h:7
 msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgstr "Determines pixel height of Search window; stored on Tomboy exit."
 
-#: ../data/tomboy.schemas.in.h:7
+#: ../data/tomboy.schemas.in.h:8
 msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgstr "Determines pixel width of Search window; stored on Tomboy exit."
 
-#: ../data/tomboy.schemas.in.h:8
+#: ../data/tomboy.schemas.in.h:9
 msgid "Enable Auto bulleted lists."
 msgstr "Enable Auto bulleted lists."
 
-#: ../data/tomboy.schemas.in.h:9
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Enable Middle-Click Paste On Icon."
 
-#: ../data/tomboy.schemas.in.h:10
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Enable WikiWord highlighting"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:12
 msgid "Enable closing notes with escape."
 msgstr "Enable closing notes with escape."
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:13
 msgid "Enable custom font"
 msgstr "Enable custom font"
 
-#: ../data/tomboy.schemas.in.h:13
+#: ../data/tomboy.schemas.in.h:14
 msgid "Enable global keybindings"
 msgstr "Enable global keybindings"
 
-#: ../data/tomboy.schemas.in.h:14
+#: ../data/tomboy.schemas.in.h:15
 msgid "Enable spellchecking"
 msgstr "Enable spellchecking"
 
-#: ../data/tomboy.schemas.in.h:15
+#: ../data/tomboy.schemas.in.h:16
 msgid "Enable startup notes"
 msgstr "Enable startup notes"
 
-#: ../data/tomboy.schemas.in.h:16
+#: ../data/tomboy.schemas.in.h:17
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
@@ -123,7 +135,7 @@ msgstr ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 
-#: ../data/tomboy.schemas.in.h:17
+#: ../data/tomboy.schemas.in.h:18
 msgid ""
 "Enable this option if you want to be able to middle-click the Tomboy icon to "
 "paste timestamped content into the Start Here note."
@@ -131,7 +143,7 @@ msgstr ""
 "Enable this option if you want to be able to middle-click the Tomboy icon to "
 "paste timestamped content into the Start Here note."
 
-#: ../data/tomboy.schemas.in.h:18
+#: ../data/tomboy.schemas.in.h:19
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
@@ -139,23 +151,23 @@ msgstr ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE Mounting Timeout (ms)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "HTML Export All Linked Notes"
 
-#: ../data/tomboy.schemas.in.h:21
+#: ../data/tomboy.schemas.in.h:22
 msgid "HTML Export Last Directory"
 msgstr "HTML Export Last Directory"
 
-#: ../data/tomboy.schemas.in.h:22
+#: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export Linked Notes"
 msgstr "HTML Export Linked Notes"
 
-#: ../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."
@@ -163,7 +175,7 @@ msgstr ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
 
-#: ../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."
@@ -171,11 +183,11 @@ msgstr ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 
-#: ../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 "If enabled, an opened note can be closed by hitting the escape key."
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -183,7 +195,7 @@ msgstr ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -193,7 +205,7 @@ msgstr ""
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
 "available from any application."
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -201,7 +213,7 @@ msgstr ""
 "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."
 
-#: ../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."
@@ -209,7 +221,7 @@ msgstr ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
 
-#: ../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."
@@ -217,7 +229,19 @@ msgstr ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:32
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+"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."
+
+#: ../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 "
@@ -231,11 +255,33 @@ msgstr ""
 "wishes to be prompted when a conflict occurs, so that they may handle each "
 "conflict situation on a case-by-case basis."
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behavior when a note is renamed, instead of prompting "
+"the user. The values map to an internal enumeration. 0 indicates that the "
+"user wishes to be prompted when renaming a note may impact links that exist "
+"in other notes. 1 indicates that links should automatically be removed. 2 "
+"indicates that link text should be updated to the new note name so that it "
+"will continue linking to the renamed note."
+msgstr ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behaviour 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."
+
+#: ../data/tomboy.schemas.in.h:35
+msgid "Link Updating Behavior on Note Rename"
+msgstr "Link Updating Behaviour on Note Rename"
+
+#: ../data/tomboy.schemas.in.h:36
 msgid "List of pinned notes."
 msgstr "List of pinned notes."
 
-#: ../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."
@@ -243,35 +289,35 @@ msgstr ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:38
 msgid "Maximum note title length to show in tray menu."
 msgstr "Maximum note title length to show in tray menu."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:39
 msgid "Minimum number of notes to show in menu"
 msgstr "Minimum number of notes to show in menu"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:40
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "Note Synchronisation Conflict Saved Behaviour"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:41
 msgid "Open Recent Changes"
 msgstr "Open Recent Changes"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:42
 msgid "Open Search Dialog"
 msgstr "Open Search Dialogue"
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:43
 msgid "Open Start Here"
 msgstr "Open Start Here"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:44
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "Path on SSH server to Tomboy synchronisation directory (optional)."
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:45
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
@@ -279,71 +325,71 @@ msgstr ""
 "Path to the synchronisation server when using the filesystem synchronisation "
 "service addin."
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:46
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "SSHFS Remote Synchronisation Folder"
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:47
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "SSHFS Remote Synchronisation User Name"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:48
 msgid "SSHFS Synchronization Server Port"
 msgstr "SSHFS Synchronisation Server Port"
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:49
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS Synchronisation Server URL"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:50
 msgid "Saved height of Search window"
 msgstr "Saved height of Search window"
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:51
 msgid "Saved horizontal position of Search window"
 msgstr "Saved horizontal position of Search window"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:52
 msgid "Saved vertical position of Search window"
 msgstr "Saved vertical position of Search window"
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:53
 msgid "Saved width of Search window"
 msgstr "Saved width of Search window"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:54
 msgid "Selected Synchronization Service Addin"
 msgstr "Selected Synchronisation Service Addin"
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:55
 msgid "Set to TRUE to activate"
 msgstr "Set to TRUE to activate"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:56
 msgid "Show applet menu"
 msgstr "Show applet menu"
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:57
 msgid "Start Here Note"
 msgstr "Start Here Note"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:58
 msgid "Sticky Note Importer First Run"
 msgstr "Sticky Note Importer First Run"
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Client ID"
 msgstr "Synchronisation Client ID"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:60
 msgid "Synchronization Local Server Path"
 msgstr "Synchronisation Local Server Path"
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:61
 msgid "The date format that is used for the timestamp."
 msgstr "The date format that is used for the timestamp."
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
@@ -359,7 +405,7 @@ msgstr ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:63
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -375,7 +421,7 @@ msgstr ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -391,7 +437,7 @@ msgstr ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:65
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
@@ -407,7 +453,7 @@ msgstr ""
 "option to the special string \"disabled\", then there will be no keybinding "
 "for this action."
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:66
 msgid ""
 "The global keybinding for showing the Tomboy applet's menu. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -423,17 +469,17 @@ msgstr ""
 "special string \"disabled\", then there will be no keybinding for this "
 "action."
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:67
 msgid "The handler for \"note://\" URLs"
 msgstr "The handler for \"note://\" URLs"
 
-#: ../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 ""
 "The last directory a note was exported to using the Export To HTML plugin."
 
-#: ../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."
@@ -441,7 +487,7 @@ msgstr ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:70
 msgid ""
 "The last setting for the 'Include all other linked notes' checkbox in the "
 "Export to HTML plugin. This setting is used in conjunction with the 'HTML "
@@ -453,7 +499,7 @@ msgstr ""
 "Export Linked Notes' setting and is used to specify whether all notes (found "
 "recursively) should be included during an export to HTML."
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:71
 msgid ""
 "The note URI of the note that should be considered the \"Start Here\" note, "
 "which is always placed at the bottom of the Tomboy note menu and also "
@@ -463,7 +509,7 @@ msgstr ""
 "which is always placed at the bottom of the Tomboy note menu and also "
 "accessible by hotkey."
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
@@ -471,7 +517,7 @@ msgstr ""
 "The port to use when connecting to the synchronisation server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:73
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -479,15 +525,15 @@ msgstr ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a synchronisation share."
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:74
 msgid "Timestamp format"
 msgstr "Timestamp format"
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:75
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "URL of SSH server containing Tomboy synchronisation directory."
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
@@ -495,7 +541,7 @@ msgstr ""
 "Unique identifier for the currently configured note synchronisation service "
 "addin."
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:77
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
@@ -503,7 +549,7 @@ msgstr ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronisation server."
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:78
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
@@ -511,12 +557,12 @@ msgstr ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:79
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
 "User name to use when connecting to the synchronisation server via SSH."
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:80
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -560,7 +606,7 @@ msgstr "_Close"
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:284
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:289
 msgid "_Quit"
 msgstr "_Quit"
 
@@ -572,7 +618,7 @@ msgstr "Quit Tomboy"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "Tomboy Preferences"
 
@@ -604,10 +650,6 @@ msgstr "_Search All Notes"
 msgid "Open the Search All Notes window"
 msgstr "Open the Search All Notes window"
 
-#: ../Tomboy/ActionManager.cs:179 ../Tomboy/Tray.cs:258
-msgid "S_ynchronize Notes"
-msgstr "S_ynchronise Notes"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "Start synchronising notes"
@@ -709,31 +751,27 @@ msgstr "Include all other linked notes"
 
 #: ../Tomboy/Addins/Evolution/EvolutionNoteAddin.cs:273
 msgid "Cannot open email"
-msgstr "Cannot open email"
+msgstr "Cannot open e-mail"
 
 #: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Folder Path:"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:109
-msgid "_Browse..."
-msgstr "_Browseâ?¦"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:128
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
 msgstr "Select Synchronisation Folderâ?¦"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:156
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
 msgid "Folder path field is empty."
 msgstr "Folder path field is empty."
 
-#: ../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 ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "Local Folder"
 
@@ -757,7 +795,7 @@ msgstr "Insert Timestamp"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Applet.cs:221 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd, d MMMM, HH:mm"
 
@@ -823,14 +861,14 @@ msgstr "Page {0} of {1}"
 #. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:238
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "dddd MM/dd/yyyy, hh:mm:ss tt"
+msgstr "dddd dd/MM/yyyy, HH:mm:ss"
 
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Add a sketch"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:55
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
@@ -957,33 +995,33 @@ msgstr ""
 msgid "Tomboy Web"
 msgstr "Tomboy Web"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:62
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:92
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
 msgid "Connect to Server"
 msgstr "Connect to Server"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:64
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
 msgstr "Connected"
 
 #. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:119
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:144
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
 msgid "Server not responding. Try again later."
 msgstr "Server not responding. Try again later."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:178
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
 msgid "Authorization Failed, Try Again"
 msgstr "Authorisation Failed, Try Again"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:187
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
 msgid "Tomboy Web Authorization Successful"
 msgstr "Tomboy Web Authorisation Successful"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:189
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
@@ -991,23 +1029,23 @@ msgstr ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronising."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:197
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
 msgid "Connected. Press Save to start synchronizing"
 msgstr "Connected. Press Save to start synchronising"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:204
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:215
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "Authorising in browser (Press to reset connection)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
 msgid "Set the default browser and try again"
 msgstr "Set the default browser and try again"
 
 #. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:214
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "_Window"
 
@@ -1134,49 +1172,50 @@ msgstr "Notebook"
 msgid "_New notebook..."
 msgstr "_New notebookâ?¦"
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1569
 msgid "Really delete this note?"
 msgstr "Really delete this note?"
 
-#: ../Tomboy/Note.cs:1452
+#: ../Tomboy/Note.cs:1572
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Really delete this {0} note?"
 msgstr[1] "Really delete these {0} notes?"
 
-#: ../Tomboy/Note.cs:1463
+#: ../Tomboy/Note.cs:1583
 msgid "If you delete a note it is permanently lost."
 msgstr "If you delete a note it is permanently lost."
 
-#: ../Tomboy/Note.cs:1497
-msgid "Error saving note data."
-msgstr "Error saving note data."
-
-#: ../Tomboy/Note.cs:1498
+#: ../Tomboy/Note.cs:1611
+#, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
-"sufficient disk space, and that you have appropriate rights on ~/.tomboy. "
-"Error details can be found in ~/.tomboy.log."
+"sufficient disk space, and that you have appropriate rights on {0}. Error "
+"details can be found in {0}."
 msgstr ""
 "An error occurred while saving your notes. Please check that you have "
-"sufficient disk space, and that you have appropriate rights on ~/.tomboy. "
-"Error details can be found in ~/.tomboy.log."
+"sufficient disk space, and that you have appropriate rights on {0}. Error "
+"details can be found in {0}."
+
+#: ../Tomboy/Note.cs:1627
+msgid "Error saving note data."
+msgstr "Error saving note data."
 
 #. 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 "New Note Template"
 
 #. 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 "Your Notes Have Moved!"
 
 #. Translators: The contents (not including the title) of the data migration note. {0}, {1}, {2}, {3}, and {4} are replaced by directory paths and should not be changed
-#: ../Tomboy/NoteManager.cs:124
+#: ../Tomboy/NoteManager.cs:160
 #, csharp-format
 msgid ""
 "In the latest version of Tomboy, your note files have moved.  You have "
@@ -1223,7 +1262,7 @@ msgstr ""
 "\n"
 "Ciao!"
 
-#: ../Tomboy/NoteManager.cs:222
+#: ../Tomboy/NoteManager.cs:259
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1261,7 +1300,7 @@ msgstr ""
 "Tomboy</link:internal> it automatically gets underlined?  Click on the link "
 "to open the note.</note-content>"
 
-#: ../Tomboy/NoteManager.cs:241
+#: ../Tomboy/NoteManager.cs:278
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1290,25 +1329,83 @@ msgstr ""
 "automatically be linked for you.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:256 ../Tomboy/NoteManager.cs:324
+#: ../Tomboy/NoteManager.cs:293 ../Tomboy/NoteManager.cs:361
 msgid "Start Here"
 msgstr "Start Here"
 
-#: ../Tomboy/NoteManager.cs:261
+#: ../Tomboy/NoteManager.cs:298
 msgid "Using Links in Tomboy"
 msgstr "Using Links in Tomboy"
 
-#: ../Tomboy/NoteManager.cs:401
+#: ../Tomboy/NoteManager.cs:438
 #, csharp-format
 msgid "New Note {0}"
 msgstr "New Note {0}"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:474 ../Tomboy/NoteManager.cs:566
+#: ../Tomboy/NoteManager.cs:511 ../Tomboy/NoteManager.cs:603
 msgid "Describe your new note here."
 msgstr "Describe your new note here."
 
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "Rename Note Links?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "_Rename Links"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "_Don't Rename Links"
+
+#: ../Tomboy/NoteRenameDialog.cs:67
+#, csharp-format
+msgid ""
+"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" to "
+"\"<span underline=\"single\">{1}</span>\"?\n"
+"\n"
+"If you do not rename the links, they will no longer link to anything."
+msgstr ""
+"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" to "
+"\"<span underline=\"single\">{1}</span>\"?\n"
+"\n"
+"If you do not rename the links, they will no longer link to anything."
+
+#: ../Tomboy/NoteRenameDialog.cs:81
+msgid "Rename Links"
+msgstr "Rename Links"
+
+#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "Note Title"
+
+#: ../Tomboy/NoteRenameDialog.cs:115
+msgid "Select All"
+msgstr "Select All"
+
+#: ../Tomboy/NoteRenameDialog.cs:123
+msgid "Select None"
+msgstr "Select None"
+
+#: ../Tomboy/NoteRenameDialog.cs:140
+msgid "Ad_vanced"
+msgstr "Ad_vanced"
+
+#: ../Tomboy/NoteRenameDialog.cs:143
+msgid "Always show this _window"
+msgstr "Always show this _window"
+
+#: ../Tomboy/NoteRenameDialog.cs:151
+msgid "Never rename _links"
+msgstr "Never rename _links"
+
+#: ../Tomboy/NoteRenameDialog.cs:159
+msgid "Alwa_ys rename links"
+msgstr "Alwa_ys rename links"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "Find in This Note"
@@ -1365,7 +1462,7 @@ msgstr "Use tools on this note"
 msgid "Delete this note"
 msgstr "Delete this note"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:161
+#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Synchronise Notes"
 
@@ -1445,27 +1542,27 @@ msgstr "Decrease Font Size"
 msgid "Bullets"
 msgstr "Bullets"
 
-#: ../Tomboy/PreferencesDialog.cs:78
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
 msgstr "Editing"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
 msgstr "Synchronisation"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
 msgstr "Add-ins"
 
-#: ../Tomboy/PreferencesDialog.cs:144
+#: ../Tomboy/PreferencesDialog.cs:173
 msgid "_Spell check while typing"
 msgstr "_Spell check while typing"
 
-#: ../Tomboy/PreferencesDialog.cs:153
+#: ../Tomboy/PreferencesDialog.cs:182
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1474,11 +1571,11 @@ msgstr ""
 "shown in the context menu."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:164
+#: ../Tomboy/PreferencesDialog.cs:193
 msgid "Highlight _WikiWords"
 msgstr "Highlight _WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:172
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1487,16 +1584,31 @@ msgstr ""
 "word will create a note with that name."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:179
+#: ../Tomboy/PreferencesDialog.cs:208
 msgid "Enable auto-_bulleted lists"
 msgstr "Enable auto-_bulleted lists"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:188
+#: ../Tomboy/PreferencesDialog.cs:217
 msgid "Use custom _font"
 msgstr "Use custom _font"
 
-#: ../Tomboy/PreferencesDialog.cs:212
+#: ../Tomboy/PreferencesDialog.cs:235
+msgid "When renaming a linked note: "
+msgstr "When renaming a linked note: "
+
+#: ../Tomboy/PreferencesDialog.cs:238
+msgid "Ask me what to do"
+msgstr "Ask me what to do"
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Never rename links"
+msgstr "Never rename links"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Always rename links"
+msgstr "Always rename links"
+
+#: ../Tomboy/PreferencesDialog.cs:260
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1504,16 +1616,16 @@ msgstr ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 
-#: ../Tomboy/PreferencesDialog.cs:221
+#: ../Tomboy/PreferencesDialog.cs:269
 msgid "Open New Note Template"
 msgstr "Open New Note Template"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:278
+#: ../Tomboy/PreferencesDialog.cs:326
 msgid "Listen for _Hotkeys"
 msgstr "Listen for _Hotkeys"
 
-#: ../Tomboy/PreferencesDialog.cs:287
+#: ../Tomboy/PreferencesDialog.cs:335
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b>&lt;Control&gt;&lt;Shift&gt;F11</b>, <b>&lt;"
@@ -1524,72 +1636,82 @@ msgstr ""
 "Alt&gt;N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:307
+#: ../Tomboy/PreferencesDialog.cs:355
 msgid "Show notes _menu"
 msgstr "Show notes _menu"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:324
+#: ../Tomboy/PreferencesDialog.cs:372
 msgid "Open \"_Start Here\""
 msgstr "Open \"_Start Here\""
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:341
+#: ../Tomboy/PreferencesDialog.cs:389
 msgid "Create _new note"
 msgstr "Create _new note"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:358
+#: ../Tomboy/PreferencesDialog.cs:406
 msgid "Open \"Search _All Notes\""
 msgstr "Open \"Search _All Notes\""
 
-#: ../Tomboy/PreferencesDialog.cs:385
+#: ../Tomboy/PreferencesDialog.cs:433
 msgid "Ser_vice:"
 msgstr "Ser_vice:"
 
-#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
+#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1114
 msgid "Not configurable"
 msgstr "Not configurable"
 
+#: ../Tomboy/PreferencesDialog.cs:512
+msgid "Automaticall_y Sync in Background Every"
+msgstr "Automaticall_y Sync in Background Every"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:518
+msgid "Minutes"
+msgstr "Minutes"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:458
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "_Advancedâ?¦"
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "The following add-ins are installed"
 
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "Get More Add-Insâ?¦"
 
-#: ../Tomboy/PreferencesDialog.cs:566
+#: ../Tomboy/PreferencesDialog.cs:649
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../Tomboy/PreferencesDialog.cs:572
+#: ../Tomboy/PreferencesDialog.cs:655
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../Tomboy/PreferencesDialog.cs:703
+#: ../Tomboy/PreferencesDialog.cs:786
 msgid "Not Implemented"
 msgstr "Not Implemented"
 
-#: ../Tomboy/PreferencesDialog.cs:717
+#: ../Tomboy/PreferencesDialog.cs:800
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Preferences"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:939
 msgid "Choose Note Font"
 msgstr "Choose Note Font"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:983
 msgid "Other Synchronization Options"
 msgstr "Other Synchronisation Options"
 
-#: ../Tomboy/PreferencesDialog.cs:906
+#: ../Tomboy/PreferencesDialog.cs:989
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1597,23 +1719,23 @@ msgstr ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronisation server:"
 
-#: ../Tomboy/PreferencesDialog.cs:913
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Always ask me what to do."
 msgstr "Always ask me what to do."
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:1000
 msgid "Rename my local note."
 msgstr "Rename my local note."
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1004
 msgid "Replace my local note with the server's update."
 msgstr "Replace my local note with the server's update."
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1150
 msgid "WARNING: Are you sure?"
 msgstr "WARNING: Are you sure?"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1152
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1621,11 +1743,11 @@ msgstr ""
 "Clearing your synchronisation settings is not recommended.  You may be "
 "forced to synchronise all of your notes again when you save new settings."
 
-#: ../Tomboy/PreferencesDialog.cs:1082
+#: ../Tomboy/PreferencesDialog.cs:1165
 msgid "Resetting Synchronization Settings"
 msgstr "Resetting Synchronisation Settings"
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#: ../Tomboy/PreferencesDialog.cs:1167
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1635,11 +1757,11 @@ msgstr ""
 "synchronisation settings will now be cleared.  You may be forced to "
 "synchronise all of your notes again when you save new settings"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1245
 msgid "Success! You're connected!"
 msgstr "Success! You're connected!"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1247
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1647,31 +1769,32 @@ msgstr ""
 "Tomboy is ready to synchronise your notes. Would you like to synchronise "
 "them now?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#: ../Tomboy/PreferencesDialog.cs:1270
+#, csharp-format
 msgid ""
 "Sorry, but something went wrong.  Please check your information and try "
-"again.  The ~/.tomboy.log might be useful too."
+"again.  The {0} might be useful too."
 msgstr ""
 "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."
 
-#: ../Tomboy/PreferencesDialog.cs:1196
+#: ../Tomboy/PreferencesDialog.cs:1283
 msgid "Error connecting :("
 msgstr "Error connecting :("
 
-#: ../Tomboy/PreferencesDialog.cs:1272
+#: ../Tomboy/PreferencesDialog.cs:1359
 msgid "Version:"
 msgstr "Version:"
 
-#: ../Tomboy/PreferencesDialog.cs:1279
+#: ../Tomboy/PreferencesDialog.cs:1366
 msgid "Author:"
 msgstr "Author:"
 
-#: ../Tomboy/PreferencesDialog.cs:1286
+#: ../Tomboy/PreferencesDialog.cs:1373
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1292
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Add-in Dependencies:"
 msgstr "Add-in Dependencies:"
 
@@ -1720,27 +1843,28 @@ msgstr[1] "Matches: {0} notes"
 msgid "Notes"
 msgstr "Notes"
 
-#: ../Tomboy/Tomboy.cs:244
+#: ../Tomboy/Tomboy.cs:266
 msgid "Cannot create new note"
 msgstr "Cannot create new note"
 
-#: ../Tomboy/Tomboy.cs:310
+#: ../Tomboy/Tomboy.cs:332
 msgid "Primary Development:"
 msgstr "Primary Development:"
 
-#: ../Tomboy/Tomboy.cs:315
+#: ../Tomboy/Tomboy.cs:338
 msgid "Contributors:"
 msgstr "Contributors:"
 
-#: ../Tomboy/Tomboy.cs:333
+#: ../Tomboy/Tomboy.cs:400
 msgid "translator-credits"
 msgstr ""
 "David Lodge <dave cirt net>\n"
 "James Ogley <james usr-local-bin org>\n"
 "Christopher Orr <chris orr me uk>\n"
-"Philip Withnall <philip tecnocode co uk>"
+"Philip Withnall <philip tecnocode co uk>\n"
+"Bruce Cowan <bcowan fastmail co uk>"
 
-#: ../Tomboy/Tomboy.cs:342
+#: ../Tomboy/Tomboy.cs:409
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
@@ -1748,15 +1872,15 @@ msgstr ""
 "Copyright © 2004â??2007 Alex Graveley\n"
 "Copyright © 2004â??2009 Others\n"
 
-#: ../Tomboy/Tomboy.cs:344
+#: ../Tomboy/Tomboy.cs:411
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "A simple and easy to use desktop note-taking application."
 
-#: ../Tomboy/Tomboy.cs:354
+#: ../Tomboy/Tomboy.cs:421
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../Tomboy/Tomboy.cs:471
+#: ../Tomboy/Tomboy.cs:533
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
@@ -1766,7 +1890,7 @@ msgstr ""
 "Copyright © 2004â??2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:483
+#: ../Tomboy/Tomboy.cs:545
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1780,7 +1904,7 @@ msgstr ""
 "  --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/Tomboy.cs:494
+#: ../Tomboy/Tomboy.cs:555
 msgid ""
 "  --new-note\t\t\tCreate and display a new note.\n"
 "  --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1794,40 +1918,20 @@ msgstr ""
 "  --start-here\t\t\tDisplay the 'Start Here' note.\n"
 "  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
 
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:511
-msgid "D-BUS remote control disabled.\n"
-msgstr "D-BUS remote control disabled.\n"
-
-#: ../Tomboy/Tomboy.cs:519
+#: ../Tomboy/Tomboy.cs:569
 #, csharp-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../Tomboy/Tomboy.cs:592
-#, csharp-format
-msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-msgstr ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-
-#: ../Tomboy/Tray.cs:63
+#: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (new)"
 
-#: ../Tomboy/Tray.cs:277
+#: ../Tomboy/Tray.cs:282
 msgid "_About Tomboy"
 msgstr "_About Tomboy"
 
-#: ../Tomboy/Utils.cs:142
+#: ../Tomboy/Utils.cs:143
 msgid ""
 "The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
@@ -1835,95 +1939,95 @@ msgstr ""
 "The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
 
-#: ../Tomboy/Utils.cs:151
+#: ../Tomboy/Utils.cs:152
 msgid "Help not found"
 msgstr "Help not found"
 
-#: ../Tomboy/Utils.cs:167
+#: ../Tomboy/Utils.cs:168
 msgid "Cannot open location"
 msgstr "Cannot open location"
 
-#: ../Tomboy/Utils.cs:189
+#: ../Tomboy/Utils.cs:190
 #, csharp-format
 msgid "Today, {0}"
 msgstr "Today, {0}"
 
-#: ../Tomboy/Utils.cs:191
+#: ../Tomboy/Utils.cs:192
 msgid "Today"
 msgstr "Today"
 
-#: ../Tomboy/Utils.cs:195
+#: ../Tomboy/Utils.cs:196
 #, csharp-format
 msgid "Yesterday, {0}"
 msgstr "Yesterday, {0}"
 
-#: ../Tomboy/Utils.cs:197
+#: ../Tomboy/Utils.cs:198
 msgid "Yesterday"
 msgstr "Yesterday"
 
-#: ../Tomboy/Utils.cs:202
+#: ../Tomboy/Utils.cs:203
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
 msgstr[0] "{0} day ago, {1}"
 msgstr[1] "{0} days ago, {1}"
 
-#: ../Tomboy/Utils.cs:206
+#: ../Tomboy/Utils.cs:207
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
 msgstr[0] "{0} day ago"
 msgstr[1] "{0} days ago"
 
-#: ../Tomboy/Utils.cs:212
+#: ../Tomboy/Utils.cs:213
 #, csharp-format
 msgid "Tomorrow, {0}"
 msgstr "Tomorrow, {0}"
 
-#: ../Tomboy/Utils.cs:214
+#: ../Tomboy/Utils.cs:215
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../Tomboy/Utils.cs:219
+#: ../Tomboy/Utils.cs:220
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
 msgstr[0] "In {0} day, {1}"
 msgstr[1] "In {0} days, {1}"
 
-#: ../Tomboy/Utils.cs:223
+#: ../Tomboy/Utils.cs:224
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
 msgstr[0] "In {0} day"
 msgstr[1] "In {0} days"
 
-#: ../Tomboy/Utils.cs:228
+#: ../Tomboy/Utils.cs:229
 msgid "MMMM d, h:mm tt"
 msgstr "d MMMM, HH:mm"
 
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
-msgstr "MMMM d"
+msgstr "d MMMM"
 
-#: ../Tomboy/Utils.cs:231
+#: ../Tomboy/Utils.cs:232
 msgid "No Date"
 msgstr "No Date"
 
-#: ../Tomboy/Utils.cs:234
+#: ../Tomboy/Utils.cs:235
 msgid "MMMM d yyyy, h:mm tt"
 msgstr "d MMMM yyyy, HH:mm"
 
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:236
 msgid "MMMM d yyyy"
-msgstr "MMMM d yyyy"
+msgstr "d MMMM yyyy"
 
 #: ../Tomboy/Watchers.cs:155
 #, csharp-format
 msgid "(Untitled {0})"
 msgstr "(Untitled {0})"
 
-#: ../Tomboy/Watchers.cs:188
+#: ../Tomboy/Watchers.cs:189
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -1932,15 +2036,15 @@ msgstr ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
 "for this note before continuing."
 
-#: ../Tomboy/Watchers.cs:203
+#: ../Tomboy/Watchers.cs:204
 msgid "Note title taken"
 msgstr "Note title taken"
 
-#: ../Tomboy/Watchers.cs:548
+#: ../Tomboy/Watchers.cs:549
 msgid "_Copy Link Address"
 msgstr "_Copy Link Address"
 
-#: ../Tomboy/Watchers.cs:553
+#: ../Tomboy/Watchers.cs:554
 msgid "_Open Link"
 msgstr "_Open Link"
 
@@ -1978,59 +2082,55 @@ msgid "An error ocurred while connecting to the specified server:"
 msgstr "An error occurred while connecting to the specified server:"
 
 #. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:88
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
 msgid "Details"
 msgstr "Details"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:118
-msgid "Note Title"
-msgstr "Note Title"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:125
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
 msgstr "Status"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:240
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
 msgid "Acquiring sync lock..."
-msgstr "Acquiring syncronisation lockâ?¦"
+msgstr "Acquiring sync lockâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "Committing changesâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "Synchronising Notes"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "Synchronising your notesâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "This may take a while; get a cup of tea!"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:250
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "Connecting to the serverâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "Deleting notes off the serverâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:260
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "Downloading new/updated notesâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:272
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "Server Locked"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "Server is locked"
 
-#: ../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."
@@ -2038,140 +2138,140 @@ msgstr ""
 "One of your other computers is currently synchronising.  Please wait 2 "
 "minutes and try again."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:278
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "Preparing to download updates from serverâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:281
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "Preparing to upload updates to serverâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "Uploading notes to serverâ?¦"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:287
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "Synchronisation Failed"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "Failed to synchronise"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "Could not synchronise notes.  Check the details below and try again."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:295
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "Synchronisation Complete"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "Synchronisation is complete"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:298
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "{0} note updated."
 msgstr[1] "{0} notes updated."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "Your notes are now up-to-date."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:307
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "Synchronisation Cancelled"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "Synchronisation was cancelled"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "You cancelled the synchronisation.  You may close the window now."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:313
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "Synchronisation Not Configured"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "Synchronisation is not configured"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "Please configure synchronisation in the preferences dialogue."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:319
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "Synchronisation Service Error"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "Service error"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "Error connecting to the synchronisation service.  Please try again."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:338
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "Deleted locally"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:341
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "Deleted from server"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:344
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "Updated"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:347
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "Added"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:350
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "Uploaded changes to server"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:353
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "Uploaded new note to server"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:501
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "Note Conflict"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:507
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (old)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:546
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "Rename local note:"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:552
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "Update links in referencing notes"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:559
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "Overwrite local note"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:563
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "Always perform this action"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:569
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "Note conflict detected"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:570
+#: ../Tomboy/Synchronization/SyncDialog.cs:565
 #, csharp-format
 msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
@@ -2180,7 +2280,7 @@ msgstr ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
 "want to do with your local note?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:159
+#: ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "_Tools"
 msgstr "_Tools"
 
@@ -2208,15 +2308,28 @@ msgstr "Enable FUSE?"
 msgid ""
 "The synchronization you've chosen requires the FUSE module to be loaded.\n"
 "\n"
-"To 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."
+"To 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 ""
 "The synchronisation you've chosen requires the FUSE module to be loaded.\n"
 "\n"
-"To 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."
+"To 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."
+
+#~ msgid "_Browse..."
+#~ msgstr "_Browseâ?¦"
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "D-BUS remote control disabled.\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
 
 #~ msgid "C_ase Sensitive"
 #~ msgstr "C_ase Sensitive"



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