[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, upstream, updated. upstream/1.2.0-1-g2ea5775

Iain Lane laney at ubuntu.com
Wed Apr 28 13:41:40 UTC 2010


The following commit has been merged in the upstream branch:
commit 2ea57752102149e6fa3ec8235983e64d4eb24d28
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Apr 28 11:57:36 2010 +0100

    Imported Upstream version 1.2.1

diff --git a/ChangeLog b/ChangeLog
index 47d148e..12c4249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,99 @@
 # Generated by Makefile. Do not edit.
 
+commit c0b958388f326f490270c85a1c033dd77fdaf84c
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date:   Mon Apr 26 10:33:04 2010 -0700
+
+    Update for 1.2.1
+
+ NEWS |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit a60ee6131d8eaceba00f903d5877187ad32142af
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date:   Sat Apr 17 14:41:50 2010 -0700
+
+    Clean up stream usage, hopefully fixing LP#556628
+
+ Tomboy/Note.cs |  118 +++++++++++++++++++++++++-------------------------------
+ 1 files changed, 53 insertions(+), 65 deletions(-)
+
+commit c77cae5403052b4ddf8d95430523d431f717e66b
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date:   Sat Apr 17 14:14:24 2010 -0700
+
+    Add timestamp to Logger messages
+
+ Tomboy/Logger.cs |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 8b73d227d4e794de5e5abe5129cb8497b7914650
+Author: Owen Williams <owen-launchpad at ywwg.com>
+Date:   Fri Mar 12 21:40:30 2010 -0500
+
+    Fix indentation problems with bullet lists (LP#516494)
+
+ Tomboy/Addins/PrintNotes/PrintNotes.addin.xml   |    2 +-
+ Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs |    4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit c21384db72f2b22b31f27ed38cb568a1a2f44f87
+Author: Ivar Smolin <okul at linux.ee>
+Date:   Mon Apr 26 08:18:05 2010 +0300
+
+    Estonian translation updated
+
+ po/et.po |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 0afa5f3002ebbb4a2d309e1dcbff89873aba5da7
+Author: Carles Ferrando <carles.ferrando at gmail.com>
+Date:   Wed Apr 21 22:41:46 2010 +0200
+
+    Updated Catalan (Valencian) translation
+
+ po/ca at valencia.po |  982 ++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 633 insertions(+), 349 deletions(-)
+
+commit 00019a57a54621571001b6f1ce306fe27ea5bb24
+Author: Simos Xenitellis <simos at gnome.org>
+Date:   Fri Apr 9 02:08:41 2010 +0300
+
+    Updated Greek translation for tomboy
+
+ po/el.po |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 752874b8d1416deb767d8402e9de768adc2ee7ae
+Author: Theppitak Karoonboonyanan <thep at linux.thai.net>
+Date:   Thu Apr 8 12:09:16 2010 +0700
+
+    Updated Thai translation.
+
+ po/th.po |  613 +++++++++++++++++++++++++++++++++++++-------------------------
+ 1 files changed, 371 insertions(+), 242 deletions(-)
+
+commit 33dd698355029ae44d51a007075878a025cef72c
+Author: Wouter Bolsterlee <wbolster at gnome.org>
+Date:   Wed Mar 31 00:17:15 2010 +0200
+
+    Dutch translation updated by Wouter Bolsterlee
+
+ po/nl.po | 1018 ++++++++++++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 653 insertions(+), 365 deletions(-)
+
+commit 46a295b4d0580c81faa978f3c8ae858a7d818bec
+Author: Sandy Armstrong <sanfordarmstrong at gmail.com>
+Date:   Mon Mar 29 11:07:51 2010 -0700
+
+    Bump version to 1.2.1
+
+ Setup/Setup.wxs         |    2 +-
+ Tomboy/Defines.WIN32.cs |    4 ++--
+ configure.in            |    2 +-
+ osx/Contents/Info.plist |    4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
 commit f77f38a6633e8eb018058680d88a00282bc8a8c3
 Author: Andika Triwidada <andika at gmail.com>
 Date:   Mon Mar 29 20:11:39 2010 +0700
diff --git a/NEWS b/NEWS
index c175c2b..2d64a06 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,12 @@ Please send questions and suggestions to
 Please report bugs using http://bugzilla.gnome.org/
 (http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
 
+Version 1.2.1
+* Fix bullet list indentation when printing (LP#516494, Owen Williams)
+* Add timestamp to logger messages, useful for watching autosync output, etc
+* Other fixes: LP#556628
+* Translation updates: ca at valencia, el, et, nl, th
+
 Version 1.2.0
 * Handle new application/x-note mimetype (#611865, Olivier Le Thanh Duong)
 * Add a text/path-list target when drag-and-dropping from Search window,
diff --git a/Tomboy/Addins/PrintNotes/PrintNotes.addin.xml b/Tomboy/Addins/PrintNotes/PrintNotes.addin.xml
index a699592..1d12b15 100644
--- a/Tomboy/Addins/PrintNotes/PrintNotes.addin.xml
+++ b/Tomboy/Addins/PrintNotes/PrintNotes.addin.xml
@@ -5,7 +5,7 @@
 	description="Allows you to print a note."
 	category="Desktop Integration"
 	defaultEnabled="true"
-	version="0.2">
+	version="0.2.1">
 
 	<Runtime>
 		<Import assembly="PrintNotes.dll" />
diff --git a/Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs b/Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs
index 160288a..d1ac1ed 100644
--- a/Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs
+++ b/Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs
@@ -200,6 +200,10 @@ namespace Tomboy.PrintNotes
 				layout.Attributes = attr_list;
 			}
 
+			DepthNoteTag depth = Buffer.FindDepthTag (p_start);
+			if (depth != null)
+				indentation += ((int) (dpiX / 3)) * depth.Depth;
+
 			layout.Width = Pango.Units.FromPixels ((int)context.Width -
 				margin_left - margin_right - indentation);
 			layout.Wrap = Pango.WrapMode.WordChar;
diff --git a/Tomboy/Logger.cs b/Tomboy/Logger.cs
index 46314ca..c46ec48 100644
--- a/Tomboy/Logger.cs
+++ b/Tomboy/Logger.cs
@@ -40,7 +40,13 @@ namespace Tomboy
 
 		public void Log (Level lvl, string msg, params object[] args)
 		{
-			msg = string.Format ("[{0}]: {1}", Enum.GetName (typeof (Level), lvl), msg);
+			Console.Write ("[{0} {1:00}:{2:00}:{3:00}.{4:000}]",
+			               Enum.GetName (typeof (Level), lvl),
+			               DateTime.Now.Hour,
+			               DateTime.Now.Minute,
+			               DateTime.Now.Second,
+			               DateTime.Now.Millisecond);
+			msg = string.Format (" {0}", msg);
 			if (args.Length > 0)
 				Console.WriteLine (msg, args);
 			else
diff --git a/Tomboy/Note.cs b/Tomboy/Note.cs
index 996940a..317c312 100644
--- a/Tomboy/Note.cs
+++ b/Tomboy/Note.cs
@@ -896,63 +896,60 @@ namespace Tomboy
 			xmlDoc.LoadXml (foreignNoteXml);
 			xmlDoc = null;
 
-			StringReader reader = new StringReader (foreignNoteXml);
-			XmlTextReader xml = new XmlTextReader (reader);
-			xml.Namespaces = false;
-
 			// Remove tags now, since a note with no tags has
 			// no "tags" element in the XML
 			List<Tag> newTags = new List<Tag> ();
-			DateTime date;
 
-			while (xml.Read ()) {
-				switch (xml.NodeType) {
-				case XmlNodeType.Element:
-					switch (xml.Name) {
-					case "title":
-						Title = xml.ReadString ();
-						break;
-					case "text":
-						XmlContent = xml.ReadInnerXml ();
-						break;
-					case "last-change-date":
-						if (DateTime.TryParse (xml.ReadString (), out date))
-							data.Data.ChangeDate = date;
-						else
-							data.Data.ChangeDate = DateTime.Now;
-						break;
-					case "last-metadata-change-date":
-						if (DateTime.TryParse (xml.ReadString (), out date))
-							data.Data.MetadataChangeDate = date;
-						else
-							data.Data.MetadataChangeDate = DateTime.Now;
-						break;
-					case "create-date":
-						if (DateTime.TryParse (xml.ReadString (), out date))
-							data.Data.CreateDate = date;
-						else
-							data.Data.CreateDate = DateTime.Now;
-						break;
-					case "tags":
-						XmlDocument doc = new XmlDocument ();
-						List<string> tag_strings = ParseTags (doc.ReadNode (xml.ReadSubtree ()));
-						foreach (string tag_str in tag_strings) {
-							Tag tag = TagManager.GetOrCreateTag (tag_str);
-							newTags.Add (tag);
+			using (var xml = new XmlTextReader (new StringReader (foreignNoteXml)) {Namespaces = false}) {
+				DateTime date;
+	
+				while (xml.Read ()) {
+					switch (xml.NodeType) {
+					case XmlNodeType.Element:
+						switch (xml.Name) {
+						case "title":
+							Title = xml.ReadString ();
+							break;
+						case "text":
+							XmlContent = xml.ReadInnerXml ();
+							break;
+						case "last-change-date":
+							if (DateTime.TryParse (xml.ReadString (), out date))
+								data.Data.ChangeDate = date;
+							else
+								data.Data.ChangeDate = DateTime.Now;
+							break;
+						case "last-metadata-change-date":
+							if (DateTime.TryParse (xml.ReadString (), out date))
+								data.Data.MetadataChangeDate = date;
+							else
+								data.Data.MetadataChangeDate = DateTime.Now;
+							break;
+						case "create-date":
+							if (DateTime.TryParse (xml.ReadString (), out date))
+								data.Data.CreateDate = date;
+							else
+								data.Data.CreateDate = DateTime.Now;
+							break;
+						case "tags":
+							XmlDocument doc = new XmlDocument ();
+							List<string> tag_strings = ParseTags (doc.ReadNode (xml.ReadSubtree ()));
+							foreach (string tag_str in tag_strings) {
+								Tag tag = TagManager.GetOrCreateTag (tag_str);
+								newTags.Add (tag);
+							}
+							break;
+						case "open-on-startup":
+							bool isStartup;
+							if (bool.TryParse (xml.ReadString (), out isStartup))
+								IsOpenOnStartup = isStartup;
+							break;
 						}
 						break;
-					case "open-on-startup":
-						bool isStartup;
-						if (bool.TryParse (xml.ReadString (), out isStartup))
-							IsOpenOnStartup = isStartup;
-						break;
 					}
-					break;
 				}
 			}
 
-			xml.Close ();
-
 			foreach (Tag oldTag in Tags)
 				if (!newTags.Contains (oldTag))
 				    RemoveTag (oldTag);
@@ -1267,13 +1264,10 @@ namespace Tomboy
 
 		public virtual NoteData ReadFile (string read_file, string uri)
 		{
-			StreamReader reader = new StreamReader (read_file,
-			                                        System.Text.Encoding.UTF8);
-			XmlTextReader xml = new XmlTextReader (reader);
-			xml.Namespaces = false;
-
+			NoteData data;
 			string version;
-			NoteData data = Read (xml, uri, out version);
+			using (var xml = new XmlTextReader (new StreamReader (read_file, System.Text.Encoding.UTF8)) {Namespaces = false})
+				data = Read (xml, uri, out version);
 
 			if (version != NoteArchiver.CURRENT_VERSION) {
 				// Note has old format, so rewrite it.  No need
@@ -1282,9 +1276,6 @@ namespace Tomboy
 				NoteArchiver.Write (read_file, data);
 			}
 
-			reader.Close ();
-			xml.Close ();
-
 			return data;
 		}
 
@@ -1379,9 +1370,8 @@ namespace Tomboy
 		public static string WriteString(NoteData note)
 		{
 			StringWriter str = new StringWriter ();
-			XmlWriter xml = XmlWriter.Create (str, XmlEncoder.DocumentSettings);
-			Instance.Write (xml, note);
-			xml.Close ();
+			using (var xml = XmlWriter.Create (str, XmlEncoder.DocumentSettings))
+				Instance.Write (xml, note);
 			str.Flush();
 			return str.ToString ();
 		}
@@ -1395,9 +1385,8 @@ namespace Tomboy
 		{
 			string tmp_file = write_file + ".tmp";
 
-			XmlWriter xml = XmlWriter.Create (tmp_file, XmlEncoder.DocumentSettings);
-			Write (xml, note);
-			xml.Close ();
+			using (var xml = XmlWriter.Create (tmp_file, XmlEncoder.DocumentSettings))
+				Write (xml, note);
 
 			if (File.Exists (write_file)) {
 				string backup_path = write_file + "~";
@@ -1425,9 +1414,8 @@ namespace Tomboy
 
 		public void WriteFile (TextWriter writer, NoteData note)
 		{
-			XmlWriter xml = XmlWriter.Create (writer, XmlEncoder.DocumentSettings);
-			Write (xml, note);
-			xml.Close ();
+			using (var xml = XmlWriter.Create (writer, XmlEncoder.DocumentSettings))
+				Write (xml, note);
 		}
 
 		void Write (XmlWriter xml, NoteData note)
diff --git a/configure b/configure
index 9b0c0f7..c45377b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for tomboy 1.2.0.
+# Generated by GNU Autoconf 2.63 for tomboy 1.2.1.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='tomboy'
 PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='tomboy 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='tomboy 1.2.1'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="Tomboy/Tomboy.cs"
@@ -1628,7 +1628,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tomboy 1.2.0 to adapt to many kinds of systems.
+\`configure' configures tomboy 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1702,7 +1702,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tomboy 1.2.0:";;
+     short | recursive ) echo "Configuration of tomboy 1.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1861,7 +1861,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tomboy configure 1.2.0
+tomboy configure 1.2.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1875,7 +1875,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tomboy $as_me 1.2.0, which was
+It was created by tomboy $as_me 1.2.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2725,7 +2725,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tomboy'
- VERSION='1.2.0'
+ VERSION='1.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18918,7 +18918,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tomboy $as_me 1.2.0, which was
+This file was extended by tomboy $as_me 1.2.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18981,7 +18981,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-tomboy config.status 1.2.0
+tomboy config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index f1725fd..a8d13be 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 1.2.0)
+AC_INIT(tomboy, 1.2.1)
 AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
 AM_INIT_AUTOMAKE([foreign tar-pax])
 AM_MAINTAINER_MODE
diff --git a/po/ca at valencia.po b/po/ca at valencia.po
index 05730ae..1dc702e 100644
--- a/po/ca at valencia.po
+++ b/po/ca at valencia.po
@@ -1,24 +1,21 @@
-# translation of tomboy.gnome-2-26.po to catalan
 #
-# Copyright © 2004-2008 Jordi Mas i Hernàndez <jmas at softcatala.org>
-# Traducció del Tomboy al català
+# Copyright © 2004-2010 Jordi Mas i Hernàndez <jmas at softcatala.org>
+# Traducció del Tomboy al català 
 #
-# Correccions Sílvia Miranda, Quico Llach, Gil Forcada
+# Correccions Sílvia Miranda, Quico Llach, Gil Forcada, Jordi Serratosa
 #
-# Carles Ferrando Garcia <carles.ferrando at gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: tomboy.gnome-2-26\n"
+"Project-Id-Version: tomboy 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-13 19:44+0200\n"
-"PO-Revision-Date: 2009-09-06 10:27+0200\n"
-"Last-Translator: Carles Ferrando Garcia <carles.ferrando at gmail.com>\n"
-"Language-Team: catalan <tradgnome at softcatala.org>\n"
+"POT-Creation-Date: 2010-04-21 22:41+0200\n"
+"PO-Revision-Date: 2010-03-06 19:11+0200\n"
+"Last-Translator: Jordi Mas <jmas at softcatala.org>\n"
+"Language-Team: Catalan <tradgnome at softcatala.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"
-"X-Generator: KBabel 1.11.4\n"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:1
 msgid "Accessories"
@@ -30,24 +27,29 @@ msgstr "Una forma senzilla i fàcil de prendre notes"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:3
 msgid "Tomboy Applet Factory"
-msgstr "Factoria de miniaplicacions Tomboy"
+msgstr "Factoria de miniaplicacions del Tomboy"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:563
+#: ../Tomboy/Tray.cs:573
 msgid "Tomboy Notes"
 msgstr "Notes del Tomboy"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:268
+msgid "S_ynchronize Notes"
+msgstr "S_incronitza les notes"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:272
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:282
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../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:277
 msgid "_Preferences"
 msgstr "_Preferències"
 
@@ -64,70 +66,74 @@ msgid "Accept SSL Certificates"
 msgstr "Accepta els certificats SSL"
 
 #: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Temps d'espera de la sincronització automàtica en segon pla"
+
+#: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
 msgstr "Crea una nota nova"
 
-#: ../data/tomboy.schemas.in.h:3
+#: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "Tipus de lletra personalitzat"
 
-#: ../data/tomboy.schemas.in.h:4
+#: ../data/tomboy.schemas.in.h:5
 msgid "Determines X coordinate of Search window; stored on Tomboy exit."
 msgstr ""
 "Determina la coordenada X de la finestra de cerca. S'alçarà quan el Tomboy "
 "isca."
 
-#: ../data/tomboy.schemas.in.h:5
+#: ../data/tomboy.schemas.in.h:6
 msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
 msgstr ""
 "Determina la coordenada Y de la finestra de cerca. S'alçarà quan el Tomboy "
 "isca."
 
-#: ../data/tomboy.schemas.in.h:6
+#: ../data/tomboy.schemas.in.h:7
 msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgstr ""
 "Determina l'altura (en píxels) de la finestra de cerca. S'alçarà quan el "
 "Tomboy isca."
 
-#: ../data/tomboy.schemas.in.h:7
+#: ../data/tomboy.schemas.in.h:8
 msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgstr ""
 "Determina l'amplada (en píxels) de la finestra de cerca. S'alçarà quan el "
 "Tomboy isca."
 
-#: ../data/tomboy.schemas.in.h:8
+#: ../data/tomboy.schemas.in.h:9
 msgid "Enable Auto bulleted lists."
 msgstr "Habilita les llistes de pics automàtiques."
 
-#: ../data/tomboy.schemas.in.h:9
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Habilita la icona enganxa amb el botó central del ratolí."
 
-#: ../data/tomboy.schemas.in.h:10
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "Habilita el ressaltat WikiWord"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:12
 msgid "Enable closing notes with escape."
 msgstr "Habilita el tancament de les notes amb la tecla d'escapament."
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:13
 msgid "Enable custom font"
 msgstr "Habilita el tipus de lletra personalitzat"
 
-#: ../data/tomboy.schemas.in.h:13
+#: ../data/tomboy.schemas.in.h:14
 msgid "Enable global keybindings"
 msgstr "Habilita les assignacions de tecles globals"
 
-#: ../data/tomboy.schemas.in.h:14
+#: ../data/tomboy.schemas.in.h:15
 msgid "Enable spellchecking"
 msgstr "Habilita la verificació ortogràfica"
 
-#: ../data/tomboy.schemas.in.h:15
+#: ../data/tomboy.schemas.in.h:16
 msgid "Enable startup notes"
 msgstr "Habilita les notes d'inici"
 
-#: ../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."
@@ -135,16 +141,16 @@ msgstr ""
 "Habiliteu esta opció si voleu que les llistes de pics siguen automàtiques "
 "quan teclejeu - o * al començament d'una línia."
 
-#: ../data/tomboy.schemas.in.h:17
+#: ../data/tomboy.schemas.in.h:18
 msgid ""
 "Enable this option if you want to be able to middle-click the Tomboy icon to "
 "paste timestamped content into the Start Here note."
 msgstr ""
 "Habiliteu esta opció si voleu que fent clic amb el botó central del ratolí a "
-"la icona del Tomboy enganxe contingut amb marca horària a la nota Comenceu "
+"la icona del Tomboy enganxi contingut amb marca horària a la nota Comenceu "
 "ací."
 
-#: ../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."
@@ -152,23 +158,23 @@ msgstr ""
 "Habiliteu esta opció per ressaltar paraules SimilarsAAquesta. Feu clic a la "
 "paraula per a crear una nota amb este nom."
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "Temps d'espera (ms) per als punts de muntatge FUSE"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "Exportació HTML de totes les Notes enllaçades"
 
-#: ../data/tomboy.schemas.in.h:21
+#: ../data/tomboy.schemas.in.h:22
 msgid "HTML Export Last Directory"
 msgstr "Darrer directori de l'exportació HTML"
 
-#: ../data/tomboy.schemas.in.h:22
+#: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export Linked Notes"
 msgstr "Notes enllaçades HTML exportades"
 
-#: ../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."
@@ -176,7 +182,7 @@ msgstr ""
 "Si enable_custom_font és cert, s'utilitzarà el tipus de lletra seleccionat "
 "ací per a mostrar les 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."
@@ -184,13 +190,13 @@ msgstr ""
 "Si s'habilita, totes les notes obertes en eixir del Tomboy es tornaran a "
 "obrir automàticament en iniciar."
 
-#: ../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 ""
 "Si s'habilita, es pot tancar una nota oberta si es prem la tecla "
 "d'escapament."
 
-#: ../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."
@@ -198,7 +204,7 @@ msgstr ""
 "Si és cert, les errades ortogràfiques se subratllaran en roig, i els "
 "suggeriments es mostraran al menú contextual."
 
-#: ../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 "
@@ -208,7 +214,7 @@ msgstr ""
 "establertes a /apps/tomboy/global_keybindings, permetent que les accions de "
 "Tomboy estiguen disponibles des de qualsevol aplicació."
 
-#: ../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."
@@ -217,7 +223,7 @@ msgstr ""
 "a mostrar les notes. En cas contrari, s'utilitzarà el tipus de lletra per "
 "defecte."
 
-#: ../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."
@@ -225,7 +231,7 @@ msgstr ""
 "Indica que el connector d'importació de notes no s'ha executat i que "
 "s'executarà de forma automàtica el proper cop que s'inicie el Tomboy."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
@@ -233,7 +239,19 @@ msgstr ""
 "Enter que determina el nombre mínim de notes a mostrar al menú de notes del "
 "Tomboy."
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:32
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+"Enter que determina la freqüència en què es produeix una sincronització en "
+"segon pla de les vostres notes (quan la sincronització està configurada). "
+"Qualsevol valor menor que 1 indica que està desactivada. El valor positiu "
+"més petit acceptable és el 5. El valor s'expressa en minuts."
+
+#: ../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 "
@@ -243,51 +261,76 @@ msgid ""
 msgstr ""
 "Enter que determina si hi ha una preferència per a fer una acció en concret "
 "quan es detecta un conflicte, en lloc de demanar-ho a l'usuari. Els valors "
-"mapar una numeració interna. 0 indica que l'usuari vol que se li pregunte "
+"mapen a una numeració interna. 0 indica que l'usuari vol que se li pregunte "
 "quan hi haja un conflicte, de manera que puga gestionar cada situació de "
 "conflicte cas per cas."
 
-#: ../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 ""
+"Enter que determina si hi ha una preferència per a fer sempre un "
+"comportament de l'actualització dels enllaços específic quan una nota es "
+"canvia de nom, en lloc de demanar-ho a l'usuari. Els valors mapen a una "
+"numeració interna. 0 indica que l'usuari vol que se li pregunte quan el "
+"canvi de nom d'una nota puga afectar els enllaços que existeixen en altres "
+"notes. 1 indica que l'enllaç s'ha de suprimir automàticament. 2 indica que "
+"el text de l'enllaç ha d'actualitzar-se amb el nou nom de nota, de manera "
+"que seguirà enllaçant a la nota a la qual s'ha canviat el nom."
+
+#: ../data/tomboy.schemas.in.h:35
+msgid "Link Updating Behavior on Note Rename"
+msgstr ""
+"Comportament de l'actualització dels enllaços en el canvi de nom de notes"
+
+#: ../data/tomboy.schemas.in.h:36
 msgid "List of pinned notes."
 msgstr "Llista de notes recordatòries"
 
-#: ../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 ""
+"La longitud màxima de caràcters del títol de la nota a mostrar a la safata o "
+"a la miniaplicació del quadre del Tomboy."
 
-#: ../data/tomboy.schemas.in.h:34
-#, fuzzy
+#: ../data/tomboy.schemas.in.h:38
 msgid "Maximum note title length to show in tray menu."
-msgstr "Nombre mínim de notes a mostrar al menú"
+msgstr "Longitud màxima del títol de la nota a mostrar al menú de la safata."
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:39
 msgid "Minimum number of notes to show in menu"
 msgstr "Nombre mínim de notes a mostrar al menú"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:40
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "Comportament predeterminat per a conflictes de sincronització de notes"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:41
 msgid "Open Recent Changes"
 msgstr "Obri els canvis recents"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:42
 msgid "Open Search Dialog"
 msgstr "Obri el diàleg de cerca"
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:43
 msgid "Open Start Here"
 msgstr "Obri Comenceu ací"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:44
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr ""
 "Camí del directori de sincronització del Tomboy al servidor d'SSH (opcional)."
 
-#: ../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."
@@ -295,71 +338,71 @@ msgstr ""
 "Camí al servidor de sincronització quan s'utilitze el complement de servei "
 "de sincronització del sistema de fitxers."
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:46
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "Carpeta de la sincronització remota SSHFS"
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:47
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "Nom d'usuari de la sincronització remota SSHFS"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:48
 msgid "SSHFS Synchronization Server Port"
 msgstr "Port del servidor de la sincronització SSHFS"
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:49
 msgid "SSHFS Synchronization Server URL"
 msgstr "URL del servidor de la sincronització SSHFS"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:50
 msgid "Saved height of Search window"
 msgstr "Alçada alçada de la finestra de cerca"
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:51
 msgid "Saved horizontal position of Search window"
 msgstr "Posició horitzontal alçada de la finestra de cerca"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:52
 msgid "Saved vertical position of Search window"
 msgstr "Posició vertical alçada de la finestra de cerca"
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:53
 msgid "Saved width of Search window"
 msgstr "Amplada alçada de la finestra de cerca"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:54
 msgid "Selected Synchronization Service Addin"
 msgstr "Complement de servei de sincronització seleccionat"
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:55
 msgid "Set to TRUE to activate"
 msgstr "Establiu-ho a CERT per a activar"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:56
 msgid "Show applet menu"
 msgstr "Mostra el menú de la miniaplicació"
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:57
 msgid "Start Here Note"
 msgstr "Nota Comenceu ací"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:58
 msgid "Sticky Note Importer First Run"
 msgstr "Primera execució de la importació de les notes adhesives"
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Client ID"
 msgstr "Identificador del client de sincronització"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:60
 msgid "Synchronization Local Server Path"
 msgstr "Camí del servidor local de sincronització"
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:61
 msgid "The date format that is used for the timestamp."
 msgstr "El format de data que s'utilitza per la marca horària."
 
-#: ../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 \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -374,7 +417,7 @@ msgstr ""
 "abreviacions com ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a la "
 "cadena especial «disabled», no hi haurà cap vinculació per a esta acció."
 
-#: ../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 \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -389,7 +432,7 @@ msgstr ""
 "ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a la cadena especial "
 "«disabled», no hi haurà cap vinculació per a esta acció."
 
-#: ../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 \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -404,7 +447,7 @@ msgstr ""
 "abreviacions com ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a la "
 "cadena especial «disabled», no hi haurà cap vinculació per a esta acció."
 
-#: ../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 \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -419,7 +462,7 @@ msgstr ""
 "abreviacions com ara «<Ctl>» i «<Ctrl>». Si establiu l'opció a la "
 "cadena especial «disabled», no hi haurà cap vinculació per a esta acció."
 
-#: ../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 \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -434,18 +477,18 @@ msgstr ""
 "abreviacions com ara «<Ctl>»i «<Ctrl>». Si establiu l'opció a la "
 "cadena especial «disabled», no hi haurà cap vinculació per a esta acció."
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:67
 msgid "The handler for \"note://\" URLs"
 msgstr "El gestor per als URL «note://»"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:68
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "El darrer directori on s'ha exportat una nota amb el connector d'exportació "
 "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."
@@ -453,7 +496,7 @@ msgstr ""
 "La darrera configuració per al quadre de verificació «Exporta les notes "
 "enllaçades» al connector d'exportació HTML."
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:70
 msgid ""
 "The last setting for the 'Include all other linked notes' checkbox in the "
 "Export to HTML plugin. This setting is used in conjunction with the 'HTML "
@@ -466,7 +509,7 @@ msgstr ""
 "per a especificar si totes les notes (trobades recursivament) s'han "
 "d'incloure durant l'exportació a 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 "
@@ -475,16 +518,16 @@ msgstr ""
 "L'URI de la nota que ha de considerar-se la nota «Comenceu ací», ubicada a "
 "dalt del menú de notes del Tomboy, accessible mitjançant una drecera."
 
-#: ../data/tomboy.schemas.in.h:68
-#, 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 ""
 "El port que s'utilitzarà en connectar-se al servidor de sincronització a "
-"través d'SSH."
+"través d'SSH. Establiu-lo a -1 o menys si en lloc d'això s'han d'utilitzar "
+"els paràmetres predeterminats del port SSH."
 
-#: ../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."
@@ -492,16 +535,16 @@ msgstr ""
 "Temps de resposta (en mil·lisegons) que hauria d'esperar el Tomboy quan "
 "s'utilitzen punts de muntatge FUSE per a muntar compartits sincronitzats."
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:74
 msgid "Timestamp format"
 msgstr "Format de la marca horària"
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:75
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr ""
 "URL del servidor d'SSH que conté el directori de sincronització del Tomboy."
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
@@ -509,7 +552,7 @@ msgstr ""
 "Identificador únic per al complement de servei de sincronització de notes "
 "actualment configurat"
 
-#: ../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."
@@ -517,7 +560,7 @@ msgstr ""
 "Identificador únic per a este client Tomboy, utilitzat en comunicar amb el "
 "servidor de sincronització."
 
-#: ../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."
@@ -525,13 +568,13 @@ msgstr ""
 "Utilitza l'opció «-ac» del wdfs per a acceptar els certificats SSL sense "
 "preguntar a l'usuari."
 
-#: ../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 ""
 "Nom d'usuari que s'utilitzarà en connectar-se al servidor de sincronització "
 "a través d'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."
@@ -575,7 +618,7 @@ msgstr "_Tanca"
 msgid "Close this window"
 msgstr "Tanca esta finestra"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:284
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:294
 msgid "_Quit"
 msgstr "I_x"
 
@@ -587,7 +630,7 @@ msgstr "_Tanca el Tomboy"
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "Preferències del Tomboy"
 
@@ -619,10 +662,6 @@ msgstr "Ce_rca totes les notes"
 msgid "Open the Search All Notes window"
 msgstr "Obri la finestra Cerca totes les notes"
 
-#: ../Tomboy/ActionManager.cs:179 ../Tomboy/Tray.cs:258
-msgid "S_ynchronize Notes"
-msgstr "S_incronitza les notes"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "Inicia la sincronització de les notes"
@@ -732,31 +771,26 @@ msgstr "No es pot obrir el correu electrònic"
 msgid "_Folder Path:"
 msgstr "_Camí de la carpeta:"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:109
-msgid "_Browse..."
-msgstr "_Navega..."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:128
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
 msgstr "Seleccioneu la carpeta de sincronització..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:156
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
 msgid "Folder path field is empty."
 msgstr "El camp del camí de la carpeta és buit."
 
-#: ../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 ""
 "El camí de la carpeta especificat no existeix, i el Tomboy no ha pogut crear-"
 "lo."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "Carpeta local"
 
 #: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
-#, fuzzy
 msgid "Fixed Wid_th"
 msgstr "A_mplada fixa"
 
@@ -774,11 +808,12 @@ msgstr "S'ha produït un error en executar el gaim-remote: «{0}»"
 msgid "Insert Timestamp"
 msgstr "Insereix marca horària"
 
+# N.T.: En català "dilluns, 13 novembre, 10:30"
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Applet.cs:227 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
-msgstr "dddd, MMMM d, h:mm tt"
+msgstr "dddd, d MMMM, H:mm"
 
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:54
 msgid "Choose one of the predefined formats or use your own."
@@ -800,10 +835,11 @@ msgstr "Hui: plantilla"
 msgid "Today: "
 msgstr "Hui: "
 
+# N.T.: En català "dilluns, 13 novembre 1980"
 #. Format: "Today: Friday, July 01 2005"
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:17
 msgid "dddd, MMMM d yyyy"
-msgstr "dddd, MMMM d, h:mm tt"
+msgstr "dddd, d MMMM yyyy"
 
 #: ../Tomboy/Addins/NoteOfTheDay/NoteOfTheDay.cs:43
 msgid "Tasks"
@@ -839,18 +875,19 @@ msgstr "S'ha produït un error en imprimir la nota"
 msgid "Page {0} of {1}"
 msgstr "Pàgina {0} de {1}"
 
+# N.T.: En català "dilluns 13/10/1980, 11:30:20"
 #. Translators: Explanation of the date and time format specifications can be found here:
 #. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
 #: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:238
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
-msgstr "dddd, MMMM d, h:mm tt"
+msgstr "dddd dd/MM/yyyy, hh:mm:ss"
 
 #: ../Tomboy/Addins/Sketching/SketchingNoteAddin.cs:19
 msgid "Add a sketch"
 msgstr "Afig un esbós"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:55
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "S_ervidor:"
 
@@ -939,7 +976,7 @@ msgstr "--- El Tasque no s'està executant ---"
 
 #: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
 msgid "_Underline"
-msgstr ""
+msgstr "_Subratllat"
 
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
 msgid "_URL:"
@@ -947,7 +984,7 @@ msgstr "_URL:"
 
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
 msgid "_Password:"
-msgstr "_Contransenya:"
+msgstr "_Contrasenya:"
 
 #: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
 msgid "URL, username, or password field is empty."
@@ -978,61 +1015,83 @@ msgstr ""
 "GNOME: "
 
 #: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
-#, fuzzy
 msgid "Tomboy Web"
-msgstr "Ajuda del Tomboy"
+msgstr "Web del Tomboy"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:62
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:92
-#, fuzzy
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
 msgid "Connect to Server"
-msgstr "S'està connectant al servidor..."
+msgstr "Connecta al servidor"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:64
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
-msgstr ""
+msgstr "S'ha connectat"
 
 #. 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 ""
+msgstr "El servidor no respon. Torneu-ho a provar més tard."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:178
-#, fuzzy
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
 msgid "Authorization Failed, Try Again"
-msgstr "S'ha produït un error en sincronitzar"
+msgstr "Ha fallat l'autorització, torneu-ho a provar"
 
 #. 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 ""
+msgstr "Autorització de la web del Tomboy correcta"
 
 #. 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."
 msgstr ""
+"Torneu a la finestra de preferències del Tomboy i premeu «Alça» per a iniciar "
+"la sincronització."
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:197
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
 msgid "Connected. Press Save to start synchronizing"
-msgstr ""
+msgstr "S'ha connectat. Premeu Alça per a iniciar la sincronització"
 
 #. 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 ""
+"S'està autoritzant en el navegador (premeu per a tornar a iniciar la "
+"connexió)"
 
 #. 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 ""
+msgstr "Establiu el navegador predeterminat i torneu-ho a provar"
+
+#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:83
+msgid "Search All Notes"
+msgstr "Cerca totes les notes"
+
+#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
+#. icons_path, (int)TomboyIcons.NewNotebook);
+#. if (new_notebook != null)
+#. object_collection.AddObject(new_notebook);
+#: ../Tomboy/JumpListManager.cs:87
+msgid "Create New Note"
+msgstr "Crea una nota nova"
+
+#: ../Tomboy/JumpListManager.cs:117
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (nova)"
+
+#: ../Tomboy/JumpListManager.cs:139
+msgid "Recent Notes"
+msgstr "Notes recents"
 
 #. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:214
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "_Finestra"
 
@@ -1118,7 +1177,7 @@ msgid "Delete the selected notebook"
 msgstr "Suprimeix el bloc de notes seleccionat"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:251
+#: ../Tomboy/RecentChanges.cs:259
 msgid "Notebooks"
 msgstr "Blocs de notes"
 
@@ -1160,50 +1219,51 @@ msgstr "Bloc de notes"
 msgid "_New notebook..."
 msgstr "_Bloc de notes nou..."
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1578
 msgid "Really delete this note?"
 msgstr "Segur que voleu suprimir esta nota?"
 
-#: ../Tomboy/Note.cs:1452
+#: ../Tomboy/Note.cs:1581
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Segur que voleu suprimir {0} nota?"
 msgstr[1] "Segur que voleu suprimir {0} notes?"
 
-#: ../Tomboy/Note.cs:1463
+#: ../Tomboy/Note.cs:1592
 msgid "If you delete a note it is permanently lost."
 msgstr "Si suprimiu una nota la perdreu definitivament."
 
-#
-#: ../Tomboy/Note.cs:1497
-msgid "Error saving note data."
-msgstr "S'ha produït un error en alçar les dades de la nota."
-
-#: ../Tomboy/Note.cs:1498
+#: ../Tomboy/Note.cs:1620
+#, 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 {1}."
 msgstr ""
 "S'ha produït un error en alçar les notes. Comproveu que hi haja espai "
-"suficient al disc, i que disposeu dels permisos adequats a  ~/.tomboy.Podeu "
-"trobar detalls de l'error a ~/.tomboy.log."
+"suficient al disc, i que disposeu dels permisos adequats a {0}. Podeu trobar "
+"detalls de l'error a {1}."
+
+#
+#: ../Tomboy/Note.cs:1636
+msgid "Error saving note data."
+msgstr "S'ha produït un error en alçar les dades de la nota."
 
 #. 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 "Plantilla de nota nova"
 
 #. 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 ""
+msgstr "Les vostres notes s'han traslladat"
 
 #. 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 "
@@ -1228,8 +1288,30 @@ msgid ""
 "\n"
 "Ciao!"
 msgstr ""
+"En l'última versió del Tomboy s'ha canviat la ubicació dels vostres fitxers "
+"de notes. Segurament mai vos ha interessat on s'emmagatzemaven les vostres "
+"notes i, si encara no vos interessa, podeu tirar pel dret i <bold>suprimir "
+"esta nota</bold>.  :-)\n"
+"\n"
+"L'antic directori de notes encara existeix a <link:url>{0}</link:url>. Si "
+"torneu a instal·lar una versió anterior del Tomboy, este cercarà les notes "
+"allí.\n"
+"\n"
+"S'han copiat les vostres notes i la informació de configuració als "
+"directoris nous, els quals s'utilitzaran a partir d'ara:\n"
+"\n"
+"<list><list-item dir=\"ltr\">Ara podeu trobar les notes a <link:url>{1}</"
+"link:url>\n"
+"</list-item><list-item dir=\"ltr\">La configuració és a <link:url>{2}</link:"
+"url>\n"
+"</list-item><list-item dir=\"ltr\">Podeu instal·lar complements a <link:url>"
+"{3}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Podeu trobar els fitxers de registre a "
+"<link:url>{4}</link:url></list-item></list>\n"
+"\n"
+"Adéu!"
 
-#: ../Tomboy/NoteManager.cs:222
+#: ../Tomboy/NoteManager.cs:265
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1268,7 +1350,7 @@ msgstr ""
 "internal>Utilització dels enllaços al Tomboy</link:internal> se subratlla "
 "automàticament. Feu clic a l'enllaç per a obrir la nota.</note-content>"
 
-#: ../Tomboy/NoteManager.cs:241
+#: ../Tomboy/NoteManager.cs:284
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1298,25 +1380,85 @@ msgstr ""
 "s'enllaçarà automàticament.</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 "Comenceu ací"
 
-#: ../Tomboy/NoteManager.cs:261
+#: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
 msgstr "Utilització dels enllaços al Tomboy"
 
-#: ../Tomboy/NoteManager.cs:401
+#: ../Tomboy/NoteManager.cs:445
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Nota nova {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 "Descriviu la vostra nota nova ací."
 
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "Voleu canviar el nom dels enllaços de la nota?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "_Canvia el nom dels enllaços"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "_No canvies el nom dels enllaços"
+
+#: ../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 ""
+"Canvia el nom a enllaços en altres notes de \"<span underline=\"single\">{0}"
+"</span>\" a \"<span underline=\"single\">{1}</span>\"?\n"
+"\n"
+"Si no canvieu els noms dels enllaços, esdevindran enllaços no vàlids."
+
+#: ../Tomboy/NoteRenameDialog.cs:81
+msgid "Rename Links"
+msgstr "Canvia el nom dels enllaços"
+
+#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "Títol de la nota"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:116
+msgid "Select All"
+msgstr "Selecciona-ho tot"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:125
+msgid "Select None"
+msgstr "No seleccionis res"
+
+#: ../Tomboy/NoteRenameDialog.cs:142
+msgid "Ad_vanced"
+msgstr "_Avançat"
+
+#: ../Tomboy/NoteRenameDialog.cs:145
+msgid "Always show this _window"
+msgstr "Mostra sempre esta finestra"
+
+#: ../Tomboy/NoteRenameDialog.cs:153
+msgid "Never rename _links"
+msgstr "No canvies mai els noms dels _enllaços"
+
+#: ../Tomboy/NoteRenameDialog.cs:161
+msgid "Alwa_ys rename links"
+msgstr "Canvia sempre els noms dels _enllaços"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "Cerca en esta nota"
@@ -1373,7 +1515,7 @@ msgstr "Usa les eines en esta nota"
 msgid "Delete this note"
 msgstr "Suprimeix esta nota"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:161
+#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Sincronitza les notes"
 
@@ -1402,9 +1544,8 @@ msgid "_Previous"
 msgstr "_Anterior"
 
 #: ../Tomboy/NoteWindow.cs:775
-#, fuzzy
 msgid "_Next"
-msgstr "_Text"
+msgstr "_Següent"
 
 #: ../Tomboy/NoteWindow.cs:1258
 msgid "_Bold"
@@ -1443,40 +1584,38 @@ msgid "S_mall"
 msgstr "_Petita"
 
 #: ../Tomboy/NoteWindow.cs:1352
-#, fuzzy
 msgid "Increase Font Size"
-msgstr "Mida de la lletra"
+msgstr "Augmenta la mida de la lletra"
 
 #: ../Tomboy/NoteWindow.cs:1370
-#, fuzzy
 msgid "Decrease Font Size"
-msgstr "Mida de la lletra"
+msgstr "Redueix la mida de la lletra"
 
 #: ../Tomboy/NoteWindow.cs:1390
 msgid "Bullets"
 msgstr "Pics"
 
-#: ../Tomboy/PreferencesDialog.cs:78
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
 msgstr "Edició"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
 msgstr "Dreceres"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
 msgstr "Sincronització"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
 msgstr "Complements"
 
-#: ../Tomboy/PreferencesDialog.cs:144
+#: ../Tomboy/PreferencesDialog.cs:173
 msgid "_Spell check while typing"
 msgstr "_Verifica l'ortografia a mesura que escric"
 
-#: ../Tomboy/PreferencesDialog.cs:153
+#: ../Tomboy/PreferencesDialog.cs:182
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1486,11 +1625,11 @@ msgstr ""
 
 # ViquiParaules ? (josep)
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:164
+#: ../Tomboy/PreferencesDialog.cs:193
 msgid "Highlight _WikiWords"
 msgstr "_Ressalta les 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."
@@ -1499,33 +1638,48 @@ msgstr ""
 "clic a la paraula es crearà una nota amb este nom."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:179
+#: ../Tomboy/PreferencesDialog.cs:208
 msgid "Enable auto-_bulleted lists"
 msgstr "Habilita llistes de vinyetes automàtiques"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:188
+#: ../Tomboy/PreferencesDialog.cs:217
 msgid "Use custom _font"
 msgstr "_Usa el tipus de lletra personalitzat"
 
-#: ../Tomboy/PreferencesDialog.cs:212
+#: ../Tomboy/PreferencesDialog.cs:235
+msgid "When renaming a linked note: "
+msgstr "En canviar el nom d'una nota enllaçada: "
+
+#: ../Tomboy/PreferencesDialog.cs:238
+msgid "Ask me what to do"
+msgstr "Demana'm què vull fer"
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Never rename links"
+msgstr "No canvies mai els noms dels enllaços"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Always rename links"
+msgstr "Canvia sempre els noms dels enllaços"
+
+#: ../Tomboy/PreferencesDialog.cs:260
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr ""
 "Utilitzeu la plantilla de nota nova per a especificar el text que s'hauria "
-"d'utilitzar quan es cree una nota nova."
+"d'utilitzar quan es crei una nota nova."
 
-#: ../Tomboy/PreferencesDialog.cs:221
+#: ../Tomboy/PreferencesDialog.cs:269
 msgid "Open New Note Template"
 msgstr "Obri la plantilla de nota nova"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:278
+#: ../Tomboy/PreferencesDialog.cs:326
 msgid "Listen for _Hotkeys"
 msgstr "Presta atenció a les _dreceres"
 
-#: ../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><Control><Shift>F11</b>, <b><"
@@ -1536,72 +1690,82 @@ msgstr ""
 "Control><Maj>F11</b>, <b><Alt>N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:307
+#: ../Tomboy/PreferencesDialog.cs:355
 msgid "Show notes _menu"
 msgstr "Mo_stra el menú de les notes"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:324
+#: ../Tomboy/PreferencesDialog.cs:372
 msgid "Open \"_Start Here\""
 msgstr "Obri «_Comenceu ací»"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:341
+#: ../Tomboy/PreferencesDialog.cs:389
 msgid "Create _new note"
 msgstr "Crea una _nota nova"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:358
+#: ../Tomboy/PreferencesDialog.cs:406
 msgid "Open \"Search _All Notes\""
 msgstr "Obr_e «Cerca totes les notes»"
 
-#: ../Tomboy/PreferencesDialog.cs:385
+#: ../Tomboy/PreferencesDialog.cs:433
 msgid "Ser_vice:"
 msgstr "Ser_vei:"
 
-#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
+#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "No configurable"
 
+#: ../Tomboy/PreferencesDialog.cs:512
+msgid "Automaticall_y Sync in Background Every"
+msgstr "Sincronitza automàticament en segon pla cada"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:518
+msgid "Minutes"
+msgstr "Minuts"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:458
+#: ../Tomboy/PreferencesDialog.cs:540
 msgid "_Advanced..."
 msgstr "_Avançat..."
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:601
 msgid "The following add-ins are installed"
 msgstr "Els complements següents estan instal·lats"
 
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:622
 msgid "Get More Add-Ins..."
-msgstr ""
+msgstr "Obté més complements..."
 
-#: ../Tomboy/PreferencesDialog.cs:566
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Habilita"
 
-#: ../Tomboy/PreferencesDialog.cs:572
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Inhabilita"
 
-#: ../Tomboy/PreferencesDialog.cs:703
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Encara no està implementat"
 
-#: ../Tomboy/PreferencesDialog.cs:717
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} Preferències"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Escolliu el tipus de lletra de la nota"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Altres opcions de sincronització"
 
-#: ../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:"
@@ -1609,23 +1773,23 @@ msgstr ""
 "Quan es detecta un conflicte entre una nota local i una nota al servidor de "
 "sincronització configurat:"
 
-#: ../Tomboy/PreferencesDialog.cs:913
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Demana'm sempre que vull fer."
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Reanomena la nota local."
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Reemplaça la nota local amb l'actualització del servidor."
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "WARNING: Are you sure?"
 msgstr "Avís: n'esteu segur?"
 
-#: ../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."
@@ -1633,11 +1797,11 @@ msgstr ""
 "No es recomana netejar els paràmetres de sincronització. Potser vos vegeu "
 "forçats a sincronitzar de nou totes les notes al alçar els paràmetres nous."
 
-#: ../Tomboy/PreferencesDialog.cs:1082
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "S'estan reiniciant els paràmetres de sincronització"
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1647,11 +1811,11 @@ msgstr ""
 "paràmetres de sincronització. Potser vos vegeu forçats a sincronitzar de nou "
 "totes les notes al alçar els paràmetres nous"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Success! You're connected!"
 msgstr "S'ha establit la connexió"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
@@ -1659,113 +1823,111 @@ msgstr ""
 "El Tomboy està preparat per a sincronitzar les notes. Voleu sincronitzar-les "
 "ara?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#: ../Tomboy/PreferencesDialog.cs:1269
+#, 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 ""
 "S'ha produït un error. Reviseu la informació i torneu-ho a provar. El fitxer "
-"~/.tomboy.log vos pot ser útil."
+"{0} vos pot ser útil."
 
-#: ../Tomboy/PreferencesDialog.cs:1196
+#: ../Tomboy/PreferencesDialog.cs:1282
 msgid "Error connecting :("
 msgstr "S'ha produït un error en connectar: ("
 
-#: ../Tomboy/PreferencesDialog.cs:1272
+#: ../Tomboy/PreferencesDialog.cs:1358
 msgid "Version:"
 msgstr "Versió:"
 
-#: ../Tomboy/PreferencesDialog.cs:1279
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Author:"
 msgstr "Autor:"
 
-#: ../Tomboy/PreferencesDialog.cs:1286
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1292
+#: ../Tomboy/PreferencesDialog.cs:1378
 msgid "Add-in Dependencies:"
 msgstr "Dependències del complement:"
 
-#: ../Tomboy/RecentChanges.cs:75
-msgid "Search All Notes"
-msgstr "Cerca totes les notes"
-
-#: ../Tomboy/RecentChanges.cs:90
+#: ../Tomboy/RecentChanges.cs:98
 msgid "_Search:"
 msgstr "_Cerca:"
 
-#: ../Tomboy/RecentChanges.cs:319
+#: ../Tomboy/RecentChanges.cs:330
 msgid "Note"
 msgstr "Nota"
 
-#: ../Tomboy/RecentChanges.cs:341
+#: ../Tomboy/RecentChanges.cs:352
 msgid "Last Changed"
 msgstr "Darrer canvi"
 
-#: ../Tomboy/RecentChanges.cs:472
+#: ../Tomboy/RecentChanges.cs:483
 msgid "Matches"
 msgstr "Coincidències"
 
 # csharp-format
-#: ../Tomboy/RecentChanges.cs:523
+#: ../Tomboy/RecentChanges.cs:534
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} coincidència"
 msgstr[1] "{0} coincidències"
 
-#: ../Tomboy/RecentChanges.cs:537
+#: ../Tomboy/RecentChanges.cs:548
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Total: {0} nota"
 msgstr[1] "Total: {0} notes"
 
-#: ../Tomboy/RecentChanges.cs:548
+#: ../Tomboy/RecentChanges.cs:559
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Coincidències: {0} nota"
 msgstr[1] "Coincidències: {0} notes"
 
-#: ../Tomboy/RecentChanges.cs:680
+#: ../Tomboy/RecentChanges.cs:695
 msgid "Notes"
 msgstr "Notes"
 
-#: ../Tomboy/Tomboy.cs:244
+#: ../Tomboy/Tomboy.cs:266
 msgid "Cannot create new note"
 msgstr "No es pot crear una nota nova"
 
-#: ../Tomboy/Tomboy.cs:310
+#: ../Tomboy/Tomboy.cs:332
 msgid "Primary Development:"
-msgstr ""
+msgstr "Desenvolupament principal:"
 
-#: ../Tomboy/Tomboy.cs:315
+#: ../Tomboy/Tomboy.cs:338
 msgid "Contributors:"
-msgstr ""
+msgstr "Col·laboradors:"
 
-#: ../Tomboy/Tomboy.cs:333
+#: ../Tomboy/Tomboy.cs:403
 msgid "translator-credits"
 msgstr "Jordi Mas i Hernàndez <jmas at softcatala.org>"
 
-#: ../Tomboy/Tomboy.cs:342
-#, fuzzy
+#: ../Tomboy/Tomboy.cs:412
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
-msgstr "Copyright © 2004-2007 Alex Graveley"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2009 Altres\n"
 
-#: ../Tomboy/Tomboy.cs:344
+#: ../Tomboy/Tomboy.cs:414
 msgid "A simple and easy to use desktop note-taking application."
 msgstr ""
 "Una senzilla aplicació d'escriptori, fàcil d'usar, per a prendre notes."
 
-#: ../Tomboy/Tomboy.cs:354
+#: ../Tomboy/Tomboy.cs:424
 msgid "Homepage"
 msgstr "Pàgina inicial"
 
-#: ../Tomboy/Tomboy.cs:471
+#: ../Tomboy/Tomboy.cs:536
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
@@ -1776,7 +1938,7 @@ msgstr ""
 "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:483
+#: ../Tomboy/Tomboy.cs:548
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1791,7 +1953,7 @@ msgstr ""
 "  --search [text]\t\tObre la finestra de cerca totes les notes amb el text "
 "de la cerca.\n"
 
-#: ../Tomboy/Tomboy.cs:494
+#: ../Tomboy/Tomboy.cs:558
 msgid ""
 "  --new-note\t\t\tCreate and display a new note.\n"
 "  --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1805,40 +1967,20 @@ msgstr ""
 "  --start-here\t\t\tMostra la nota «Comenceu ací»\n"
 "  --highlight-search [text]\tCerca i ressalta el text a la nota oberta\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 "El control remot D-BUS és inhabilitat.\n"
-
-#: ../Tomboy/Tomboy.cs:519
+#: ../Tomboy/Tomboy.cs:572
 #, csharp-format
 msgid "Version {0}"
 msgstr "Versió {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: opció desconeguda «{0}»\n"
-"Proveu «tomboy --help» per a més informació.\n"
-"El control remot D-BUS és inhabilitat."
-
-#: ../Tomboy/Tray.cs:63
+#: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (nova) "
 
-#: ../Tomboy/Tray.cs:277
+#: ../Tomboy/Tray.cs:287
 msgid "_About Tomboy"
 msgstr "_Quant al 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."
@@ -1846,33 +1988,33 @@ msgstr ""
 "No s'ha pogut trobar el «manual de notes del Tomboy». Comproveu que la "
 "instal·lació s'ha realitzat correctament."
 
-#: ../Tomboy/Utils.cs:151
+#: ../Tomboy/Utils.cs:152
 msgid "Help not found"
 msgstr "No s'ha trobat l'ajuda"
 
-#: ../Tomboy/Utils.cs:167
+#: ../Tomboy/Utils.cs:168
 msgid "Cannot open location"
 msgstr "No es pot obrir la ubicació"
 
-#: ../Tomboy/Utils.cs:189
+#: ../Tomboy/Utils.cs:190
 #, csharp-format
 msgid "Today, {0}"
 msgstr "Hui, {0}"
 
-#: ../Tomboy/Utils.cs:191
+#: ../Tomboy/Utils.cs:192
 msgid "Today"
 msgstr "Hui"
 
-#: ../Tomboy/Utils.cs:195
+#: ../Tomboy/Utils.cs:196
 #, csharp-format
 msgid "Yesterday, {0}"
 msgstr "Ahir, {0}"
 
-#: ../Tomboy/Utils.cs:197
+#: ../Tomboy/Utils.cs:198
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: ../Tomboy/Utils.cs:202
+#: ../Tomboy/Utils.cs:203
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
@@ -1880,53 +2022,53 @@ msgstr[0] "Fa {0} dia, {1}"
 msgstr[1] "Fa {0} dies, {1}"
 
 # csharp-format
-#: ../Tomboy/Utils.cs:206
+#: ../Tomboy/Utils.cs:207
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
 msgstr[0] "Fa {0} dia"
 msgstr[1] "Fa {0} dies"
 
-#: ../Tomboy/Utils.cs:212
+#: ../Tomboy/Utils.cs:213
 #, csharp-format
 msgid "Tomorrow, {0}"
 msgstr "Demà, {0}"
 
-#: ../Tomboy/Utils.cs:214
+#: ../Tomboy/Utils.cs:215
 msgid "Tomorrow"
 msgstr "Demà"
 
-#: ../Tomboy/Utils.cs:219
+#: ../Tomboy/Utils.cs:220
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
 msgstr[0] "En {0} dia, {1}"
 msgstr[1] "En {0} dies, {1}"
 
-#: ../Tomboy/Utils.cs:223
+#: ../Tomboy/Utils.cs:224
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
 msgstr[0] "En {0} dia"
 msgstr[1] "En {0} dies"
 
-#: ../Tomboy/Utils.cs:228
+#: ../Tomboy/Utils.cs:229
 msgid "MMMM d, h:mm tt"
-msgstr "d MMMM, h:mm tt"
+msgstr "d MMMM, H:mm"
 
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "d MMMM"
 
-#: ../Tomboy/Utils.cs:231
+#: ../Tomboy/Utils.cs:232
 msgid "No Date"
 msgstr "Sense data"
 
-#: ../Tomboy/Utils.cs:234
+#: ../Tomboy/Utils.cs:235
 msgid "MMMM d yyyy, h:mm tt"
-msgstr "MMMM d yyyy, h:mm tt"
+msgstr "MMMM d yyyy, H:mm"
 
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:236
 msgid "MMMM d yyyy"
 msgstr "d MMMM yyyy"
 
@@ -1935,7 +2077,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Sense títol {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 "
@@ -1944,15 +2086,15 @@ msgstr ""
 "Ja existeix una nota amb el títol <b>{0}</b>. Escolliu un altre nom per a "
 "esta nota abans de continuar."
 
-#: ../Tomboy/Watchers.cs:203
+#: ../Tomboy/Watchers.cs:204
 msgid "Note title taken"
 msgstr "El títol de la nota ja és en ús"
 
-#: ../Tomboy/Watchers.cs:548
+#: ../Tomboy/Watchers.cs:549
 msgid "_Copy Link Address"
 msgstr "_Copia l'adreça de l'enllaç"
 
-#: ../Tomboy/Watchers.cs:553
+#: ../Tomboy/Watchers.cs:554
 msgid "_Open Link"
 msgstr "_Obri l'enllaç"
 
@@ -1990,59 +2132,55 @@ msgid "An error ocurred while connecting to the specified server:"
 msgstr "S'ha produït un error mentre es connectava al servidor:"
 
 #. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:88
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
 msgid "Details"
 msgstr "Detalls:"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:118
-msgid "Note Title"
-msgstr "Títol de la nota"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:125
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
 msgstr "Estat"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:240
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
 msgid "Acquiring sync lock..."
 msgstr "S'està obtenint un bloqueig de sincronització..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "S'estan confirmant els canvis..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "S'estan sincronitzant les notes"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "S'estan sincronitzant les notes..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "Esta operació pot trigar una estona"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:250
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "S'està connectant al servidor..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "S'estan suprimint les notes del servidor..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:260
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "S'estan baixant les notes noves o actualitzades..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:272
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "Servidor bloquejat"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "El servidor està bloquejat"
 
-#: ../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."
@@ -2050,144 +2188,144 @@ msgstr ""
 "Un dels vostres altres ordinadors s'està sincronitzant actualment. Espereu "
 "dos minuts i torneu-ho a provar."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:278
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "S'està preparant la baixada d'actualitzacions des del servidor..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:281
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "S'està preparant la pujada d'actualitzacions al servidor..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "S'estan pujant les notes al servidor..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:287
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "S'ha produït un error en sincronitzar"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "No s'ha pogut sincronitzar"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr ""
 "No s'han pogut sincronitzar les notes. Comproveu els detalls a sota i torneu-"
 "ho a provar de nou."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:295
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "S'ha completat la sincronització"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "La sincronització s'ha completat"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:298
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "S'ha actualitzat {0} nota."
 msgstr[1] "S'han actualitzat {0} notes."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "Les notes estan actualitzades."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:307
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "S'ha cancel·lat la sincronització"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "S'ha cancel·lat la sincronització"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "Heu cancel·lat la sincronització. Podeu tancar ara la finestra."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:313
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "No s'ha configurat la sincronització"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "La sincronització no està configurada"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "Configureu la sincronització al diàleg de preferències."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:319
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "S'ha produït un error en el servei de sincronització"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "S'ha produït un error al servei"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr ""
 "S'ha produït un error en connectar al servei de sincronització. Torneu-ho a "
 "provar de nou."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:338
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "S'ha suprimit localment"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:341
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "S'ha suprimit des del servidor"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:344
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "Actualitzat"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:347
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "Afegit"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:350
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "S'han pujat els canvis al servidor"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:353
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "S'ha pujat la nota nova al servidor"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:501
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "S'ha produït un conflicte amb la nota"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:507
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (antiga)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:546
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "Reanomena la nota local:"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:552
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "Actualitza els enllaços en les notes a les quals es fa referència"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:559
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "Sobreescriu la nota local"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:563
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "Realitza sempre esta acció"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:569
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "S'ha detectat un conflicte amb les notes"
 
-#: ../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 "
@@ -2196,7 +2334,7 @@ msgstr ""
 "La versió del servidor de «{0}» està en conflicte amb la nota local. Què "
 "voleu fer amb la nota local?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:159
+#: ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "_Tools"
 msgstr "E_ines"
 
@@ -2234,5 +2372,151 @@ msgstr ""
 "l'inici. Afegiu «modprobe fuse» to /etc/init.d/boot.local or «fuse» to etc/"
 "modules."
 
+#~ msgid "_Browse..."
+#~ msgstr "_Navega..."
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "El control remot D-BUS està inhabilitat.\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy: opció desconeguda «{0}»\n"
+#~ "Proveu «tomboy --help» per a més informació.\n"
+#~ "El control remot D-BUS està inhabilitat."
+
 #~ msgid "C_ase Sensitive"
 #~ msgstr "_Diferencia entre majúscules i minúscules"
+
+#~ msgid "Preparing pages..."
+#~ msgstr "S'estan preparant les pàgines..."
+
+#~ msgid "Rendering page %d of %d..."
+#~ msgstr "S'està representant la pàgina %d de %d..."
+
+#~ msgid "Printing page %d of %d..."
+#~ msgstr "S'està imprimint la pàgina %d de %d..."
+
+#~ msgid "Print preview"
+#~ msgstr "Exemple d'impressió"
+
+#~ msgid "%A %x, %X"
+#~ msgstr "%A %x, %X"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuració"
+
+#~ msgid "Configuration options for the print job"
+#~ msgstr "Opcions de configuració del treball d'impressió"
+
+#~ msgid "Source Buffer"
+#~ msgstr "Memòria intermèdia font"
+
+#~ msgid "GtkTextBuffer object to print"
+#~ msgstr "Objecte GtkTextBuffer a imprimir"
+
+#~ msgid "Tabs Width"
+#~ msgstr "Amplada de les tabulacions"
+
+#~ msgid "Width in equivalent space characters of tabs"
+#~ msgstr "Amplada equivalent de les tabulacions en caràcters d'espai"
+
+#~ msgid "Wrap Mode"
+#~ msgstr "Mode d'ajustament"
+
+#~ msgid "Word wrapping mode"
+#~ msgstr "Mode d'ajustament de paraula"
+
+#~ msgid "Highlight"
+#~ msgstr "Ressaltat"
+
+#~ msgid "Whether to print the document with highlighted syntax"
+#~ msgstr "Si s'ha d'imprimir el document amb la sintaxi ressaltada"
+
+#~ msgid "Font"
+#~ msgstr "Tipus lletra"
+
+#~ msgid "GnomeFont name to use for the document text (deprecated)"
+#~ msgstr "El tipus de lletra que s'utilitzarà en el document (desaconsellat)"
+
+#~ msgid "Font Description"
+#~ msgstr "Descripció del tipus de lletra"
+
+#~ msgid "Font to use for the document text (e.g. \"Monospace 10\")"
+#~ msgstr ""
+#~ "Tipus de lletra que es farà servir pel text del document (p.ex. «Monospace "
+#~ "10»)"
+
+#~ msgid "Numbers Font"
+#~ msgstr "Tipus de lletra dels números"
+
+#~ msgid "GnomeFont name to use for the line numbers (deprecated)"
+#~ msgstr ""
+#~ "Nom de la GnomeFont que es farà servir en els números de línia "
+#~ "(desaconsellat)"
+
+#~ msgid "Font description to use for the line numbers"
+#~ msgstr ""
+#~ "Descripció del tipus de lletra que es farà servir en els números de línia"
+
+#~ msgid "Print Line Numbers"
+#~ msgstr "Imprimeix els números de línia"
+
+#~ msgid "Interval of printed line numbers (0 means no numbers)"
+#~ msgstr ""
+#~ "Interval dels números de línia en l'impressió (el 0 indica no imprimir el "
+#~ "número de línia)"
+
+#~ msgid "Print Header"
+#~ msgstr "Imprimeix la capçalera"
+
+#~ msgid "Whether to print a header in each page"
+#~ msgstr "Si s'ha d'imprimir la capçalera en cada pàgina"
+
+#~ msgid "Print Footer"
+#~ msgstr "Imprimeix el peu de pàgina"
+
+#~ msgid "Whether to print a footer in each page"
+#~ msgstr "Si s'ha d'imprimir el peu de pàgina en cada pàgina"
+
+#~ msgid "Header and Footer Font"
+#~ msgstr "Tipus de lletra de la capçalera i del peu de pàgina"
+
+#~ msgid "GnomeFont name to use for the header and footer (deprecated)"
+#~ msgstr ""
+#~ "Nom del GnomeFont que s'utilitzarà per a la capçalera i el peu de pàgina "
+#~ "(desaconsellat)"
+
+#~ msgid "Header and Footer Font Description"
+#~ msgstr "Descripció del tipus de lletra de la capçalera i del peu de pàgina"
+
+#~ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
+#~ msgstr ""
+#~ "Tipus de lletra a utilitzar per a la capçalera i del peu de pàgina (p.ex. "
+#~ "«Monospace 10»)"
+
+#~ msgid "Really delete these notes?"
+#~ msgstr "Segur que voleu suprimir aquestes notes?"
+
+#~ msgid "Add-in"
+#~ msgstr "Complement"
+
+#~ msgid "Version"
+#~ msgstr "Versió"
+
+#~ msgid "Other"
+#~ msgstr "Altres"
+
+#~ msgid "_Open New Note Template..."
+#~ msgstr "_Obre la plantilla de nota nova..."
+
+#~ msgid "NoteOfTheDay"
+#~ msgstr "Nota del dia"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "_Diferencia entre majúscules i minúscules"
+
+#~ msgid "Delete"
+#~ msgstr "Suprimeix"
diff --git a/po/el.po b/po/el.po
index b188be7..19a701e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -36,7 +36,7 @@ msgstr "Εργοστάσιο μικροεφαρμογής Tomboy"
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
 #: ../Tomboy/Tray.cs:568
 msgid "Tomboy Notes"
-msgstr "Σημειώσεις Tomboy"
+msgstr "Σημειώσεις"
 
 #: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
 #: ../Tomboy/Tray.cs:263
diff --git a/po/et.po b/po/et.po
index bbc9c04..5ed80fe 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: tomboy MASTER\n"
+"Project-Id-Version: tomboy 1.2.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=tomboy&component=general\n"
-"POT-Creation-Date: 2010-03-06 00:32+0000\n"
+"POT-Creation-Date: 2010-04-01 06:41+0000\n"
 "PO-Revision-Date: 2010-03-07 09:46+0200\n"
 "Last-Translator: Ivar Smolin <okul at linux.ee>\n"
 "Language-Team: Estonian <gnome-et at linux.ee>\n"
@@ -1145,9 +1145,11 @@ msgstr "Nimeta ümber"
 msgid "Note Title"
 msgstr "Märkme pealkiri"
 
+#. Translators: This button causes all notes in the list to be selected
 msgid "Select All"
 msgstr "Vali kõik"
 
+#. Translators: This button causes all notes in the list to be unselected
 msgid "Select None"
 msgstr "Valiku tühistamine"
 
diff --git a/po/nl.po b/po/nl.po
index ac2a7ad..563dfc6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 # Jo Vermeulen <jo at lumumba.luc.ac.be>
 # Tino Meinen <a.t.meinen at chello.nl>, 2006, 2007, 2008.
 # Sander Brabander <sanderfox at gmail.com>, 2006.
-# Wouter Bolsterlee <wbolster at gnome.org>, 2006–2009.
+# Wouter Bolsterlee <wbolster at gnome.org>, 2006–2010.
 # Daniel van Eeden <gnomenl at myname.nl>, 2008.
 #
 # 200902: Wouter Bolsterlee heeft flink opgeruimd, want dat was gezien het
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tomboy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-04 09:09+0100\n"
+"POT-Creation-Date: 2010-03-31 00:17+0200\n"
 "PO-Revision-Date: 2009-03-04 09:12+0100\n"
 "Last-Translator: Wouter Bolsterlee <wbolster at gnome.org>\n"
 "Language-Team: Dutch\n"
@@ -42,21 +42,26 @@ msgid "Tomboy Applet Factory"
 msgstr "Tomboy-appletfabriek"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:522
+#: ../Tomboy/Tray.cs:573
 msgid "Tomboy Notes"
 msgstr "Tomboy-notities"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:268
+msgid "S_ynchronize Notes"
+msgstr "Notitites s_ynchroniseren"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "In_fo"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:236
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:282
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:231
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:277
 msgid "_Preferences"
 msgstr "_Voorkeuren…"
 
@@ -74,70 +79,74 @@ msgid "Accept SSL Certificates"
 msgstr "SSL-certificaten accepteren"
 
 #: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "Timeout voor automatische synchronisatie op de achtergrond"
+
+#: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
 msgstr "Nieuwe notitie"
 
-#: ../data/tomboy.schemas.in.h:3
+#: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "Aangepast lettertype"
 
-#: ../data/tomboy.schemas.in.h:4
+#: ../data/tomboy.schemas.in.h:5
 msgid "Determines X coordinate of Search window; stored on Tomboy exit."
 msgstr ""
 "Bepaalt de x-coördinaat van het zoekvenster; opgeslagen als Tomboy "
 "afgesloten wordt."
 
-#: ../data/tomboy.schemas.in.h:5
+#: ../data/tomboy.schemas.in.h:6
 msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
 msgstr ""
 "Bepaalt de y-coördinaat van het zoekvenster; opgeslagen als Tomboy "
 "afgesloten wordt."
 
-#: ../data/tomboy.schemas.in.h:6
+#: ../data/tomboy.schemas.in.h:7
 msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgstr ""
 "Bepaalt de hoogte van het zoekvenster (in pixels); opgeslagen als Tomboy "
 "afgesloten wordt."
 
-#: ../data/tomboy.schemas.in.h:7
+#: ../data/tomboy.schemas.in.h:8
 msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgstr ""
 "Bepaalt de breedte van het zoekvenster (in pixels); opgeslagen als Tomboy "
 "afgesloten wordt."
 
-#: ../data/tomboy.schemas.in.h:8
+#: ../data/tomboy.schemas.in.h:9
 msgid "Enable Auto bulleted lists."
 msgstr "Automatische opsommingen inschakelen."
 
-#: ../data/tomboy.schemas.in.h:9
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "Plakken met middelste muisknop op het pictogram inschakelen."
 
-#: ../data/tomboy.schemas.in.h:10
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "WikiWoord-markering gebruiken"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:12
 msgid "Enable closing notes with escape."
 msgstr "Sluiten van notities met Esc inschakelen."
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:13
 msgid "Enable custom font"
 msgstr "Aangepast lettertype gebruiken"
 
-#: ../data/tomboy.schemas.in.h:13
+#: ../data/tomboy.schemas.in.h:14
 msgid "Enable global keybindings"
 msgstr "Sneltoetsen gebruiken"
 
-#: ../data/tomboy.schemas.in.h:14
+#: ../data/tomboy.schemas.in.h:15
 msgid "Enable spellchecking"
 msgstr "Spellingscontrole gebruiken"
 
-#: ../data/tomboy.schemas.in.h:15
+#: ../data/tomboy.schemas.in.h:16
 msgid "Enable startup notes"
 msgstr "Opstartnotities gebruiken"
 
-#: ../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."
@@ -145,7 +154,7 @@ msgstr ""
 "Schakel deze optie in voor automatische opsomming bij het typen van een ‘-’ "
 "of ‘*’ aan het begin van de regel."
 
-#: ../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."
@@ -154,7 +163,7 @@ msgstr ""
 "hier’-notitie door met de middelste muisknop op het Tomboy pictogram te "
 "klikken."
 
-#: ../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."
@@ -162,23 +171,23 @@ msgstr ""
 "Deze optie zorgt ervoor dat woorden DieErZoUitzien worden gemarkeerd. Door "
 "op zo'n woord te dubbelklikken maakt u een nieuwe notitie aan met die naam."
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE-koppelings-timeout (ms)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "Alle notities waarnaar verwezen wordt exporteren"
 
-#: ../data/tomboy.schemas.in.h:21
+#: ../data/tomboy.schemas.in.h:22
 msgid "HTML Export Last Directory"
 msgstr "Laatst gebruikte map voor HTML-export"
 
-#: ../data/tomboy.schemas.in.h:22
+#: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export Linked Notes"
 msgstr "Notities waarnaar verwezen wordt exporteren"
 
-#: ../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."
@@ -186,7 +195,7 @@ msgstr ""
 "Als ‘enable_custom_font’ ingeschakeld is, wordt het hier gekozen lettertype "
 "gebruikt voor de notities."
 
-#: ../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."
@@ -194,11 +203,11 @@ msgstr ""
 "Indien ingeschakeld zullen alle notities die openstonden toen Tomboy "
 "afgesloten werd, weer geopend worden bij het opstarten."
 
-#: ../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 "Schakel deze optie in voor het sluiten van notities met de Esc-toets."
 
-#: ../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."
@@ -206,7 +215,7 @@ msgstr ""
 "Indien ingeschakeld zullen spelfouten rood worden onderstreept en zullen "
 "door rechts te klikken verbeteringen in een menu verschijnen."
 
-#: ../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 "
@@ -216,7 +225,7 @@ msgstr ""
 "global_keybindings’ actief zijn, zodat vanuit elk programma handige Tomboy-"
 "handelingen verricht kunnen worden."
 
-#: ../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."
@@ -225,7 +234,7 @@ msgstr ""
 "worden gebruikt in de notities. Anders wordt het standaardlettertype "
 "gebruikt."
 
-#: ../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."
@@ -233,14 +242,26 @@ msgstr ""
 "Geeft aan dat de plugin voor het importeren van memo's nog niet gebruikt is, "
 "zodat deze automatisch begint na een herstart van Tomboy."
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr ""
 "Getal dat aangeeft hoeveel notities minimaal worden getoond in het 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-waarde die aangeeft hoe vaak een achtergrondsynchronisatie van de "
+"notities plaatsvindt (indien synchronisatie is ingeschakeld). Dit wordt "
+"opgegeven in minuten. Waardes kleiner dan 1 geven aan dat synchronisatie is "
+"uitgeschakeld. De kleinste geldige positieve waarde is 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 "
@@ -254,35 +275,71 @@ msgstr ""
 "opsomming. ‘0’ betekent dat gebruiker op de hoogte wordt gebracht van "
 "conflicten zodat deze per geval afgehandeld kunnen worden."
 
-#: ../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-waarde die aangeeft of er een voorkeur is voor het uitvoeren van een "
+"specifieke actie wanneer een notitie wordt hernoemd, in plaats van het de "
+"gebruiker te vragen. De waarden komen overeen met een interne opsomming. De "
+"waarde 0 geeft aan dat de gebruiker zelf wil aangeven wat er moet gebeuren "
+"als er een notitie hernoemd wordt waarnaar verwezen wordt vanuit andere "
+"notities. De waarde 1 geeft aan dat verwijzingen automatisch verwijderd "
+"worden. De waarde 2 geeft aan dat de verwijzingstekst bijgewerkt moet worden "
+"zodat dat verwijzing blijft werken nadat het verwijzingsdoel hernoemd is."
+
+#: ../data/tomboy.schemas.in.h:35
+msgid "Link Updating Behavior on Note Rename"
+msgstr ""
+"Gedrag voor het bijwerken van verwijzingen bij het hernoemen van notities"
+
+#: ../data/tomboy.schemas.in.h:36
 msgid "List of pinned notes."
 msgstr "Lijst van vastgepinde notities"
 
-#: ../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 ""
+"Het maximum aantal tekens van de notitietitel die getoond wordt in het "
+"Tomboy-notificatiepictogram of in het menu van het paneel-applet."
+
+#: ../data/tomboy.schemas.in.h:38
+msgid "Maximum note title length to show in tray menu."
+msgstr "Maximaal aantal tekens van notitietitels in het paneelmenu."
+
+#: ../data/tomboy.schemas.in.h:39
 msgid "Minimum number of notes to show in menu"
 msgstr "Minimum aantal notities dat in het menu getoond wordt"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:40
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "Opgeslagen conflictgedrag bij notitie-synchronisatie"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:41
 msgid "Open Recent Changes"
 msgstr "Recente wijzigingen openen"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:42
 msgid "Open Search Dialog"
 msgstr "Zoekvenster openen"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:43
 msgid "Open Start Here"
 msgstr "‘Begin hier’ openen"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:44
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "Pad op SSH-server naar de Tomboy-synchronisatiemap (optioneel)."
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:45
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
@@ -290,71 +347,71 @@ msgstr ""
 "Pad naar de synchronisatiedienst bij het gebruik van de uitbreiding voor "
 "synchronisatie via het bestandssysteem."
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:46
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "Map op afstand voor SSHFS-synchronisatie"
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:47
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "Gebruikersnaam op afstand voor SSHFS-synchronisatie"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:48
 msgid "SSHFS Synchronization Server Port"
 msgstr "Server-poort voor SSHFS-synchronisatieserver"
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:49
 msgid "SSHFS Synchronization Server URL"
 msgstr "Server-url voor SSHFS-synchronisatieserver"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:50
 msgid "Saved height of Search window"
 msgstr "Opgeslagen hoogte van het zoekvenster"
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:51
 msgid "Saved horizontal position of Search window"
 msgstr "Opgeslagen horizontale positie van het zoekvenster"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:52
 msgid "Saved vertical position of Search window"
 msgstr "Opgeslagen verticale positie van het zoekvenster"
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:53
 msgid "Saved width of Search window"
 msgstr "Opgeslagen breedte van het zoekvenster"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:54
 msgid "Selected Synchronization Service Addin"
 msgstr "Geselecteerde uitbreiding voor synchronisatiediensten"
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:55
 msgid "Set to TRUE to activate"
 msgstr "Inschakelen om te activeren"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:56
 msgid "Show applet menu"
 msgstr "Applet-menu tonen"
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:57
 msgid "Start Here Note"
 msgstr "‘Begin hier’-notitie"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:58
 msgid "Sticky Note Importer First Run"
 msgstr "Eerste keer importeren van memo's"
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Client ID"
 msgstr "Synchronisatie client ID"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:60
 msgid "Synchronization Local Server Path"
 msgstr "Lokaal pad voor synchronisatie"
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:61
 msgid "The date format that is used for the timestamp."
 msgstr "De datum opmaak voor tijdstipweergave."
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -369,7 +426,7 @@ msgstr ""
 "Ctrl>’. Indien u de optie instelt op de speciale tekenreeks ‘disabled’, "
 "zal er geen sneltoets voor deze handeling gebruikt worden."
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:63
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -384,7 +441,7 @@ msgstr ""
 "Ctrl>’. Indien u de optie instelt op de speciale tekenreeks ‘disabled’, "
 "zal er geen sneltoets voor deze handeling gebruikt worden."
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -399,7 +456,7 @@ msgstr ""
 "en ‘<Ctrl>’. Indien u de optie instelt op de speciale tekenreeks "
 "‘disabled’, zal er geen sneltoets voor deze handeling gebruikt worden."
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:65
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -414,7 +471,7 @@ msgstr ""
 "Ctrl>’. Indien u de optie instelt op de speciale tekenreeks ‘disabled’, "
 "zal er geen sneltoets voor deze handeling gebruikt worden."
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:66
 msgid ""
 "The global keybinding for showing the Tomboy applet's menu. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -429,18 +486,18 @@ msgstr ""
 "Ctrl>’. Indien u de optie instelt op de speciale tekenreeks ‘disabled’, "
 "zal er geen sneltoets voor deze handeling gebruikt worden."
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:67
 msgid "The handler for \"note://\" URLs"
 msgstr "De afhandeling van ‘note://’-URLs"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:68
 msgid ""
 "The last directory a note was exported to using the Export To HTML plugin."
 msgstr ""
 "De laatst gebruikte map voor het opslaan van notities met de HTML-export "
 "plugin."
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:69
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
@@ -448,7 +505,7 @@ msgstr ""
 "De laatste gebruikte instelling voor het ‘Notities waarnaar verwezen wordt’-"
 "selectievakje in de HTML-export plugin."
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../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 "
@@ -461,7 +518,7 @@ msgstr ""
 "verwezen wordt’ en geeft aan of alle notities (recursief vanaf de huidige "
 "notitie) als HTML geëxporteerd dienen te worden."
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../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 "
@@ -471,13 +528,16 @@ msgstr ""
 "notitie wordt altijd getoond in het menu en is ook tevens met een sneltoets "
 "te openen."
 
-#: ../data/tomboy.schemas.in.h:66
-msgid "The port to use when connecting to the synchronization server via SSH."
+#: ../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 ""
 "De te gebruiken poort voor het verbinden naar de synchronisatiedienst over "
-"SSH."
+"SSH. Gebruik de waarde -1 als de standaardinstellingen gebruikt moeten "
+"worden."
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:73
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -485,15 +545,15 @@ msgstr ""
 "De tijd (in milliseconden) dat Tomboy moet blijven wachten op een antwoord "
 "als FUSE gebruikt wordt kom een via FUSE gedeelde map aan te koppelen."
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:74
 msgid "Timestamp format"
 msgstr "Tijdstip opmaak"
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:75
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "URL van de SSH-server met de synchronisatiemap voor Tomboy."
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
@@ -501,7 +561,7 @@ msgstr ""
 "Unieke identifier voor de momenteel geconfigureerde uitbreiding voor het "
 "sychroniseren van notities."
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:77
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
@@ -509,7 +569,7 @@ msgstr ""
 "Unieke identificatie voor deze Tomboy-client, gebruikt voor de communicatie "
 "met de synchronisatieserver."
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:78
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
@@ -517,13 +577,13 @@ msgstr ""
 "Gebruik de ‘wdfs’-optie ‘-ac’ om SSL-certificaten te accepteren zonder de "
 "gebruiker te vragen."
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:79
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr ""
 "Te gebruiken gebruikersnaam voor het verbinden naar de synchroniesatiedienst "
 "over SSH."
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:80
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -559,7 +619,7 @@ msgstr "Ver_wijderen"
 msgid "Delete the selected note"
 msgstr "De geselecteerde notitie verwijderen"
 
-#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:416
+#: ../Tomboy/ActionManager.cs:142 ../Tomboy/NoteWindow.cs:406
 msgid "_Close"
 msgstr "Sl_uiten"
 
@@ -567,7 +627,7 @@ msgstr "Sl_uiten"
 msgid "Close this window"
 msgstr "Venster sluiten"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:248
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:294
 msgid "_Quit"
 msgstr "A_fsluiten"
 
@@ -579,7 +639,7 @@ msgstr "Tomboy afsluiten"
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "Voorkeuren"
 
@@ -605,7 +665,7 @@ msgstr "Pictogram in mededelingengebied"
 msgid "Create _New Note"
 msgstr "_Nieuwe notitie"
 
-#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:359
+#: ../Tomboy/ActionManager.cs:175 ../Tomboy/NoteWindow.cs:349
 msgid "_Search All Notes"
 msgstr "_Alle notities doorzoeken"
 
@@ -613,10 +673,6 @@ msgstr "_Alle notities doorzoeken"
 msgid "Open the Search All Notes window"
 msgstr "Zoekvenster om alle notities te doorzoeken openen"
 
-#: ../Tomboy/ActionManager.cs:179
-msgid "S_ynchronize Notes"
-msgstr "Notitites s_ynchroniseren"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "Synchronseren van notities starten"
@@ -629,7 +685,7 @@ msgstr "Wat verwijst hiernaartoe?"
 msgid "(none)"
 msgstr "(niets)"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:32
+#: ../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."
@@ -638,47 +694,47 @@ msgstr ""
 "verslepen. Wanneer u een speciaal pictogram voor bepaalde hosts wilt "
 "gebruiken kunt u die hier toevoegen."
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:50
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:41
 msgid "Host Name"
 msgstr "Hostnaam:"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:67
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:58
 msgid "Icon"
 msgstr "Afbeelding"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:185
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:176
 msgid "Select an icon..."
 msgstr "Kies een afbeelding…"
 
 #. Extra Widget
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:200
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:191
 msgid "_Host name:"
 msgstr "_Hostnaam:"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:229
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:220
 msgid "No host name specified"
 msgstr "Geen hostnaam opgegeven"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:230
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:221
 msgid "You must specify the Bugzilla host name to use with this icon."
 msgstr ""
 "U dient een Bugzilla-hostnaam op te geven waarvoor u deze afbeelding wilt "
 "gebruiken."
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:256
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:247
 msgid "Error saving icon"
 msgstr "Fout bij opslaan van afbeelding"
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:257
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:248
 msgid "Could not save the icon file."
 msgstr "Kon pictogrambestand niet opslaan."
 
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:311
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:302
 msgid "Really remove this icon?"
 msgstr "Deze afbeelding echt verwijderen?"
 
 # vrij vertaald (Wouter Bolsterlee)
-#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:312
+#: ../Tomboy/Addins/Bugzilla/BugzillaPreferences.cs:303
 msgid "If you remove an icon it is permanently lost."
 msgstr "Het verwijderen van een afbeelding kan niet ongedaan gemaakt worden."
 
@@ -686,25 +742,25 @@ msgstr "Het verwijderen van een afbeelding kan niet ongedaan gemaakt worden."
 msgid "Export to HTML"
 msgstr "Exporteren naar HTML"
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:113
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:114
 #, csharp-format
 msgid "Your note was exported to \"{0}\"."
 msgstr "Uw notitie is geëxporteerd naar ‘{0}’."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:124
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:125
 msgid "Note exported successfully"
 msgstr "Notitie succesvol geëxporteerd"
 
 # accesoires/hulpmiddelen/hulpjes
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:130
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:131
 msgid "Access denied."
 msgstr "Toegang geweigerd."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:132
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:133
 msgid "Folder does not exist."
 msgstr "Map bestaat niet."
 
-#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:147
+#: ../Tomboy/Addins/ExportToHtml/ExportToHtmlNoteAddin.cs:148
 #, csharp-format
 msgid "Could not save the file \"{0}\""
 msgstr "Kon bestand ‘{0}’ niet opslaan."
@@ -728,33 +784,29 @@ msgstr "Alle notities waarnaar verwezen wordt exporteren"
 msgid "Cannot open email"
 msgstr "E-mail kon niet geopend worden"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:91
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:93
 msgid "_Folder Path:"
 msgstr "_Pad naar map:"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:101
-msgid "_Browse..."
-msgstr "_Zoeken…"
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:120
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
 msgstr "Synchronisatiemap selecteren…"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:148
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
 msgid "Folder path field is empty."
 msgstr "Het veld voor het pad naar de map is leeg."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:157
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
 msgid ""
 "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "De opgeven map bestaat niet en Tomboy kon deze niet aanmaken."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:235
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "Lokale map"
 
-#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:14
-msgid "_Fixed Width"
+#: ../Tomboy/Addins/FixedWidth/FixedWidthMenuItem.cs:13
+msgid "Fixed Wid_th"
 msgstr "_Vaste breedte"
 
 #: ../Tomboy/Addins/GalagoPresence/GalagoPresenceNoteAddin.cs:244
@@ -773,7 +825,7 @@ msgstr "Tijdstip invoegen"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:132
+#: ../Tomboy/Applet.cs:227 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd d MMMM, hh:mm"
 
@@ -822,22 +874,22 @@ msgstr ""
 msgid "_Open Today: Template"
 msgstr "‘Vandaag: sjabloon’ _openen"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:51
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:52
 msgid "Print"
 msgstr "Afdrukken"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:79
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:82
 msgid "Error printing note"
 msgstr "Fout bij afdrukken van notitie"
 
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:205
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:219
 #, csharp-format
 msgid "Page {0} of {1}"
 msgstr "Pagina {0} van {1}"
 
 #. Translators: Explanation of the date and time format specifications can be found here:
 #. * http://msdn.microsoft.com/en-us/library/system.globalization.datetimeformatinfo.aspx
-#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:224
+#: ../Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs:238
 msgid "dddd MM/dd/yyyy, hh:mm:ss tt"
 msgstr "dddd dd MMMM yyyy, hh:mm:ss"
 
@@ -845,21 +897,22 @@ msgstr "dddd dd MMMM yyyy, hh:mm:ss"
 msgid "Add a sketch"
 msgstr "Tekening toevoegen"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:43
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "Se_rver:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:52
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:60
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:51
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:59
 msgid "User_name:"
 msgstr "Gebruikers_naam:"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:61
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:55
 msgid "_Folder Path (optional):"
 msgstr "_Map pad (optioneel):"
 
 #. Text for label describing setup required for SSH sync addin to work
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:71
+#: ../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."
@@ -867,15 +920,15 @@ msgstr ""
 "SSH synchronisatie vereist een bestaande SSH key voor deze server en "
 "gebruiker, toegevoegd aan een actieve SSH daemon."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:95
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:82
 msgid "Server or username field is empty."
 msgstr "Server of gebruikersnaam veld is leeg."
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:143
+#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:130
 msgid "SSH (sshfs FUSE)"
 msgstr "SSH (sshfs FUSE)"
 
-#: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:191
+#: ../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."
@@ -930,23 +983,27 @@ msgstr "Alles"
 msgid "--- Tasque is not running ---"
 msgstr "— Tasque is niet actief —"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:51
+#: ../Tomboy/Addins/Underline/UnderlineMenuItem.cs:12
+msgid "_Underline"
+msgstr "_Onderstreept"
+
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:55
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:69
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:64
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:90
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:77
 msgid "URL, username, or password field is empty."
 msgstr "URL-, gebruikersnaam- of wachtwoord-veld is leeg."
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:132
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:119
 msgid "WebDAV (wdfs FUSE)"
 msgstr "WebDAV (wdfs FUSE)"
 
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:191
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:178
 msgid ""
 "There was an error connecting to the server.  This may be caused by using an "
 "incorrect user name and/or password."
@@ -959,14 +1016,88 @@ msgstr ""
 #. Save configuration into GConf
 #. Preferences.Set ("/apps/tomboy/sync_wdfs_url", url ?? string.Empty);
 #. Preferences.Set ("/apps/tomboy/sync_wdfs_username", username ?? string.Empty);
-#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:267
+#: ../Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs:254
 msgid ""
 "Saving configuration to the GNOME keyring failed with the following message:"
 msgstr ""
 "Opslaan van de configuratie in de Gnome-sleutelbos is mislukt. Foutmelding:"
 
+#: ../Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs:70
+msgid "Tomboy Web"
+msgstr "Tomboy Web"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
+msgid "Connect to Server"
+msgstr "Verbinden met server"
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
+msgid "Connected"
+msgstr "Verbonden"
+
+#. Translators: The web service supporting Tomboy WebSync is not responding as expected
+#: ../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 antwoordt niet. Probeer het later opnieuw."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
+msgid "Authorization Failed, Try Again"
+msgstr "Autorisatie mislukt. Probeer opnieuw."
+
+#. Translators: Title of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
+msgid "Tomboy Web Authorization Successful"
+msgstr "Autorisatie voor Tomboy Web succesvol"
+
+#. Translators: Body of web page presented to user after they authorized Tomboy for sync
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
+msgid ""
+"Please return to the Tomboy Preferences window and press Save to start "
+"synchronizing."
+msgstr ""
+"Keer terug naar het Tomboy-voorkeurenvenster en kies Opslaan om de "
+"synchronisatie te starten."
+
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
+msgid "Connected. Press Save to start synchronizing"
+msgstr "Verbonden. Druk op Opslaan om de synchronisatie te starten"
+
+#. Translators: The user must take action in their web browser to continue the authorization process
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
+msgid "Authorizing in browser (Press to reset connection)"
+msgstr "Autoriseren in browser (Klik om de verbinding te resetten)"
+
+#. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
+msgid "Set the default browser and try again"
+msgstr "Stel de standaardbrowser in en probeer opnieuw"
+
+#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:83
+msgid "Search All Notes"
+msgstr "Alle notities doorzoeken"
+
+#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
+#. icons_path, (int)TomboyIcons.NewNotebook);
+#. if (new_notebook != null)
+#. object_collection.AddObject(new_notebook);
+#: ../Tomboy/JumpListManager.cs:87
+msgid "Create New Note"
+msgstr "Nieuwe notitie"
+
+#: ../Tomboy/JumpListManager.cs:117
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (nieuw)"
+
+#: ../Tomboy/JumpListManager.cs:139
+msgid "Recent Notes"
+msgstr "Recente notities"
+
 #. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:160
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "_Venster"
 
@@ -1052,7 +1183,7 @@ msgid "Delete the selected notebook"
 msgstr "Het geselecteerde notitieboek verwijderen"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:251
+#: ../Tomboy/RecentChanges.cs:259
 msgid "Notebooks"
 msgstr "Notitieboeken"
 
@@ -1082,54 +1213,108 @@ msgstr "Geen notitieboek"
 msgid "New \"{0}\" Note"
 msgstr "Nieuwe ‘{0}’-notitie"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:45
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:46
 msgid "Place this note into a notebook"
 msgstr "Deze notitie in een notitieboek plaatsen"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:126
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:127
 msgid "Notebook"
 msgstr "Notitieboek"
 
-#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:155
+#: ../Tomboy/Notebooks/NotebookNoteAddin.cs:156
 msgid "_New notebook..."
 msgstr "Nieuw notitie_boek…"
 
-#: ../Tomboy/Note.cs:1427
+#: ../Tomboy/Note.cs:1578
 msgid "Really delete this note?"
 msgstr "Wilt u deze notitie echt verwijderen?"
 
-#: ../Tomboy/Note.cs:1430
+#: ../Tomboy/Note.cs:1581
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "Wilt u deze notitie echt verwijderen?"
 msgstr[1] "Wilt u deze {0} notities echt verwijderen?"
 
-#: ../Tomboy/Note.cs:1441
+#: ../Tomboy/Note.cs:1592
 msgid "If you delete a note it is permanently lost."
 msgstr "Het verwijderen van een notitie kan niet ongedaan gemaakt worden."
 
-#: ../Tomboy/Note.cs:1475
-msgid "Error saving note data."
-msgstr "Fout bij opslaan van notitiedata."
-
-#: ../Tomboy/Note.cs:1476
+#: ../Tomboy/Note.cs:1620
+#, 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 {1}."
 msgstr ""
 "Er is een fout opgetreden bij het opslaan van uw notities. Controleer of u "
-"genoeg schijfruimte heeft en dat u de juiste toegangsrecehten heeft tot de "
-"map ‘~/.tomboy’. Meer details kunt u vinden in ‘~/.tomboy.log’."
+"genoeg schijfruimte heeft en dat u de juiste toegangsrecehten heeft tot "
+"‘{0}’. Meer details kunt u vinden in ‘{1}’."
+
+#: ../Tomboy/Note.cs:1636
+msgid "Error saving note data."
+msgstr "Fout bij opslaan van notitiedata."
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:19 ../Tomboy/PreferencesDialog.cs:210
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
 msgid "New Note Template"
 msgstr "Nieuw notitiesjabloon"
 
-#: ../Tomboy/NoteManager.cs:135
+#. Create migration notification note
+#. Translators: The title of the data migration note
+#: ../Tomboy/NoteManager.cs:147
+msgid "Your Notes Have Moved!"
+msgstr "Uw notities zijn verplaatst!"
+
+#. 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:160
+#, csharp-format
+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"
+"\n"
+"Your 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"
+"\n"
+"But 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"
+"\n"
+"Ciao!"
+msgstr ""
+"In nieuwe versies van Tomboy zijn de notitiebestanden verplaatst. Het heeft "
+"u waarschijnlijk nooit veel uitgemaakt waar de notities werden opgeslagen en "
+"als het u nog steeds niet interesseert kunt u <bold>deze notitie "
+"verwijderen</bold. :-)\n"
+"\n"
+"De oude notitiemap is nog steeds volledig beschikbaar op <link:url>{0}</link:"
+"url>. Mocht u de overstap op een oudere Tomboy-versie maken, dan zal deze "
+"oudere versie op hier naar notities zoeken.\n"
+"De notities zijn echter gekopiëerd naar nieuwe mappen, die vanaf heden "
+"gebruikt zullen worden:\n"
+"\n"
+"<list><list-item dir=\"ltr\">Notities staan in <link:url>{1}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">Configuratie staat in <link:url>{2}</link:"
+"url>\n"
+"</list-item><list-item dir=\"ltr\">Uitbreiding kunnen in <link:url>{3}</link:"
+"url> geïnstalleerd worden\n"
+"</list-item><list-item dir=\"ltr\">Logbestanden zijn te vinden in <link:url>"
+"{4}</link:url></list-item></list>\n"
+"\n"
+"Tot ziens!"
+
+#: ../Tomboy/NoteManager.cs:265
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1169,7 +1354,7 @@ msgstr ""
 
 # Let op: ik heb de volgorde van de alinea's een klein beetje aangepast zodat
 # het geheel wat beter leesbaar is. (Wouter Bolsterlee)
-#: ../Tomboy/NoteManager.cs:154
+#: ../Tomboy/NoteManager.cs:284
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1199,173 +1384,248 @@ msgstr ""
 "bestaande notities wijzen als een notitie wordt hernoemd.</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:169 ../Tomboy/NoteManager.cs:236
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:368
 msgid "Start Here"
 msgstr "Begin hier"
 
-#: ../Tomboy/NoteManager.cs:174
+#: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
 msgstr "Verwijzingen in Tomboy"
 
-#: ../Tomboy/NoteManager.cs:313
+#: ../Tomboy/NoteManager.cs:445
 #, csharp-format
 msgid "New Note {0}"
 msgstr "Nieuwe notitie {0}"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:386 ../Tomboy/NoteManager.cs:478
+#: ../Tomboy/NoteManager.cs:518 ../Tomboy/NoteManager.cs:611
 msgid "Describe your new note here."
 msgstr "Schrijf hier uw nieuwe notitie."
 
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "Notitie-verwijzingen hernoemen?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "Verwijzingen _hernoemen"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "Verwijzingen _niet hernoemen"
+
+#: ../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 ""
+"Verwijzingen in andere notities van ‘<span underline=\"single\">{0}</span>’ "
+"in ‘<span underline=\"single\">{1}</span>’ veranderen?\n"
+"\n"
+"Als u de verwijzingen niet hernoemd, zullen deze nergens meer naar toe "
+"verwijzen."
+
+#: ../Tomboy/NoteRenameDialog.cs:81
+msgid "Rename Links"
+msgstr "Verwijzingen hernoemen"
+
+#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "Notitietitel"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:116
+msgid "Select All"
+msgstr "Alles selecteren"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:125
+msgid "Select None"
+msgstr "Niets selecteren"
+
+#: ../Tomboy/NoteRenameDialog.cs:142
+msgid "Ad_vanced"
+msgstr "Ge_avanceerd"
+
+#: ../Tomboy/NoteRenameDialog.cs:145
+msgid "Always show this _window"
+msgstr "Dit venster altijd _weergeven"
+
+#: ../Tomboy/NoteRenameDialog.cs:153
+msgid "Never rename _links"
+msgstr "_Nooit verwijzingen hernoemen"
+
+#: ../Tomboy/NoteRenameDialog.cs:161
+msgid "Alwa_ys rename links"
+msgstr "_Altijd verwijzingen hernoemen"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "In deze notitie zoeken"
 
-#: ../Tomboy/NoteWindow.cs:371
+#: ../Tomboy/NoteWindow.cs:361
 msgid "_Link to New Note"
 msgstr "Naar nieuwe notitie verwij_zen"
 
-#: ../Tomboy/NoteWindow.cs:383
+#: ../Tomboy/NoteWindow.cs:373
 msgid "Te_xt"
 msgstr "Te_kst"
 
-#: ../Tomboy/NoteWindow.cs:391
+#: ../Tomboy/NoteWindow.cs:381
 msgid "_Find in This Note"
 msgstr "In deze notitie _zoeken"
 
-#: ../Tomboy/NoteWindow.cs:406
+#: ../Tomboy/NoteWindow.cs:396
 msgid "Clos_e All Notes"
 msgstr "Alle notities sl_uiten"
 
-#: ../Tomboy/NoteWindow.cs:446
+#: ../Tomboy/NoteWindow.cs:436
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../Tomboy/NoteWindow.cs:449
+#: ../Tomboy/NoteWindow.cs:439
 msgid "Search your notes (Ctrl-Shift-F)"
 msgstr "Notities doorzoeken (Ctrl-Shift-F)"
 
-#: ../Tomboy/NoteWindow.cs:461
+#: ../Tomboy/NoteWindow.cs:451
 msgid "Link"
 msgstr "Verwijzen"
 
-#: ../Tomboy/NoteWindow.cs:467
+#: ../Tomboy/NoteWindow.cs:457
 msgid "Link selected text to a new note (Ctrl-L)"
 msgstr ""
 "De geselecteerde tekst naar een nieuwe notitie laten verwijzen (Ctrl-L)"
 
 # Hierboven staat ook al een keer Te_xt met een andere mnemonic... gewoon maar
 # hetzelfde houden (Wouter Bolsterlee)
-#: ../Tomboy/NoteWindow.cs:480
+#: ../Tomboy/NoteWindow.cs:470
 msgid "_Text"
 msgstr "Te_kst"
 
-#: ../Tomboy/NoteWindow.cs:485
+#: ../Tomboy/NoteWindow.cs:475
 msgid "Set properties of text"
 msgstr "Eigenschappen van de tekst"
 
-#: ../Tomboy/NoteWindow.cs:490
+#: ../Tomboy/NoteWindow.cs:480
 msgid "T_ools"
 msgstr "_Hulpmiddelen"
 
-#: ../Tomboy/NoteWindow.cs:494
+#: ../Tomboy/NoteWindow.cs:484
 msgid "Use tools on this note"
 msgstr "Hulpmiddelen gebruiken op deze notitie"
 
-#: ../Tomboy/NoteWindow.cs:502
+#: ../Tomboy/NoteWindow.cs:492
 msgid "Delete this note"
 msgstr "Deze notitie verwijderen"
 
-#: ../Tomboy/NoteWindow.cs:511 ../Tomboy/Synchronization/SyncManager.cs:161
+#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "Notities synchroniseren"
 
-#: ../Tomboy/NoteWindow.cs:554
+#: ../Tomboy/NoteWindow.cs:562
 msgid "_Find..."
 msgstr "_Zoeken…"
 
-#: ../Tomboy/NoteWindow.cs:565 ../Tomboy/NoteWindow.cs:767
+#: ../Tomboy/NoteWindow.cs:573
 msgid "Find _Next"
 msgstr "V_olgende zoeken"
 
-#: ../Tomboy/NoteWindow.cs:578
+#: ../Tomboy/NoteWindow.cs:586
 msgid "Find _Previous"
 msgstr "Vo_rige zoeken"
 
-#: ../Tomboy/NoteWindow.cs:666
+#: ../Tomboy/NoteWindow.cs:674
 msgid "Cannot create note"
 msgstr "Kon notitie niet aanmaken"
 
-#: ../Tomboy/NoteWindow.cs:747
+#: ../Tomboy/NoteWindow.cs:755
 msgid "_Find:"
 msgstr "_Zoeken:"
 
-#: ../Tomboy/NoteWindow.cs:758
+#: ../Tomboy/NoteWindow.cs:766
 msgid "_Previous"
 msgstr "Vo_rige"
 
-#: ../Tomboy/NoteWindow.cs:1242
+# Hierboven staat ook al een keer Te_xt met een andere mnemonic... gewoon maar
+# hetzelfde houden (Wouter Bolsterlee)
+#: ../Tomboy/NoteWindow.cs:775
+msgid "_Next"
+msgstr "Vol_gende"
+
+#: ../Tomboy/NoteWindow.cs:1258
 msgid "_Bold"
 msgstr "_Vetgedrukt"
 
-#: ../Tomboy/NoteWindow.cs:1254
+#: ../Tomboy/NoteWindow.cs:1270
 msgid "_Italic"
 msgstr "_Cursief"
 
-#: ../Tomboy/NoteWindow.cs:1266
+#: ../Tomboy/NoteWindow.cs:1282
 msgid "_Strikeout"
 msgstr "_Doorhalen"
 
-#: ../Tomboy/NoteWindow.cs:1278
+#: ../Tomboy/NoteWindow.cs:1294
 msgid "_Highlight"
 msgstr "_Oplichten"
 
-#: ../Tomboy/NoteWindow.cs:1291
+#: ../Tomboy/NoteWindow.cs:1307
 msgid "Font Size"
 msgstr "Tekstgrootte"
 
-#: ../Tomboy/NoteWindow.cs:1294
+#: ../Tomboy/NoteWindow.cs:1310
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: ../Tomboy/NoteWindow.cs:1301
+#: ../Tomboy/NoteWindow.cs:1327
 msgid "Hu_ge"
 msgstr "_Enorm"
 
-#: ../Tomboy/NoteWindow.cs:1309
+#: ../Tomboy/NoteWindow.cs:1335
 msgid "_Large"
 msgstr "_Groot"
 
-#: ../Tomboy/NoteWindow.cs:1317
+#: ../Tomboy/NoteWindow.cs:1343
 msgid "S_mall"
 msgstr "_Klein"
 
-#: ../Tomboy/NoteWindow.cs:1328
+#: ../Tomboy/NoteWindow.cs:1352
+msgid "Increase Font Size"
+msgstr "Grotere tekst"
+
+#: ../Tomboy/NoteWindow.cs:1370
+msgid "Decrease Font Size"
+msgstr "Kleinere tekst"
+
+#: ../Tomboy/NoteWindow.cs:1390
 msgid "Bullets"
 msgstr "Opsomming"
 
-#: ../Tomboy/PreferencesDialog.cs:80
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
 msgstr "Bewerken"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
 msgstr "Sneltoetsen"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
 msgstr "Synchronisatie"
 
-#: ../Tomboy/PreferencesDialog.cs:87
+#: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
 msgstr "Uitbreidingen"
 
-#: ../Tomboy/PreferencesDialog.cs:146
+#: ../Tomboy/PreferencesDialog.cs:173
 msgid "_Spell check while typing"
 msgstr "_Spelling controleren tijdens het typen"
 
-#: ../Tomboy/PreferencesDialog.cs:155
+#: ../Tomboy/PreferencesDialog.cs:182
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1374,11 +1634,11 @@ msgstr ""
 "contextmenu."
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:166
+#: ../Tomboy/PreferencesDialog.cs:193
 msgid "Highlight _WikiWords"
 msgstr "_WikiWoorden markeren"
 
-#: ../Tomboy/PreferencesDialog.cs:174
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1387,16 +1647,31 @@ msgstr ""
 "woord aan te klikken maakt u een nieuwe notitie met die naam."
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:181
+#: ../Tomboy/PreferencesDialog.cs:208
 msgid "Enable auto-_bulleted lists"
 msgstr "Automatische _opsommingen inschakelen"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:190
+#: ../Tomboy/PreferencesDialog.cs:217
 msgid "Use custom _font"
 msgstr "_Aangepast lettertype gebruiken"
 
-#: ../Tomboy/PreferencesDialog.cs:214
+#: ../Tomboy/PreferencesDialog.cs:235
+msgid "When renaming a linked note: "
+msgstr "Bij het hernoemen van een notitie waarnaar verwezen wordt:"
+
+#: ../Tomboy/PreferencesDialog.cs:238
+msgid "Ask me what to do"
+msgstr "Vragen wat te doen"
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Never rename links"
+msgstr "Nooit verwijzingen hernoemen"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Always rename links"
+msgstr "Altijd verwijzingen hernoemen"
+
+#: ../Tomboy/PreferencesDialog.cs:260
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
@@ -1404,16 +1679,16 @@ msgstr ""
 "Gebruik het nieuwe notitiesjabloon voor het opgeven van de tekst voor nieuwe "
 "notities."
 
-#: ../Tomboy/PreferencesDialog.cs:224
+#: ../Tomboy/PreferencesDialog.cs:269
 msgid "Open New Note Template"
 msgstr "Sjabloon voor nieuwe notities openen"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:281
+#: ../Tomboy/PreferencesDialog.cs:326
 msgid "Listen for _Hotkeys"
 msgstr "_Sneltoetsen gebruiken"
 
-#: ../Tomboy/PreferencesDialog.cs:290
+#: ../Tomboy/PreferencesDialog.cs:335
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b><Control><Shift>F11</b>, <b><"
@@ -1424,68 +1699,82 @@ msgstr ""
 "N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:310
+#: ../Tomboy/PreferencesDialog.cs:355
 msgid "Show notes _menu"
 msgstr "_Notitiemenu tonen"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:327
+#: ../Tomboy/PreferencesDialog.cs:372
 msgid "Open \"_Start Here\""
 msgstr "‘_Begin hier’ openen"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:344
+#: ../Tomboy/PreferencesDialog.cs:389
 msgid "Create _new note"
 msgstr "_Nieuwe notitie"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:361
+#: ../Tomboy/PreferencesDialog.cs:406
 msgid "Open \"Search _All Notes\""
 msgstr "Zoekvenster voor _alle notities openen"
 
-#: ../Tomboy/PreferencesDialog.cs:388
+#: ../Tomboy/PreferencesDialog.cs:433
 msgid "Ser_vice:"
 msgstr "_Dienst:"
 
-#: ../Tomboy/PreferencesDialog.cs:441 ../Tomboy/PreferencesDialog.cs:1019
+#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "Niet configureerbaar"
 
+#: ../Tomboy/PreferencesDialog.cs:512
+msgid "Automaticall_y Sync in Background Every"
+msgstr "_Automatisch op de achtergrond synchroniseren iedere"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:518
+msgid "Minutes"
+msgstr "minuten"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:461
+#: ../Tomboy/PreferencesDialog.cs:540
 msgid "_Advanced..."
 msgstr "Ge_avanceerd…"
 
-#: ../Tomboy/PreferencesDialog.cs:522
+#: ../Tomboy/PreferencesDialog.cs:601
 msgid "The following add-ins are installed"
 msgstr "De volgende uitbreidingen zijn geïnstalleerd"
 
-#: ../Tomboy/PreferencesDialog.cs:553
+#: ../Tomboy/PreferencesDialog.cs:622
+msgid "Get More Add-Ins..."
+msgstr "Meer aanvullingen zoeken…"
+
+#: ../Tomboy/PreferencesDialog.cs:648
 msgid "_Enable"
 msgstr "_Inschakelen"
 
-#: ../Tomboy/PreferencesDialog.cs:559
+#: ../Tomboy/PreferencesDialog.cs:654
 msgid "_Disable"
 msgstr "_Uitschakelen"
 
-#: ../Tomboy/PreferencesDialog.cs:690
+#: ../Tomboy/PreferencesDialog.cs:785
 msgid "Not Implemented"
 msgstr "Niet geïmplementeerd"
 
-#: ../Tomboy/PreferencesDialog.cs:704
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0}-voorkeuren"
 
-#: ../Tomboy/PreferencesDialog.cs:843
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "Notitie-lettertype kiezen"
 
-#: ../Tomboy/PreferencesDialog.cs:887
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "Overige synchronisatie-instellingen"
 
-#: ../Tomboy/PreferencesDialog.cs:894
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
@@ -1493,23 +1782,23 @@ msgstr ""
 "Als een conflict wordt gevonden tussen de lokale notitie en de notitie op de "
 "synchronisatieserver:"
 
-#: ../Tomboy/PreferencesDialog.cs:901
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "Altijd vragen wat te doen."
 
-#: ../Tomboy/PreferencesDialog.cs:905
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "Mijn lokale notitie hernoemen."
 
-#: ../Tomboy/PreferencesDialog.cs:909
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "Lokale notitie vervangen door bijgewerkte versie van de server."
 
-#: ../Tomboy/PreferencesDialog.cs:1055
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "WARNING: Are you sure?"
 msgstr "WAARSCHUWING: Weet u dit zeker?"
 
-#: ../Tomboy/PreferencesDialog.cs:1057
+#: ../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."
@@ -1518,11 +1807,11 @@ msgstr ""
 "nodig zijn dat alle notities opnieuw gesynchroniseerd moeten worden wanneer "
 "u nieuwe instellingen opslaat."
 
-#: ../Tomboy/PreferencesDialog.cs:1070
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "Synchronisatie-opties opnieuw instellen"
 
-#: ../Tomboy/PreferencesDialog.cs:1072
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1533,98 +1822,99 @@ msgstr ""
 "notities opnieuw gesynchroniseerd moeten worden wanneer u nieuwe "
 "instellingen opslaat."
 
-#: ../Tomboy/PreferencesDialog.cs:1170
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Success! You're connected!"
 msgstr "Het is gelukt: u bent verbonden!"
 
-#: ../Tomboy/PreferencesDialog.cs:1172
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy is gereed om uw notities te synchroniseren. Wilt u dat nu doen?"
 
-#: ../Tomboy/PreferencesDialog.cs:1195
+#: ../Tomboy/PreferencesDialog.cs:1269
+#, 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, er is iets misgegaan. Controleer uw instellingen en probeer het "
-"opnieuw. Ook het logbestand ~/.tomboy.log kan handig zijn."
+"opnieuw. ‘{0}’ kan ook van pas komen."
 
-#: ../Tomboy/PreferencesDialog.cs:1204
+#: ../Tomboy/PreferencesDialog.cs:1282
 msgid "Error connecting :("
 msgstr "Fout bij verbinden"
 
-#: ../Tomboy/PreferencesDialog.cs:1280
+#: ../Tomboy/PreferencesDialog.cs:1358
 msgid "Version:"
 msgstr "Versie:"
 
-#: ../Tomboy/PreferencesDialog.cs:1287
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Author:"
 msgstr "Auteur:"
 
-#: ../Tomboy/PreferencesDialog.cs:1294
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../Tomboy/PreferencesDialog.cs:1300
+#: ../Tomboy/PreferencesDialog.cs:1378
 msgid "Add-in Dependencies:"
 msgstr "Afhankelijkheden van uitbreiding:"
 
-#: ../Tomboy/RecentChanges.cs:76
-msgid "Search All Notes"
-msgstr "Alle notities doorzoeken"
-
-#: ../Tomboy/RecentChanges.cs:93
+#: ../Tomboy/RecentChanges.cs:98
 msgid "_Search:"
 msgstr "_Zoeken:"
 
-#: ../Tomboy/RecentChanges.cs:114
-msgid "C_ase Sensitive"
-msgstr "_Hoofdlettergevoelig"
-
-#: ../Tomboy/RecentChanges.cs:316
+#: ../Tomboy/RecentChanges.cs:330
 msgid "Note"
 msgstr "Notitie"
 
-#: ../Tomboy/RecentChanges.cs:338
+#: ../Tomboy/RecentChanges.cs:352
 msgid "Last Changed"
 msgstr "Laatste wijziging"
 
-#: ../Tomboy/RecentChanges.cs:470
+#: ../Tomboy/RecentChanges.cs:483
 msgid "Matches"
 msgstr "Resultaten"
 
-#: ../Tomboy/RecentChanges.cs:521
+#: ../Tomboy/RecentChanges.cs:534
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "{0} resultaat"
 msgstr[1] "{0} resultaten"
 
-#: ../Tomboy/RecentChanges.cs:535
+#: ../Tomboy/RecentChanges.cs:548
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "Totaal: {0} notitie"
 msgstr[1] "Totaal: {0} notities"
 
-#: ../Tomboy/RecentChanges.cs:545
+#: ../Tomboy/RecentChanges.cs:559
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "Gevonden: {0} notitie"
 msgstr[1] "Gevonden: {0} notities"
 
-#: ../Tomboy/RecentChanges.cs:676
+#: ../Tomboy/RecentChanges.cs:695
 msgid "Notes"
 msgstr "Notitie"
 
-#: ../Tomboy/Tomboy.cs:205
+#: ../Tomboy/Tomboy.cs:266
 msgid "Cannot create new note"
 msgstr "Aanmaken van notitie mislukt"
 
-#: ../Tomboy/Tomboy.cs:292
+#: ../Tomboy/Tomboy.cs:332
+msgid "Primary Development:"
+msgstr "Hoofdontwikkeling:"
+
+#: ../Tomboy/Tomboy.cs:338
+msgid "Contributors:"
+msgstr "Bijdragen van:"
+
+#: ../Tomboy/Tomboy.cs:403
 msgid "translator-credits"
 msgstr ""
 "Wouter Bolsterlee\n"
@@ -1636,19 +1926,23 @@ msgstr ""
 "\n"
 "Kijk voor meer informatie op http://nl.gnome.org/"
 
-#: ../Tomboy/Tomboy.cs:301
-msgid "Copyright © 2004-2007 Alex Graveley"
-msgstr "Copyright © 2004–2007 Alex Graveley"
+#: ../Tomboy/Tomboy.cs:412
+msgid ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2009 Others\n"
+msgstr ""
+"Copyright © 2004-2007 Alex Graveley\n"
+"Copyright © 2004-2009 Others\n"
 
-#: ../Tomboy/Tomboy.cs:302
+#: ../Tomboy/Tomboy.cs:414
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "Een eenvoudig en snel notitieboekje."
 
-#: ../Tomboy/Tomboy.cs:312
+#: ../Tomboy/Tomboy.cs:424
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../Tomboy/Tomboy.cs:419
+#: ../Tomboy/Tomboy.cs:536
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
@@ -1658,7 +1952,7 @@ msgstr ""
 "Copyright © 2004–2006 Alex Graveley <alex at beatniksoftware.com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:431
+#: ../Tomboy/Tomboy.cs:548
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1672,7 +1966,7 @@ msgstr ""
 "  --note-path [pad]\t\tNotitie-gegevens in deze map laden/opslaan.\n"
 "  --search [tekst]\t\tHet zoekvenster voor de opgegeven tekst openen.\n"
 
-#: ../Tomboy/Tomboy.cs:442
+#: ../Tomboy/Tomboy.cs:558
 msgid ""
 "  --new-note\t\t\tCreate and display a new note.\n"
 "  --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1686,40 +1980,20 @@ msgstr ""
 "  --start-here\t\t\tDe ‘Begin hier’-notitie openen.\n"
 "  --highlight-search [tekst]\tNaar tekst zoeken in de geopende notitie.\n"
 
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:459
-msgid "D-BUS remote control disabled.\n"
-msgstr "D-BUS-afstandsbediening uitgeschakeld.\n"
-
-#: ../Tomboy/Tomboy.cs:467
+#: ../Tomboy/Tomboy.cs:572
 #, csharp-format
 msgid "Version {0}"
 msgstr "Versie {0}"
 
-#: ../Tomboy/Tomboy.cs:537
-#, csharp-format
-msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-msgstr ""
-"Tomboy: optie ‘{0}’ niet herkend\n"
-"Probeer ‘tomboy --help’  voor meer informatie.\n"
-"D-BUS-afstandsbediening uitgeschakeld."
-
-#: ../Tomboy/Tray.cs:63
+#: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (nieuw)"
 
-#: ../Tomboy/Tray.cs:241
+#: ../Tomboy/Tray.cs:287
 msgid "_About Tomboy"
 msgstr "I_nfo"
 
-#: ../Tomboy/Utils.cs:146
+#: ../Tomboy/Utils.cs:143
 msgid ""
 "The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
@@ -1727,87 +2001,87 @@ msgstr ""
 "De gebruikershandleiding kon niet gevonden worden. Controleer of uw "
 "installatie correct is."
 
-#: ../Tomboy/Utils.cs:155
+#: ../Tomboy/Utils.cs:152
 msgid "Help not found"
 msgstr "Hulp niet gevonden"
 
-#: ../Tomboy/Utils.cs:171
+#: ../Tomboy/Utils.cs:168
 msgid "Cannot open location"
 msgstr "Locatie kon niet geopend worden"
 
-#: ../Tomboy/Utils.cs:193
+#: ../Tomboy/Utils.cs:190
 #, csharp-format
 msgid "Today, {0}"
 msgstr "Vandaag, om {0}"
 
-#: ../Tomboy/Utils.cs:195
+#: ../Tomboy/Utils.cs:192
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../Tomboy/Utils.cs:199
+#: ../Tomboy/Utils.cs:196
 #, csharp-format
 msgid "Yesterday, {0}"
 msgstr "Gisteren, om {0}"
 
-#: ../Tomboy/Utils.cs:201
+#: ../Tomboy/Utils.cs:198
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: ../Tomboy/Utils.cs:206
+#: ../Tomboy/Utils.cs:203
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
 msgstr[0] "{0} dag geleden, om {1}"
 msgstr[1] "{0} dagen geleden, om {1}"
 
-#: ../Tomboy/Utils.cs:210
+#: ../Tomboy/Utils.cs:207
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
 msgstr[0] "{0} dag geleden"
 msgstr[1] "{0} dagen geleden"
 
-#: ../Tomboy/Utils.cs:216
+#: ../Tomboy/Utils.cs:213
 #, csharp-format
 msgid "Tomorrow, {0}"
 msgstr "Morgen, om {0}"
 
-#: ../Tomboy/Utils.cs:218
+#: ../Tomboy/Utils.cs:215
 msgid "Tomorrow"
 msgstr "Morgen"
 
-#: ../Tomboy/Utils.cs:223
+#: ../Tomboy/Utils.cs:220
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
 msgstr[0] "Over {0} dag, om {1}"
 msgstr[1] "Over {0} dagen, om {1}"
 
-#: ../Tomboy/Utils.cs:227
+#: ../Tomboy/Utils.cs:224
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
 msgstr[0] "Over {0} dag"
 msgstr[1] "Over {0} dagen"
 
-#: ../Tomboy/Utils.cs:232
+#: ../Tomboy/Utils.cs:229
 msgid "MMMM d, h:mm tt"
 msgstr "d MMMM, hh:mm"
 
-#: ../Tomboy/Utils.cs:233
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "MMMM d"
 
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:232
 msgid "No Date"
 msgstr "Geen datum"
 
 # Wat doet tt? (Wouter Bolsterlee)
-#: ../Tomboy/Utils.cs:238
+#: ../Tomboy/Utils.cs:235
 msgid "MMMM d yyyy, h:mm tt"
 msgstr "d MMMM yyyy, hh:mm"
 
-#: ../Tomboy/Utils.cs:239
+#: ../Tomboy/Utils.cs:236
 msgid "MMMM d yyyy"
 msgstr "d MMMM yyyy"
 
@@ -1816,7 +2090,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(Naamloos {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 "
@@ -1825,15 +2099,15 @@ msgstr ""
 "Er bestaat al een notitie met de naam <b>{0}</b>. Kies een andere naam voor "
 "deze notitie voordat u verder gaat."
 
-#: ../Tomboy/Watchers.cs:203
+#: ../Tomboy/Watchers.cs:204
 msgid "Note title taken"
 msgstr "Deze naam is al in gebruik"
 
-#: ../Tomboy/Watchers.cs:551
+#: ../Tomboy/Watchers.cs:549
 msgid "_Copy Link Address"
 msgstr "Verwijzing _kopiëren"
 
-#: ../Tomboy/Watchers.cs:556
+#: ../Tomboy/Watchers.cs:554
 msgid "_Open Link"
 msgstr "Verwijzing _openen"
 
@@ -1871,59 +2145,55 @@ msgid "An error ocurred while connecting to the specified server:"
 msgstr "Er is een fout opgetreden bij het verbinden met de opgegeven 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 "Notitietitel"
-
-#: ../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 "Synchronisatie-vergrendeling verkrijgen…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "Veranderingen opslaan…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "Notities synchroniseren"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "Synchroniseren van uw notities…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "Dit kan een even duren, ga er rustig voor zitten!"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:250
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "Verbinding maken met de server…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "Verwijderen van notities op de server…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:260
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "Ophalen van nieuwe en veranderde notitities…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:272
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "Server vergrendeld"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "Server is vergrendeld"
 
-#: ../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."
@@ -1931,143 +2201,143 @@ msgstr ""
 "Een van uw andere computers is momenteel aan het synchroniseren. Wacht 2 "
 "minuten en probeer opnieuw."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:278
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "Ophalen updates van de server voorbereiden…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:281
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "Versturen notities naar de server voorbereiden…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "Versturen van notities naar de server…"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:287
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "Synchronisatie mislukt"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "Synchroniseren is mislukt"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr ""
 "Kon de notities niet synchroniseren. Controleer de onderstaande gegevens en "
 "probeer opnieuw."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:295
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "Synchroniseren voltooid"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "Synchroniseren is voltooid"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:298
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "{0} notitie bijgewerkt."
 msgstr[1] "{0} notities bijgewerkt."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "Uw notities zijn bijgewerkt."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:307
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "Synchronisatie afgebroken"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "Synchroniseren is afgebroken"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "U heeft de synchronisatie afgebroken. U kunt het venster nu sluiten."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:313
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "Synchronisatie niet geconfigureerd"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "Synchronisatie is niet geconfigureerd"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr ""
 "U kunt de synchronisatieconfiguratie beheren via het voorkeurenvenster."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:319
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "Synchronisatiedienst-fout"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "Service-fout"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "Fout bij verbinden naar synchronisatiedienst. Probeer het nogmaals."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:338
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "Lokaal verwijderd"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:341
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "Van server verwijderd"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:344
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:347
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "Toegevoegd"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:350
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "Veranderingen naar server verstuurd"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:353
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "Nieuwe notitie naar server verstuurd"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:501
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "Notitie-conflict"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:507
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (oud)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:546
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "Lokale notitie hernomen:"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:552
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "Verwijzingen in verwijzende notities bijwerken"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:559
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "Lokale notitie overschrijven"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:563
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "Altijd deze actie uitvoeren"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:569
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "Notitieconflict gevonden"
 
-#: ../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 "
@@ -2076,17 +2346,17 @@ msgstr ""
 "De serverversie ‘{0}’ komt niet overeen met uw lokale notitie. Wat wilt u "
 "doen met uw lokale notitie?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:159
+#: ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "_Tools"
 msgstr "_Hulpmiddelen"
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:133
-#: ../Tomboy/Synchronization/SyncUtils.cs:177
+#: ../Tomboy/Synchronization/SyncUtils.cs:119
+#: ../Tomboy/Synchronization/SyncUtils.cs:163
 msgid "Could not enable FUSE"
 msgstr "FUSE kon niet ingeschakeld worden"
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:134
-#: ../Tomboy/Synchronization/SyncUtils.cs:178
+#: ../Tomboy/Synchronization/SyncUtils.cs:120
+#: ../Tomboy/Synchronization/SyncUtils.cs:164
 msgid ""
 "The FUSE module could not be loaded. Please check that it is installed "
 "properly and try again."
@@ -2094,13 +2364,13 @@ msgstr ""
 "De FUSE-module kon niet worden geladen. Controleer of deze juist "
 "geinstalleerd is en probeer opnieuw."
 
-#: ../Tomboy/Synchronization/SyncUtils.cs:149
+#: ../Tomboy/Synchronization/SyncUtils.cs:135
 msgid "Enable FUSE?"
 msgstr "FUSE inschakelen?"
 
 #. TODO: This message isn't entirely accurate.
 #. We should fix it.
-#: ../Tomboy/Synchronization/SyncUtils.cs:153
+#: ../Tomboy/Synchronization/SyncUtils.cs:139
 msgid ""
 "The synchronization you've chosen requires the FUSE module to be loaded.\n"
 "\n"
@@ -2113,3 +2383,21 @@ msgstr ""
 "Om deze melding in het vervolg te voorkomen kunt u FUSE laden tijdens het "
 "starten. Voeg ‘modprobe fuse’ aan /etc/init.d/boot.local toe of ‘fuse’ aan /"
 "etc/modules."
+
+#~ msgid "_Browse..."
+#~ msgstr "_Zoeken…"
+
+#~ msgid "C_ase Sensitive"
+#~ msgstr "_Hoofdlettergevoelig"
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "D-BUS-afstandsbediening uitgeschakeld.\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy: optie ‘{0}’ niet herkend\n"
+#~ "Probeer ‘tomboy --help’  voor meer informatie.\n"
+#~ "D-BUS-afstandsbediening uitgeschakeld."
diff --git a/po/th.po b/po/th.po
index aad5f72..50b5633 100644
--- a/po/th.po
+++ b/po/th.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: Tomboy VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=tomboy&component=general\n"
-"POT-Creation-Date: 2010-01-25 21:44+0000\n"
-"PO-Revision-Date: 2010-02-07 21:12+0700\n"
+"POT-Creation-Date: 2010-04-01 06:41+0000\n"
+"PO-Revision-Date: 2010-04-08 12:07+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep at linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -34,12 +34,12 @@ msgid "Tomboy Applet Factory"
 msgstr "โรงงานแอพเพล็ต Tomboy"
 
 #: ../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 "บันทึกของ Tomboy"
 
 #: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
-#: ../Tomboy/Tray.cs:263
+#: ../Tomboy/Tray.cs:268
 msgid "S_ynchronize Notes"
 msgstr "ป_รับข้อมูลบันทึก"
 
@@ -48,12 +48,12 @@ msgid "_About"
 msgstr "เ_กี่ยวกับ"
 
 #: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:277
+#: ../Tomboy/Tray.cs:282
 msgid "_Help"
 msgstr "_วิธีใช้"
 
 #: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:272
+#: ../Tomboy/Tray.cs:277
 msgid "_Preferences"
 msgstr "_ปรับแต่ง"
 
@@ -70,68 +70,72 @@ msgid "Accept SSL Certificates"
 msgstr "ยอมรับใบรับรอง SSL"
 
 #: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "กำหนดเวลาการปรับข้อมูลให้ตรงกันหลังฉากโดยอัตโนมัติ"
+
+#: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
 msgstr "สร้างบันทึกใหม่"
 
-#: ../data/tomboy.schemas.in.h:3
+#: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "แบบอักษรกำหนดเอง"
 
-#: ../data/tomboy.schemas.in.h:4
+#: ../data/tomboy.schemas.in.h:5
 msgid "Determines X coordinate of Search window; stored on Tomboy exit."
 msgstr "กำหนดตำแหน่ง X ของหน้าต่างค้นหา ซึ่งจะบันทึกไว้เมื่อ Tomboy จบการทำงาน"
 
-#: ../data/tomboy.schemas.in.h:5
+#: ../data/tomboy.schemas.in.h:6
 msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
 msgstr "กำหนดตำแหน่ง Y ของหน้าต่างค้นหา ซึ่งจะบันทึกไว้เมื่อ Tomboy จบการทำงาน"
 
-#: ../data/tomboy.schemas.in.h:6
+#: ../data/tomboy.schemas.in.h:7
 msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgstr "กำหนดความสูงเป็นพิกเซลของหน้าต่างค้นหา ซึ่งจะบันทึกไว้เมื่อ Tomboy จบการทำงาน"
 
-#: ../data/tomboy.schemas.in.h:7
+#: ../data/tomboy.schemas.in.h:8
 msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgstr "กำหนดความกว้างเป็นพิกเซลของหน้าต่างค้นหา ซึ่งจะบันทึกไว้เมื่อ Tomboy จบการทำงาน"
 
-#: ../data/tomboy.schemas.in.h:8
+#: ../data/tomboy.schemas.in.h:9
 msgid "Enable Auto bulleted lists."
 msgstr "เปิดใช้รายการย่อยแบบอัตโนมัติ"
 
-#: ../data/tomboy.schemas.in.h:9
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "เปิดใช้การแปะด้วยเมาส์ปุ่มกลางบนไอคอน"
 
-#: ../data/tomboy.schemas.in.h:10
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "เปิดใช้การเน้นข้อความ WikiWord"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:12
 msgid "Enable closing notes with escape."
 msgstr "เปิดใช้การปิดบันทึกด้วยปุ่ม escape"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:13
 msgid "Enable custom font"
 msgstr "เปิดใช้งานแบบอักษรที่กำหนดเอง"
 
-#: ../data/tomboy.schemas.in.h:13
+#: ../data/tomboy.schemas.in.h:14
 msgid "Enable global keybindings"
 msgstr "เปิดใช้งานปุ่มลัดที่ใช้ทั่วทั้งเดสก์ท็อป"
 
-#: ../data/tomboy.schemas.in.h:14
+#: ../data/tomboy.schemas.in.h:15
 msgid "Enable spellchecking"
 msgstr "เปิดใช้งานการตรวจตัวสะกด"
 
-#: ../data/tomboy.schemas.in.h:15
+#: ../data/tomboy.schemas.in.h:16
 msgid "Enable startup notes"
 msgstr "เปิดใช้งานการเปิดบันทึกเมื่อเริ่มทำงาน"
 
-#: ../data/tomboy.schemas.in.h:16
+#: ../data/tomboy.schemas.in.h:17
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
 msgstr "เปิดใช้ตัวเลือกนี้ถ้าต้องการใช้รายการย่อยแบบอัตโนมัติเมื่อมี - หรือ * ที่ต้นบรรทัด"
 
-#: ../data/tomboy.schemas.in.h:17
+#: ../data/tomboy.schemas.in.h:18
 msgid ""
 "Enable this option if you want to be able to middle-click the Tomboy icon to "
 "paste timestamped content into the Start Here note."
@@ -139,7 +143,7 @@ msgstr ""
 "เปิดใช้ตัวเลือกนี้ถ้าต้องการให้สามารถใช้เมาส์ปุ่มกลางคลิกที่ไอคอนของ Tomboy "
 "เพื่อแปะเนื้อหาที่ลงบันทึกเวลาปัจจุบันในบันทึก \"เริ่มที่นี่\""
 
-#: ../data/tomboy.schemas.in.h:18
+#: ../data/tomboy.schemas.in.h:19
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
@@ -147,46 +151,46 @@ msgstr ""
 "เปิดใช้งานตัวเลือกนี้ถ้าต้องการเน้นคำที่อยู่ในรูป WordCapital "
 "และการคลิกที่คำดังกล่าวจะสร้างบันทึกชื่อในชื่อนั้น"
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "เวลาคอยสำหรับการเมานท์ FUSE (ms)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "HTML ส่งออกบันทึกที่เชื่อมโยงทั้งหมด"
 
-#: ../data/tomboy.schemas.in.h:21
+#: ../data/tomboy.schemas.in.h:22
 msgid "HTML Export Last Directory"
 msgstr "ไดเรกทอรีที่ส่งออก HTML ครั้งล่าสุด"
 
-#: ../data/tomboy.schemas.in.h:22
+#: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export Linked Notes"
 msgstr "HTML ส่งออกบันทึกที่เชื่อมโยง"
 
-#: ../data/tomboy.schemas.in.h:23
+#: ../data/tomboy.schemas.in.h:24
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
 msgstr "ถ้า enable_custom_font เป็นจริง แบบอักษรที่ตั้งไว้นี้จะถูกใช้แบบอักษรสำหรับแสดงบันทึก"
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
 msgstr ""
 "ถ้าเปิดใช้ บันทึกทั้งหมดที่เปิดไว้ขณะที่ออกจาก Tomboy ครั้งล่าสุด จะถูกเปิดอีกครั้งเมื่อเริ่มทำงาน"
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:26
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "ถ้าเปิดใช้ จะสามารถปิดบันทึกที่เปิดอยู่โดยกดปุ่ม escape ได้"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
 msgstr "ถ้าเป็นจริง คำที่สะกดผิดจะถูกขีดเส้นใต้สีแดง และแนะนำคำที่สะกดถูกในเมนูคลิกขวา"
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -195,7 +199,7 @@ msgstr ""
 "ถ้าเป็นจริง ชุดปุ่มลัดเพื่อใช้ทั่วทั้งเดสก์ท็อปที่กำหนดใน /apps/tomboy/global_keybindings "
 "จะเปิดใช้งาน  ทำให้สามารถเรียกใช้งาน Tomboy จากโปรแกรมอื่นๆ ได้"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -203,7 +207,7 @@ 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."
@@ -211,13 +215,23 @@ msgstr ""
 "ระบุว่าปลั๊กอินนำเข้าบันทึกจากโน้ตติดกาวยังไม่เคยถูกเรียกมาก่อน จึงควรเรียกโดยอัตโนมัติในการใช้ "
 "Tomboy ครั้งต่อไป"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "เลขจำนวนเต็มระบุจำนวนบันทึกอย่างต่ำที่จะแสดงในเมนูบันทึกของ Tomboy"
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:32
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+"ค่าจำนวนเต็มระบุความถี่ของการปรับข้อมูลบันทึกให้ตรงกันหลังฉาก (ถ้ามีการกำหนดให้ปรับข้อมูล) "
+"ค่าที่น้อยกว่า 1 จะหมายถึงการปิดการปรับข้อมูลอัตโนมัติ ค่าบวกต่ำสุดที่ยอมรับได้คือ 5 ค่านี้มีหน่วยเป็นนาที"
+
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -229,115 +243,135 @@ msgstr ""
 "แทนที่จะถามผู้ใช้หรือไม่ ค่านี้จะมีความหมายตรงกับรายการค่าคงที่ที่กำหนดไว้เป็นการภายใน ค่า 0 "
 "หมายถึงการถามผู้ใช้เมื่อมีข้อขัดแย้ง เพื่อให้สามารถจัดการข้อขัดแย้งเป็นกรณีๆ ไป"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behavior when a note is renamed, instead of prompting "
+"the user. The values map to an internal enumeration. 0 indicates that the "
+"user wishes to be prompted when renaming a note may impact links that exist "
+"in other notes. 1 indicates that links should automatically be removed. 2 "
+"indicates that link text should be updated to the new note name so that it "
+"will continue linking to the renamed note."
+msgstr ""
+"ค่าจำนวนเต็มระบุว่าต้องการเจาะจงพฤติกรรมการปรับข้อมูลลิงก์อย่างใดอย่างหนึ่งเมื่อบันทึกถูกเปลี่ยนชื่อ "
+"แทนที่จะถามผู้ใช้หรือไม่ ค่านี้จะมีความหมายตรงกับรายการค่าคงที่ที่กำหนดไว้เป็นการภายใน ค่า 0 "
+"หมายถึงการถามผู้ใช้เมื่อการเปลี่ยนชื่อบันทึกอาจมีผลต่อลิงก์ที่มีอยู่ในบันทึกอื่น ค่า 1 "
+"หมายถึงการลบลิงก์ที่ถูกกระทบโดยอัตโนมัติ ค่า 2 หมายถึงการปรับข้อความในลิงก์ให้เป็นชื่อใหม่ของบันทึก "
+"เพื่อให้ลิงก์ยังคงเชื่อมโยงไปสู่บันทึกที่เปลี่ยนชื่อไป"
+
+#: ../data/tomboy.schemas.in.h:35
+msgid "Link Updating Behavior on Note Rename"
+msgstr "พฤติกรรมการปรับข้อมูลลิงก์เมื่อเปลี่ยนชื่อบันทึก"
+
+#: ../data/tomboy.schemas.in.h:36
 msgid "List of pinned notes."
 msgstr "รายการบันทึกปักหมุด"
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
 msgstr "จำนวนอักขระสูงสุดของหัวข้อบันทึกที่จะแสดงในเมนูบันทึกในถาดหรือในแอพเพล็ต Tomboy"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:38
 msgid "Maximum note title length to show in tray menu."
 msgstr "ความยาวสูงสุดของหัวข้อบันทึกที่จะแสดงในเมนูของถาด"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:39
 msgid "Minimum number of notes to show in menu"
 msgstr "จำนวนบันทึกอย่างต่ำที่จะแสดงในเมนู"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:40
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "พฤติกรรมที่จดจำไว้สำหรับใช้กับกรณีที่การปรับข้อมูลบันทึกให้ตรงกันเกิดข้อขัดแย้ง"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:41
 msgid "Open Recent Changes"
 msgstr "เปิดหน้าการเปลี่ยนแปลงล่าสุด"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:42
 msgid "Open Search Dialog"
 msgstr "เปิดกล่องโต้ตอบค้นหา"
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:43
 msgid "Open Start Here"
 msgstr "เปิดหน้า \"เริ่มที่นี่ \""
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:44
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "พาธในเซิร์ฟเวอร์ SSH ไปยังไดเรกทอรีที่ Tomboy จะใช้ปรับข้อมูลให้ตรงกัน (มีหรือไม่ก็ได้)"
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:45
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
 msgstr "พาธสำหรับเซิร์ฟเวอร์ปรับข้อมูล เมื่อใช้บริการเสริมการปรับข้อมูลระบบแฟ้ม"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:46
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "โฟลเดอร์ SSHFS ในเครือข่ายที่จะใช้ปรับข้อมูลให้ตรงกัน"
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:47
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "ชื่อผู้ใช้ SSHFS ในเครือข่ายที่จะใช้ปรับข้อมูลให้ตรงกัน"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:48
 msgid "SSHFS Synchronization Server Port"
 msgstr "พอร์ตของเซิร์ฟเวอร์ SSHFS ที่จะใช้ปรับข้อมูลให้ตรงกัน"
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:49
 msgid "SSHFS Synchronization Server URL"
 msgstr "URL ของเซิร์ฟเวอร์ SSHFS ที่จะใช้ปรับข้อมูลให้ตรงกัน"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:50
 msgid "Saved height of Search window"
 msgstr "ความสูงที่บันทึกไว้ของหน้าต่างค้นหา"
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:51
 msgid "Saved horizontal position of Search window"
 msgstr "ตำแหน่งแนวนอนที่บันทึกไว้ของหน้าต่างค้นหา"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:52
 msgid "Saved vertical position of Search window"
 msgstr "ตำแหน่งแนวตั้งที่บันทึกไว้ของหน้าต่างค้นหา"
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:53
 msgid "Saved width of Search window"
 msgstr "ความกว้างที่บันทึกไว้ของหน้าต่างค้นหา"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:54
 msgid "Selected Synchronization Service Addin"
 msgstr "บริการเสริมสำหรับปรับข้อมูลให้ตรงกันที่เลือก"
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:55
 msgid "Set to TRUE to activate"
 msgstr "ตั้งเป็นค่าจริงเพื่อเปิดใช้งาน"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:56
 msgid "Show applet menu"
 msgstr "แสดงเมนูแอพเพล็ต"
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:57
 msgid "Start Here Note"
 msgstr "บันทึก \"เริ่มที่นี่\""
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:58
 msgid "Sticky Note Importer First Run"
 msgstr "เรียกเครื่องมือนำเข้าบันทึกจากโน้ตติดกาวครั้งแรก"
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Client ID"
 msgstr "ID ลูกข่าย การปรับข้อมูลให้ตรงกัน"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:60
 msgid "Synchronization Local Server Path"
 msgstr "พาธของเซิร์ฟเวอร์ในเครื่อง ที่ใช้ปรับข้อมูลให้ตรงกัน"
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:61
 msgid "The date format that is used for the timestamp."
 msgstr "รูปแบบวันที่ที่จะใช้ลงบันทึกเวลา"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -351,7 +385,7 @@ msgstr ""
 "และเข้าใจชื่อย่อ เช่น \"<Ctl>\" และ \"<Ctrl>\"  คุณสามารถตั้งค่าตัวเลือกเป็น "
 "\"disabled\" ได้ ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:63
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -365,7 +399,7 @@ msgstr ""
 "และเข้าใจชื่อย่อ เช่น \"<Ctl>\" และ \"<Ctrl>\"  คุณสามารถตั้งค่าตัวเลือกเป็น "
 "\"disabled\" ได้ ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -379,7 +413,7 @@ msgstr ""
 "และเข้าใจชื่อย่อ เช่น \"<Ctl>\" และ \"<Ctrl>\"  คุณสามารถตั้งค่าตัวเลือกเป็น "
 "\"disabled\" ได้ ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:65
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"<Control>a\" or \"<Shift><Alt>F1\". The "
@@ -394,7 +428,7 @@ msgstr ""
 "\"<Ctrl>\"  คุณสามารถตั้งค่าตัวเลือกเป็น \"disabled\" ได้ "
 "ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:66
 msgid ""
 "The global keybinding for showing the Tomboy applet's menu. The format looks "
 "like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is "
@@ -408,23 +442,23 @@ msgstr ""
 "และเข้าใจชื่อย่อ เช่น \"<Ctl>\" และ \"<Ctrl>\"  คุณสามารถตั้งค่าตัวเลือกเป็น "
 "\"disabled\" ได้ ถ้าไม่ต้องการปุ่มลัดสำหรับปฏิบัติการนี้"
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:67
 msgid "The handler for \"note://\" URLs"
 msgstr "คำสั่งสำหรับจัดการ  \"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 "ไดเรกทอรีล่าสุดที่ส่งออกบันทึกด้วยปลั๊กอิน \"ส่งออกเป็น HTML\""
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:69
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 msgstr ""
 "ค่าสุดท้ายที่ตั้งไว้สำหรับกล่องกากบาท 'ส่งออกบันทึกที่เชื่อมโยง' ในปลั๊กอิน \"ส่งออกเป็น HTML\""
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:70
 msgid ""
 "The last setting for the 'Include all other linked notes' checkbox in the "
 "Export to HTML plugin. This setting is used in conjunction with the 'HTML "
@@ -435,7 +469,7 @@ msgstr ""
 "HTML\" ค่านี้ใช้ร่วมกับค่าตั้ง 'HTML ส่งออกบันทึกที่เชื่อมโยง' "
 "โดยใช้ระบุว่าจะรวมโน้ตทั้งหมดที่พบทุกระดับความลึกในหน้า HTML ที่ส่งออกหรือไม่"
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:71
 msgid ""
 "The note URI of the note that should be considered the \"Start Here\" note, "
 "which is always placed at the bottom of the Tomboy note menu and also "
@@ -444,7 +478,7 @@ msgstr ""
 "URI ของบันทึกที่จะถือเป็นบันทึก \"เริ่มที่นี่\" ซึ่งจะวางไว้ที่ท้ายเมนูบันทึกของ Tomboy เสมอ "
 "และสามารถเรียกได้ด้วยปุ่มลัด"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
@@ -452,7 +486,7 @@ msgstr ""
 "พอร์ตที่จะใช้เชื่อมต่อไปยังเซิร์ฟเวอร์สำหรับปรับข้อมูลให้ตรงกันผ่าน SSH  กำหนดเป็นค่า -1 ลงมา "
 "ถ้าต้องการใช้ค่าตั้งพอร์ตปกติของ SSH"
 
-#: ../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."
@@ -460,37 +494,37 @@ msgstr ""
 "เวลา (เป็นมิลลิวินาที) ที่ Tomboy จะรอการตอบสนอง เมื่อใช้ FUSE "
 "ในการเมานท์แหล่งใช้ร่วมสำหรับการปรับข้อมูลให้ตรงกัน"
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:74
 msgid "Timestamp format"
 msgstr "รูปแบบการลงบันทึกเวลา"
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:75
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "URL ของเซิร์ฟเวอร์ SSH ที่เก็บไดเรกทอรีสำหรับปรับข้อมูลให้ตรงกันของ Tomboy"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr "ชื่อเรียกเฉพาะสำหรับบริการเสริมสำหรับปรับข้อมูลบันทึกให้ตรงกันที่ตั้งค่าไว้"
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:77
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
 msgstr "ชื่อเรียกเฉพาะของลูกข่าย Tomboy นี้ ใช้เมื่อสื่อสารกับเซิร์ฟเวอร์ปรับข้อมูล"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:78
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr "ใช้ตัวเลือก \"-ac\" กับ wdfs เพื่อยอมรับใบรับรอง SSL โดยไม่ต้องถามผู้ใช้"
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:79
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr "ชื่อผู้ใช้ที่จะใช้เชื่อมต่อไปยังเซิร์ฟเวอร์สำหรับปรับข้อมูลให้ตรงกันผ่าน SSH"
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:80
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -532,7 +566,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 "_ออก"
 
@@ -544,7 +578,7 @@ msgstr "ออกจาก Tomboy"
 msgid "_Edit"
 msgstr "แ_ก้ไข"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "ปรับแต่ง Tomboy"
 
@@ -720,7 +754,7 @@ msgstr "ลงบันทึกเวลา"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:221 ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Applet.cs:227 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd d MMMM, H:mm"
 
@@ -965,6 +999,27 @@ msgstr "กำลังขอยืนยันสิทธิ์ผ่านเ
 msgid "Set the default browser and try again"
 msgstr "กรุณากำหนดเบราว์เซอร์ปริยายแล้วลองใหม่"
 
+#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:83
+msgid "Search All Notes"
+msgstr "ค้นบันทึกทั้งหมด"
+
+#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
+#. icons_path, (int)TomboyIcons.NewNotebook);
+#. if (new_notebook != null)
+#. object_collection.AddObject(new_notebook);
+#: ../Tomboy/JumpListManager.cs:87
+msgid "Create New Note"
+msgstr "สร้างบันทึกใหม่"
+
+#: ../Tomboy/JumpListManager.cs:117
+#, csharp-format
+msgid "{0} (new)"
+msgstr "{0} (ใหม่)"
+
+#: ../Tomboy/JumpListManager.cs:139
+msgid "Recent Notes"
+msgstr "บันทึกล่าสุด"
+
 #. Translators: This is the name of "Window" menu in the Mac menubar
 #: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
@@ -1052,7 +1107,7 @@ msgid "Delete the selected notebook"
 msgstr "ลบสมุดบันทึกที่เลือก"
 
 #: ../Tomboy/Notebooks/NotebookApplicationAddin.cs:68
-#: ../Tomboy/RecentChanges.cs:251
+#: ../Tomboy/RecentChanges.cs:259
 msgid "Notebooks"
 msgstr "สมุดบันทึก"
 
@@ -1093,48 +1148,48 @@ msgstr "สมุดบันทึก"
 msgid "_New notebook..."
 msgstr "_สมุดบันทึกใหม่..."
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1578
 msgid "Really delete this note?"
 msgstr "ยืนยันว่าจะลบบันทึกนี้หรือไม่?"
 
-#: ../Tomboy/Note.cs:1452
+#: ../Tomboy/Note.cs:1581
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "ยืนยันว่าจะลบบันทึกทั้ง {0} รายการนี้หรือไม่?"
 
-#: ../Tomboy/Note.cs:1463
+#: ../Tomboy/Note.cs:1592
 msgid "If you delete a note it is permanently lost."
 msgstr "ถ้าเลือกลบ บันทึกจะถูกลบอย่างถาวร"
 
-#: ../Tomboy/Note.cs:1491
+#: ../Tomboy/Note.cs:1620
 #, csharp-format
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
 "sufficient disk space, and that you have appropriate rights on {0}. Error "
-"details can be found in {0}."
+"details can be found in {1}."
 msgstr ""
 "เกิดข้อผิดพลาดขณะบันทึกข้อมูลบันทึกข้อความของคุณ กรุณาตรวจสอบว่าคุณมีเนื้อที่ดิสก์เพียงพอ "
-"และคุณมีสิทธิ์เขียน {0} หรือไม่ คุณสามารถดูรายละเอียดของข้อผิดพลาดได้ใน {0}"
+"และคุณมีสิทธิ์เขียน {0} หรือไม่ คุณสามารถดูรายละเอียดของข้อผิดพลาดได้ใน {1}"
 
-#: ../Tomboy/Note.cs:1507
+#: ../Tomboy/Note.cs:1636
 msgid "Error saving note data."
 msgstr "เกิดข้อผิดพลาดขณะบันทึกข้อมูลบันทึก"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs: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:142
+#: ../Tomboy/NoteManager.cs:147
 msgid "Your Notes Have Moved!"
 msgstr "บันทึกของคุณย้ายที่แล้ว!"
 
 #. Translators: The contents (not including the title) of the data migration note. {0}, {1}, {2}, {3}, and {4} are replaced by directory paths and should not be changed
-#: ../Tomboy/NoteManager.cs:155
+#: ../Tomboy/NoteManager.cs:160
 #, csharp-format
 msgid ""
 "In the latest version of Tomboy, your note files have moved.  You have "
@@ -1176,7 +1231,7 @@ msgstr ""
 "\n"
 "ยินดีรับใช้!"
 
-#: ../Tomboy/NoteManager.cs:254
+#: ../Tomboy/NoteManager.cs:265
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1211,7 +1266,7 @@ msgstr ""
 "ว่าทุกครั้งที่คุณพิมพ์ <link:internal>การใช้ลิงก์ใน Tomboy</link:internal> "
 "ข้อความดังกล่าวจะถูกขีดเส้นใต้โดยอัตโนมัติ? คลิกที่ลิงก์เพื่อเปิดดูบันทึกดังกล่าวได้</note-content>"
 
-#: ../Tomboy/NoteManager.cs:273
+#: ../Tomboy/NoteManager.cs:284
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1239,25 +1294,85 @@ msgstr ""
 "content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:288 ../Tomboy/NoteManager.cs:356
+#: ../Tomboy/NoteManager.cs:299 ../Tomboy/NoteManager.cs:368
 msgid "Start Here"
 msgstr "เริ่มที่นี่"
 
-#: ../Tomboy/NoteManager.cs:293
+#: ../Tomboy/NoteManager.cs:304
 msgid "Using Links in Tomboy"
 msgstr "การใช้ลิงก์ใน Tomboy"
 
-#: ../Tomboy/NoteManager.cs:433
+#: ../Tomboy/NoteManager.cs:445
 #, csharp-format
 msgid "New Note {0}"
 msgstr "บันทึกใหม่ {0}"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:506 ../Tomboy/NoteManager.cs:598
+#: ../Tomboy/NoteManager.cs:518 ../Tomboy/NoteManager.cs:611
 msgid "Describe your new note here."
 msgstr "บรรยายบันทึกใหม่ของคุณที่นี่"
 
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "จะเปลี่ยนชื่อลิงก์ของบันทึกหรือไม่?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+msgid "_Rename Links"
+msgstr "เ_ปลี่ยนชื่อลิงก์"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "ไ_ม่เปลี่ยนชื่อลิงก์"
+
+#: ../Tomboy/NoteRenameDialog.cs:67
+#, csharp-format
+msgid ""
+"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" "
+"to \"<span underline=\"single\">{1}</span>\"?\n"
+"\n"
+"If you do not rename the links, they will no longer link to anything."
+msgstr ""
+"จะเปลี่ยนชื่อลิงก์ในบันทึกอื่นๆ จาก \"<span underline=\"single\">{0}</span>\" "
+"เป็น \"<span underline=\"single\">{1}</span>\" หรือไม่?\n"
+"\n"
+"ถ้าคุณไม่เปลี่ยนชื่อ ลิงก์ดังกล่าวก็จะไม่ได้เชื่อมโยงไปสู่สิ่งใดเลย"
+
+#: ../Tomboy/NoteRenameDialog.cs:81
+msgid "Rename Links"
+msgstr "เปลี่ยนชื่อลิงก์"
+
+#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "หัวข้อบันทึก"
+
+#. Translators: This button causes all notes in the list to be selected
+#: ../Tomboy/NoteRenameDialog.cs:116
+msgid "Select All"
+msgstr "เลือกทั้งหมด"
+
+#. Translators: This button causes all notes in the list to be unselected
+#: ../Tomboy/NoteRenameDialog.cs:125
+msgid "Select None"
+msgstr "ไม่เลือกสักบันทึก"
+
+#: ../Tomboy/NoteRenameDialog.cs:142
+msgid "Ad_vanced"
+msgstr "_ขั้นสูง"
+
+#: ../Tomboy/NoteRenameDialog.cs:145
+msgid "Always show this _window"
+msgstr "แสดงห_น้าต่างนี้เสมอ"
+
+#: ../Tomboy/NoteRenameDialog.cs:153
+msgid "Never rename _links"
+msgstr "ไ_ม่ต้องเปลี่ยนชื่อลิงก์เลย"
+
+#: ../Tomboy/NoteRenameDialog.cs:161
+msgid "Alwa_ys rename links"
+msgstr "เ_ปลี่ยนชื่อลิงก์เสมอ"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "หาในบันทึกนี้"
@@ -1314,7 +1429,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 "ปรับข้อมูลบันทึกให้ตรงกัน"
 
@@ -1394,38 +1509,38 @@ msgstr "ลดขนาดตัวอักษร"
 msgid "Bullets"
 msgstr "รายการ"
 
-#: ../Tomboy/PreferencesDialog.cs:78
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
 msgstr "แก้ไข"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
 msgstr "ปุ่มลัด"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
 msgstr "การปรับข้อมูลให้ตรงกัน"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
 msgstr "โปรแกรมเสริม"
 
-#: ../Tomboy/PreferencesDialog.cs:144
+#: ../Tomboy/PreferencesDialog.cs:173
 msgid "_Spell check while typing"
 msgstr "ตรวจตัว_สะกดขณะพิมพ์"
 
-#: ../Tomboy/PreferencesDialog.cs:153
+#: ../Tomboy/PreferencesDialog.cs:182
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
 msgstr "คำที่สะกดผิดจะถูกขีดเส้นใต้สีแดง พร้อมคำแนะนำตัวสะกดในเมนูคลิกขวา"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:164
+#: ../Tomboy/PreferencesDialog.cs:193
 msgid "Highlight _WikiWords"
 msgstr "เ_น้น WikiWords"
 
-#: ../Tomboy/PreferencesDialog.cs:172
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1434,31 +1549,46 @@ msgstr ""
 "และการคลิกที่คำดังกล่าวจะสร้างบันทึกชื่อในชื่อนั้น"
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:179
+#: ../Tomboy/PreferencesDialog.cs:208
 msgid "Enable auto-_bulleted lists"
 msgstr "เปิดใช้_รายการย่อยแบบอัตโนมัติ"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:188
+#: ../Tomboy/PreferencesDialog.cs:217
 msgid "Use custom _font"
 msgstr "ใช้แ_บบอักษรที่กำหนด"
 
-#: ../Tomboy/PreferencesDialog.cs:212
+#: ../Tomboy/PreferencesDialog.cs:235
+msgid "When renaming a linked note: "
+msgstr "เมื่อเปลี่ยนชื่อบันทึกที่ถูกลิงก์อยู่:"
+
+#: ../Tomboy/PreferencesDialog.cs:238
+msgid "Ask me what to do"
+msgstr "ถามก่อนว่าจะให้ทำอย่างไร"
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Never rename links"
+msgstr "ไม่ต้องเปลี่ยนชื่อลิงก์เลย"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Always rename links"
+msgstr "เปลี่ยนชื่อลิงก์เสมอ"
+
+#: ../Tomboy/PreferencesDialog.cs:260
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "ใช้แผ่นแบบบันทึกเพื่อกำหนดข้อความที่จะใช้เมื่อสร้างบันทึกใหม่"
 
-#: ../Tomboy/PreferencesDialog.cs:221
+#: ../Tomboy/PreferencesDialog.cs:269
 msgid "Open New Note Template"
 msgstr "เปิดแผ่นแบบสำหรับบันทึกใหม่"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:278
+#: ../Tomboy/PreferencesDialog.cs:326
 msgid "Listen for _Hotkeys"
 msgstr "ใช้งาน_ปุ่มลัด"
 
-#: ../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><Control><Shift>F11</b>, <b><"
@@ -1468,94 +1598,104 @@ msgstr ""
 "F11</b>, <b><Alt>N</b>"
 
 #. 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:385
+#: ../Tomboy/PreferencesDialog.cs:433
 msgid "Ser_vice:"
 msgstr "บ_ริการ:"
 
-#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
+#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1113
 msgid "Not configurable"
 msgstr "ปรับแต่งไม่ได้"
 
+#: ../Tomboy/PreferencesDialog.cs:512
+msgid "Automaticall_y Sync in Background Every"
+msgstr "ปรับข้อมูลให้ตรงกันหลังฉากโดย_อัตโนมัติทุกๆ"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:518
+msgid "Minutes"
+msgstr "นาที"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:458
+#: ../Tomboy/PreferencesDialog.cs:540
 msgid "_Advanced..."
 msgstr "_ขั้นสูง..."
 
-#: ../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
+#: ../Tomboy/PreferencesDialog.cs:799
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "ปรับแต่ง {0}"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:938
 msgid "Choose Note Font"
 msgstr "เลือกขนาดอักษรสำหรับบันทึก"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:982
 msgid "Other Synchronization Options"
 msgstr "ตัวเลือกอื่นสำหรับการปรับข้อมูลให้ตรงกัน"
 
-#: ../Tomboy/PreferencesDialog.cs:906
+#: ../Tomboy/PreferencesDialog.cs:988
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "เมื่อมีสิ่งขัดแย้งระหว่างบันทึกในเครื่อง กับบันทึกที่อยู่ในเซิร์ฟเวอร์ที่กำหนดไว้สำหรับปรับข้อมูล:"
 
-#: ../Tomboy/PreferencesDialog.cs:913
+#: ../Tomboy/PreferencesDialog.cs:995
 msgid "Always ask me what to do."
 msgstr "ถามก่อนว่าจะให้ทำอย่างไร"
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:999
 msgid "Rename my local note."
 msgstr "เปลี่ยนชื่อบันทึกในเครื่อง"
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1003
 msgid "Replace my local note with the server's update."
 msgstr "เขียนบันทึกใหม่จากเซิร์ฟเวอร์ทับบันทึกในเครื่อง"
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1149
 msgid "WARNING: Are you sure?"
 msgstr "คำเตือน: แน่ใจหรือยัง?"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1151
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1563,11 +1703,11 @@ msgstr ""
 "ไม่แนะนำให้ล้างค่าตั้งการปรับข้อมูลให้ตรงกันออก คุณอาจจำเป็นต้องปรับข้อมูลบันทึกของคุณใหม่หมด "
 "เมื่อคุณบันทึกการตั้งค่าชุดใหม่"
 
-#: ../Tomboy/PreferencesDialog.cs:1082
+#: ../Tomboy/PreferencesDialog.cs:1164
 msgid "Resetting Synchronization Settings"
 msgstr "กำลังล้างค่าตั้งสำหรับการปรับข้อมูลให้ตรงกัน"
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#: ../Tomboy/PreferencesDialog.cs:1166
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1576,17 +1716,17 @@ msgstr ""
 "คุณได้ปิดบริการปรับข้อมูลให้ตรงกันที่ได้ตั้งค่าไว้ ค่าตั้งเกี่ยวกับการปรับข้อมูลให้ตรงกันของคุณจะถูกลบทิ้ง "
 "คุณอาจจำเป็นต้องปรับข้อมูลบันทึกของคุณใหม่หมดเมื่อคุณบันทึกการตั้งค่าชุดใหม่"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1244
 msgid "Success! You're connected!"
 msgstr "สำเร็จ! เชื่อมต่อได้แล้ว"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1246
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "Tomboy พร้อมที่จะปรับข้อมูลบันทึกของคุณให้ตรงกันแล้ว ต้องการจะปรับข้อมูลเลยหรือไม่?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#: ../Tomboy/PreferencesDialog.cs:1269
 #, csharp-format
 msgid ""
 "Sorry, but something went wrong.  Please check your information and try "
@@ -1594,65 +1734,61 @@ msgid ""
 msgstr ""
 "เสียใจด้วย มีบางอย่างผิดพลาด โปรดตรวจสอบข้อมูลของคุณแล้วลองใหม่อีกครั้ง แฟ้ม {0} อาจช่วยได้"
 
-#: ../Tomboy/PreferencesDialog.cs:1200
+#: ../Tomboy/PreferencesDialog.cs:1282
 msgid "Error connecting :("
 msgstr "เกิดข้อผิดพลาดขณะเชื่อมต่อ :("
 
-#: ../Tomboy/PreferencesDialog.cs:1276
+#: ../Tomboy/PreferencesDialog.cs:1358
 msgid "Version:"
 msgstr "รุ่น:"
 
-#: ../Tomboy/PreferencesDialog.cs:1283
+#: ../Tomboy/PreferencesDialog.cs:1365
 msgid "Author:"
 msgstr "ผู้แต่ง:"
 
-#: ../Tomboy/PreferencesDialog.cs:1290
+#: ../Tomboy/PreferencesDialog.cs:1372
 msgid "Copyright:"
 msgstr "สงวนลิขสิทธิ์:"
 
-#: ../Tomboy/PreferencesDialog.cs:1296
+#: ../Tomboy/PreferencesDialog.cs:1378
 msgid "Add-in Dependencies:"
 msgstr "สิ่งที่โปรแกรมเสริมต้องใช้:"
 
-#: ../Tomboy/RecentChanges.cs:75
-msgid "Search All Notes"
-msgstr "ค้นบันทึกทั้งหมด"
-
-#: ../Tomboy/RecentChanges.cs:90
+#: ../Tomboy/RecentChanges.cs:98
 msgid "_Search:"
 msgstr "_ค้นหา:"
 
-#: ../Tomboy/RecentChanges.cs:319
+#: ../Tomboy/RecentChanges.cs:330
 msgid "Note"
 msgstr "บันทึก"
 
-#: ../Tomboy/RecentChanges.cs:341
+#: ../Tomboy/RecentChanges.cs:352
 msgid "Last Changed"
 msgstr "เปลี่ยนแปลงล่าสุด"
 
-#: ../Tomboy/RecentChanges.cs:472
+#: ../Tomboy/RecentChanges.cs:483
 msgid "Matches"
 msgstr "ผลการค้นหา"
 
-#: ../Tomboy/RecentChanges.cs:523
+#: ../Tomboy/RecentChanges.cs:534
 #, csharp-format
 msgid "{0} match"
 msgid_plural "{0} matches"
 msgstr[0] "พบ {0} รายการ"
 
-#: ../Tomboy/RecentChanges.cs:537
+#: ../Tomboy/RecentChanges.cs:548
 #, csharp-format
 msgid "Total: {0} note"
 msgid_plural "Total: {0} notes"
 msgstr[0] "บันทึกทั้งหมด: {0} รายการ"
 
-#: ../Tomboy/RecentChanges.cs:548
+#: ../Tomboy/RecentChanges.cs:559
 #, csharp-format
 msgid "Matches: {0} note"
 msgid_plural "Matches: {0} notes"
 msgstr[0] "บันทึกที่พบ: {0} รายการ"
 
-#: ../Tomboy/RecentChanges.cs:680
+#: ../Tomboy/RecentChanges.cs:695
 msgid "Notes"
 msgstr "บันทึก"
 
@@ -1668,7 +1804,7 @@ msgstr "งานพัฒนาหลัก:"
 msgid "Contributors:"
 msgstr "ผู้ร่วมสมทบงาน:"
 
-#: ../Tomboy/Tomboy.cs:400
+#: ../Tomboy/Tomboy.cs:403
 msgid "translator-credits"
 msgstr ""
 "Isriya Paireepairit <markpeak at gmail.com>\n"
@@ -1676,7 +1812,7 @@ msgstr ""
 "Theppitak Karoonboonyanan <thep at linux.thai.net>\n"
 "aka.ape <aka.ape at gmail.com>"
 
-#: ../Tomboy/Tomboy.cs:409
+#: ../Tomboy/Tomboy.cs:412
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
@@ -1684,15 +1820,15 @@ msgstr ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
 
-#: ../Tomboy/Tomboy.cs:411
+#: ../Tomboy/Tomboy.cs:414
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "โปรแกรมบันทึกข้อความที่เรียบง่ายใช้สะดวก"
 
-#: ../Tomboy/Tomboy.cs:421
+#: ../Tomboy/Tomboy.cs:424
 msgid "Homepage"
 msgstr "โฮมเพจ"
 
-#: ../Tomboy/Tomboy.cs:533
+#: ../Tomboy/Tomboy.cs:536
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
@@ -1702,7 +1838,7 @@ msgstr ""
 "Copyright (C) 2004-2006 Alex Graveley <alex at beatniksoftware.com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:545
+#: ../Tomboy/Tomboy.cs:548
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1716,7 +1852,7 @@ msgstr ""
 "  --note-path [path]\t\tเรียก/บันทึกข้อความในไดเรกทอรีนี้\n"
 "  --search [text]\t\tเปิดหน้าต่างค้นบันทึกทั้งหมด พร้อมคำค้น\n"
 
-#: ../Tomboy/Tomboy.cs:555
+#: ../Tomboy/Tomboy.cs:558
 msgid ""
 "  --new-note\t\t\tCreate and display a new note.\n"
 "  --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1730,7 +1866,7 @@ msgstr ""
 "  --start-here\t\t\tแสดงบันทึก 'เริ่มที่นี่'\n"
 "  --highlight-search [text]\tค้นหาและเน้นข้อความในบันทึกที่เปิดอยู่\n"
 
-#: ../Tomboy/Tomboy.cs:569
+#: ../Tomboy/Tomboy.cs:572
 #, csharp-format
 msgid "Version {0}"
 msgstr "รุ่น {0}"
@@ -1739,92 +1875,92 @@ msgstr "รุ่น {0}"
 msgid " (new)"
 msgstr " (ใหม่)"
 
-#: ../Tomboy/Tray.cs:282
+#: ../Tomboy/Tray.cs:287
 msgid "_About Tomboy"
 msgstr "เ_กี่ยวกับ Tomboy"
 
-#: ../Tomboy/Utils.cs:142
+#: ../Tomboy/Utils.cs:143
 msgid ""
 "The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
 msgstr "ไม่พบ \"คู่มือวิธีใช้บันทึก Tomboy\" กรุณาตรวจสอบการติดตั้งของคุณว่าครบถ้วนสมบูรณ์หรือไม่"
 
-#: ../Tomboy/Utils.cs:151
+#: ../Tomboy/Utils.cs:152
 msgid "Help not found"
 msgstr "ไม่พบคู่มือวิธีใช้"
 
-#: ../Tomboy/Utils.cs:167
+#: ../Tomboy/Utils.cs:168
 msgid "Cannot open location"
 msgstr "ไม่สามารถเปิดตำแหน่ง"
 
-#: ../Tomboy/Utils.cs:189
+#: ../Tomboy/Utils.cs:190
 #, csharp-format
 msgid "Today, {0}"
 msgstr "วันนี้ {0}"
 
-#: ../Tomboy/Utils.cs:191
+#: ../Tomboy/Utils.cs:192
 msgid "Today"
 msgstr "วันนี้"
 
-#: ../Tomboy/Utils.cs:195
+#: ../Tomboy/Utils.cs:196
 #, csharp-format
 msgid "Yesterday, {0}"
 msgstr "เมื่อวานนี้ {0}"
 
-#: ../Tomboy/Utils.cs:197
+#: ../Tomboy/Utils.cs:198
 msgid "Yesterday"
 msgstr "เมื่อวาน"
 
-#: ../Tomboy/Utils.cs:202
+#: ../Tomboy/Utils.cs:203
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
 msgstr[0] "{0} วันก่อน {1}"
 
-#: ../Tomboy/Utils.cs:206
+#: ../Tomboy/Utils.cs:207
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
 msgstr[0] "{0} วันก่อน"
 
-#: ../Tomboy/Utils.cs:212
+#: ../Tomboy/Utils.cs:213
 #, csharp-format
 msgid "Tomorrow, {0}"
 msgstr "พรุ่งนี้ {0}"
 
-#: ../Tomboy/Utils.cs:214
+#: ../Tomboy/Utils.cs:215
 msgid "Tomorrow"
 msgstr "พรุ่งนี้"
 
-#: ../Tomboy/Utils.cs:219
+#: ../Tomboy/Utils.cs:220
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
 msgstr[0] "อีก {0} วัน {1}"
 
-#: ../Tomboy/Utils.cs:223
+#: ../Tomboy/Utils.cs:224
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
 msgstr[0] "อีก {0} วัน"
 
-#: ../Tomboy/Utils.cs:228
+#: ../Tomboy/Utils.cs:229
 msgid "MMMM d, h:mm tt"
 msgstr "d MMMM, H:mm"
 
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "d MMMM"
 
-#: ../Tomboy/Utils.cs:231
+#: ../Tomboy/Utils.cs:232
 msgid "No Date"
 msgstr "ไม่ระบุวันที่"
 
-#: ../Tomboy/Utils.cs:234
+#: ../Tomboy/Utils.cs:235
 msgid "MMMM d yyyy, h:mm tt"
 msgstr "d MMMM yyyy, H:mm"
 
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:236
 msgid "MMMM d yyyy"
 msgstr "d MMMM yyyy"
 
@@ -1833,7 +1969,7 @@ msgstr "d MMMM yyyy"
 msgid "(Untitled {0})"
 msgstr "(ไม่มีหัวข้อ {0})"
 
-#: ../Tomboy/Watchers.cs:188
+#: ../Tomboy/Watchers.cs:189
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -1841,15 +1977,15 @@ msgid ""
 msgstr ""
 "มีบันทึกที่หัวข้อ <b>{0}</b> อยู่ก่อนแล้ว กรุณาเลือกชื่ออื่นสำหรับบันทึกนี้ ก่อนที่จะดำเนินการต่อไป"
 
-#: ../Tomboy/Watchers.cs:203
+#: ../Tomboy/Watchers.cs:204
 msgid "Note title taken"
 msgstr "หัวข้อนี้ถูกใช้แล้ว"
 
-#: ../Tomboy/Watchers.cs:548
+#: ../Tomboy/Watchers.cs:549
 msgid "_Copy Link Address"
 msgstr "_คัดลอกตำแหน่งลิงก์"
 
-#: ../Tomboy/Watchers.cs:553
+#: ../Tomboy/Watchers.cs:554
 msgid "_Open Link"
 msgstr "เ_ปิดลิงก์"
 
@@ -1891,193 +2027,189 @@ msgstr "เกิดข้อผิดพลาดขณะเชื่อมต
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:119
-msgid "Note Title"
-msgstr "หัวข้อบันทึก"
-
 #: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
 msgstr "สถานะ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:241
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
 msgid "Acquiring sync lock..."
 msgstr "กำลังขอล็อคเพื่อปรับข้อมูล..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:244
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "กำลังบันทึกการเปลี่ยนแปลง..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "กำลังปรับข้อมูลบันทึกให้ตรงกัน"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "ปรับข้อมูลบันทึกของคุณ..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:249
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "อาจใช้เวลาสักครู่ ขอให้สนุก!"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:251
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "กำลังเชื่อมต่อไปยังเซิร์ฟเวอร์..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:257
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "กำลังลบบันทึกออกจากเซิร์ฟเวอร์..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:261
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "กำลังดาวน์โหลด บันทึกใหม่/ปรับปรุง..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "เซิร์ฟเวอร์ล็อคอยู่"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "เซิร์ฟเวอร์ถูกล็อคอยู่"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:275
+#: ../Tomboy/Synchronization/SyncDialog.cs:270
 msgid ""
 "One of your other computers is currently synchronizing.  Please wait 2 "
 "minutes and try again."
 msgstr "คอมพิวเตอร์เครื่องอื่นกำลังปรับข้อมูลอยู่ กรุณารอ 2 นาทีแล้วลองใหม่"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:279
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "กำลังเตรียมดาวน์โหลดการปรับข้อมูลจากเซิร์ฟเวอร์..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:282
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "กำลังเตรียมอัปโหลดการปรับข้อมูลไปยังเซิร์ฟเวอร์..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:285
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "กำลังอัปโหลดบันทึกไปยังเซิร์ฟเวอร์..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "การปรับข้อมูลให้ตรงกันล้มเหลว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "ปรับข้อมูลให้ตรงกันไม่สำเร็จ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:290
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "ไม่สามารถปรับข้อมูลบันทึก โปรดตรวจสอบรายละเอียดด้านล่างแล้วลองใหม่อีกครั้ง"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "การปรับข้อมูลให้ตรงกันเสร็จสมบูรณ์"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:297
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "การปรับข้อมูลให้ตรงกันเสร็จสมบูรณ์"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:299
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "ปรับข้อมูลบันทึกแล้ว {0} ฉบับ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:304
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "บันทึกของคุณกลายเป็นฉบับล่าสุดแล้ว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "การปรับข้อมูลให้ตรงกันถูกยกเลิก"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "การปรับข้อมูลให้ตรงกันถูกยกเลิก"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:310
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "คุณยกเลิกการปรับข้อมูลให้ตรงกัน คุณอาจปิดหน้าต่างนี้ได้"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "การปรับข้อมูลให้ตรงกันไม่ได้ตั้งค่าไว้"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "การปรับข้อมูลให้ตรงกันไม่ได้ตั้งค่าไว้"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:316
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "โปรดตั้งค่าการปรับข้อมูลให้ตรงกันในกล่องโต้ตอบปรับแต่ง"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "บริการปรับข้อมูลให้ตรงกันผิดพลาด"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "บริการผิดพลาด"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:322
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "เกิดข้อผิดพลาดขณะเชื่อมต่อไปยังบริการปรับข้อมูลให้ตรงกัน โปรดลองใหม่อีกครั้ง"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:339
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "ลบบันทึกในเครื่องแล้ว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:342
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "ลบออกจากเซิร์ฟเวอร์แล้ว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:345
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "ปรับข้อมูลแล้ว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:348
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "เพิ่มแล้ว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:351
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "อัปโหลดการเปลี่ยนแปลงไปยังเซิร์ฟเวอร์แล้ว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:354
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "อัปโหลดบันทึกใหม่ไปยังเซิร์ฟเวอร์แล้ว"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:502
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "ความขัดแย้งของบันทึก"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:508
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (เก่า)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:547
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "เปลี่ยนชื่อบันทึกในเครื่อง:"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:553
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "ปรับปรุงลิงก์ในบันทึกที่อ้างถึง"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:560
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "เขึยนทับบันทึกในเครื่อง"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:564
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "เลือกปฎิบัติการนี้เสมอ"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:570
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "ตรวจพบความขัดแย้งของบันทึก"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:571
+#: ../Tomboy/Synchronization/SyncDialog.cs:565
 #, csharp-format
 msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
@@ -2086,7 +2218,7 @@ msgstr ""
 "บันทึก \"{0}\" ฉบับที่เซิร์ฟเวอร์ขัดแย้งกับบันทึกในเครื่องคุณ "
 "คุณต้องการทำอย่างไรกับบันทึกในเครื่องของคุณ?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:159
+#: ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "_Tools"
 msgstr "เ_ครื่องมือ"
 
@@ -2505,9 +2637,6 @@ msgstr ""
 #~ "<b>สารบัญ</b> แสดงรายการบันทึกทั้งหมดของคุณ\n"
 #~ "ดับเบิลคลิกเพื่อเปิดดูบันทึก"
 
-#~ msgid "Search Note"
-#~ msgstr "ค้นหาบันทึก"
-
 #~ msgid "Search _Results"
 #~ msgstr "_ผลการค้นหา"
 
diff --git a/tomboy.spec b/tomboy.spec
index 02c7d1c..e42752b 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
 Name:           tomboy
-Version:        1.2.0
+Version:        1.2.1
 Release:        1
 Epoch:          0
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 

-- 
Tomboy - desktop note taking program using Wiki style links



More information about the Pkg-cli-apps-commits mailing list